Changeset 9704 in orxonox.OLD

Timestamp:

Aug 25, 2006, 12:22:50 PM (18 years ago)

Author:

bensch

Message:

adapted some game-rules

Location:

branches/new_class_id/src/util

Files:

• game_rules.cc (modified) (2 diffs)
• game_rules.h (modified) (1 diff)
• multiplayer_team_deathmatch.cc (modified) (5 diffs)
• multiplayer_team_deathmatch.h (modified) (2 diffs)
• network_game_rules.cc (modified) (4 diffs)
• network_game_rules.h (modified) (2 diffs)

branches/new_class_id/src/util/game_rules.cc

@@ -28 +28 @@
 
 
-
+NewObjectListDefinition(GameRules);
 
 /**
@@ -35 +35 @@
 GameRules::GameRules(const TiXmlElement* root)
 {
-  this->setClassID(CL_GAME_RULES, "GameRules");
+  this->registerObject(this, GameRules::_objectList);
 }
 

branches/new_class_id/src/util/game_rules.h

@@ -23 +23 @@
 class GameRules : virtual public BaseObject
 {
+  NewObjectListDeclaration(GameRules);
 
   public:

branches/new_class_id/src/util/multiplayer_team_deathmatch.cc

@@ -24 +24 @@
 #include "render2D/image_plane.h"
 #include "state.h"
-#include "class_list.h"
 
 #include "player.h"
@@ -33 +32 @@
 #include "shared_network_data.h"
 #include "terrain.h"
-#include "class_list.h"
 #include "space_ships/space_ship.h"
 
@@ -50 +48 @@
 
 
-
+#include "class_id.h"
 
 CREATE_FACTORY(MultiplayerTeamDeathmatch, CL_MULTIPLAYER_TEAM_DEATHMATCH);
-
-
+NewObjectListDefinitionID(MultiplayerTeamDeathmatch, CL_MULTIPLAYER_TEAM_DEATHMATCH);
 /**
  * constructor
@@ -61 +58 @@
   : NetworkGameRules(root)
 {
-  this->setClassID(CL_MULTIPLAYER_TEAM_DEATHMATCH, "MultiplayerTeamDeathmatch");
+  this->registerObject(this, MultiplayerTeamDeathmatch::_objectList);
 
   this->bLocalPlayerDead = false;
@@ -305 +302 @@
 }
 
-ClassID MultiplayerTeamDeathmatch::getPlayableClassId( int userId, int team )
+NewClassID MultiplayerTeamDeathmatch::getPlayableClassId( int userId, int team )
 {
   if ( team == TEAM_NOTEAM || team == TEAM_SPECTATOR )

branches/new_class_id/src/util/multiplayer_team_deathmatch.h

@@ -30 +30 @@
 class MultiplayerTeamDeathmatch : public NetworkGameRules, public EventListener
 {
+  NewObjectListDeclaration(MultiplayerTeamDeathmatch);
 
   public:
@@ -38 +39 @@
 
     virtual int getTeamForNewUser();
-    virtual const NewClassID& getPlayableClassId( int userId, int team );
+    virtual NewClassID getPlayableClassId( int userId, int team );
     virtual std::string getPlayableModelTextureFileName( int userId, int team, const NewClassID& classId );
     virtual std::string getPlayableModelFileName( int userId, int team, const NewClassID& classId );

branches/new_class_id/src/util/network_game_rules.cc

@@ -22 +22 @@
 
 
+NewObjectListDefinition(NetworkGameRules);
 
 /**
@@ -27 +28 @@
  */
 NetworkGameRules::NetworkGameRules ( const TiXmlElement* root )
-  : GameRules( root )
+    : GameRules( root )
 {
-  this->setClassID( CL_NETWORK_GAME_RULES, "NetworkGameRules");
+  this->registerObject(this, NetworkGameRules::_objectList);
 }
 
@@ -37 +38 @@
  */
 NetworkGameRules::~NetworkGameRules ()
-{
-}
+{}
 
 
-std::string NetworkGameRules::getPlayableModelTextureFileName( int userId, int team, ClassID classId )
+std::string NetworkGameRules::getPlayableModelTextureFileName( int userId, int team, const NewClassID& classId )
 {
   return "";
 }
 
-std::string NetworkGameRules::getPlayableModelFileName( int uesrId, int team, ClassID classId )
+std::string NetworkGameRules::getPlayableModelFileName( int uesrId, int team, const NewClassID& classId )
 {
   return "models/ships/reap_#.obj";
 }
 
-ClassID NetworkGameRules::getPlayableClassId( int userId, int team )
+NewClassID NetworkGameRules::getPlayableClassId( int userId, int team )
 {
-  return CL_SPACE_SHIP;
+  const NewObjectListBase* objList = NewObjectListBase::getObjectList("SpaceShip");
+  if (objList != NULL)
+    return objList->identity();
+  else
+    return NewClassID();
 }
 
@@ -68 +72 @@
 
 
-float NetworkGameRules::getPlayableScale( int userId, int team, ClassID classId )
+float NetworkGameRules::getPlayableScale( int userId, int team, const NewClassID& classId )
 {
   return 1.0f;

branches/new_class_id/src/util/network_game_rules.h

@@ -15 +15 @@
 class NetworkGameRules : public GameRules
 {
+  NewObjectListDeclaration(NetworkGameRules);
 
   public:
@@ -21 +22 @@
 
     virtual int getTeamForNewUser();
-    virtual const NewClassID& getPlayableClassId( int userId, int team );
+    virtual NewClassID getPlayableClassId( int userId, int team );
     virtual std::string getPlayableModelFileName( int userId, int team, const NewClassID& classId );
     virtual std::string getPlayableModelTextureFileName( int userId, int team, const NewClassID& classId );