Changeset 9715 in orxonox.OLD for branches/new_class_id/src/util/multiplayer_team_deathmatch.cc

Timestamp:

Sep 1, 2006, 8:06:39 PM (19 years ago)

Author:

bensch

Message:

renamed newclassid to classid and newobjectlist to objectlist

File:

• branches/new_class_id/src/util/multiplayer_team_deathmatch.cc (modified) (12 diffs)

branches/new_class_id/src/util/multiplayer_team_deathmatch.cc

@@ -50 +50 @@
 #include "class_id.h"
 
-NewObjectListDefinitionID(MultiplayerTeamDeathmatch, CL_MULTIPLAYER_TEAM_DEATHMATCH);
+ObjectListDefinitionID(MultiplayerTeamDeathmatch, CL_MULTIPLAYER_TEAM_DEATHMATCH);
 CREATE_FACTORY(MultiplayerTeamDeathmatch);
 /**
@@ -301 +301 @@
 }
 
-NewClassID MultiplayerTeamDeathmatch::getPlayableClassId( int userId, int team )
+ClassID MultiplayerTeamDeathmatch::getPlayableClassId( int userId, int team )
 {
   if ( team == TEAM_NOTEAM || team == TEAM_SPECTATOR )
-    return NewObjectListBase::retrieveIdentity("Spectator");
+    return ObjectListBase::retrieveIdentity("Spectator");
 
   if ( team == 0 || team == 1 )
-    return NewObjectListBase::retrieveIdentity("TurbineHover");
+    return ObjectListBase::retrieveIdentity("TurbineHover");
 
   assert( false );
@@ -313 +313 @@
 
 
-std::string MultiplayerTeamDeathmatch::getPlayableModelFileName( int userId, int team, const NewClassID& classId )
+std::string MultiplayerTeamDeathmatch::getPlayableModelFileName( int userId, int team, const ClassID& classId )
 {
   if (classId == CL_TURBINE_HOVER)
@@ -325 +325 @@
 }
 
-std::string MultiplayerTeamDeathmatch::getPlayableModelTextureFileName( int userId, int team, const NewClassID& classId )
+std::string MultiplayerTeamDeathmatch::getPlayableModelTextureFileName( int userId, int team, const ClassID& classId )
 {
   if ( classId == CL_FPS_PLAYER )
@@ -338 +338 @@
 }
 
-float MultiplayerTeamDeathmatch::getPlayableScale( int userId, int team, const NewClassID& classId )
-{
-  if ( classId == NewObjectListBase::retrieveIdentity(CL_FPS_PLAYER))
+float MultiplayerTeamDeathmatch::getPlayableScale( int userId, int team, const ClassID& classId )
+{
+  if ( classId == ObjectListBase::retrieveIdentity(CL_FPS_PLAYER))
   {
     return 10.0f;
@@ -358 +358 @@
     teamScore[i] = 0;
 
-  for (NewObjectList<PlayerStats>::const_iterator it = PlayerStats::objectList().begin();
+  for (ObjectList<PlayerStats>::const_iterator it = PlayerStats::objectList().begin();
        it != PlayerStats::objectList().end();
        ++it)
@@ -382 +382 @@
     playersInTeam[i] = 0;
 
-  for (NewObjectList<PlayerStats>::const_iterator it = PlayerStats::objectList().begin();
+  for (ObjectList<PlayerStats>::const_iterator it = PlayerStats::objectList().begin();
        it != PlayerStats::objectList().end();
        ++it)
@@ -442 +442 @@
 void MultiplayerTeamDeathmatch::handleTeamChanges( )
 {
-  for (NewObjectList<PlayerStats>::const_iterator it = PlayerStats::objectList().begin();
+  for (ObjectList<PlayerStats>::const_iterator it = PlayerStats::objectList().begin();
        it != PlayerStats::objectList().end();
        ++it)
@@ -458 +458 @@
 
   //now serve player who want join a random team
-  for (NewObjectList<PlayerStats>::const_iterator it = PlayerStats::objectList().begin();
+  for (ObjectList<PlayerStats>::const_iterator it = PlayerStats::objectList().begin();
        it != PlayerStats::objectList().end();
        ++it)
@@ -491 +491 @@
 
 
-  NewClassID       playableClassId  = getPlayableClassId( userId, stats.getPreferedTeamId() );
+  ClassID       playableClassId  = getPlayableClassId( userId, stats.getPreferedTeamId() );
   std::string   playableModel    = getPlayableModelFileName( userId, stats.getPreferedTeamId(), playableClassId );
   std::string   playableTexture  = getPlayableModelTextureFileName( userId, stats.getPreferedTeamId(), playableClassId );
@@ -813 +813 @@
   std::vector<SpawningPoint*> spList;
 
-  for (NewObjectList<SpawningPoint>::const_iterator it = SpawningPoint::objectList().begin();
+  for (ObjectList<SpawningPoint>::const_iterator it = SpawningPoint::objectList().begin();
        it != SpawningPoint::objectList().end();
        ++it)
@@ -825 +825 @@
   if ( spList.size() == 0 )
   {
-    for (NewObjectList<SpawningPoint>::const_iterator it = SpawningPoint::objectList().begin();
+    for (ObjectList<SpawningPoint>::const_iterator it = SpawningPoint::objectList().begin();
          it != SpawningPoint::objectList().end();
          ++it)