From: Jorrit T. <jo...@us...> - 2005-03-07 14:26:29
|
Update of /cvsroot/planeshift/planeshift/src/server In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13456/src/server Modified Files: gem.cpp gem.h npcmanager.cpp npcmanager.h psserverchar.cpp spawnmanager.h spellmanager.cpp Log Message: CS_ID->uint. Index: gem.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/server/gem.cpp,v retrieving revision 1.209 retrieving revision 1.210 diff -C2 -d -r1.209 -r1.210 *** gem.cpp 5 Mar 2005 22:26:55 -0000 1.209 --- gem.cpp 7 Mar 2005 14:26:14 -0000 1.210 *************** *** 191,195 **** } ! gemObject *GEMSupervisor::FindObject(CS_ID id) { csHash<gemObject *>::Iterator i(entities.GetIterator(id)); --- 191,195 ---- } ! gemObject *GEMSupervisor::FindObject(uint id) { csHash<gemObject *>::Iterator i(entities.GetIterator(id)); *************** *** 210,214 **** } ! CS_ID GEMSupervisor::FindItemID(psItem *item) { if (item == NULL) --- 210,214 ---- } ! uint GEMSupervisor::FindItemID(psItem *item) { if (item == NULL) Index: gem.h =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/server/gem.h,v retrieving revision 1.95 retrieving revision 1.96 diff -C2 -d -r1.95 -r1.96 *** gem.h 26 Feb 2005 21:06:25 -0000 1.95 --- gem.h 7 Mar 2005 14:26:15 -0000 1.96 *************** *** 107,113 **** void RemoveEntity(gemObject *which); ! gemObject *FindObject(CS_ID id); gemObject *FindObject(const csString& name); ! CS_ID FindItemID(psItem *item); gemObject *GetObjectFromEntityList(iCelEntityList *list,int i); csPtr<iCelEntity> CreateProxActorList(uint32_t clientnum,iCelEntity *all_actors); --- 107,113 ---- void RemoveEntity(gemObject *which); ! gemObject *FindObject(uint id); gemObject *FindObject(const csString& name); ! uint FindItemID(psItem *item); gemObject *GetObjectFromEntityList(iCelEntityList *list,int i); csPtr<iCelEntity> CreateProxActorList(uint32_t clientnum,iCelEntity *all_actors); Index: npcmanager.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/server/npcmanager.cpp,v retrieving revision 1.80 retrieving revision 1.81 diff -C2 -d -r1.80 -r1.81 *** npcmanager.cpp 29 Jan 2005 07:01:34 -0000 1.80 --- npcmanager.cpp 7 Mar 2005 14:26:15 -0000 1.81 *************** *** 356,360 **** if (!actor) { ! Error2("Illegal CS_ID %d from superclient!\n",drmsg.entityid); } else if (!actor->IsAlive()) --- 356,360 ---- if (!actor) { ! Error2("Illegal uint %d from superclient!\n",drmsg.entityid); } else if (!actor->IsAlive()) *************** *** 385,391 **** case psNPCCommandsMessage::CMD_ATTACK: { ! CS_ID attacker_id = list.msg->GetUInt32(); Debug2(LOG_SUPERCLIENT,"-->Got attack cmd for entity %d\n",attacker_id); ! CS_ID target_id = list.msg->GetUInt32(); // Make sure we haven't run past the end of the buffer --- 385,391 ---- case psNPCCommandsMessage::CMD_ATTACK: { ! uint attacker_id = list.msg->GetUInt32(); Debug2(LOG_SUPERCLIENT,"-->Got attack cmd for entity %d\n",attacker_id); ! uint target_id = list.msg->GetUInt32(); // Make sure we haven't run past the end of the buffer *************** *** 553,557 **** void NPCManager::QueueEnemyPerception(int8_t type, ! CS_ID npc, CS_ID player, float relative_faction) { --- 553,557 ---- void NPCManager::QueueEnemyPerception(int8_t type, ! uint npc, uint player, float relative_faction) { Index: npcmanager.h =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/server/npcmanager.h,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** npcmanager.h 18 Jan 2005 23:33:45 -0000 1.22 --- npcmanager.h 7 Mar 2005 14:26:15 -0000 1.23 *************** *** 76,80 **** /// Let the superclient know that one of its npcs has died. ! void QueueEnemyPerception(int8_t type, CS_ID npc, CS_ID player, float relative_faction); /// Send all queued commands and perceptions to active superclients and reset the queues. --- 76,80 ---- /// Let the superclient know that one of its npcs has died. ! void QueueEnemyPerception(int8_t type, uint npc, uint player, float relative_faction); /// Send all queued commands and perceptions to active superclients and reset the queues. Index: psserverchar.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/server/psserverchar.cpp,v retrieving revision 1.264 retrieving revision 1.265 diff -C2 -d -r1.264 -r1.265 *** psserverchar.cpp 3 Mar 2005 23:54:43 -0000 1.264 --- psserverchar.cpp 7 Mar 2005 14:26:15 -0000 1.265 *************** *** 1219,1223 **** int fromClientNum = fromClient->GetClientNum(); int playerID = fromClient->GetPlayerID(); ! CS_ID playerObject = fromClient->GetActor()->GetEntity()->GetID(); csString mesh = item->GetMeshName(); --- 1219,1223 ---- int fromClientNum = fromClient->GetClientNum(); int playerID = fromClient->GetPlayerID(); ! uint playerObject = fromClient->GetActor()->GetEntity()->GetID(); csString mesh = item->GetMeshName(); Index: spawnmanager.h =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/server/spawnmanager.h,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** spawnmanager.h 18 Jan 2005 23:33:19 -0000 1.31 --- spawnmanager.h 7 Mar 2005 14:26:16 -0000 1.32 *************** *** 357,361 **** psSpawnManager *spawnmanager; int ticks; ! CS_ID entity; public: --- 357,361 ---- psSpawnManager *spawnmanager; int ticks; ! uint entity; public: Index: spellmanager.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/server/spellmanager.cpp,v retrieving revision 1.77 retrieving revision 1.78 diff -C2 -d -r1.77 -r1.78 *** spellmanager.cpp 29 Jan 2005 07:01:36 -0000 1.77 --- spellmanager.cpp 7 Mar 2005 14:26:16 -0000 1.78 *************** *** 240,245 **** csString effectName; csVector3 offset; ! CS_ID anchorID; ! CS_ID targetID; unsigned int castingDuration; csString castingText; --- 240,245 ---- csString effectName; csVector3 offset; ! uint anchorID; ! uint targetID; unsigned int castingDuration; csString castingText; *************** *** 503,508 **** csString responseEffectName; csVector3 offset; ! CS_ID anchorID; ! CS_ID targetID; csString effectText; --- 503,508 ---- csString responseEffectName; csVector3 offset; ! uint anchorID; ! uint targetID; csString effectText; |