Changeset 9926 in orxonox.OLD

Timestamp:

Nov 9, 2006, 7:41:00 PM (18 years ago)

Author:

rennerc

Message:

compiles again

Location:

branches/network/src

Files:

• util/multiplayer_team_deathmatch.cc (modified) (3 diffs)
• world_entities/projectiles/bomb.cc (modified) (1 diff)
• world_entities/projectiles/laser.cc (modified) (1 diff)
• world_entities/projectiles/rail_projectile.cc (modified) (1 diff)
• world_entities/projectiles/test_bullet.cc (modified) (1 diff)

branches/network/src/util/multiplayer_team_deathmatch.cc

@@ -46 +46 @@
 #include "spawning_point.h"
 
-
-
-
+#include "creatures/fps_player.h"
 
 ObjectListDefinition(MultiplayerTeamDeathmatch);
@@ -305 +303 @@
 std::string MultiplayerTeamDeathmatch::getPlayableModelFileName( int userId, int team, const ClassID& classId )
 {
-  if (classId == CL_TURBINE_HOVER)
-  {
-    assert(false);
-    return "models/ships/hoverglider_mainbody.obj";
-  }
   if ( team == 0 )
     return "models/creatures/doom_guy.md2";
@@ -335 +328 @@
 float MultiplayerTeamDeathmatch::getPlayableScale( int userId, int team, const ClassID& classId )
 {
-  if ( classId == ObjectListBase::retrieveIdentity(CL_FPS_PLAYER))
+  if ( classId == FPSPlayer::staticClassID() )
   {
     return 10.0f;

branches/network/src/world_entities/projectiles/bomb.cc

@@ -166 +166 @@
 void Bomb::collidesWith (WorldEntity* entity, const Vector& location)
 {
-  if (this->lifeCycle < .9f && entity->isA(CL_NPC))
+  if (this->lifeCycle < .9f && entity->isA( "NPC" ))
     this->lifeCycle = 0.9f;
 }

branches/network/src/world_entities/projectiles/laser.cc

@@ -107 +107 @@
 void Laser::collidesWith(WorldEntity* entity, const Vector& location)
 {
-  if (this->hitEntity != entity && entity->isA(CL_NPC))
+  if (this->hitEntity != entity && entity->isA( "NPC" ))
     this->destroy( entity );
   this->hitEntity = entity;

branches/network/src/world_entities/projectiles/rail_projectile.cc

@@ -106 +106 @@
 void RailProjectile::collidesWith(WorldEntity* entity, const Vector& location)
 {
-  if (this->hitEntity != entity && entity->isA(CL_NPC))
+  if (this->hitEntity != entity && entity->isA( "NPC" ))
     this->destroy( entity );
   this->hitEntity = entity;

branches/network/src/world_entities/projectiles/test_bullet.cc

@@ -119 +119 @@
 void TestBullet::collidesWith(WorldEntity* entity, const Vector& location)
 {
-  if (this->hitEntity != entity && entity->isA(CL_NPC))
+  if (this->hitEntity != entity && entity->isA( "NPC" ))
     this->destroy( entity );
   this->hitEntity = entity;