From: Kenny G. <ken...@us...> - 2007-09-15 09:19:49
|
Update of /cvsroot/planeshift/planeshift/src/server In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27192/src/server Modified Files: bankmanager.cpp Log Message: - Fixed server crash on "spawn" - psGuildInfo was missing a new in one of the ctors. However, rather than adding it, I changed bankMoney back to not being a pointer. It lives for the same duration as the object anyway... Index: bankmanager.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/server/bankmanager.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** bankmanager.cpp 14 Sep 2007 23:01:50 -0000 1.2 --- bankmanager.cpp 15 Sep 2007 09:19:48 -0000 1.3 *************** *** 110,123 **** { psGuildInfo* g = pschar->GetGuild(); ! // No guild. ! if(!g) ! return NULL; ! psMoney* mon = g->GetBankMoney(); ! return mon; } else { ! psMoney* mon = pschar->BankMoney(); ! return mon; } } --- 110,118 ---- { psGuildInfo* g = pschar->GetGuild(); ! return g ? &g->GetBankMoney() : NULL; } else { ! return &pschar->BankMoney(); } } |