From: <wel...@us...> - 2009-12-24 10:33:38
|
Revision: 5040 http://planeshift.svn.sourceforge.net/planeshift/?rev=5040&view=rev Author: weltall2 Date: 2009-12-24 10:33:28 +0000 (Thu, 24 Dec 2009) Log Message: ----------- fixed crash when receiving a new main actor when being in a group Modified Paths: -------------- trunk/src/client/gui/pawsgroupwindow.cpp trunk/src/client/gui/pawsgroupwindow.h Modified: trunk/src/client/gui/pawsgroupwindow.cpp =================================================================== --- trunk/src/client/gui/pawsgroupwindow.cpp 2009-12-24 06:45:54 UTC (rev 5039) +++ trunk/src/client/gui/pawsgroupwindow.cpp 2009-12-24 10:33:28 UTC (rev 5040) @@ -52,7 +52,6 @@ pawsGroupWindow::pawsGroupWindow() { memberList = 0; - player = NULL; } pawsGroupWindow::~pawsGroupWindow() @@ -219,8 +218,7 @@ void pawsGroupWindow::Draw() { - if (!player) - player = psengine->GetCelClient()->GetMainPlayer(); + GEMClientActor* player = psengine->GetCelClient()->GetMainPlayer(); player->GetVitalMgr()->Predict( csGetTicks(),"Self" ); Modified: trunk/src/client/gui/pawsgroupwindow.h =================================================================== --- trunk/src/client/gui/pawsgroupwindow.h 2009-12-24 06:45:54 UTC (rev 5039) +++ trunk/src/client/gui/pawsgroupwindow.h 2009-12-24 10:33:28 UTC (rev 5040) @@ -56,8 +56,6 @@ void Draw(); void HandleGroup( csString& string ); void HandleMembers( csString& string ); - - GEMClientActor* player; pawsChatWindow* chatWindow; }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |