Changeset 9926 in orxonox.OLD for branches/network
- Timestamp:
- Nov 9, 2006, 7:41:00 PM (18 years ago)
- Location:
- branches/network/src
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/network/src/util/multiplayer_team_deathmatch.cc
r9925 r9926 46 46 #include "spawning_point.h" 47 47 48 49 50 48 #include "creatures/fps_player.h" 51 49 52 50 ObjectListDefinition(MultiplayerTeamDeathmatch); … … 305 303 std::string MultiplayerTeamDeathmatch::getPlayableModelFileName( int userId, int team, const ClassID& classId ) 306 304 { 307 if (classId == CL_TURBINE_HOVER)308 {309 assert(false);310 return "models/ships/hoverglider_mainbody.obj";311 }312 305 if ( team == 0 ) 313 306 return "models/creatures/doom_guy.md2"; … … 335 328 float MultiplayerTeamDeathmatch::getPlayableScale( int userId, int team, const ClassID& classId ) 336 329 { 337 if ( classId == ObjectListBase::retrieveIdentity(CL_FPS_PLAYER))330 if ( classId == FPSPlayer::staticClassID() ) 338 331 { 339 332 return 10.0f; -
branches/network/src/world_entities/projectiles/bomb.cc
r9925 r9926 166 166 void Bomb::collidesWith (WorldEntity* entity, const Vector& location) 167 167 { 168 if (this->lifeCycle < .9f && entity->isA( CL_NPC))168 if (this->lifeCycle < .9f && entity->isA( "NPC" )) 169 169 this->lifeCycle = 0.9f; 170 170 } -
branches/network/src/world_entities/projectiles/laser.cc
r9925 r9926 107 107 void Laser::collidesWith(WorldEntity* entity, const Vector& location) 108 108 { 109 if (this->hitEntity != entity && entity->isA( CL_NPC))109 if (this->hitEntity != entity && entity->isA( "NPC" )) 110 110 this->destroy( entity ); 111 111 this->hitEntity = entity; -
branches/network/src/world_entities/projectiles/rail_projectile.cc
r9925 r9926 106 106 void RailProjectile::collidesWith(WorldEntity* entity, const Vector& location) 107 107 { 108 if (this->hitEntity != entity && entity->isA( CL_NPC))108 if (this->hitEntity != entity && entity->isA( "NPC" )) 109 109 this->destroy( entity ); 110 110 this->hitEntity = entity; -
branches/network/src/world_entities/projectiles/test_bullet.cc
r9925 r9926 119 119 void TestBullet::collidesWith(WorldEntity* entity, const Vector& location) 120 120 { 121 if (this->hitEntity != entity && entity->isA( CL_NPC))121 if (this->hitEntity != entity && entity->isA( "NPC" )) 122 122 this->destroy( entity ); 123 123 this->hitEntity = entity;
Note: See TracChangeset
for help on using the changeset viewer.