Changeset 9869 in orxonox.OLD for trunk/src/util/network_game_rules.cc

Timestamp:

Oct 3, 2006, 12:19:30 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

File:

• trunk/src/util/network_game_rules.cc (modified) (5 diffs)

trunk/src/util/network_game_rules.cc

@@ -22 +22 @@
 
 
+ObjectListDefinition(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 ClassID& classId )
 {
   return "";
 }
 
-std::string NetworkGameRules::getPlayableModelFileName( int uesrId, int team, ClassID classId )
+std::string NetworkGameRules::getPlayableModelFileName( int uesrId, int team, const ClassID& classId )
 {
   return "models/ships/reap_#.obj";
@@ -53 +53 @@
 ClassID NetworkGameRules::getPlayableClassId( int userId, int team )
 {
-  return CL_SPACE_SHIP;
+  const ObjectListBase* objList = ObjectListBase::getObjectList("SpaceShip");
+  if (objList != NULL)
+    return objList->identity();
+  else
+    return ClassID();
 }
 
@@ -68 +72 @@
 
 
-float NetworkGameRules::getPlayableScale( int userId, int team, ClassID classId )
+float NetworkGameRules::getPlayableScale( int userId, int team, const ClassID& classId )
 {
   return 1.0f;