From: Keith F. <ven...@us...> - 2007-05-19 21:56:17
|
Update of /cvsroot/planeshift/planeshift/src/server In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30001 Modified Files: command.cpp gem.cpp Log Message: - Committing patch from Brandon Rioja which interrupts any WORK in progress if you move. This fixes a fatigue bug (#2029). - Minor reformatting. Index: command.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/server/command.cpp,v retrieving revision 1.247 retrieving revision 1.248 diff -C2 -d -r1.247 -r1.248 *** command.cpp 12 May 2007 19:46:42 -0000 1.247 --- command.cpp 19 May 2007 21:56:17 -0000 1.248 *************** *** 547,555 **** { WordArray words(arg); ! if (words.GetCount()>1) { ! csString fullname = words[0]+" "+words[1]; ! dict->Print(fullname.GetDataSafe()); ! } else ! dict->Print(words[0].GetDataSafe()); return 0; } --- 547,557 ---- { WordArray words(arg); ! if (words.GetCount()>1) ! { ! csString fullname = words[0]+" "+words[1]; ! dict->Print(fullname.GetDataSafe()); ! } ! else ! dict->Print(words[0].GetDataSafe()); return 0; } *************** *** 557,561 **** int com_filtermsg(char* arg) { - CPrintf(CON_CMDOUTPUT ,"%s\n",psserver->GetNetManager()->LogMessageFilter(arg).GetDataSafe()); --- 559,562 ---- Index: gem.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/server/gem.cpp,v retrieving revision 1.448 retrieving revision 1.449 diff -C2 -d -r1.448 -r1.449 *** gem.cpp 18 May 2007 09:32:52 -0000 1.448 --- gem.cpp 19 May 2007 21:56:17 -0000 1.449 *************** *** 2628,2632 **** else // Moving { ! #ifdef STAMINA_PROCESS_DEBUG printf("Moving @"); #endif --- 2628,2639 ---- else // Moving { ! // unwork stuff ! if (psChar->GetMode() == PSCHARACTER_MODE_WORK ) ! { ! SetMode(PSCHARACTER_MODE_PEACE); ! psserver->SendSystemInfo(GetClientID(),"You stop working."); ! } ! ! #ifdef STAMINA_PROCESS_DEBUG printf("Moving @"); #endif |