From: <ma...@us...> - 2011-12-11 10:43:35
|
Revision: 7803 http://planeshift.svn.sourceforge.net/planeshift/?rev=7803&view=rev Author: magodra Date: 2011-12-11 10:43:29 +0000 (Sun, 11 Dec 2011) Log Message: ----------- - Fixed name of interface function to be equal for both npcclient and server. Modified Paths: -------------- trunk/src/npcclient/command.cpp trunk/src/npcclient/networkmgr.cpp trunk/src/npcclient/npcclient.h trunk/src/npcclient/status.cpp Modified: trunk/src/npcclient/command.cpp =================================================================== --- trunk/src/npcclient/command.cpp 2011-12-11 10:17:42 UTC (rev 7802) +++ trunk/src/npcclient/command.cpp 2011-12-11 10:43:29 UTC (rev 7803) @@ -63,7 +63,7 @@ { npcclient->Disconnect(); - npcclient->GetEventMgr()->Stop(); + npcclient->GetEventManager()->Stop(); return 0; } Modified: trunk/src/npcclient/networkmgr.cpp =================================================================== --- trunk/src/npcclient/networkmgr.cpp 2011-12-11 10:17:42 UTC (rev 7802) +++ trunk/src/npcclient/networkmgr.cpp 2011-12-11 10:43:29 UTC (rev 7803) @@ -953,7 +953,7 @@ } //if found set it - npc->SetBrain(type, npcclient->GetEventMgr()); + npc->SetBrain(type, npcclient->GetEventManager()); break; } @@ -993,7 +993,7 @@ reconnect = true; // 60 secs to allow any connections to go linkdead. psNPCReconnect *recon = new psNPCReconnect(60000, this, false); - npcclient->GetEventMgr()->Push(recon); + npcclient->GetEventManager()->Push(recon); } } @@ -1430,7 +1430,7 @@ } // 2 seconds to allow linkdead messages to be processed psNPCReconnect *recon = new psNPCReconnect(2000, this, true); - npcclient->GetEventMgr()->Push(recon); + npcclient->GetEventManager()->Push(recon); } void NetworkManager::SendConsoleCommand(const char *cmd) Modified: trunk/src/npcclient/npcclient.h =================================================================== --- trunk/src/npcclient/npcclient.h 2011-12-11 10:17:42 UTC (rev 7802) +++ trunk/src/npcclient/npcclient.h 2011-12-11 10:43:29 UTC (rev 7803) @@ -293,7 +293,7 @@ csVector3* basePos=NULL, iSector* baseSector=NULL, bool sameSector=false); - EventManager* GetEventMgr() + EventManager* GetEventManager() { return eventmanager; } /** Modified: trunk/src/npcclient/status.cpp =================================================================== --- trunk/src/npcclient/status.cpp 2011-12-11 10:17:42 UTC (rev 7802) +++ trunk/src/npcclient/status.cpp 2011-12-11 10:43:29 UTC (rev 7803) @@ -114,5 +114,5 @@ void NPCStatus::ScheduleNextRun() { - npcclient->GetEventMgr()->Push(new psNPCStatusRunEvent(reportRate)); + npcclient->GetEventManager()->Push(new psNPCStatusRunEvent(reportRate)); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |