mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-30 16:17:46 +00:00
Code Activity

Build fix

Browse source
This commit is contained in:
Mordred 2018-02-21 11:28:34 +01:00
parent 322dce393d
commit 8e38ffdb56
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavel.cpp
View file

@ -10,10 +10,10 @@ public:
void onInit( InstanceContent& instance ) override void onInit( InstanceContent& instance ) override
{ {
auto exit = new Entity::EventObject( EXIT_OBJECT, 0, { 0, 0, -10 } ); auto exit = new Entity::EventObject( EXIT_OBJECT, 0, { 0, 0, -10 } );
instance.registerEObj(Entity::InstanceObjectPtr(exit)); instance.registerEObj(Entity::EventObjectPtr(exit));
auto start = new Entity::EventObject( START_CIRCLE, 4236868, { 0, 0, 24 } ); auto start = new Entity::EventObject( START_CIRCLE, 4236868, { 0, 0, 24 } );
instance.registerEObj(Entity::InstanceObjectPtr(start)); instance.registerEObj(Entity::EventObjectPtr(start));
} }
void onUpdate( InstanceContent& instance, uint32_t currTime ) override void onUpdate( InstanceContent& instance, uint32_t currTime ) override

6
src/servers/sapphire_zone/Zone/Zone.cpp
View file

@ -805,15 +805,15 @@ void Core::Zone::registerEObj( Entity::EventObjectPtr object )
//object->setParentInstance( InstanceContentPtr( this ) ); //object->setParentInstance( InstanceContentPtr( this ) );
m_instanceObjects[object->getId()] = object; m_eventObjects[object->getId()] = object;
g_log.debug( "Registered instance eobj: " + std::to_string( object->getId() ) ); g_log.debug( "Registered instance eobj: " + std::to_string( object->getId() ) );
} }
Core::Entity::EventObjectPtr Core::Zone::getEObj( uint32_t objId ) Core::Entity::EventObjectPtr Core::Zone::getEObj( uint32_t objId )
{ {
auto obj = m_instanceObjects.find( objId ); auto obj = m_eventObjects.find( objId );
if( obj == m_instanceObjects.end() ) if( obj == m_eventObjects.end() )
return nullptr; return nullptr;
return obj->second; return obj->second;

2
src/servers/sapphire_zone/Zone/Zone.h
View file

@ -35,7 +35,7 @@ protected:
std::unordered_map< int32_t, Entity::PlayerPtr > m_playerMap; std::unordered_map< int32_t, Entity::PlayerPtr > m_playerMap;
std::unordered_map< int32_t, Entity::BattleNpcPtr > m_BattleNpcMap; std::unordered_map< int32_t, Entity::BattleNpcPtr > m_BattleNpcMap;
std::unordered_map< int32_t, Entity::EventObjectPtr > m_instanceObjects; std::unordered_map< int32_t, Entity::EventObjectPtr > m_eventObjects;
std::set< Entity::BattleNpcPtr > m_BattleNpcDeadMap; std::set< Entity::BattleNpcPtr > m_BattleNpcDeadMap;