Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10114 in orxonox.OLD for trunk/src/world_entities


Ignore:
Timestamp:
Dec 19, 2006, 11:55:26 PM (18 years ago)
Author:
patrick
Message:

merged network back to trunk

Location:
trunk/src/world_entities
Files:
72 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/world_entities/bsp_entity.cc

    r9869 r10114  
    1919#include "loading/resource_manager.h"
    2020
    21 #include "class_id_DEPRECATED.h"
    22 ObjectListDefinitionID(BspEntity, CL_BSP_ENTITY);
     21
     22ObjectListDefinition(BspEntity);
    2323CREATE_FACTORY(BspEntity);
    2424

  • trunk/src/world_entities/creatures/fps_player.cc

    r10013 r10114  
    4141
    4242
    43 #include "class_id_DEPRECATED.h"
    44 ObjectListDefinitionID(FPSPlayer, CL_FPS_PLAYER);
     43
     44ObjectListDefinition(FPSPlayer);
    4545CREATE_FACTORY(FPSPlayer);
    4646
    … …  
    273273  {
    274274    this->getWeaponManager().fire();
    275 
    276 //     WorldEntity* target = this->aimingSystem->getNearestTarget();
    277 //     if( target != NULL)
    278 //     {
    279 //       PRINTF(0)("hit hit hit, got: %s\n", target->getClassCName());
    280 //     }
    281 //     else
    282 //     {
    283 //       PRINTF(0)("nothing hit\n");
    284 //     }
    285275  }
    286276
    287277
    288278  //dealing damage
    289 
    290279  if ( State::isOnline() && (SharedNetworkData::getInstance()->isMasterServer() /*|| SharedNetworkData::getInstance()->isProxyServerActive()*/))
    291280  {
    … …  
    384373
    385374  // physical falling of the player
    386   if( !this->isOnGround())
     375  if( /*FIXME for testing*/ false && !this->isOnGround())
    387376  {
    388377    this->fallVelocity += 300.0f * time;
    … …  
    404393
    405394
    406   if( likely(this->getModel(0) != NULL) && this->getModel(0)->isA(CL_INTERACTIVE_MODEL))
     395  if( likely(this->getModel(0) != NULL) && this->getModel(0)->isA(InteractiveModel::staticClassID()))
    407396  {
    408397    ((InteractiveModel*)this->getModel(0))->tick(time);
    409 
    410     // handle animations differently
    411 
    412 
    413 
    414 
    415 
    416 //     else if( this->bFire && likely(this->getModel(0) != NULL))
    417 //     {
    418 //       if( ((InteractiveModel*)this->getModel(0))->getAnim() != ATTACK)
    419 //         ((InteractiveModel*)this->getModel(0))->setAnimation(ATTACK);
    420 //     }
    421 //     else if( fabs(move.len()) > 0.0f && likely(this->getModel(0) != NULL))
    422 //     {
    423 //       if( ((InteractiveModel*)this->getModel(0))->getAnim() != RUN)
    424 //         ((InteractiveModel*)this->getModel(0))->setAnimation(RUN);
    425 //     }
    426 //     else if (likely(this->getModel(0) != NULL))
    427 //     {
    428 //       if( ((InteractiveModel*)this->getModel(0))->getAnimation() != STAND)
    429 //         ((InteractiveModel*)this->getModel(0))->setAnimation(STAND);
    430 //     }
    431398  }
    432399

  • trunk/src/world_entities/creatures/md2_creature.cc

    r10033 r10114  
    3636#include "debug.h"
    3737
    38 #include "class_id_DEPRECATED.h"
    39 ObjectListDefinitionID(MD2Creature, CL_MD2_CREATURE);
     38
     39ObjectListDefinition(MD2Creature);
    4040CREATE_FACTORY(MD2Creature);
    4141

  • trunk/src/world_entities/effects/billboard.cc

    r9869 r10114  
    2626
    2727
    28 #include "class_id_DEPRECATED.h"
    29 ObjectListDefinitionID(Billboard, CL_BILLBOARD);
     28
     29ObjectListDefinition(Billboard);
    3030CREATE_FACTORY(Billboard);
    3131

  • trunk/src/world_entities/effects/explosion.cc

    r9869 r10114  
    2727
    2828
    29 #include "class_id_DEPRECATED.h"
    30 ObjectListDefinitionID(Explosion, CL_EXPLOSION);
     29
     30ObjectListDefinition(Explosion);
    3131CREATE_FAST_FACTORY_STATIC(Explosion);
    3232

  • trunk/src/world_entities/effects/lightning_bolt.cc

    r9869 r10114  
    2525
    2626
    27 #include "class_id_DEPRECATED.h"
    28 ObjectListDefinitionID(LightningBolt, CL_LIGHTNING_BOLT);
     27
     28ObjectListDefinition(LightningBolt);
    2929CREATE_FACTORY(LightningBolt);
    3030

  • trunk/src/world_entities/elements/image_entity.cc

    r9869 r10114  
    3030
    3131
    32 #include "class_id_DEPRECATED.h"
    33 ObjectListDefinitionID(ImageEntity, CL_IMAGE_ENTITY);
     32
     33ObjectListDefinition(ImageEntity);
    3434CREATE_FACTORY(ImageEntity);
    3535

  • trunk/src/world_entities/elements/text_element.cc

    r9869 r10114  
    2727
    2828
    29 #include "class_id_DEPRECATED.h"
    30 ObjectListDefinitionID(TextElement, CL_TEXT_ELEMENT);
     29
     30ObjectListDefinition(TextElement);
    3131CREATE_FACTORY(TextElement);
    3232

  • trunk/src/world_entities/environment.cc

    r10033 r10114  
    2424#include "util/loading/factory.h"
    2525
    26 #include "class_id_DEPRECATED.h"
    27 ObjectListDefinitionID(Environment, CL_ENVIRONMENT);
     26
     27ObjectListDefinition(Environment);
    2828CREATE_FACTORY(Environment);
    2929

  • trunk/src/world_entities/environments/building.cc

    r9869 r10114  
    2323
    2424
    25 #include "class_id_DEPRECATED.h"
    26 ObjectListDefinitionID(Building, CL_BUILDING);
     25
     26ObjectListDefinition(Building);
    2727CREATE_FACTORY(Building);
    2828

  • trunk/src/world_entities/environments/mapped_water.cc

    r10034 r10114  
    2626#include "resource_shader.h"
    2727
    28 #include "class_id_DEPRECATED.h"
    29 ObjectListDefinitionID(MappedWater, CL_MAPPED_WATER);
     28
     29ObjectListDefinition(MappedWater);
    3030CREATE_FACTORY(MappedWater);
    3131

  • trunk/src/world_entities/environments/model_entity.cc

    r9869 r10114  
    2323
    2424
    25 #include "class_id_DEPRECATED.h"
    26 ObjectListDefinitionID(ModelEntity, CL_MODEL_ENTITY);
     25
     26ObjectListDefinition(ModelEntity);
    2727CREATE_FACTORY(ModelEntity);
    2828

  • trunk/src/world_entities/environments/water.cc

    r9869 r10114  
    3232
    3333
    34 #include "class_id_DEPRECATED.h"
    35 ObjectListDefinitionID(Water, CL_WATER);
     34
     35ObjectListDefinition(Water);
    3636CREATE_FACTORY(Water);
    3737

  • trunk/src/world_entities/movie_entity.cc

    r9869 r10114  
    2121
    2222
    23 #include "class_id_DEPRECATED.h"
    24 ObjectListDefinitionID(MovieEntity, CL_MOVIE_ENTITY);
     23
     24ObjectListDefinition(MovieEntity);
    2525CREATE_FACTORY(MovieEntity);
    2626

  • trunk/src/world_entities/npcs/attractor_mine.cc

    r10013 r10114  
    3333#include "effects/explosion.h"
    3434
    35 #include "class_id_DEPRECATED.h"
    36 ObjectListDefinitionID(AttractorMine, CL_ATTRACTOR_MINE);
     35
     36ObjectListDefinition(AttractorMine);
    3737CREATE_FACTORY(AttractorMine);
    3838#include "script_class.h"

  • trunk/src/world_entities/npcs/door.cc

    r9869 r10114  
    2626#include "door.h"
    2727
    28 #include "class_id_DEPRECATED.h"
    29 ObjectListDefinitionID(Door, CL_DOOR);
     28
     29ObjectListDefinition(Door);
    3030CREATE_FACTORY(Door);
    3131

  • trunk/src/world_entities/npcs/gate.cc

    r9869 r10114  
    3131
    3232
    33 #include "class_id_DEPRECATED.h"
    34 ObjectListDefinitionID(Gate, CL_GATE);
     33
     34ObjectListDefinition(Gate);
    3535CREATE_FACTORY(Gate);
    3636

  • trunk/src/world_entities/npcs/generic_npc.cc

    r10013 r10114  
    3333#include "bsp_entity.h"
    3434
    35 #include "class_id_DEPRECATED.h"
    36 ObjectListDefinitionID(GenericNPC, CL_GENERIC_NPC);
     35
     36ObjectListDefinition(GenericNPC);
    3737CREATE_FACTORY(GenericNPC);
    3838

  • trunk/src/world_entities/npcs/ground_turret.cc

    r9869 r10114  
    2929#include "effects/explosion.h"
    3030
    31 #include "class_id_DEPRECATED.h"
    3231
    33 ObjectListDefinitionID(GroundTurret, CL_GROUND_TURRET);
     32
     33ObjectListDefinition(GroundTurret);
    3434CREATE_FACTORY(GroundTurret);
    3535

  • trunk/src/world_entities/npcs/network_turret.cc

    r9869 r10114  
    3232#include "debug.h"
    3333
    34 #include "class_id_DEPRECATED.h"
    35 ObjectListDefinitionID(NetworkTurret, CL_NETWORK_TURRET);
     34
     35ObjectListDefinition(NetworkTurret);
    3636CREATE_FACTORY(NetworkTurret);
    3737

  • trunk/src/world_entities/npcs/npc_test.cc

    r9869 r10114  
    3030#include "effects/explosion.h"
    3131
    32 #include "class_id_DEPRECATED.h"
    33 ObjectListDefinitionID(NPC2, CL_NPC_TEST2);
     32
     33ObjectListDefinition(NPC2);
    3434CREATE_FACTORY(NPC2);
    3535

  • trunk/src/world_entities/npcs/repair_station.cc

    r9869 r10114  
    2626#include "repair_station.h"
    2727
    28 #include "class_id_DEPRECATED.h"
    29 ObjectListDefinitionID(RepairStation, CL_DOOR +1 );
     28
     29ObjectListDefinition(RepairStation);
    3030CREATE_FACTORY(RepairStation);
    3131

  • trunk/src/world_entities/npcs/space_turret.cc

    r9869 r10114  
    2929#include "effects/explosion.h"
    3030
    31 #include "class_id_DEPRECATED.h"
    32 ObjectListDefinitionID(SpaceTurret, CL_SPACE_TURRET);
     31
     32ObjectListDefinition(SpaceTurret);
    3333CREATE_FACTORY(SpaceTurret);
    3434

  • trunk/src/world_entities/particles/box_emitter.cc

    r9869 r10114  
    2424#include "debug.h"
    2525
    26 #include "class_id_DEPRECATED.h"
    2726
    28 ObjectListDefinitionID(BoxEmitter, CL_BOX_EMITTER);
     27
     28ObjectListDefinition(BoxEmitter);
    2929CREATE_FACTORY(BoxEmitter);
    3030

  • trunk/src/world_entities/particles/dot_emitter.cc

    r9869 r10114  
    2626
    2727
    28 #include "class_id_DEPRECATED.h"
    29 ObjectListDefinitionID(DotEmitter, CL_DOT_EMITTER);
     28
     29ObjectListDefinition(DotEmitter);
    3030CREATE_FACTORY(DotEmitter);
    3131

  • trunk/src/world_entities/particles/dot_particles.cc

    r9869 r10114  
    2323#include "state.h"
    2424
    25 #include "class_id_DEPRECATED.h"
    2625
    27 ObjectListDefinitionID(DotParticles, CL_DOT_PARTICLES);
     26
     27ObjectListDefinition(DotParticles);
    2828CREATE_FACTORY(DotParticles);
    2929

  • trunk/src/world_entities/particles/model_particles.cc

    r9869 r10114  
    2525#include "debug.h"
    2626
    27 #include "class_id_DEPRECATED.h"
    2827
    29 ObjectListDefinitionID(ModelParticles, CL_MODEL_PARTICLES);
     28
     29ObjectListDefinition(ModelParticles);
    3030CREATE_FACTORY(ModelParticles);
    3131

  • trunk/src/world_entities/particles/plane_emitter.cc

    r9869 r10114  
    2424#include "debug.h"
    2525
    26 #include "class_id_DEPRECATED.h"
    2726
    28 ObjectListDefinitionID(PlaneEmitter, CL_PLANE_EMITTER);
     27
     28ObjectListDefinition(PlaneEmitter);
    2929CREATE_FACTORY(PlaneEmitter);
    3030

  • trunk/src/world_entities/particles/spark_particles.cc

    r9869 r10114  
    2424#include "shell_command.h"
    2525
    26 #include "class_id_DEPRECATED.h"
    2726
    28 ObjectListDefinitionID(SparkParticles, CL_SPARK_PARTICLES);
     27
     28ObjectListDefinition(SparkParticles);
    2929CREATE_FACTORY(SparkParticles);
    3030

  • trunk/src/world_entities/particles/sprite_particles.cc

    r9869 r10114  
    2424#include "shell_command.h"
    2525
    26 #include "class_id_DEPRECATED.h"
    2726
    28 ObjectListDefinitionID(SpriteParticles, CL_SPRITE_PARTICLES);
     27
     28ObjectListDefinition(SpriteParticles);
    2929CREATE_FACTORY(SpriteParticles);
    3030

  • trunk/src/world_entities/planet.cc

    r9869 r10114  
    3232#include "debug.h"
    3333
    34 #include "class_id_DEPRECATED.h"
    35 ObjectListDefinitionID(Planet, CL_PLANET);
     34
     35ObjectListDefinition(Planet);
    3636CREATE_FACTORY(Planet);
    3737

  • trunk/src/world_entities/power_ups/laser_power_up.cc

    r9869 r10114  
    2424
    2525
    26 #include "class_id_DEPRECATED.h"
    27 ObjectListDefinitionID(LaserPowerUp, CL_LASER_POWER_UP);
     26
     27ObjectListDefinition(LaserPowerUp);
    2828CREATE_FACTORY(LaserPowerUp);
    2929
    … …  
    8080{
    8181 // PRINTF(3)("collision %s vs %s @ (%f,%f,%f)\n", this->getClassCName(), entity->getClassCName(), location.x, location.y, location.z);
    82  if (entity->isA(CL_PLAYABLE))
     82  if (entity->isA(Playable::staticClassID()))
    8383  this->toList(OM_DEAD);
    8484}

  • trunk/src/world_entities/power_ups/param_power_up.cc

    r9869 r10114  
    2727
    2828
    29 #include "class_id_DEPRECATED.h"
    30 ObjectListDefinitionID(ParamPowerUp, CL_PARAM_POWER_UP);
     29
     30ObjectListDefinition(ParamPowerUp);
    3131CREATE_FACTORY(ParamPowerUp);
    3232

  • trunk/src/world_entities/power_ups/turret_power_up.cc

    r9869 r10114  
    2424
    2525
    26 #include "class_id_DEPRECATED.h"
    27 ObjectListDefinitionID(TurretPowerUp, CL_TURRET_POWER_UP);
     26
     27ObjectListDefinition(TurretPowerUp);
    2828CREATE_FACTORY(TurretPowerUp);
    2929
    … …  
    7676{
    7777 // PRINTF(3)("collision %s vs %s @ (%f,%f,%f)\n", this->getClassCName(), entity->getClassCName(), location.x, location.y, location.z);
    78  if (entity->isA(CL_PLAYABLE))
     78  if (entity->isA(Playable::staticClassID()))
    7979   this->toList(OM_DEAD);
    8080}

  • trunk/src/world_entities/power_ups/weapon_power_up.cc

    r9869 r10114  
    2727#include "debug.h"
    2828
    29 #include "class_id_DEPRECATED.h"
    30 ObjectListDefinitionID(WeaponPowerUp, CL_WEAPON_POWER_UP);
     29
     30ObjectListDefinition(WeaponPowerUp);
    3131CREATE_FACTORY(WeaponPowerUp);
    3232

  • trunk/src/world_entities/projectiles/bomb.cc

    r9869 r10114  
    2525#include "debug.h"
    2626
    27 #include "class_id_DEPRECATED.h"
    28 ObjectListDefinitionID(Bomb, CL_BOMB);
     27
     28ObjectListDefinition(Bomb);
    2929CREATE_FAST_FACTORY_STATIC(Bomb);
    3030
    … …  
    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}

  • trunk/src/world_entities/projectiles/boomerang_projectile.cc

    r9869 r10114  
    2626#include "debug.h"
    2727
    28 #include "class_id_DEPRECATED.h"
    29 ObjectListDefinitionID(BoomerangProjectile, CL_BOOMERANG_PROJECTILE);
     28
     29ObjectListDefinition(BoomerangProjectile);
    3030CREATE_FAST_FACTORY_STATIC(BoomerangProjectile);
    3131

  • trunk/src/world_entities/projectiles/guided_missile.cc

    r9869 r10114  
    2525#include "debug.h"
    2626
    27 #include "class_id_DEPRECATED.h"
    28 ObjectListDefinitionID(GuidedMissile, CL_GUIDED_MISSILE);
     27
     28ObjectListDefinition(GuidedMissile);
    2929CREATE_FAST_FACTORY_STATIC(GuidedMissile);
    3030

  • trunk/src/world_entities/projectiles/hyperblast.cc

    r9869 r10114  
    2525#include "debug.h"
    2626
    27 #include "class_id_DEPRECATED.h"
    28 ObjectListDefinitionID(Hyperblast, CL_HYPERBLAST);
     27
     28ObjectListDefinition(Hyperblast);
    2929CREATE_FAST_FACTORY_STATIC(Hyperblast);
    3030

  • trunk/src/world_entities/projectiles/laser.cc

    r9869 r10114  
    2828
    2929
    30 #include "class_id_DEPRECATED.h"
     30
    3131ObjectListDefinition(Laser);
    3232CREATE_FAST_FACTORY_STATIC(Laser);
    … …  
    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;

  • trunk/src/world_entities/projectiles/rail_projectile.cc

    r9869 r10114  
    2828
    2929
    30 #include "class_id_DEPRECATED.h"
    31 ObjectListDefinitionID(RailProjectile, CL_RAIL_PROJECTILE);
     30
     31ObjectListDefinition(RailProjectile);
    3232CREATE_FAST_FACTORY_STATIC(RailProjectile);
    3333
    … …  
    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;

  • trunk/src/world_entities/projectiles/rocket.cc

    r9869 r10114  
    2525#include "debug.h"
    2626
    27 #include "class_id_DEPRECATED.h"
    28 ObjectListDefinitionID(Rocket, CL_ROCKET);
     27
     28ObjectListDefinition(Rocket);
    2929CREATE_FAST_FACTORY_STATIC(Rocket);
    3030

  • trunk/src/world_entities/projectiles/test_bullet.cc

    r9869 r10114  
    2424#include "debug.h"
    2525
    26 #include "class_id_DEPRECATED.h"
    27 ObjectListDefinitionID(TestBullet, CL_TEST_BULLET);
     26
     27ObjectListDefinition(TestBullet);
    2828CREATE_FAST_FACTORY_STATIC(TestBullet);
    2929
    … …  
    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;

  • trunk/src/world_entities/recorder.cc

    r9869 r10114  
    2121#include "debug.h"
    2222
    23 #include "class_id_DEPRECATED.h"
    24 ObjectListDefinitionID(Recorder, CL_RECORDER);
     23
     24ObjectListDefinition(Recorder);
    2525CREATE_FACTORY(Recorder);
    2626

  • trunk/src/world_entities/skybox.cc

    r9869 r10114  
    3131#include "debug.h"
    3232
    33 #include "class_id_DEPRECATED.h"
    34 ObjectListDefinitionID(SkyBox, CL_SKYBOX);
     33
     34ObjectListDefinition(SkyBox);
    3535CREATE_FACTORY(SkyBox);
    3636

  • trunk/src/world_entities/space_ships/collision_probe.cc

    r9869 r10114  
    2424
    2525
    26 #include "class_id_DEPRECATED.h"
    27 ObjectListDefinitionID(CollisionProbe, CL_COLLISION_PROBE);
     26
     27ObjectListDefinition(CollisionProbe);
    2828
    2929CREATE_FACTORY(CollisionProbe);

  • trunk/src/world_entities/space_ships/cruizer.cc

    r9869 r10114  
    3434#include "debug.h"
    3535
    36 #include "class_id_DEPRECATED.h"
    37 ObjectListDefinitionID(Cruizer, CL_CRUIZER);
     36
     37ObjectListDefinition(Cruizer);
    3838CREATE_FACTORY(Cruizer);
    3939

  • trunk/src/world_entities/space_ships/helicopter.cc

    r9869 r10114  
    3434#include "debug.h"
    3535
    36 #include "class_id_DEPRECATED.h"
    37 ObjectListDefinitionID(Helicopter, CL_HELICOPTER);
     36
     37ObjectListDefinition(Helicopter);
    3838CREATE_FACTORY(Helicopter);
    3939#include "script_class.h"

  • trunk/src/world_entities/space_ships/hover.cc

    r9869 r10114  
    3434#include "debug.h"
    3535
    36 #include "class_id_DEPRECATED.h"
    37 ObjectListDefinitionID(Hover, CL_HOVER);
     36
     37ObjectListDefinition(Hover);
    3838CREATE_FACTORY(Hover);
    3939

  • trunk/src/world_entities/space_ships/space_ship.cc

    r9869 r10114  
    5353
    5454
    55 #include "class_id_DEPRECATED.h"
    56 ObjectListDefinitionID(SpaceShip, CL_SPACE_SHIP);
     55
     56ObjectListDefinition(SpaceShip);
    5757CREATE_FACTORY(SpaceShip);
    5858

  • trunk/src/world_entities/space_ships/spacecraft_2d.cc

    r10013 r10114  
    3838
    3939
    40 #include "class_id_DEPRECATED.h"
    41 ObjectListDefinitionID(Spacecraft2D, CL_SPACECRAFT_2D);
     40
     41ObjectListDefinition(Spacecraft2D);
    4242CREATE_FACTORY(Spacecraft2D);
    4343

  • trunk/src/world_entities/space_ships/turbine_hover.cc

    r9869 r10114  
    3434#include "debug.h"
    3535
    36 #include "class_id_DEPRECATED.h"
    37 ObjectListDefinitionID(TurbineHover, CL_TURBINE_HOVER);
     36
     37ObjectListDefinition(TurbineHover);
    3838CREATE_FACTORY(TurbineHover);
    3939

  • trunk/src/world_entities/spawning_point.cc

    r9869 r10114  
    3333#include "converter.h"
    3434
    35 #include "class_id_DEPRECATED.h"
    36 ObjectListDefinitionID(SpawningPoint, CL_SPAWNING_POINT);
     35
     36ObjectListDefinition(SpawningPoint);
    3737CREATE_FACTORY( SpawningPoint);
    3838/**

  • trunk/src/world_entities/spectator.cc

    r10108 r10114  
    2222#include "shared_network_data.h"
    2323
    24 #include "class_id_DEPRECATED.h"
    25 ObjectListDefinitionID(Spectator, CL_SPECTATOR);
     24#include "src/world_entities/creatures/fps_player.h"
     25#include "src/world_entities/npcs/generic_npc.h"
     26
     27
     28ObjectListDefinition(Spectator);
    2629CREATE_FACTORY(Spectator);
    2730
    … …  
    8386  registerEvent(KeyMapper::PEV_RIGHT);
    8487  registerEvent(KeyMapper::PEV_FIRE1);
     88  registerEvent(KeyMapper::PEV_JUMP);
    8589  registerEvent(EV_MOUSE_MOTION);
    8690
    … …  
    233237    this->yMouse += event.yRel;
    234238  }
    235 }
    236 
    237 
    238 
    239 
     239  else if( event.type == KeyMapper::PEV_JUMP)
     240  {
     241//     FPSPlayer * fps = new FPSPlayer();
     242    //GenericNPC* fps = new GenericNPC();
     243    WorldEntity* fps = new WorldEntity();
     244    //WorldEntity * fps = new WorldEntity();
     245
     246    fps->setAbsCoor( this->getAbsCoorX(), this->getAbsCoorY(), this->getAbsCoorZ() );
     247    fps->setAbsDir( this->getAbsDir() );
     248    fps->loadMD2Texture( "doom_guy.png" );
     249    fps->loadModel( "models/creatures/doom_guy.md2", 10.0f );
     250    fps->toList( OM_GROUP_00);
     251    //fps->loadModel( "models/ships/terran_cruizer.obj" );
     252
     253    //((Playable*)fps)->setPlayDirection(  0, 0, 1, 0 );
     254  }
     255}
     256
     257
     258
     259

  • trunk/src/world_entities/terrain.cc

    r9877 r10114  
    3434#include "debug.h"
    3535
    36 #include "class_id_DEPRECATED.h"
    37 ObjectListDefinitionID(Terrain, CL_TERRAIN);
     36
     37ObjectListDefinition(Terrain);
    3838CREATE_FACTORY(Terrain);
    3939

  • trunk/src/world_entities/test_entity.cc

    r9928 r10114  
    3333
    3434
    35 #include "class_id_DEPRECATED.h"
     35
    3636ObjectListDefinition(TestEntity);
    3737CREATE_FACTORY(TestEntity);

  • trunk/src/world_entities/weapons/aiming_turret.cc

    r9869 r10114  
    2727#include "util/loading/factory.h"
    2828
    29 #include "class_id_DEPRECATED.h"
    30 ObjectListDefinitionID(AimingTurret, CL_AIMING_TURRET);
     29
     30ObjectListDefinition(AimingTurret);
    3131CREATE_FACTORY(AimingTurret);
    3232

  • trunk/src/world_entities/weapons/boomerang_gun.cc

    r9869 r10114  
    2727#include "util/loading/factory.h"
    2828
    29 #include "class_id_DEPRECATED.h"
    30 ObjectListDefinitionID(BoomerangGun, CL_BOOMERANG_GUN);
     29
     30ObjectListDefinition(BoomerangGun);
    3131CREATE_FACTORY(BoomerangGun);
    3232

  • trunk/src/world_entities/weapons/cannon.cc

    r9869 r10114  
    3636
    3737
    38 #include "class_id_DEPRECATED.h"
    39 ObjectListDefinitionID(Cannon, CL_CANNON);
     38
     39ObjectListDefinition(Cannon);
    4040CREATE_FACTORY(Cannon);
    4141

  • trunk/src/world_entities/weapons/fps_sniper_rifle.cc

    r9869 r10114  
    3939
    4040
    41 #include "class_id_DEPRECATED.h"
    42 ObjectListDefinitionID(FPSSniperRifle, CL_FPS_SNIPER_RIFLE);
     41
     42ObjectListDefinition(FPSSniperRifle);
    4343CREATE_FACTORY(FPSSniperRifle);
    4444

  • trunk/src/world_entities/weapons/hyperblaster.cc

    r9869 r10114  
    3535
    3636
    37 #include "class_id_DEPRECATED.h"
    38 ObjectListDefinitionID(Hyperblaster, CL_HYPERBLASTER);
     37
     38ObjectListDefinition(Hyperblaster);
    3939CREATE_FACTORY(Hyperblaster);
    4040

  • trunk/src/world_entities/weapons/laser_cannon.cc

    r9869 r10114  
    3131#include "loading/fast_factory.h"
    3232
    33 #include "class_id_DEPRECATED.h"
    34 ObjectListDefinitionID(LaserCannon, CL_LASER_CANNON);
     33
     34ObjectListDefinition(LaserCannon);
    3535CREATE_FACTORY(LaserCannon);
    3636

  • trunk/src/world_entities/weapons/targeting_turret.cc

    r9869 r10114  
    2626#include "util/loading/factory.h"
    2727
    28 #include "class_id_DEPRECATED.h"
    29 ObjectListDefinitionID(TargetingTurret, CL_TARGETING_TURRET);
     28
     29ObjectListDefinition(TargetingTurret);
    3030CREATE_FACTORY(TargetingTurret);
    3131

  • trunk/src/world_entities/weapons/test_gun.cc

    r9869 r10114  
    3333#include "loading/fast_factory.h"
    3434
    35 #include "class_id_DEPRECATED.h"
    36 ObjectListDefinitionID(TestGun, CL_TEST_GUN);
     35
     36ObjectListDefinition(TestGun);
    3737CREATE_FACTORY(TestGun);
    3838/**

  • trunk/src/world_entities/weapons/turret.cc

    r9869 r10114  
    2727#include "util/loading/factory.h"
    2828
    29 #include "class_id_DEPRECATED.h"
    30 ObjectListDefinitionID(Turret, CL_TURRET);
     29
     30ObjectListDefinition(Turret);
    3131CREATE_FACTORY(Turret);
    3232

  • trunk/src/world_entities/weather_effects/cloud_effect.cc

    r10034 r10114  
    3030#include "resource_shader.h"
    3131
    32 #include "class_id_DEPRECATED.h"
     32
    3333
    3434Vector    CloudEffect::cloudColor;
    … …  
    4141float     CloudEffect::fadeTime;
    4242
    43 ObjectListDefinitionID(CloudEffect, CL_CLOUD_EFFECT);
     43ObjectListDefinition(CloudEffect);
    4444
    4545

  • trunk/src/world_entities/weather_effects/fog_effect.cc

    r9869 r10114  
    3030SHELL_COMMAND(fadeout, FogEffect, fadeOutFog);
    3131
    32 #include "class_id_DEPRECATED.h"
     32
    3333
    3434CREATE_SCRIPTABLE_CLASS(FogEffect,

  • trunk/src/world_entities/weather_effects/lense_flare.cc

    r9869 r10114  
    3434#include "camera.h"
    3535
    36 #include "class_id_DEPRECATED.h"
    37 
    38 ObjectListDefinitionID(LenseFlare, CL_LENSE_FLARE);
     36
     37
     38ObjectListDefinition(LenseFlare);
    3939CREATE_FACTORY(LenseFlare);
    4040

  • trunk/src/world_entities/weather_effects/lightning_effect.cc

    r9869 r10114  
    2828#include "script_class.h"
    2929#include "debug.h"
    30 #include "class_id_DEPRECATED.h"
    31 
    32 ObjectListDefinitionID(LightningEffect, CL_LIGHTNING_EFFECT);
     30
     31
     32ObjectListDefinition(LightningEffect);
    3333
    3434SHELL_COMMAND(activate, LightningEffect, activateLightning);

  • trunk/src/world_entities/weather_effects/rain_effect.cc

    r9869 r10114  
    3232#include "debug.h"
    3333
    34 #include "class_id_DEPRECATED.h"
    35 
    36 ObjectListDefinitionID(RainEffect, CL_RAIN_EFFECT);
     34
     35
     36ObjectListDefinition(RainEffect);
    3737
    3838// Define shell commands

  • trunk/src/world_entities/weather_effects/snow_effect.cc

    r9869 r10114  
    3030#include "cloud_effect.h"
    3131
    32 #include "class_id_DEPRECATED.h"
    33 
    34 ObjectListDefinitionID(SnowEffect, CL_SNOW_EFFECT);
     32
     33
     34ObjectListDefinition(SnowEffect);
    3535SHELL_COMMAND(activate, SnowEffect, activateSnow);
    3636SHELL_COMMAND(deactivate, SnowEffect, deactivateSnow);

  • trunk/src/world_entities/weather_effects/volfog_effect.cc

    r9869 r10114  
    4949
    5050
    51 #include "class_id_DEPRECATED.h"
    52 ObjectListDefinitionID(VolFogEffect, CL_VOLFOG_EFFECT);
     51
     52ObjectListDefinition(VolFogEffect);
    5353CREATE_FACTORY(VolFogEffect);
    5454
Note: See TracChangeset for help on using the changeset viewer.