From: Keith F. <ven...@us...> - 2003-06-22 09:18:10
|
Update of /cvsroot/planeshift/planeshift/src/client In directory sc8-pr-cvs1:/tmp/cvs-serv8078 Modified Files: psengine.cpp pscelclient.cpp Log Message: Added a TYPE parm to all Debug(), etc. macros. See log.h for list. Index: psengine.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/client/psengine.cpp,v retrieving revision 1.265 retrieving revision 1.266 diff -C2 -d -r1.265 -r1.266 *** psengine.cpp 17 Jun 2003 19:28:26 -0000 1.265 --- psengine.cpp 22 Jun 2003 09:18:07 -0000 1.266 *************** *** 778,782 **** if (!modelnames[modelToLoad]) { ! Debug1("Preloading complete"); modelsLoaded = true; paws->GetMouse()->ChangeImage("Standard Mouse Pointer"); --- 778,782 ---- if (!modelnames[modelToLoad]) { ! Debug1(LOG_ADMIN,"Preloading complete"); modelsLoaded = true; paws->GetMouse()->ChangeImage("Standard Mouse Pointer"); Index: pscelclient.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/client/pscelclient.cpp,v retrieving revision 1.92 retrieving revision 1.93 diff -C2 -d -r1.92 -r1.93 *** pscelclient.cpp 21 Jun 2003 05:34:12 -0000 1.92 --- pscelclient.cpp 22 Jun 2003 09:18:07 -0000 1.93 *************** *** 220,228 **** // Not sure if this is a good idea but appears to be ok // engine->DeleteAll(); ! Debug1("Persist Message: CELPERSISTCMD_SEND_WORLD\n"); if (requeststatus != 1) { ! Warning1 ("Received world without requesting it!\n"); return; } --- 220,228 ---- // Not sure if this is a good idea but appears to be ok // engine->DeleteAll(); ! Debug1(LOG_CELPERSIST,"Persist Message: CELPERSISTCMD_SEND_WORLD\n"); if (requeststatus != 1) { ! Error1("Received world without requesting it!\n"); return; } *************** *** 234,238 **** if (!entity) { ! Error1 ("Error while reading Entity!\n"); return; } --- 234,238 ---- if (!entity) { ! Error1("Error while reading Entity!\n"); return; } *************** *** 254,258 **** // SetupWorldColliders(); (now handled region by region in psworld.cpp) ! Debug1 ("Received world\n"); break; } --- 254,258 ---- // SetupWorldColliders(); (now handled region by region in psworld.cpp) ! Debug1(LOG_CELPERSIST,"Received world\n"); break; } *************** *** 261,265 **** case CELPERSISTCMD_SEND_ENTITY: { ! Debug1("Persist Message: CELPERSISTCMD_SEND_ENTITY\n"); csString pwd = vfs->GetCwd(); --- 261,265 ---- case CELPERSISTCMD_SEND_ENTITY: { ! Debug1(LOG_CELPERSIST,"Persist Message: CELPERSISTCMD_SEND_ENTITY\n"); csString pwd = vfs->GetCwd(); *************** *** 278,282 **** } ! Debug4("Received entity %s:%d and Refcount is %d.\n", entity->GetName(), entity->GetID(), --- 278,282 ---- } ! Debug4(LOG_CELPERSIST,"Received entity %s:%d and Refcount is %d.\n", entity->GetName(), entity->GetID(), *************** *** 290,294 **** if (!actors) { ! Warning2("Received actor entity %s before actor list! Ignored.\n",entity->GetName() ); vfs->ChDir(pwd); return; --- 290,294 ---- if (!actors) { ! Error2("Received actor entity %s before actor list! Ignored.\n",entity->GetName() ); vfs->ChDir(pwd); return; *************** *** 298,302 **** AddActor(entity); else ! Warning2("Received double copy of %s!\n",entity->GetName() ); } else --- 298,302 ---- AddActor(entity); else ! Warning2(LOG_CELPERSIST,"Received double copy of %s!\n",entity->GetName() ); } else *************** *** 305,309 **** } ! Debug4("After Add: Got entity %s:%lu with refcount %d in celclient\n", entity->GetName(), entity->GetID(), --- 305,309 ---- } ! Debug4(LOG_CELPERSIST,"After Add: Got entity %s:%lu with refcount %d in celclient\n", entity->GetName(), entity->GetID(), *************** *** 320,324 **** case CELPERSISTCMD_SEND_ACTORLIST: { ! Debug1("Persist Message: CELPERSISTCMD_SEND_ACTORLIST\n"); csString pwd = vfs->GetCwd(); --- 320,324 ---- case CELPERSISTCMD_SEND_ACTORLIST: { ! Debug1(LOG_CELPERSIST,"Persist Message: CELPERSISTCMD_SEND_ACTORLIST\n"); csString pwd = vfs->GetCwd(); *************** *** 330,334 **** if (requeststatus != 2) { ! Warning1("Received Actorlist without requesting it!\n"); vfs->ChDir(pwd); return; --- 330,334 ---- if (requeststatus != 2) { ! Error1("Received Actorlist without requesting it!\n"); vfs->ChDir(pwd); return; *************** *** 354,358 **** SetMainActor(newactor); ! Debug1("Received Player list!\n"); // Change directory back to what it was. --- 354,358 ---- SetMainActor(newactor); ! Debug1(LOG_CELPERSIST,"Received Player list!\n"); // Change directory back to what it was. *************** *** 367,371 **** default: { ! Warning1("Message is: UNKNOWN!!!\n"); break; } --- 367,371 ---- default: { ! Error1("CEL Persist Message is: UNKNOWN!!!\n"); break; } *************** *** 462,466 **** } ! Debug1("Loading Key Bindings..."); psXMLString mainString; --- 462,466 ---- } ! Debug1(LOG_STARTUP,"Loading Key Bindings..."); psXMLString mainString; |