Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9926 in orxonox.OLD


Ignore:
Timestamp:
Nov 9, 2006, 7:41:00 PM (18 years ago)
Author:
rennerc
Message:

compiles again

Location:
branches/network/src
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/network/src/util/multiplayer_team_deathmatch.cc

    r9925 r9926  
    4646#include "spawning_point.h"
    4747
    48 
    49 
    50 
     48#include "creatures/fps_player.h"
    5149
    5250ObjectListDefinition(MultiplayerTeamDeathmatch);
     
    305303std::string MultiplayerTeamDeathmatch::getPlayableModelFileName( int userId, int team, const ClassID& classId )
    306304{
    307   if (classId == CL_TURBINE_HOVER)
    308   {
    309     assert(false);
    310     return "models/ships/hoverglider_mainbody.obj";
    311   }
    312305  if ( team == 0 )
    313306    return "models/creatures/doom_guy.md2";
     
    335328float MultiplayerTeamDeathmatch::getPlayableScale( int userId, int team, const ClassID& classId )
    336329{
    337   if ( classId == ObjectListBase::retrieveIdentity(CL_FPS_PLAYER))
     330  if ( classId == FPSPlayer::staticClassID() )
    338331  {
    339332    return 10.0f;
  • branches/network/src/world_entities/projectiles/bomb.cc

    r9925 r9926  
    166166void Bomb::collidesWith (WorldEntity* entity, const Vector& location)
    167167{
    168   if (this->lifeCycle < .9f && entity->isA(CL_NPC))
     168  if (this->lifeCycle < .9f && entity->isA( "NPC" ))
    169169    this->lifeCycle = 0.9f;
    170170}
  • branches/network/src/world_entities/projectiles/laser.cc

    r9925 r9926  
    107107void Laser::collidesWith(WorldEntity* entity, const Vector& location)
    108108{
    109   if (this->hitEntity != entity && entity->isA(CL_NPC))
     109  if (this->hitEntity != entity && entity->isA( "NPC" ))
    110110    this->destroy( entity );
    111111  this->hitEntity = entity;
  • branches/network/src/world_entities/projectiles/rail_projectile.cc

    r9925 r9926  
    106106void RailProjectile::collidesWith(WorldEntity* entity, const Vector& location)
    107107{
    108   if (this->hitEntity != entity && entity->isA(CL_NPC))
     108  if (this->hitEntity != entity && entity->isA( "NPC" ))
    109109    this->destroy( entity );
    110110  this->hitEntity = entity;
  • branches/network/src/world_entities/projectiles/test_bullet.cc

    r9925 r9926  
    119119void TestBullet::collidesWith(WorldEntity* entity, const Vector& location)
    120120{
    121   if (this->hitEntity != entity && entity->isA(CL_NPC))
     121  if (this->hitEntity != entity && entity->isA( "NPC" ))
    122122    this->destroy( entity );
    123123  this->hitEntity = entity;
Note: See TracChangeset for help on using the changeset viewer.