mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-26 14:37:44 +00:00
Code Activity

minor instance script fixes, eobj parser should work as well as produce usable scripts now

Browse source
This commit is contained in:
liam 2019-11-23 02:57:29 -05:00
parent 8b99bb8d37
commit f16be26e4c
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/tools/event_object_parser/instance.tmpl
View file

@ -14,7 +14,7 @@ public:
EOBJ_INIT EOBJ_INIT
} }
void onUpdate( InstanceContent& instance, uint32_t currTime ) override void onUpdate( InstanceContent& instance, uint64_t tickCount ) override
{ {
} }

2
src/tools/event_object_parser/main.cpp
View file

@ -137,7 +137,7 @@ void loadAllInstanceContentEntries()
if( !ic ) if( !ic )
continue; continue;
type = ic->instanceContentType; type = ic->instanceContentType;
name = ic->name; name = cfc->name;
} }
else if( cfc->contentLinkType == 5 ) else if( cfc->contentLinkType == 5 )
{ {

2
src/tools/event_object_parser/questbattle.tmpl
View file

@ -16,7 +16,7 @@ public:
EOBJ_INIT EOBJ_INIT
} }
void onUpdate( QuestBattle& instance, uint32_t currTime ) override void onUpdate( QuestBattle& instance, uint64_t tickCount ) override
{ {
} }

4
src/world/Manager/TerritoryMgr.cpp
View file

@ -345,13 +345,13 @@ Sapphire::TerritoryPtr Sapphire::World::Manager::TerritoryMgr::createInstanceCon
auto pTeri = getTerritoryDetail( pContentFinderCondition->territoryType ); auto pTeri = getTerritoryDetail( pContentFinderCondition->territoryType );
if( !pTeri || pInstanceContent->name.empty() ) if( !pTeri || pContentFinderCondition->name.empty() )
return nullptr; return nullptr;
Logger::debug( "Starting instance for InstanceContent id: {0} ({1})", instanceContentId, pInstanceContent->name ); Logger::debug( "Starting instance for InstanceContent id: {0} ({1})", instanceContentId, pInstanceContent->name );
auto pZone = make_InstanceContent( pInstanceContent, pContentFinderCondition->territoryType, getNextInstanceId(), auto pZone = make_InstanceContent( pInstanceContent, pContentFinderCondition->territoryType, getNextInstanceId(),
pTeri->name, pInstanceContent->name, instanceContentId, framework() ); pTeri->name, pContentFinderCondition->name, instanceContentId, framework() );
pZone->init(); pZone->init();
m_instanceContentIdToInstanceMap[ instanceContentId ][ pZone->getGuId() ] = pZone; m_instanceContentIdToInstanceMap[ instanceContentId ][ pZone->getGuId() ] = pZone;