Changeset 9235 in orxonox.OLD for trunk

Timestamp:

Jul 5, 2006, 4:39:02 PM (18 years ago)

Author:

bensch

Message:

merged the presentation back

Location:

trunk/src

Files:

• defs/class_id.h (modified) (5 diffs)
• lib/collision_detection/obb_tree.cc (modified) (2 diffs)
• lib/collision_detection/obb_tree.h (modified) (2 diffs)
• lib/collision_detection/obb_tree_node.cc (modified) (4 diffs)
• lib/collision_detection/obb_tree_node.h (modified) (2 diffs)
• lib/collision_reaction/Makefile.am (modified) (2 diffs)
• lib/collision_reaction/collision_handle.cc (modified) (4 diffs)
• lib/collision_reaction/cr_engine.h (modified) (1 diff)
• lib/collision_reaction/cr_object_damage.cc (modified) (1 diff)
• lib/collision_reaction/cr_physics_full_walk.cc (copied) (copied from branches/presentation/src/lib/collision_reaction/cr_physics_full_walk.cc)
• lib/collision_reaction/cr_physics_full_walk.h (copied) (copied from branches/presentation/src/lib/collision_reaction/cr_physics_full_walk.h)
• lib/collision_reaction/cr_physics_ground_walk.cc (modified) (4 diffs)
• lib/coord/p_node.cc (modified) (1 diff)
• lib/graphics/effects/cloud_effect.cc (modified) (1 diff)
• lib/graphics/effects/fog_effect.cc (modified) (9 diffs)
• lib/graphics/effects/fog_effect.h (modified) (3 diffs)
• lib/graphics/effects/lightning_effect.cc (modified) (1 diff)
• lib/graphics/effects/rain_effect.cc (modified) (8 diffs)
• lib/graphics/effects/rain_effect.h (modified) (1 diff)
• lib/graphics/effects/snow_effect.cc (modified) (6 diffs)
• lib/graphics/effects/snow_effect.h (modified) (4 diffs)
• lib/graphics/importer/bsp_manager.cc (modified) (6 diffs)
• lib/graphics/importer/md2/md2Model.cc (modified) (2 diffs)
• lib/graphics/importer/md2/md2Model.h (modified) (3 diffs)
• lib/gui/gl/glgui_handler.cc (modified) (2 diffs)
• lib/network/handshake.cc (modified) (1 diff)
• lib/network/handshake.h (modified) (2 diffs)
• lib/network/network_game_manager.cc (modified) (4 diffs)
• lib/network/network_stream.cc (modified) (3 diffs)
• lib/network/player_stats.cc (modified) (3 diffs)
• lib/particles/particle_system.cc (modified) (1 diff)
• lib/script_engine/script.cc (modified) (7 diffs)
• lib/script_engine/script.h (modified) (2 diffs)
• lib/sound/sound_engine.cc (modified) (1 diff)
• orxonox.cc (modified) (1 diff)
• story_entities/game_world.cc (modified) (9 diffs)
• story_entities/game_world.h (modified) (1 diff)
• story_entities/game_world_data.cc (modified) (2 diffs)
• story_entities/menu/game_menu.cc (modified) (13 diffs)
• story_entities/multi_player_world.cc (modified) (2 diffs)
• story_entities/multi_player_world_data.cc (modified) (1 diff)
• util/hud.cc (modified) (1 diff)
• util/multiplayer_team_deathmatch.cc (modified) (8 diffs)
• util/multiplayer_team_deathmatch.h (modified) (1 diff)
• util/network_game_rules.cc (modified) (1 diff)
• util/network_game_rules.h (modified) (1 diff)
• world_entities/WorldEntities.am (modified) (6 diffs)
• world_entities/camera.cc (modified) (1 diff)
• world_entities/creatures/fps_player.cc (modified) (15 diffs)
• world_entities/creatures/fps_player.h (modified) (4 diffs)
• world_entities/effects/explosion.cc (modified) (3 diffs)
• world_entities/environments/mapped_water.cc (modified) (6 diffs)
• world_entities/environments/model_entity.cc (modified) (3 diffs)
• world_entities/npcs/attractor_mine.cc (copied) (copied from branches/presentation/src/world_entities/npcs/attractor_mine.cc)
• world_entities/npcs/attractor_mine.h (copied) (copied from branches/presentation/src/world_entities/npcs/attractor_mine.h)
• world_entities/npcs/gate.cc (copied) (copied from branches/presentation/src/world_entities/npcs/gate.cc)
• world_entities/npcs/gate.h (copied) (copied from branches/presentation/src/world_entities/npcs/gate.h)
• world_entities/npcs/generic_npc.cc (modified) (3 diffs)
• world_entities/npcs/generic_npc.h (modified) (1 diff)
• world_entities/npcs/ground_turret.cc (modified) (1 diff)
• world_entities/npcs/ground_turret.h (modified) (1 diff)
• world_entities/npcs/npc.cc (modified) (2 diffs)
• world_entities/npcs/npc_test.cc (modified) (6 diffs)
• world_entities/npcs/npc_test.h (modified) (2 diffs)
• world_entities/npcs/npc_test1.cc (modified) (1 diff)
• world_entities/npcs/space_turret.cc (copied) (copied from branches/presentation/src/world_entities/npcs/space_turret.cc)
• world_entities/npcs/space_turret.h (copied) (copied from branches/presentation/src/world_entities/npcs/space_turret.h)
• world_entities/playable.cc (modified) (4 diffs)
• world_entities/playable.h (modified) (2 diffs)
• world_entities/projectiles/boomerang_projectile.cc (copied) (copied from branches/presentation/src/world_entities/projectiles/boomerang_projectile.cc)
• world_entities/projectiles/boomerang_projectile.h (copied) (copied from branches/presentation/src/world_entities/projectiles/boomerang_projectile.h)
• world_entities/projectiles/guided_missile.cc (modified) (4 diffs)
• world_entities/projectiles/guided_missile.h (modified) (1 diff)
• world_entities/projectiles/hyperblast.cc (modified) (1 diff)
• world_entities/projectiles/hyperblast.h (modified) (1 diff)
• world_entities/projectiles/laser.cc (modified) (4 diffs)
• world_entities/projectiles/laser.h (modified) (1 diff)
• world_entities/projectiles/projectile.cc (modified) (3 diffs)
• world_entities/projectiles/projectile.h (modified) (1 diff)
• world_entities/projectiles/rail_projectile.cc (copied) (copied from branches/presentation/src/world_entities/projectiles/rail_projectile.cc)
• world_entities/projectiles/rail_projectile.h (copied) (copied from branches/presentation/src/world_entities/projectiles/rail_projectile.h)
• world_entities/projectiles/rocket.cc (modified) (2 diffs)
• world_entities/projectiles/rocket.h (modified) (1 diff)
• world_entities/projectiles/test_bullet.cc (modified) (2 diffs)
• world_entities/projectiles/test_bullet.h (modified) (1 diff)
• world_entities/script_trigger.cc (modified) (4 diffs)
• world_entities/skydome.cc (modified) (6 diffs)
• world_entities/space_ships/cruizer.cc (modified) (1 diff)
• world_entities/space_ships/helicopter.cc (modified) (2 diffs)
• world_entities/space_ships/helicopter.h (modified) (2 diffs)
• world_entities/space_ships/hover.cc (modified) (7 diffs)
• world_entities/space_ships/hover.h (modified) (2 diffs)
• world_entities/space_ships/space_ship.cc (modified) (4 diffs)
• world_entities/space_ships/space_ship.h (modified) (1 diff)
• world_entities/space_ships/spacecraft_2d.cc (modified) (12 diffs)
• world_entities/space_ships/spacecraft_2d.h (modified) (1 diff)
• world_entities/spawning_point.cc (modified) (7 diffs)
• world_entities/test_entity.cc (modified) (2 diffs)
• world_entities/test_entity.h (modified) (1 diff)
• world_entities/weapons/aiming_system.cc (copied) (copied from branches/presentation/src/world_entities/weapons/aiming_system.cc)
• world_entities/weapons/aiming_system.h (copied) (copied from branches/presentation/src/world_entities/weapons/aiming_system.h)
• world_entities/weapons/boomerang_gun.cc (copied) (copied from branches/presentation/src/world_entities/weapons/boomerang_gun.cc)
• world_entities/weapons/boomerang_gun.h (copied) (copied from branches/presentation/src/world_entities/weapons/boomerang_gun.h)
• world_entities/weapons/fps_sniper_rifle.cc (modified) (2 diffs)
• world_entities/weapons/laser_cannon.cc (copied) (copied from branches/presentation/src/world_entities/weapons/laser_cannon.cc)
• world_entities/weapons/laser_cannon.h (copied) (copied from branches/presentation/src/world_entities/weapons/laser_cannon.h)
• world_entities/world_entity.cc (modified) (8 diffs)
• world_entities/world_entity.h (modified) (4 diffs)

trunk/src/defs/class_id.h

@@ -191 +191 @@
   CL_CRANE                      =    0x00000316,
   CL_BRAKING_WALL               =    0X00000317,
+  CL_AIMING_SYSTEM              =    0x00000318,
+  CL_GATE                       =    0x00000319,
 
   // Playables
@@ -213 +215 @@
   // Weapons
   CL_TEST_GUN                   =    0x000003a0,
-  CL_TURRET                     =    0x000003a1,
-  CL_AIMING_TURRET              =    0x000003a2,
-  CL_CANNON                     =    0x000003a3,
-  CL_TARGETING_TURRET           =    0x000003a4,
-  CL_HYPERBLASTER               =    0x000003a5,
-  CL_FPS_SNIPER_RIFLE           =    0x000003a6,
-  CL_FPS_LASER_RIFLE            =    0x000003a7,
+  CL_LASER_CANNON               =    0x000003a1,
+  CL_TURRET                     =    0x000003a2,
+  CL_AIMING_TURRET              =    0x000003a3,
+  CL_CANNON                     =    0x000003a4,
+  CL_TARGETING_TURRET           =    0x000003a5,
+  CL_HYPERBLASTER               =    0x000003a6,
+  CL_FPS_SNIPER_RIFLE           =    0x000003a7,
+  CL_FPS_LASER_RIFLE            =    0x000003a8,
+  CL_BOOMERANG_GUN              =    0x00000309,
 
   // Projectiles
@@ -225 +229 @@
   CL_ROCKET                     =    0x000003e1,
   CL_LASER                      =    0x000003e2,
-  CL_BOMB                       =    0x000003e3,
-  CL_GROUND_TURRET              =    0x000003e4,
-  CL_GUIDED_MISSILE             =    0x000003e5,
-  CL_HYPERBLAST                 =    0x000003e6,
+  CL_RAIL_PROJECTILE            =    0x000003e3,
+  CL_BOMB                       =    0x000003e4,
+  CL_GROUND_TURRET              =    0x000003e5,
+  CL_SPACE_TURRET               =    0x000003e6,
+  CL_GUIDED_MISSILE             =    0x000003e7,
+  CL_HYPERBLAST                 =    0x000003e8,
+  CL_BOOMERANG_PROJECTILE       =    0x00000309,
 
   // NPC's
@@ -234 +241 @@
   CL_NPC_TEST2                  =    0x00000402,
   CL_GENERIC_NPC                =    0x00000403,
+  CL_ATTRACTOR_MINE             =    0x00000404,
 
   // Testing Entities
@@ -276 +284 @@
   CL_COLLISION_REACTION         =    0X00000713,
   CL_CR_PHYSICS_MOMENTUM        =    0X00000714,
-  CL_CR_PHYSICS_GROUND          =    0X00000715,
-  CL_CR_PHYSICS_GROUND_WALK     =    0X00000716,
+  CL_CR_PHYSICS_GROUND_WALK     =    0X00000715,
+  CL_CR_PHYSICS_FULL_WALK       =    0X00000716,
   CL_CR_OBJECT_DAMAGE           =    0X00000717,
   CL_CR_OBJECT_PICKUP           =    0X00000718,

trunk/src/lib/collision_detection/obb_tree.cc

@@ -41 +41 @@
 
 
+/**
+ *  standard constructor
+ */
+OBBTree::OBBTree()
+  : BVTree()
+{}
+
 
 void OBBTree::init()
@@ -78 +85 @@
 
   this->rootNode->spawnBVTree(modelInf, triangleIndexes, modelInf.numTriangles);
+}
+
+
+void OBBTree::createBox(Vector start, Vector end)
+{
+  this->rootNode = new OBBTreeNode(*this, NULL, 1);
+
+  this->rootNode->createBox(start, end);
 }
 

trunk/src/lib/collision_detection/obb_tree.h

@@ -23 +23 @@
   public:
     OBBTree(int depth, const modelInfo* modInfo, WorldEntity* entity);
+    OBBTree();
     virtual ~OBBTree();
     void init();
@@ -28 +29 @@
     virtual void spawnBVTree(const modelInfo& modelInf);
     virtual void flushTree();
+
+    void createBox(Vector start, Vector end);
 
     virtual void collideWith(WorldEntity* entity1, WorldEntity* entity2);

trunk/src/lib/collision_detection/obb_tree_node.cc

@@ -90 +90 @@
     delete this->bvElement;
 }
+
+
+
+void OBBTreeNode::createBox(Vector start, Vector end)
+{
+
+  this->bvElement = new OBB();
+  this->nodeLeft = NULL;
+  this->nodeRight = NULL;
+//   this->depth = 0;
+
+  this->bvElement->center = (end - start) * 0.5f;
+  this->bvElement->halfLength[0] = (end.x - start.x) * 0.5f;
+  this->bvElement->halfLength[1] = (end.y - start.y) * 0.5f;
+  this->bvElement->halfLength[2] = (end.z - start.z) * 0.5f;
+
+  this->bvElement->axis[0] = Vector(1,0,0);
+  this->bvElement->axis[1] = Vector(0,1,0);
+  this->bvElement->axis[2] = Vector(0,0,1);
+}
+
 
 
@@ -561 +582 @@
 bool OBBTreeNode::overlapTest(OBB* boxA, OBB* boxB, WorldEntity* nodeA, WorldEntity* nodeB)
 {
+
   //HACK remove this again
   this->owner = nodeA;
@@ -677 +699 @@
 void OBBTreeNode::drawBV(int depth, int drawMode, const Vector& color,  bool top) const
 {
+
   /* this function can be used to draw the triangles and/or the points only  */
   if( 1 /*drawMode & DRAW_MODEL || drawMode & DRAW_ALL*/)
@@ -682 +705 @@
     if( depth == 0/*!(drawMode & DRAW_SINGLE && depth != 0)*/)
     {
-      if( 1 /*drawMode & DRAW_POINTS*/)
+      if( 0 /*drawMode & DRAW_POINTS*/)
       {
         glBegin(GL_POINTS);

trunk/src/lib/collision_detection/obb_tree_node.h

@@ -31 +31 @@
 
     virtual void spawnBVTree(const modelInfo& modelInf, const int* triangleIndexes, int length);
+    void createBox(Vector start, Vector end);
 
     virtual void collideWith(BVTreeNode* treeNode, WorldEntity* nodeA, WorldEntity* nodeB);
@@ -79 +80 @@
 
     WorldEntity*        owner;
+
 };
 

trunk/src/lib/collision_reaction/Makefile.am

@@ -10 +10 @@
                      collision_reaction.cc \
                      cr_object_damage.cc \
-                     cr_physics_ground_walk.cc
+                     cr_physics_ground_walk.cc \
+                     cr_physics_full_walk.cc
 
 
@@ -21 +22 @@
                      collision_reaction.h \
                      cr_object_damage.h \
-                     cr_physics_ground_walk.h
+                     cr_physics_ground_walk.h \
+                     cr_physics_full_walk.h
 

trunk/src/lib/collision_reaction/collision_handle.cc

@@ -25 +25 @@
 #include "cr_object_damage.h"
 #include "cr_physics_ground_walk.h"
+#include "cr_physics_full_walk.h"
 
 #include "debug.h"
@@ -52 +53 @@
   switch( type)
   {
-    case CREngine::CR_PHYSICS_STEP_BACK:
-//       this->collisionReaction = new CRPhysicsGroundWalk();
+    case CREngine::CR_PHYSICS_FULL_WALK:
+      this->collisionReaction = new CRPhysicsFullWalk();
       this->bContinuousPoll = true;
       break;
@@ -229 +230 @@
   for(; it < this->targetList.end(); it++)
   {
+//     if(collisionEvent->getEntityB()->isA(CL_AIMING_SYSTEM) || collisionEvent->getEntityA()->isA(CL_AIMING_SYSTEM))
+//     {
+//        PRINTF(0)("I am: %s colliding with: %s\n", owner->getClassName(), collisionEvent->getEntityB()->getClassName(), *it);
+//        if( collisionEvent->getEntityA() == this->owner) {
+//          PRINTF(0)("I am owner -> I am: %s colliding with: %s is a %i filter?\n", owner->getClassName(),
+//          collisionEvent->getEntityB()->getClassName(), *it);
+//          if( collisionEvent->getEntityB()->isA((ClassID)(*it))) {
+//            PRINTF(0)("I am owner -> I am: %s colliding with: %s is a %i filter ok\n", owner->getClassName(),
+//            collisionEvent->getEntityB()->getClassName(), *it);
+//             }
+//        }
+//        else {
+//          PRINTF(0)("I am not owner -> I am: %s colliding with: %s is a %i filter?\n", owner->getClassName(),
+//          collisionEvent->getEntityB()->getClassName(), *it);
+//          if( collisionEvent->getEntityA()->isA((ClassID)(*it))) {
+//            PRINTF(0)("I'm not owner -> I am: %s colliding with: %s is a %i filter ok\n", owner->getClassName(),
+//            collisionEvent->getEntityA()->getClassName(), *it);
+//             }
+//        }
+//
+//     }
+
     if( collisionEvent->getEntityA() == this->owner) {
       if( collisionEvent->getEntityB()->isA((ClassID)(*it))) {
@@ -256 +279 @@
   for(; it < this->targetList.end(); it++)
   {
+
+//     if(collision->getEntityB()->isA(CL_AIMING_SYSTEM) || collision->getEntityA()->isA(CL_AIMING_SYSTEM))
+//     {
+//       PRINTF(0)("Shared!!! I am: %s colliding with: %s\n", owner->getClassName(), collision->getEntityB()->getClassName(), *it);
+//       if( collision->getEntityA() == this->owner) {
+//         PRINTF(0)("I am owner -> I am: %s colliding with: %s is a %i filter?\n", owner->getClassName(),
+//         collision->getEntityB()->getClassName(), *it);
+//         if( collision->getEntityB()->isA((ClassID)(*it))) {
+//           PRINTF(0)("I am owner -> I am: %s colliding with: %s is a %i filter ok\n", owner->getClassName(),
+//           collision->getEntityB()->getClassName(), *it);
+//         }
+//       }
+//       else {
+//         PRINTF(0)("I'm not owner -> I am: %s colliding with: %s is a %i filter?\n", owner->getClassName(),
+//         collision->getEntityB()->getClassName(), *it);
+//         if( collision->getEntityA()->isA((ClassID)(*it))) {
+//           PRINTF(0)("I'm not owner -> I am: %s colliding with: %s is a %i filter ok\n", owner->getClassName(),
+//           collision->getEntityA()->getClassName(), *it);
+//         }
+//       }
+//     }
+
     if( collision->getEntityA() == this->owner) {
       if( collision->getEntityA()->isA((ClassID)(*it)))

trunk/src/lib/collision_reaction/cr_engine.h

@@ -30 +30 @@
     CR_PHYSICS_MOMENTUM   = 0,    //!< physical reaction: conservervation of momentum
     CR_PHYSICS_STEP_BACK,         //!< physical reaction: just go to the last position without collisions
-    CR_PHYSICS_GROUND,            //!< physical reaction: stand on the ground, no movement: simulating simple normal force away from the gravity force
-    CR_PHYSICS_GROUND_WALK,       //!< physical reaction: walking on the ground (inkl. hills etc)
+    CR_PHYSICS_GROUND_WALK,       //!< physical reaction: stand on the ground, no movement: simulating simple normal force away from the gravity force
+    CR_PHYSICS_FULL_WALK,         //!< physical reaction: walking on the ground (inkl. hills etc)
     CR_PHYSICS_DAMAGE,            //!< physical reaction: daling damage according to the object energy and their structural stability
 

trunk/src/lib/collision_reaction/cr_object_damage.cc

@@ -56 +56 @@
   float damage = 0.0f;
 
-  PRINTF(0)("Dealing damage - Handling collision: %s vs %s\n",
+  PRINTF(4)("Dealing damage - Handling collision: %s vs %s\n",
             collision->getEntityA()->getClassName(),
             collision->getEntityB()->getClassName());

trunk/src/lib/collision_reaction/cr_physics_ground_walk.cc

@@ -71 +71 @@
 
   float CR_MAX_WALK_HEIGHT = 15.0f;
-  float CR_THRESHOLD = 0.2f;
 
   float height = 0.0f;
-  float front = 0.0f;
-  float back = 0.0f;
-  float right = 0.0f;
-  float left = 0.0f;
 
 
@@ -94 +89 @@
     switch( ce->getType())
     {
-        /* collision in the X-AXIS */
-      case COLLISION_TYPE_AXIS_X:
-        front = collPos.len() - box->halfLength[0];
-
-        // object is beneath the plane (ground)
-        if( front <= 0.0f )
-        {
-          Vector dirX = entity->getAbsDirX();
-          dirX.y = 0.0f;
-          dirX.normalize();
-          Vector backoff = dirX * front;
-
-          entity->shiftCoor(backoff);
-        }
-        else if( ce->isInWall())
-        {
-          // object is already in the wall
-          entity->setAbsCoor(entity->getLastAbsCoor());
-        }
-        break;
-
-      case COLLISION_TYPE_AXIS_X_NEG:
-        back = collPos.len() - box->halfLength[0];
-
-        // object is beneath the plane (ground)
-        if( back <= 0.0f)
-        {
-          Vector dirX = entity->getAbsDirX();
-          dirX.y = 0.0f;
-          dirX.normalize();
-          Vector backoff = dirX * back * -1.0f;
-
-          entity->shiftCoor(backoff);
-        }
-        else if( ce->isInWall())
-        {
-          // object is already in the wall
-          entity->setAbsCoor(entity->getLastAbsCoor());
-        }
-        break;
-
-
         /* collision in the Y-AXIS */
       case COLLISION_TYPE_AXIS_Y_NEG:
@@ -153 +106 @@
         {
           entity->setAbsCoor(entity->getLastAbsCoor());
-          PRINTF(0)("ground collision: reset pos\n");
         }
         else
@@ -163 +115 @@
 
 
-        /* collision in the Z-AXIS */
-      case COLLISION_TYPE_AXIS_Z:
-
-        right = collPos.len()  - box->halfLength[2];
-
-        // object is beneath the plane (ground)
-        if( right <= 0.0f )
-        {
-          Vector dirZ = entity->getAbsDirZ();
-          dirZ.y = 0.0f;
-          dirZ.normalize();
-          Vector backoff = dirZ * right;
-          entity->shiftCoor(backoff);
-        }
-        else if( ce->isInWall())
-        {
-          // object is already in the wall
-          entity->setAbsCoor(entity->getLastAbsCoor());
-        }
-        break;
-
-
-        // collision in the z-axis
-      case COLLISION_TYPE_AXIS_Z_NEG:
-
-        left = collPos.len()  - box->halfLength[2];
-
-        // object is beneath the plane (ground)
-        if( left <= 0.0f )
-        {
-          Vector dirZ = entity->getAbsDirZ();
-          dirZ.y = 0.0f;
-          dirZ.normalize();
-          Vector backoff = dirZ * left*-1.0f;
-          entity->shiftCoor(backoff);
-        }
-        // object is already in the wall
-        else if( ce->isInWall())
-        {
-          entity->setAbsCoor(entity->getLastAbsCoor());
-        }
-        break;
     }
   }
   //PRINTF(0)("collision distances: x: %f, y: %f, z: %f\n", front, height, side);
-
-
-
-
-
-
 
 }

trunk/src/lib/coord/p_node.cc

@@ -1089 +1089 @@
 void PNode::varChangeHandler( std::list< int > & id )
 {
+  Synchronizeable::varChangeHandler( id );
+  
   if ( std::find( id.begin(), id.end(), relCoordinate_handle ) != id.end() )
   {

trunk/src/lib/graphics/effects/cloud_effect.cc

@@ -90 +90 @@
     this->planetRadius = 1500;
     this->divs = 15;
+    this->cloudActivate = false;
     fadeSky = false;
     fadeCloud = false;

trunk/src/lib/graphics/effects/fog_effect.cc

@@ -20 +20 @@
 #include "shell_command.h"
 #include "script_class.h"
+#include "cloud_effect.h"
 
 // Define shell commands
-SHELL_COMMAND(activate, FogEffect, activateFog);
-SHELL_COMMAND(deactivate, FogEffect, deactivateFog);
+//SHELL_COMMAND(activate, FogEffect, activateFog);
+//SHELL_COMMAND(deactivate, FogEffect, deactivateFog);
 SHELL_COMMAND(fadein, FogEffect, fadeInFog);
 SHELL_COMMAND(fadeout, FogEffect, fadeOutFog);
@@ -84 +85 @@
   this->fogFadeInActivate = false;
   this->fogFadeOutActivate = false;
+  
+  this->cloudColor = Vector(0.2f, 0.3f, 0.3f);
+  this->skyColor = Vector(0.2f, 0.3f, 0.3f);
 }
 
@@ -93 +97 @@
     WeatherEffect::loadParams(root);
 
-    LoadParam(root, "mode", this, FogEffect, setFogMode).describe("fog mode (linear, exponential)");;
-    LoadParam(root, "density", this, FogEffect, setFogDensity).describe("fog density if exp. fog");;
-    LoadParam(root, "range", this, FogEffect, setFogRange).describe("fog range: start, end");;
-    LoadParam(root, "color", this, FogEffect, setFogColor).describe("fog color: r,g,b");;
-    LoadParam(root, "fadeinduration", this, FogEffect, setFogFadeIn).describe("duration of the fade in");;
-    LoadParam(root, "fadeoutduration", this, FogEffect, setFogFadeOut).describe("duration of the fade out");;
-
+    LoadParam(root, "mode", this, FogEffect, setFogMode).describe("fog mode (linear, exponential)");
+    LoadParam(root, "density", this, FogEffect, setFogDensity).describe("fog density if exp. fog");
+    LoadParam(root, "range", this, FogEffect, setFogRange).describe("fog range: start, end");
+    LoadParam(root, "color", this, FogEffect, setFogColor).describe("fog color: r,g,b");
+    LoadParam(root, "fadeinduration", this, FogEffect, setFogFadeIn).describe("duration of the fade in");
+    LoadParam(root, "fadeoutduration", this, FogEffect, setFogFadeOut).describe("duration of the fade out");
+    LoadParam(root, "cloudcolor", this, FogEffect, setCloudColor);
+    LoadParam(root, "skycolor", this, FogEffect, setSkyColor);
+    
     LOAD_PARAM_START_CYCLE(root, element);
     {
-      LoadParam_CYCLE(element, "option", this, FogEffect, setFogOption).describe("sets a fog option: activate");;
+      LoadParam_CYCLE(element, "option", this, FogEffect, setFogOption).describe("sets a fog option: activate");
     }
     LOAD_PARAM_END_CYCLE(element);
@@ -125 +131 @@
 
     glEnable(GL_FOG);
+    
+    // Store cloud- and sky color before the snow
+    this->oldCloudColor = CloudEffect::cloudColor;
+    this->oldSkyColor   = CloudEffect::skyColor;
+    
+    // Change the colors
+    CloudEffect::changeCloudColor(this->cloudColor, this->fogFadeInDuration);
+    CloudEffect::changeSkyColor(this->skyColor, this->fogFadeInDuration);
 }
 
@@ -184 +198 @@
 
         if ( this->fogMode == GL_LINEAR)
-          this->fogFadeEnd = 2000 * ( this->localTimer / this->fogFadeInDuration ) + this->fogEnd;
+          this->fogFadeEnd = 2000 * ( this->localTimer / this->fogFadeOutDuration ) + this->fogEnd;
         else
-            this->fogFadeDensity = 1 - (( this->localTimer / this->fogFadeInDuration ) * this->fogDensity);
+            this->fogFadeDensity = 1 - (( this->localTimer / this->fogFadeOutDuration ) * this->fogDensity);
 
         if ( this->localTimer >= this->fogFadeOutDuration )
@@ -207 +221 @@
     // If no manual FadeIn value was set, set a default value
     if (!this->fogFadeInDuration > 0)
-        this->fogFadeInDuration = 20;
+        this->fogFadeInDuration = 10;
 
     // Reset local timer
@@ -227 +241 @@
     this->fogFadeInActivate = false;
 
+    
     // If Fog is off, turn it on first
     if (!this->fogActivate)
@@ -233 +248 @@
     // If no manual FadeOut value was set, set a default value
     if (!this->fogFadeOutDuration > 0)
-        this->fogFadeOutDuration = 20;
+        this->fogFadeOutDuration = 10;
 
     // set FogFadeOut activate
@@ -240 +255 @@
     // Reset local timer
     this->localTimer = 0;
-}
-
+
+    // Restore the old cloud- and sky color
+    CloudEffect::changeCloudColor(this->oldCloudColor, this->fogFadeOutDuration);
+    CloudEffect::changeSkyColor(this->oldSkyColor, this->fogFadeOutDuration);
+}
+

trunk/src/lib/graphics/effects/fog_effect.h

@@ -10 +10 @@
 #include "glincl.h"
 #include "vector.h"
+
+class CloudEffect;
 
 class FogEffect : public WeatherEffect
@@ -73 +75 @@
       this->fogActivate = true;
   }
+  
+  inline void setCloudColor(float colorX, float colorY, float colorZ)
+  {
+    this->cloudColor = Vector(colorX, colorY, colorZ);
+  }
+  inline void setSkyColor(float colorX, float colorY, float colorZ)
+  {
+    this->skyColor = Vector(colorX, colorY, colorZ);
+  }
 
   void fadeInFog();
@@ -109 +120 @@
   Vector        colorVector;
   float         localTimer; 
+  
+  Vector oldSkyColor;
+  Vector oldCloudColor;
+  Vector skyColor;
+  Vector cloudColor;
 };
 

trunk/src/lib/graphics/effects/lightning_effect.cc

@@ -112 +112 @@
     }
 
+    //should load both texture
     this->thunderTextureA = true;
     this->setTexture();
+    this->switchTexture();
 
     if (this->lightningMove) {

trunk/src/lib/graphics/effects/rain_effect.cc

@@ -34 +34 @@
 
 // Define shell commands
-SHELL_COMMAND(activate, RainEffect, activateRain);
-SHELL_COMMAND(deactivate, RainEffect, deactivateRain);
+//SHELL_COMMAND(activate, RainEffect, activateRain);
+//SHELL_COMMAND(deactivate, RainEffect, deactivateRain);
 SHELL_COMMAND(startraining, RainEffect, startRaining);
 SHELL_COMMAND(stopraining, RainEffect, stopRaining);
@@ -96 +96 @@
  */
 void RainEffect::init() {
+
+    this->rainParticles = NULL;
+    this->emitter = NULL;
+    this->rainBuffer = NULL;
+    this->windBuffer = NULL;
+    this->lightMan = NULL;
+
     //Default values
     this->rainActivate = false;
@@ -119 +126 @@
     this->emitter = new PlaneEmitter(this->rainSize);
 
+    lightMan = LightManager::getInstance();
 }
 
@@ -187 +195 @@
     // If we're not fading, change color immediately
     if (!this->rainFadeInActivate || !this->rainFadeOutActivate) {
-        CloudEffect::changeCloudColor(this->cloudColor, 0);
-        CloudEffect::changeSkyColor(this->skyColor, 0);
-    }
+        CloudEffect::changeCloudColor(this->cloudColor, 0.2);
+        CloudEffect::changeSkyColor(this->skyColor, 0.2);
+    }
+
+    //lightMan->setAmbientColor(.1,.1,.1);
 }
 
@@ -202 +212 @@
     this->rainFadeOutActivate = false;
 
-    this->emitter->setSystem(NULL);
+    //if(this->emitter)
+    //  this->emitter->setSystem(NULL);
+    //this->hideRain();
 
     // Stop Sound
@@ -208 +220 @@
 
     // Restore the old cloud- and sky color
-    CloudEffect::changeCloudColor(this->oldCloudColor, 0);
-    CloudEffect::changeSkyColor(this->oldSkyColor, 0);
+    CloudEffect::changeCloudColor(this->oldCloudColor, 0.2);
+    CloudEffect::changeSkyColor(this->oldSkyColor, 0.2);
 }
 
@@ -242 +254 @@
 
         // increase sound volume
-        if (!this->soundSource.isPlaying())
+        if (progress > 0.5) {
+          if (!this->soundSource.isPlaying())
             this->soundSource.play(this->rainBuffer, this->soundRainVolume, true);
-        this->soundSource.gain(this->rainBuffer, this->soundRainVolume * progress);
+          this->soundSource.gain(this->rainBuffer, this->soundRainVolume * progress * 2 - 0.5);
+        }
 
         if (progress >= 1)
             this->rainFadeInActivate = false;
+
+        lightMan->setAmbientColor(1-progress, 1-progress, 1-progress);
     }
 
@@ -276 +292 @@
             this->deactivate();
         }
+        lightMan->setAmbientColor(1-progress, 1-progress, 1-progress);
     }
 }

trunk/src/lib/graphics/effects/rain_effect.h

@@ -132 +132 @@
   float                       soundRainVolume;
 
-  Vector oldSkyColor;
-  Vector oldCloudColor;
-  Vector skyColor;
-  Vector cloudColor;
+  Vector                      oldSkyColor;
+  Vector                      oldCloudColor;
+  Vector                      skyColor;
+  Vector                      cloudColor;
+  
+  LightManager*               lightMan;
 
 };

trunk/src/lib/graphics/effects/snow_effect.cc

@@ -28 +28 @@
 #include "shell_command.h"
 #include "script_class.h"
+#include "cloud_effect.h"
 
 #include "parser/tinyxml/tinyxml.h"
@@ -53 +54 @@
 
         //load wind sound
-        if (this->snowWindForce > 1) {
+        if (this->snowWindForce >= 1) {
                 if (this->windBuffer != NULL)
                         ResourceManager::getInstance()->unload(this->windBuffer);
-                        this->windBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load("sound/atmosphere/wind.wav", WAV);
+          this->windBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load("sound/atmosphere/wind.wav", WAV);
         }
 
@@ -87 +88 @@
         LoadParam(root, "size", this, SnowEffect, size);
         LoadParam(root, "coord", this, SnowEffect, coord);
+  LoadParam(root, "cloudcolor", this, SnowEffect, setCloudColor);
+  LoadParam(root, "skycolor", this, SnowEffect, setSkyColor);
+  LoadParam(root, "fadetime", this, SnowEffect, setFadeTime);
 
         LOAD_PARAM_START_CYCLE(root, element);
@@ -119 +123 @@
         this->snowCoord = Vector(100,450,400);
         this->snowWindForce = 1;
+  
+  this->fadeTime = 10;
+  this->cloudColor = Vector(0.2f, 0.2f, 0.2f);
+  this->skyColor = Vector(0.0f, 0.0f, 0.0f);
 }
 
@@ -149 +157 @@
   if (this->snowWindForce != 0)
     this->soundSource.play(this->windBuffer, 0.1f * this->snowWindForce, true);
+  
+  // Store cloud- and sky color before the snow
+  this->oldCloudColor = CloudEffect::cloudColor;
+  this->oldSkyColor   = CloudEffect::skyColor;
+
+  // Change the colors
+  CloudEffect::changeCloudColor(this->cloudColor, this->fadeTime);
+  CloudEffect::changeSkyColor(this->skyColor, this->fadeTime);
 
 }
@@ -162 +178 @@
         if (this->windBuffer != NULL)
                 ResourceManager::getInstance()->unload(this->windBuffer);
+  
+  // Restore the old cloud- and sky color
+  CloudEffect::changeCloudColor(this->oldCloudColor, this->fadeTime);
+  CloudEffect::changeSkyColor(this->oldSkyColor, this->fadeTime);
 }
 

trunk/src/lib/graphics/effects/snow_effect.h

@@ -16 +16 @@
 class PlaneEmitter;
 class PNode;
+class CloudEffect;
 
 #include "sound_source.h"
@@ -77 +78 @@
         this->snowWindForce = force;
     }
+    inline void setCloudColor(float colorX, float colorY, float colorZ)
+    {
+      this->cloudColor = Vector(colorX, colorY, colorZ);
+    }
+    inline void setSkyColor(float colorX, float colorY, float colorZ)
+    {
+      this->skyColor = Vector(colorX, colorY, colorZ);
+    }
+    inline void setFadeTime(float time)
+    {
+      this->fadeTime = time;
+    }
 
     inline void setSnowOption(const std::string& option) {
@@ -97 +110 @@
     float         angle, randomAngle;
     float         alpha;
+    float         fadeTime;
     Vector        snowCoord;
     Vector2D      snowSize;
@@ -110 +124 @@
     OrxSound::SoundBuffer*    windBuffer;
 
+    Vector oldSkyColor;
+    Vector oldCloudColor;
+    Vector skyColor;
+    Vector cloudColor;
 };
 

trunk/src/lib/graphics/importer/bsp_manager.cc

@@ -53 +53 @@
 {
 
+  this->lastTex = -1;
   this->parent = parent;
   /*// open a BSP file
@@ -101 +102 @@
   return 0;
 }
+
+
 /*
 BspManager::BspManager(const char* fileName, float scale)
@@ -270 +273 @@
         const float dMaxs = dir.x*(float)curLeaf.maxs[0] +dir.y*(float)curLeaf.maxs[1] +dir.z*(float)curLeaf.maxs[2] - dist;
 
-        if(dMins < -50.0 && dMaxs < -  50.0) {
+        if(dMins < -70.0 && dMaxs < -70.0) {
           continue;
         }
@@ -1371 +1374 @@
   else
   {
-    if( this->outputFraction == 1.0f)
+    if( this->outputFraction == 1.0f) // No collision Detected
     {
-      if( this->outputAllSolid )
+      if( this->outputAllSolid ) 
       {
         this->collPlane = new plane;
@@ -1382 +1385 @@
         SolidFlag = true;
       }
-      else
+      else      // No collision happened
       {
         yCollisionDown = false;
@@ -1388 +1391 @@
       }
     }
-    else
+    else           // A collision has happended
     {
       yCollisionDown = true;
       collPos = position + (down - position) * this->outputFraction;
-      this->out = collPos;        // why this????
     }
   }

trunk/src/lib/graphics/importer/md2/md2Model.cc

@@ -40 +40 @@
 
 //! list of all different animations a std md2model supports
-sAnim MD2Model::animationList[21] =
+sAnim MD2Model::animationList[22] =
   {
  // begin, end, fps, interruptable
@@ -64 +64 @@
     { 190, 197,  10, 0 },   //!< DEATH_FALLBACKSLOW
     { 198, 198,  5, 1 },   //!< BOOM
+    {  199, 204, 10, 1 },  //!< WALK (only for spectial models)
   };
 

trunk/src/lib/graphics/importer/md2/md2Model.h

@@ -30 +30 @@
 #define MD2_VERSION                     8                                        //!< the md2 version in the header
 #define MD2_MAX_TRIANGLES               4096                                     //!< maximal triangles count
-#define MD2_MAX_VERTICES                2048                                     //!< maximal vertices count
-#define MD2_MAX_TEXCOORDS               2048                                     //!< maximal tex coordinates
+#define MD2_MAX_VERTICES                3048                                     //!< maximal vertices count
+#define MD2_MAX_TEXCOORDS               3048                                     //!< maximal tex coordinates
 #define MD2_MAX_FRAMES                  512                                      //!< maximal frames
 #define MD2_MAX_SKINS                   32                                       //!< maximal skins
@@ -92 +92 @@
     DEATH_FALLBACKSLOW,
     BOOM,
+    WALK,
 
     MAX_ANIMATIONS
@@ -180 +181 @@
   static sVec3D       anorms[NUM_VERTEX_NORMALS];       //!< the anormals
   static float        anormsDots[SHADEDOT_QUANT][256];  //!< the anormals dot products
-  static sAnim        animationList[21];                //!< the anomation list
+  static sAnim        animationList[22];                //!< the anomation list
    //! again one of these strange id software parts
   float*              shadeDots;

trunk/src/lib/gui/gl/glgui_handler.cc

@@ -33 +33 @@
 /// TAKE THIS OUT OF HERE.
 #include "graphics_engine.h"
+#include "loading/resource_manager.h"
 
 namespace OrxGui
@@ -74 +75 @@
     this->_cursor->show();
     this->_cursor->setMaxBorders(Vector2D(GraphicsEngine::getInstance()->getResolutionX(), GraphicsEngine::getInstance()->getResolutionY()));
+
+    _cursor->loadTextureSequence(ResourceManager::getInstance()->getDataDir() + "/" + "maps/reap_mouse/reap_mouse_##.png", 1, 49);
+
   }
 

trunk/src/lib/network/handshake.cc

@@ -43 +43 @@
 
   candel_id = registerVarId( new SynchronizeableInt( &localState.canDel, &remoteState.canDel, "canDel", PERMISSION_ALL ) );
+  
+  registerVar( new SynchronizeableString( &localState.preferedNickName, &remoteState.preferedNickName, "preferedNickName", PERMISSION_ALL ) );
 
   localState.completed = 0;

trunk/src/lib/network/handshake.h

@@ -28 +28 @@
   
   std::string errorString;
+  
+  //additional data
+  std::string preferedNickName;
 };
 
@@ -43 +46 @@
     inline bool       allowDel(){ return localState.canDel == 1; }
     inline void       del(){ localState.canDel = 1; }
+    
+    inline void       setPreferedNickName( const std::string & nick ){ localState.preferedNickName = nick; }
+    inline std::string getPreferedNickName(){ return remoteState.preferedNickName; }
     
     virtual void varChangeHandler( std::list<int> & id );

trunk/src/lib/network/network_game_manager.cc

@@ -42 +42 @@
 #include "multiplayer_team_deathmatch.h"
 
+#include "preferences.h"
+
 
 /* using namespace std is default, this needs to be here */
@@ -99 +101 @@
   std::string playableModel = rules.getPlayableModelFileName( userId, team, playableClassId );
   std::string playableTexture = rules.getPlayableModelFileName( userId, team, playableClassId );
+  float       playableScale = rules.getPlayableScale( userId, team, playableClassId );
   
   BaseObject * bo = Factory::fabricate( playableClassId );
@@ -107 +110 @@
   Playable & playable = *(dynamic_cast<Playable*>(bo));
   
-  if ( playableTexture != "" )
-    playable.loadMD2Texture( playableTexture );
-  if ( playableModel != "" )
-    playable.loadModel( playableModel );
+  playable.loadMD2Texture( playableTexture );
+  
+  playable.loadModel( playableModel, 100.0f );
   playable.setOwner( userId );
   playable.setUniqueID( SharedNetworkData::getInstance()->getNewUniqueID() );
@@ -125 +127 @@
   stats->setPlayableUniqueId( playable.getUniqueID() );
   stats->setModelFileName( playableModel );
+  
+  if ( userId == 0 )
+    stats->setNickName( Preferences::getInstance()->getString( "multiplayer", "nickname", "Server" ) );
   
   if ( rules.isA( CL_MULTIPLAYER_TEAM_DEATHMATCH ) )

trunk/src/lib/network/network_stream.cc

@@ -37 +37 @@
 #include "network_log.h"
 
+#include "player_stats.h"
 
 #include "lib/util/loading/factory.h"
@@ -153 +154 @@
   assert( peers[0].handshake == NULL );
   peers[0].handshake = hs;
+  
+  hs->setPreferedNickName( Preferences::getInstance()->getString( "multiplayer", "nickname", "Player" ) );
+  
 //   peers[0].handshake->setSynchronized( true );
   //this->connectSynchronizeable(*hs);
@@ -392 +396 @@
               {
                 handleNewClient( it->second.userId );
+                
+                if ( PlayerStats::getStats( it->second.userId ) && it->second.handshake->getPreferedNickName() != "" )
+                {
+                  PlayerStats::getStats( it->second.userId )->setNickName( it->second.handshake->getPreferedNickName() );
+                }
               }
               

trunk/src/lib/network/player_stats.cc

@@ -22 +22 @@
 #include "state.h"
 #include "shared_network_data.h"
+
+#include "preferences.h"
 
 #include "debug.h"
@@ -187 +189 @@
 void PlayerStats::setNickName( std::string nick )
 {
-  if ( isServer() )
+  if ( SharedNetworkData::getInstance()->isGameServer() )
   {
     this->nickName = nick;
@@ -226 +228 @@
   if ( getStats( SharedNetworkData::getInstance()->getHostID() ) )
     getStats( SharedNetworkData::getInstance()->getHostID() )->setNickName( newNick );
+    
+  Preferences::getInstance()->setString( "multiplayer", "nickname", newNick );
 }
 

trunk/src/lib/particles/particle_system.cc

@@ -460 +460 @@
     int i = 1;
     Particle* tmpPart = this->deadList;
-    while (tmpPart = tmpPart->next) ++i;
+    while (tmpPart = tmpPart->next) { ++i; }
     PRINT(0)("count: %d\n", i);
   }

trunk/src/lib/script_engine/script.cc

@@ -26 +26 @@
 CREATE_SCRIPTABLE_CLASS(Script, CL_SCRIPT,
                     addMethod("addObject", ExecutorLua2<Script,const std::string&, const std::string& >(&Script::addObject))
+                    ->addMethod("registerClass", ExecutorLua1<Script,const std::string&>(&Script::registerClass))
                     ->addMethod("selectFunction", ExecutorLua2ret<Script, bool, const std::string&, int >(&Script::selectFunction))
                     ->addMethod("executeFunction", ExecutorLua0ret<Script,bool >(&Script::executeFunction))
@@ -78 +79 @@
 bool Script::loadFile(const std::string& filename)
  {
-   this->setName(filename);
    std::string filedest(ResourceManager::getInstance()->getDataDir());
    filedest += "scripts/" + filename;
@@ -95 +95 @@
    if(error == 0)
    {
-     
+     currentFile = filename;
      error = lua_pcall(luaState, 0, 0, 0);
 
      if(error == 0)
      {
-      currentFile = filename;
       return true;
      }
@@ -358 +357 @@
    bool success = false;
    
-   //success = this->registerClass(std::string("Vector"));
-    success = this->registerClass("ScriptTrigger");
+   //this->registerClass(std::string("Vector"));
+    this->registerClass("ScriptTrigger");
+  //  this->registerClass("AttractorMine");
 
    return success;
@@ -365 +365 @@
  
  
- bool Script::registerClass( const std::string& className)
+ void Script::registerClass( const std::string& className)
  {
    BaseObject* scriptClass = ClassList::getObject(className, CL_SCRIPT_CLASS);
@@ -378 +378 @@
        tmpObj.name = "";
        registeredObjects.push_back(tmpObj);
+       return;
+     }
+   }
+ 
+ }
+
+ bool Script::classIsRegistered(const std::string& type)
+ {
+   for(std::list<WorldObject>::const_iterator it = registeredObjects.begin(); it != registeredObjects.end(); it++ )
+   {
+     if( (*it).type == type)
+     {
        return true;
      }
    }
    return false;
- 
- }
-
- bool Script::classIsRegistered(const std::string& type)
+ }
+
+
+
+ bool Script::objectIsAdded(const std::string& name)
  {
    for(std::list<WorldObject>::const_iterator it = registeredObjects.begin(); it != registeredObjects.end(); it++ )
    {
-     if( (*it).type == type)
+     if( (*it).name == name)
      {
        return true;
@@ -395 +408 @@
    }
    return false;
- }
-
-
-
- bool Script::objectIsAdded(const std::string& name)
- {
-   for(std::list<WorldObject>::const_iterator it = registeredObjects.begin(); it != registeredObjects.end(); it++ )
-   {
-     if( (*it).name == name)
-     {
-       return true;
-     }
-   }
-   return false;
-
-
- }
+
+
+ }

trunk/src/lib/script_engine/script.h

@@ -32 +32 @@
     bool loadFile(const std::string& filename);
     void addObject( const std::string& className,const std::string& objectName);
+    void registerClass(const std::string& className);                           //!< Register a class but dont add any instances 
 
     /// QUERRYING
@@ -64 +65 @@
     int  reportError(int error);                      //!< Get errormessage from the lua stack and print it.
     bool registerStandartClasses();                   //!< Register all the classes that the script might need
-    bool registerClass(const std::string& className); //!< Register a class but dont add any instances 
     bool classIsRegistered(const std::string& type);  //!< Checks wheter the class "type" has already been registered with the script
     bool objectIsAdded(const std::string& name);      //!< Checks wheter the object "name" has already been added to the script

trunk/src/lib/sound/sound_engine.cc

@@ -352 +352 @@
     if ((errorCode = alGetError()) != AL_NO_ERROR)
     {
-      PRINTF(1)("Error %s (line:%d): '%s'\n", error.c_str(), line, SoundEngine::getALErrorString(errorCode));
+      //PRINTF(1)("Error %s (line:%d): '%s'\n", error.c_str(), line, SoundEngine::getALErrorString(errorCode));
       return false;
     }

trunk/src/orxonox.cc

@@ -145 +145 @@
   SDL_QuitSubSystem(SDL_INIT_TIMER);
   ClassList::debug();
+  
+  Preferences::getInstance()->save();
 
   PRINT(3)

trunk/src/story_entities/game_world.cc

@@ -62 +62 @@
 #include "game_rules.h"
 
-using namespace std;
-
 #include "script_class.h"
 CREATE_SCRIPTABLE_CLASS(GameWorld, CL_GAME_WORLD,
                         addMethod("setPlaymode", ExecutorLua1<GameWorld,const std::string&>(&GameWorld::setPlaymode))
+                        ->addMethod("setSoundtrack", ExecutorLua1<GameWorld, const std::string&>(&GameWorld::setSoundtrack))
                        );
 
@@ -158 +157 @@
 
   PRINTF(3)("> Loading world: '%s'\n", getLoadFile().c_str());
-//  TiXmlElement* element;
-//  GameLoader* loader = GameLoader::getInstance();
+  //  TiXmlElement* element;
+  //  GameLoader* loader = GameLoader::getInstance();
 
   if( getLoadFile().empty())
@@ -233 +232 @@
 
 
+void GameWorld::setSoundtrack(const std::string& soundTrack)
+{
+  if (this->dataTank != NULL)
+  {
+    this->dataTank->setSoundTrack(soundTrack);
+    this->dataTank->music->play();
+  }
+}
+
+
 /**
  *  starts the GameWorld
@@ -312 +321 @@
     /* update the state */
     //this->update (); /// LESS REDUNDANCY.
-//      PNode::getNullParent()->updateNode(this->dtS);
+    //      PNode::getNullParent()->updateNode(this->dtS);
     PNode::getNullParent()->updateNode(this->dtS);
 
@@ -459 +468 @@
   CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_01),
       this->dataTank->objectManager->getObjectList(OM_GROUP_00_PROJ));
-  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_00),
-      this->dataTank->objectManager->getObjectList(OM_GROUP_01));
+  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_01),
+    this->dataTank->objectManager->getObjectList(OM_GROUP_00));
+
+  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_01),
+  this->dataTank->objectManager->getObjectList(OM_GROUP_02));
+  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_02),
+  this->dataTank->objectManager->getObjectList(OM_GROUP_01_PROJ));
+
 
   CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_00),
@@ -536 +551 @@
 void GameWorld::renderPassReflection()
 {
-    // clear buffer
+  // clear buffer
   glClear( GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
-//  glLoadIdentity();
+  //  glLoadIdentity();
 
   const std::list<BaseObject*>* reflectedWaters;
@@ -562 +577 @@
       // draw everything to be included in the reflection
       this->drawEntityList(State::getObjectManager()->getReflectionList());
-//       for (unsigned int i = 0; i < this->dataTank->drawLists.size(); ++i)
-//         this->drawEntityList(State::getObjectManager()->getObjectList(this->dataTank->drawLists[i]));
+      //       for (unsigned int i = 0; i < this->dataTank->drawLists.size(); ++i)
+      //         this->drawEntityList(State::getObjectManager()->getObjectList(this->dataTank->drawLists[i]));
 
       // clean up from reflection rendering
@@ -578 +593 @@
 void GameWorld::renderPassRefraction()
 {
-    // clear buffer
+  // clear buffer
   glClear( GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
   //glLoadIdentity();
@@ -602 +617 @@
       // draw everything to be included in the reflection
       this->drawEntityList(State::getObjectManager()->getReflectionList());
-//       for (unsigned int i = 0; i < this->dataTank->drawLists.size(); ++i)
-//         this->drawEntityList(State::getObjectManager()->getObjectList(this->dataTank->drawLists[i]));
+      //       for (unsigned int i = 0; i < this->dataTank->drawLists.size(); ++i)
+      //         this->drawEntityList(State::getObjectManager()->getObjectList(this->dataTank->drawLists[i]));
 
       // clean up from reflection rendering

trunk/src/story_entities/game_world.h

@@ -31 +31 @@
 class GameWorld : public StoryEntity
 {
-  public:
-    GameWorld ();
-    virtual ~GameWorld ();
+public:
+  GameWorld ();
+  virtual ~GameWorld ();
 
-    virtual void loadParams(const TiXmlElement* root);
+  virtual void loadParams(const TiXmlElement* root);
 
-    /* functions from story-entity */
-    virtual ErrorMessage init();
-    virtual ErrorMessage loadData();
-    virtual ErrorMessage unloadData();
+  /* functions from story-entity */
+  virtual ErrorMessage init();
+  virtual ErrorMessage loadData();
+  virtual ErrorMessage unloadData();
 
-    virtual bool start();
-    virtual bool stop();
-    virtual bool pause();
-    virtual bool resume();
-    virtual void run();
+  virtual bool start();
+  virtual bool stop();
+  virtual bool pause();
+  virtual bool resume();
+  virtual void run();
 
-    void setPlaymode(Playable::Playmode playmode);
-    void setPlaymode(const std::string& playmode);
-    /**  this returns the current game time @returns elapsed game time     */
-    inline double getGameTime() { return this->gameTime; }
-    /** sets the game speed @param speed speed of the Game */
-    inline void setSpeed(float speed) { this->speed = speed; };
-    /**  returns the track path of this world @returns the track path */
-
-    void togglePNodeVisibility();
-    void toggleBVVisibility(int level);
-
-    inline void setSky(WorldEntity* sky) { this->dataTank->sky = sky; }
+  void setPlaymode(Playable::Playmode playmode);
+  void setPlaymode(const std::string& playmode);
+  /**  this returns the current game time @returns elapsed game time     */
+  inline double getGameTime() { return this->gameTime; }
+  /** sets the game speed @param speed speed of the Game */
+  inline void setSpeed(float speed) { this->speed = speed; };
+  /**  returns the track path of this world @returns the track path */
 
 
-  protected:
-    /* world - running functions */
-    virtual void synchronize();
-    virtual void handleInput();
-    virtual void tick(ObjectManager::EntityList worldEntity, float dt);
-    virtual void tick();
-    virtual void update();
-    virtual void checkGameRules();
-    virtual void collisionDetection();
-    virtual void collisionReaction();
+  void setSoundtrack(const std::string& soundTrack);
+  void togglePNodeVisibility();
+  void toggleBVVisibility(int level);
 
-    void applyCameraSettings();
-    void drawEntityList(const ObjectManager::EntityList& drawList ) const;
-    virtual void renderPassReflection();
-    virtual void renderPassRefraction();
-    virtual void renderPassAll();
+  inline void setSky(WorldEntity* sky) { this->dataTank->sky = sky; }
 
 
-    virtual void display();
+protected:
+  /* world - running functions */
+  virtual void synchronize();
+  virtual void handleInput();
+  virtual void tick(ObjectManager::EntityList worldEntity, float dt);
+  virtual void tick();
+  virtual void update();
+  virtual void checkGameRules();
+  virtual void collisionDetection();
+  virtual void collisionReaction();
+
+  void applyCameraSettings();
+  void drawEntityList(const ObjectManager::EntityList& drawList ) const;
+  virtual void renderPassReflection();
+  virtual void renderPassRefraction();
+  virtual void renderPassAll();
 
 
-  private:
-    void displayLoadScreen();
-    void releaseLoadScreen();
+  virtual void display();
 
 
-  protected:
-    GameWorldData*      dataTank;                     //!< reference to the GameWorld Data Tank
-    TiXmlElement*       dataXML;                      //!< The XML-Element this World has been loaded with.
+private:
+  void displayLoadScreen();
+  void releaseLoadScreen();
 
-    bool                showPNodes;                   //!< if the PNodes should be visible.
-    bool                showBV;                       //!< if the Bounding Volumes should be visible.
-    int                 showBVLevel;                  //!< the depth level of the displayed bounding volumes
 
-    /* world timing */
-    double              lastFrame;                    //!< last time of frame (in MiliSeconds)
-    Uint32              cycle;                        //!< The cycle we are in (starts with 0 and rises with every frame)
-    float               dtS;                          //!< The time needed for caluculations in seconds
-    float               speed;                        //!< how fast the game flows
-    double              gameTime;                     //!< this is where the game time is saved
-    double              frameTimes[TICK_SMOOTH_VALUE];//!< The time used for the last TICK_SMOOTH_VALUE's frames.
+protected:
+  GameWorldData*      dataTank;                     //!< reference to the GameWorld Data Tank
+  TiXmlElement*       dataXML;                      //!< The XML-Element this World has been loaded with.
 
-    GameRules*          gameRules;                    //!< Pointer to the data structure containig the game rules
+  bool                showPNodes;                   //!< if the PNodes should be visible.
+  bool                showBV;                       //!< if the Bounding Volumes should be visible.
+  int                 showBVLevel;                  //!< the depth level of the displayed bounding volumes
 
-  private:
-    /* external modules interfaces */
-    ScriptManager       scriptManager;
-    OrxShell::Shell*    shell;
+  /* world timing */
+  double              lastFrame;                    //!< last time of frame (in MiliSeconds)
+  Uint32              cycle;                        //!< The cycle we are in (starts with 0 and rises with every frame)
+  float               dtS;                          //!< The time needed for caluculations in seconds
+  float               speed;                        //!< how fast the game flows
+  double              gameTime;                     //!< this is where the game time is saved
+  double              frameTimes[TICK_SMOOTH_VALUE];//!< The time used for the last TICK_SMOOTH_VALUE's frames.
+
+  GameRules*          gameRules;                    //!< Pointer to the data structure containig the game rules
+
+private:
+  /* external modules interfaces */
+  ScriptManager       scriptManager;
+  OrxShell::Shell*    shell;
 };
 

trunk/src/story_entities/game_world_data.cc

@@ -249 +249 @@
   this->tickLists.push_back(OM_GROUP_01);
   this->tickLists.push_back(OM_GROUP_01_PROJ);
+  this->tickLists.push_back(OM_GROUP_02);
 
   this->drawLists.push_back(OM_ENVIRON_NOTICK);
   this->drawLists.push_back(OM_ENVIRON);
-  this->drawLists.push_back(OM_COMMON);
   this->drawLists.push_back(OM_GROUP_00);
   this->drawLists.push_back(OM_GROUP_00_PROJ);
   this->drawLists.push_back(OM_GROUP_01);
   this->drawLists.push_back(OM_GROUP_01_PROJ);
+  this->drawLists.push_back(OM_GROUP_02);
+  this->drawLists.push_back(OM_COMMON);
 
   /* init the pnode tree */
@@ -343 +345 @@
   LoadParamXML(root, "GameRule", this, GameWorldData, loadGameRule);
 
+  LoadParam(root, "clip-region", this->localCamera, Camera, setClipRegion);
+
 
   //LoadParamXML(root, "ParticleEngine", ParticleEngine::getInstance(), ParticleEngine, loadParams);
   //LoadParamXML(root, "PhysicsEngine", PhysicsEngine::getInstance(), PhysicsEngine, loadParams);
 
-  this->localCamera->setClipRegion(1, 10000.0);
   if( this->sky != NULL)
     this->localCamera->addChild(this->sky);

trunk/src/story_entities/menu/game_menu.cc

@@ -40 +40 @@
 
 #include "network_manager.h"
+
+#include "preferences.h"
 
 //! This creates a Factory to fabricate a GameMenu
@@ -126 +128 @@
   this->levelsBox = NULL;
   this->networkBox = NULL;
-  
+
   this->clientNetworkBox = NULL;
   this->serverNetworkBox = NULL;
@@ -239 +241 @@
     {
       OrxGui::GLGuiBox * box = new OrxGui::GLGuiBox();
-      
+
       OrxGui::GLGuiButton* clientButton = new OrxGui::GLGuiPushButton("Client");
       box->pack(clientButton);
@@ -247 +249 @@
       box->pack(serverButton);
       serverButton->connect(SIGNAL(serverButton, released), this, SLOT(GameMenu, showServerMenu));
-      
+
       networkBox->pack( box );
     }
@@ -340 +342 @@
   OrxGui::GLGuiHandler::getInstance()->activateCursor();
   OrxGui::GLGuiHandler::getInstance()->activate();
-  OrxGui::GLGuiHandler::getInstance()->cursor()->loadTextureSequence(ResourceManager::getInstance()->getDataDir() + "/" + "maps/reap_mouse/reap_mouse_##.png", 1, 49);
 
   /* now call the underlying*/
@@ -518 +519 @@
     //this->serverNetworkBox = NULL;
   }
-  
+
   if ( !this->clientNetworkBox )
   {
@@ -526 +527 @@
       text->setText( "Host:" );
       this->clientNetworkBox->pack( text );
-      
+
       this->ipInputLine = new OrxGui::GLGuiInputLine( );
-      this->ipInputLine->setText( "tardis-d08" );
+      this->ipInputLine->setText( Preferences::getInstance()->getString( "multiplayer", "lastVisitedServer", "localhost" ) );
       this->clientNetworkBox->pack( this->ipInputLine );
       this->ipInputLine->connect(SIGNAL(ipInputLine, enterPushed), this, SLOT(GameMenu, connectToServer));
       this->ipInputLine->select();
-      
+
       OrxGui::GLGuiButton* connectButton = new OrxGui::GLGuiPushButton("Connect");
       clientNetworkBox->pack(connectButton);
@@ -538 +539 @@
     }
   }
-  
+
   this->networkBox->pack( this->clientNetworkBox );
-  
+
   this->clientNetworkBox->showAll();
-  
+
   //this->clientNetworkBox->setAbsCoor2D( 300.0f, 100.0f );
 }
@@ -558 +559 @@
     //this->clientNetworkBox = NULL;
   }
-  
+
   if ( !this->serverNetworkBox )
   {
@@ -566 +567 @@
       text->setText( "Map:" );
       this->serverNetworkBox->pack( text );
-      
+
       OrxGui::GLGuiText * text2 = new OrxGui::GLGuiText();
       text2->setText( "Multiplayer TeamDeathMatch Arena" );
       this->serverNetworkBox->pack( text2 );
-      
+
       OrxGui::GLGuiButton* createButton = new OrxGui::GLGuiPushButton("Create Server");
       serverNetworkBox->pack(createButton);
@@ -576 +577 @@
     }
   }
-  
+
   this->networkBox->pack( this->serverNetworkBox );
-  
+
   this->serverNetworkBox->showAll();
-  
+
   //this->serverNetworkBox->setAbsCoor2D( 300.0f, 100.0f );
 }
@@ -590 +591 @@
 {
   PRINTF(0)("Connecting to %s\n", this->ipInputLine->_getText().c_str() );
-  
+
   State::setOnline(true);
   NetworkManager::getInstance()->establishConnection( this->ipInputLine->_getText(), 9999 );
-  
+
+  Preferences::getInstance()->setString( "multiplayer", "lastVisitedServer", this->ipInputLine->_getText() );
+
   this->startLevel( 5 );
 }
@@ -600 +603 @@
 {
   PRINTF(0)("Create server\n" );
-  
+
   State::setOnline(true);
   NetworkManager::getInstance()->createServer( 9999 );
-  
+
   this->startLevel( 5 );
 }

trunk/src/story_entities/multi_player_world.cc

@@ -97 +97 @@
   //CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_PLAYERS), this->dataTank->objectManager->getObjectList(OM_PLAYERS));
 
-  PRINTF(5)("\n-----------------------------------------\nchecking OM_PLAYERS vs OM_PLAYERS_PROJ\n\n");
-  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_PLAYERS_PROJ),
-  this->dataTank->objectManager->getObjectList(OM_PLAYERS));
   PRINTF(5)("\n-----------------------------------------\nchecking OM_PLAYERS vs OM_GROUP_01_PROJ\n\n");
   CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_PLAYERS),
@@ -106 +103 @@
   CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_PLAYERS),
     this->dataTank->objectManager->getObjectList(OM_GROUP_01_PROJ));
+  PRINTF(5)("\n-----------------------------------------\nchecking OM_PLAYERS vs OM_PLAYERS_PROJ\n\n");
   CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_PLAYERS),
-    this->dataTank->objectManager->getObjectList(OM_GROUP_00));
-  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_PLAYERS),
-    this->dataTank->objectManager->getObjectList(OM_GROUP_01));
+    this->dataTank->objectManager->getObjectList(OM_PLAYERS_PROJ));
+
+  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_00),
+  this->dataTank->objectManager->getObjectList(OM_PLAYERS));
+  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_01),
+  this->dataTank->objectManager->getObjectList(OM_PLAYERS));
 
 

trunk/src/story_entities/multi_player_world_data.cc

@@ -109 +109 @@
 ErrorMessage MultiPlayerWorldData::loadWorldEntities(const TiXmlElement* root)
 {
-  /* load the spawning points */
-  const TiXmlElement* element = root->FirstChildElement("SpawningPoints");
-  if( element == NULL)
-  {
-    PRINTF(1)("NetworkWorld is missing 'SpawningPoints'\n");
-  }
-  else
-  {
-    element = element->FirstChildElement();
-    // load Players/Objects/Whatever
-    PRINTF(4)("Loading Spawning Points\n");
-    while( element != NULL)
-    {
-      BaseObject* created = Factory::fabricate(element);
-      if( created != NULL )
-        printf("Created a Spawning Point %s: %s\n", created->getClassName(), created->getName());
-
-      element = element->NextSiblingElement();
-      glmis->step();
-    }
-    PRINTF(4)("Done loading Spawning Points\n");
+  const TiXmlElement* element = NULL;
+  
+  if( NetworkManager::getInstance()->isGameServer() )
+  {
+    /* load the spawning points */
+    element = root->FirstChildElement("SpawningPoints");
+    if( element == NULL)
+    {
+      PRINTF(1)("NetworkWorld is missing 'SpawningPoints'\n");
+    }
+    else
+    {
+      element = element->FirstChildElement();
+      // load Players/Objects/Whatever
+      PRINTF(4)("Loading Spawning Points\n");
+      while( element != NULL)
+      {
+        BaseObject* created = Factory::fabricate(element);
+        if( created != NULL )
+          printf("Created a Spawning Point %s: %s\n", created->getClassName(), created->getName());
+
+        element = element->NextSiblingElement();
+        glmis->step();
+      }
+      PRINTF(4)("Done loading Spawning Points\n");
+    }
   }
 

trunk/src/util/hud.cc

@@ -187 +187 @@
     this->_radar->setCenterNode(State::getPlayer()->getPlayable());
     this->_radar->addEntityList(&State::getObjectManager()->getObjectList((OM_LIST)(State::getPlayer()->getPlayable()->getOMListNumber()+1)), Color(.4, .4, 1.0));
+    this->_radar->addEntityList(&State::getObjectManager()->getObjectList(OM_GROUP_02), Color(1.0, .2, .2));
     this->_radar->setAbsCoor2D(0.8 * this->resX, 0.01 * this->resY);
     this->_radar->setWidgetSize(0.2 * this->resX, 0.2 * this->resY);

trunk/src/util/multiplayer_team_deathmatch.cc

@@ -210 +210 @@
   while ( this->killList.begin() != this->killList.end() )
   {
+    PRINTF(0)("KKKKKKKKIIIIIIIIILLLLLLLLLLLLL\n");
     onKill( this->killList.begin()->getVictim(), this->killList.begin()->getKiller() );
     this->killList.erase( this->killList.begin() );
@@ -305 +306 @@
     return "models/creatures/doom_guy.md2";
   else if ( team == 1 )
-    return "models/creatures/doom_guy.md2";
+    return "models/creatures/male.md2";
   else
     return "";
 }
 
+std::string MultiplayerTeamDeathmatch::getPlayableModelTextureFileName( int userId, int team, ClassID classId )
+{
+  if ( classId == CL_FPS_PLAYER )
+  {
+    if ( team == 0 )
+      return "maps/doom_guy.png";
+    else
+      return "maps/male_fiend.pcx";
+  }
+  
+  return "";
+}
+
+float MultiplayerTeamDeathmatch::getPlayableScale( int userId, int team, ClassID classId )
+{
+  if ( classId == CL_FPS_PLAYER )
+  {
+    return 10.0f;
+  }
+  
+  return 1.0f;
+}
+
 /**
  * calculate team score
@@ -399 +423 @@
   if ( currentGameState == GAMESTATE_POST_GAME )
   {
-    State::getCurrentStoryEntity()->stop();
+    //State::getCurrentStoryEntity()->stop();
     this->bShowTeamChange = false;
 
@@ -456 +480 @@
   std::string playableModel = getPlayableModelFileName( userId, stats.getPreferedTeamId(), playableClassId );
   std::string playableTexture = getPlayableModelTextureFileName( userId, stats.getPreferedTeamId(), playableClassId );
+  float       playableScale = getPlayableScale( userId, stats.getPreferedTeamId(), playableClassId );
 
   BaseObject * bo = Factory::fabricate( playableClassId );
@@ -464 +489 @@
   Playable & playable = *(dynamic_cast<Playable*>(bo));
 
-  if ( playableTexture != "" )
-    playable.loadMD2Texture( playableTexture );
-  if ( playableModel != "" )
-    playable.loadModel( playableModel );
+  playable.loadMD2Texture( playableTexture );
+  playable.loadModel( playableModel, playableScale );
   playable.setOwner( userId );
   playable.setUniqueID( SharedNetworkData::getInstance()->getNewUniqueID() );
@@ -687 +710 @@
 {
   if ( !victim )
-    return;
+  {
+    PRINTF(0)("victim == NULL\n");
+    return;
+  }
   if ( !killer )
-    return;
+  {
+    PRINTF(0)("killer == NULL\n");
+    return;
+  }
   
   int killerUserId = killer->getOwner();
   int victimUserId = victim->getOwner();
+  
+  PRINTF(0)("%d %d %x %x %s %s\n", killerUserId, victimUserId, killer, victim, killer->getClassName(), victim->getClassName());
 
   PlayerStats & victimStats = *PlayerStats::getStats( victimUserId );
@@ -698 +729 @@
   
   if ( killerStats.getPlayable() != killer || victimStats.getPlayable() != victim )
-    return;
+  {
+    PRINTF(0)("killerStats.getPlayable() != killer || victimStats.getPlayable() != victim\n");
+    PRINTF(0)("%x %x %x %x\n", killerStats.getPlayable(), killer, victimStats.getPlayable(), victim );
+    PRINTF(0)("%d %d %d %d\n", killerStats.getPlayable()->getUniqueID(), killer->getUniqueID(), victimStats.getPlayable()->getUniqueID(), victim->getUniqueID() );
+    return;
+  }
 
   //check for suicide
@@ -782 +818 @@
 }
 
-std::string MultiplayerTeamDeathmatch::getPlayableModelTextureFileName( int userId, int team, ClassID classId )
-{
-  if ( classId == CL_FPS_PLAYER )
-  {
-    return "maps/doom_guy.png";
-  }
-  
-  return "";
-}
-
+

trunk/src/util/multiplayer_team_deathmatch.h

@@ -41 +41 @@
     virtual std::string getPlayableModelTextureFileName( int userId, int team, ClassID classId );
     virtual std::string getPlayableModelFileName( int userId, int team, ClassID classId );
+    virtual float getPlayableScale( int userId, int team, ClassID classId );
 
     virtual void registerSpawn( WorldEntity * we );

trunk/src/util/network_game_rules.cc

@@ -68 +68 @@
 
 
+float NetworkGameRules::getPlayableScale( int userId, int team, ClassID classId )
+{
+  return 1.0f;
+}

trunk/src/util/network_game_rules.h

@@ -24 +24 @@
     virtual std::string getPlayableModelFileName( int userId, int team, ClassID classId );
     virtual std::string getPlayableModelTextureFileName( int userId, int team, ClassID classId );
+    virtual float getPlayableScale( int userId, int team, ClassID classId );
     
     virtual PlayerStats * getNewPlayerStats( int userId ){ return new PlayerStats( userId ); }

trunk/src/world_entities/WorldEntities.am

@@ -4 +4 @@
                 world_entities/npcs/npc_test.cc \
                 world_entities/npcs/ground_turret.cc \
+                world_entities/npcs/space_turret.cc \
                 world_entities/npcs/generic_npc.cc \
                 world_entities/npcs/door.cc \
+                world_entities/npcs/gate.cc \
                 world_entities/npcs/repair_station.cc \
+                world_entities/npcs/attractor_mine.cc \
                 \
                 world_entities/environment.cc \
@@ -22 +25 @@
                 \
                 world_entities/weapons/test_gun.cc \
+                world_entities/weapons/laser_cannon.cc \
                 world_entities/weapons/turret.cc \
                 world_entities/weapons/aiming_turret.cc \
@@ -28 +32 @@
                 world_entities/weapons/hyperblaster.cc \
                 world_entities/weapons/aim.cc \
+                world_entities/weapons/aiming_system.cc \
                 world_entities/weapons/fps_sniper_rifle.cc \
+                world_entities/weapons/boomerang_gun.cc \
                 \
                 world_entities/projectiles/bomb.cc \
                 world_entities/projectiles/laser.cc \
+                world_entities/projectiles/rail_projectile.cc \
                 world_entities/projectiles/test_bullet.cc \
                 world_entities/projectiles/rocket.cc \
                 world_entities/projectiles/guided_missile.cc \
+                world_entities/projectiles/boomerang_projectile.cc \
                 world_entities/projectiles/hyperblast.cc \
                 \
@@ -70 +78 @@
                 npcs/npc_test1.h \
                 npcs/ground_turret.h \
+                npcs/space_turret.h \
                 npcs/door.cc \
-                npcs/repair_station.cc \
+                npcs/repair_station.h \
+                npcs/attractor_mine.h \
                 \
                 environment.h \
@@ -87 +97 @@
                 \
                 weapons/test_gun.h \
+                weapons/laser_cannon.cc \
                 weapons/cannon.h \
                 weapons/hyperblaster.h \
@@ -92 +103 @@
                 weapons/aiming_turret.h \
                 weapons/targeting_turret.h \
+                weapons/boomerang_gun.h \
                 weapons/aim.h \
+                weapons/aiming_system.h \
                 weapons/fps_sniper_rifle.h \
                 \
                 projectiles/bomb.h \
                 projectiles/laser.h \
+                projectiles/rail_projectile.h \
                 projectiles/test_bullet.h \
                 projectiles/rocket.h \
                 projectiles/guided_missile.h \
+                projectiles/boomerang_projectile.h \
                 projectiles/hyperblast.h \
                 \

trunk/src/world_entities/camera.cc

@@ -36 +36 @@
   this->setFovy(90);
   this->setAspectRatio(1.2f);
-  this->setClipRegion(.1, 2000);
+  this->setClipRegion(.1, 10000);
 
   this->setViewMode(Camera::ViewNormal);

trunk/src/world_entities/creatures/fps_player.cc

@@ -29 +29 @@
 #include "weapons/cannon.h"
 #include "weapons/fps_sniper_rifle.h"
+#include "weapons/aiming_system.h"
 
 #include "aabb.h"
+
 
 #include "key_mapper.h"
@@ -57 +59 @@
 {
   this->setPlayer(NULL);
+
+  if( this->aimingSystem)
+    delete this->aimingSystem;
 }
 
@@ -81 +86 @@
 {
   this->setClassID(CL_FPS_PLAYER, "FPSPlayer");
-
 
   this->bLeft = false;
@@ -89 +93 @@
   this->bJump = false;
   this->bPosBut = false;
+  this->bFire = false;
 
   this->xMouse = 0.0f;
@@ -125 +130 @@
 
 //   this->addWeapon(wpLeft, 1, 0);
-  this->addWeapon(wpRight,1, 0);
+  if( State::isOnline())
+    this->addWeapon(wpRight,1, 0);
   this->getWeaponManager().changeWeaponConfig(1);
 
   this->getWeaponManager().setSlotCount(2);
-//   this->getWeaponManager().setSlotDirection(0, Quaternion(M_PI_2, Vector(0,1,0)));
+  this->getWeaponManager().setSlotDirection(0, Quaternion(M_PI_4*-0.55f, Vector(0,0,1)));
   this->getWeaponManager().setSlotCapability(0, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
   this->getWeaponManager().setSlotDirection(1, Quaternion(M_PI_4*.5, Vector(1,0,0)));
@@ -135 +141 @@
   this->getWeaponManager().setSlotPosition(1, Vector(5.0, 0.0, 0.0));
 
+//   this->getWeaponManager().getFixedTarget()->setRelDir(Quaternion(M_PI_4*-0.6f, Vector(0,0,1)));
+
 
   this->getWeaponManager().setParentNode(&this->cameraNode);
@@ -141 +149 @@
   this->getWeaponManager().getFixedTarget()->setParent(&this->cameraNode);
   this->getWeaponManager().getFixedTarget()->setRelCoor(1000,0,0);
+
+  this->aimingSystem = new AimingSystem(this);
+  //this->addChild(this->aimingSystem);
+  wpRight->addChild(this->aimingSystem);
+//   this->getWeaponManager().sl
 
 
@@ -148 +161 @@
   registerVar( new SynchronizeableBool( &bForward, &bForward, "bForward", PERMISSION_OWNER ) );
   registerVar( new SynchronizeableBool( &bBackward, &bBackward, "bBackward", PERMISSION_OWNER ) );
+  registerVar( new SynchronizeableBool( &bJump, &bJump, "bJump", PERMISSION_OWNER ) );
   registerVar( new SynchronizeableFloat( &heading, &heading, "heading", PERMISSION_OWNER ) );
   registerVar( new SynchronizeableFloat( &attitude, &attitude, "attitude", PERMISSION_OWNER ) );
+
+    //subscribe to collision reaction
+  this->subscribeReaction(CREngine::CR_PHYSICS_FULL_WALK, CL_BSP_ENTITY);
+
+  this->initWeapon = false;
+  this->damageTicker = 0.0f;
+
+  if( State::isOnline())
+    toList( OM_PLAYERS );
 }
 
@@ -192 +215 @@
   this->getWeaponManager().getFixedTarget()->setRelCoor(0,0,0);
 
-
-  AABB* box = this->getModelAABB();
-  if( box != NULL)
-  {
-    State::getCameraNode()->setRelCoor(0, box->halfLength[1] * 2.0f, 0);
-    State::getCameraTargetNode()->setRelCoor(10, box->halfLength[1] * 2.0f, 0);
-
-    this->getWeaponManager().setSlotPosition(0, Vector(1.5, box->halfLength[1] * 2.0f - 0.7, 1.1));
-    this->getWeaponManager().setSlotPosition(1, Vector(5.0, box->halfLength[1] * 2.0f, 0.0));
+  if ( !State::isOnline() )
+  {
+    this->respawn();
   }
 }
@@ -219 +236 @@
 {
 
-  if( this->bPosBut)
-  {
-    this->bPosBut = false;
-    printf("mechanic2:walkTo( %f, mtheight, %f)\n",this->getAbsCoorX(),this->getAbsCoorZ());
-  }
-
-  Playable::tick( time );
+  if ( !this->initWeapon )
+  {
+    this->initWeapon = true;
+
+    this->cameraNode.setParentMode(PNODE_ROTATE_AND_MOVE);
+
+    this->getWeaponManager().getParentNode()->setParentMode(PNODE_ROTATE_AND_MOVE);
+    this->getWeaponManager().getFixedTarget()->setParent(&this->cameraNode);
+    this->getWeaponManager().getFixedTarget()->setParentMode(PNODE_ROTATE_AND_MOVE);
+
+
+    this->aimingSystem->toList(OM_GROUP_01);
+    this->aimingSystem->setParent(&this->cameraNode);
+//     this->aimingSystem->setParentMode(PNODE_ROTATE_AND_MOVE);
+    this->aimingSystem->setRelDir(Quaternion(M_PI_4*-0.58f, Vector(0,0,1)));
+    this->aimingSystem->setRelCoor(0, -1, -1);
+
+
+    AABB* box = this->getModelAABB();
+    if( box != NULL)
+    {
+      float f = 1.0;
+      this->cameraNode.setRelCoor(0, box->halfLength[1] * f, 0);
+//       this->cameraNode.setRelCoor(10, box->halfLength[1] * f, 0);
+
+      float v = 0.1f;
+      this->getWeaponManager().setSlotPosition(0, Vector(-8.0, box->halfLength[1] * v, 1.1));
+      this->getWeaponManager().setSlotPosition(1, Vector(5.0, box->halfLength[1] * v, 0.0));
+    }
+  }
+
+
+  this->getWeaponManager().tick(time);
+  if( this->bFire)
+  {
+    this->getWeaponManager().fire();
+
+//     WorldEntity* target = this->aimingSystem->getNearestTarget();
+//     if( target != NULL)
+//     {
+//       PRINTF(0)("hit hit hit, got: %s\n", target->getClassName());
+//     }
+//     else
+//     {
+//       PRINTF(0)("nothing hit\n");
+//     }
+  }
+
+
+  //dealing damage
+
+  if ( State::isOnline() && SharedNetworkData::getInstance()->isGameServer() )
+  {
+    this->damageTicker -= time;
+
+    if ( this->damageTicker <= 0.0f && this->beFire() )
+    {
+      this->damageTicker = 0.25;
+
+      WorldEntity * victim = aimingSystem->getNearestTarget();
+
+      if ( victim )
+      {
+        PRINTF(0)("FIRE: hit %s\n", victim->getClassName());
+        victim->hit( 20, this );
+      }
+      else
+      {
+        PRINTF(0)("FIRE: nothing hit\n");
+      }
+    }
+  }
+
 
   if( ( xMouse != 0 || yMouse != 0 ) && (this->getOwner() == SharedNetworkData::getInstance()->getHostID() || !State::isOnline() ) )
@@ -235 +318 @@
     attitude-= yMouse;
 
-    if ( attitude > 2.05 )
-      attitude = 2.05;
-
-    else if ( attitude < -1.15 )
-      attitude = -1.15;
+
+    if ( attitude > 1.95 )
+      attitude = 1.95;
+    else if ( attitude < -1.07 )
+      attitude = -1.07;
 
     xMouse = yMouse = 0;
@@ -304 +387 @@
     this->fallVelocity += 300.0f * time;
     velocity -= Vector(0.0, 1.0, 0.0) * this->fallVelocity;
+
+//     PRINTF(0)("vel %f\n", this->fallVelocity);
   }
   else
@@ -309 +394 @@
     this->fallVelocity = 0.0f;
   }
-
 
   this->shiftCoor( velocity*time );
@@ -346 +430 @@
   }
 
+  this->setOnGround(false);
+  this->aimingSystem->flushList();
 }
 
@@ -383 +469 @@
   }
   else if( event.type == KeyMapper::PEV_JUMP)
+  {
     this->bJump = event.bPressed;
-    this->bPosBut = event.bPressed;
-}
-
-
-
-
+  }
+  else if( event.type == KeyMapper::PEV_FIRE1)
+  {
+    this->bFire = event.bPressed;
+  }
+}
+
+
+void FPSPlayer::respawn( )
+{
+  if( State::isOnline())
+    toList( OM_PLAYERS );
+
+  this->damageTicker = 0.0f;
+
+  Playable::respawn();
+}
+
+
+void FPSPlayer::destroy( WorldEntity* killer )
+{
+  Playable::destroy( killer );
+
+  toList( OM_DEAD );
+}
+

trunk/src/world_entities/creatures/fps_player.h

@@ -9 +9 @@
 
 #include "playable.h"
+
+
+class AimingSystem;
 
 
@@ -27 +30 @@
     virtual void reset();
 
+    virtual void destroy(WorldEntity* killer);
+    virtual void respawn();
 
     virtual void tick(float time);
@@ -43 +48 @@
     bool                  bJump;              //!< jumping
     bool                  bPosBut;             //!< position button
+    bool                  bFire;              //!< fire button
 
     float                 xMouse;             //!< mouse moved in x-Direction
@@ -55 +61 @@
     float                 fallVelocity;        //!< velocity for falling down
     float                 jumpForce;           //!< the jump force
+
+    bool                  initWeapon;
+
+    AimingSystem*         aimingSystem;        //!< aiming system of the player
+
+    float                 damageTicker;        //!< ticker for dealing damage
 };
 

trunk/src/world_entities/effects/explosion.cc

@@ -40 +40 @@
   this->toList(OM_DEAD_TICK);
 
-  this->emitter = new BoxEmitter(Vector(10,10,10), 500, 45, M_2_PI);
+  this->emitter = new BoxEmitter(Vector(10,10,10), 200, 45, M_2_PI);
   this->emitter->addNodeFlags(PNODE_PROHIBIT_DELETE_WITH_PARENT);
   this->emitter->setParent(this);
@@ -83 +83 @@
     Explosion::explosionParticles->setLifeSpan(1.5, .3);
     Explosion::explosionParticles->setRadius(0.0, 10);
-    Explosion::explosionParticles->setRadius(.5, 15.0);
+    Explosion::explosionParticles->setRadius(.5, 30.0);
     Explosion::explosionParticles->setRadius(1.0, 10.0);
     Explosion::explosionParticles->setColor(0.0, 1,0,0,1);
@@ -113 +113 @@
 void Explosion::tick (float dt)
 {
-  printf("%f %f\n", this->lifeCycle, this->lifeTime);
   this->lifeCycle += dt;
   if(this->lifeTime < this->lifeCycle)

trunk/src/world_entities/environments/mapped_water.cc

@@ -337 +337 @@
 {
   // it's not too nice, but it works fine
-  PRINTF(0)("\nMappedWater XML Code:\n<MappedWater>\n  <waterpos>%f, %f, %f</waterpos>\n  <watersize>%f, %f</watersize>\n  <wateruv>%f</wateruv>\n  <waterflow>%f</waterflow>\n  <lightpos>%f, %f, %f</lightpos>\n  <waterangle>%f</waterangle>\n  <normalmapscale>%f</normalmapscale>\n  <shinesize>%f</waterpos>\n  <shinestrength>%f</shinestrength>\n  <reflstrength>%f</reflstrength>\n  <refraction>%f</refraction>\n  <watercolor>%f, %f, %f</watercolor>\n</MappedWater>\n", this->waterVerts[0], this->waterHeight, this->waterVerts[1], this->xWidth, this->zWidth, this->waterUV, this->waterFlow, this->lightPos.x, this->lightPos.y, this->lightPos.z, this->waterAngle, this->kNormalMapScale, this->shineSize, this->shineStrength, this->reflStrength, this->refraction, this->waterColor.x, this->waterColor.y, this->waterColor.z);
+  PRINT(0)("\nMappedWater XML Code:\n<MappedWater>\n");
+
+  PRINT(0)("  <waterpos>%f, %f, %f</waterpos>\n", this->waterVerts[0], this->waterHeight, this->waterVerts[1]);
+  PRINT(0)("  <watersize>%f, %f</watersize>\n", this->xWidth, this->zWidth);
+  PRINT(0)("  <wateruv>%f</wateruv>\n", this->waterUV);
+  PRINT(0)("  <waterflow>%f</waterflow>\n", this->waterFlow);
+  PRINT(0)("  <lightpos>%f, %f, %f</lightpos>\n", this->lightPos.x, this->lightPos.y, this->lightPos.z);
+  PRINT(0)("  <waterangle>%f</waterangle>\n", this->waterAngle);
+  PRINT(0)("  <normalmapscale>%f</normalmapscale>\n", this->kNormalMapScale);
+  PRINT(0)("  <shinesize>%f</shinesize>\n", this->shineSize);
+  PRINT(0)("  <shinestrength>%f</shinestrength>\n", this->shineStrength);
+  PRINT(0)("  <reflstrength>%f</reflstrength>\n", this->reflStrength);
+  PRINT(0)("  <refraction>%f</refraction>\n", this->refraction);
+  PRINT(0)("  <watercolor>%f, %f, %f</watercolor>\n", this->waterColor.x, this->waterColor.y, this->waterColor.z);
+
+  PRINT(0)("</MappedWater>\n");
 }
 
@@ -475 +490 @@
 
         OrxGui::GLGuiSlider* lightPosX = new OrxGui::GLGuiSlider();
-        lightPosX->setRange(-600, 600);
+        lightPosX->setRange(-4000, 4000);
         lightPosX->setValue(this->lightPos.x);
         lightPosX->setStep(15);
@@ -482 +497 @@
 
         OrxGui::GLGuiSlider* lightPosY = new OrxGui::GLGuiSlider();
-        lightPosY->setRange(-600, 600);
+        lightPosY->setRange(-4000, 4000);
         lightPosY->setStep(15);
         lightPosY->setValue(this->lightPos.y);
@@ -489 +504 @@
 
         OrxGui::GLGuiSlider* lightPosZ = new OrxGui::GLGuiSlider();
-        lightPosZ->setRange(-600, 600);
+        lightPosZ->setRange(-4000, 4000);
         lightPosZ->setStep(15);
         lightPosZ->setValue(this->lightPos.z);
@@ -504 +519 @@
 
         OrxGui::GLGuiSlider* waterHeight = new OrxGui::GLGuiSlider();
-        waterHeight->setRange(-500, 500);
+        waterHeight->setRange(100, 370);
         waterHeight->setValue(this->waterHeight);
-        waterHeight->setStep(10);
+        waterHeight->setStep(4);
         waterHeight->connect(SIGNAL(waterHeight, valueChanged), this, SLOT(MappedWater, setWaterHeight));
         waterHeightBox->pack(waterHeight);
@@ -547 +562 @@
   glDisable(GL_BLEND);
 
+  // TODO change texture coords, so water doesnt look distorted when xWidth != zWidth
   glBegin(GL_QUADS);
   // The back left vertice for the water

trunk/src/world_entities/environments/model_entity.cc

@@ -32 +32 @@
 {
   this->setClassID(CL_MODEL_ENTITY, "ModelEntity");
-  this->toList(OM_ENVIRON_NOTICK);
+  this->toList(OM_ENVIRON);
 
   this->speed = NULL;
@@ -71 +71 @@
 void ModelEntity::setMomentum (float angle, float x, float y, float z)
 {
+  Vector v(x,y,z);
+  v.debug();
+  v.normalize();
+  v.debug();
+
   if (this->momentum == NULL)
     this->momentum = new Quaternion;
-  *this->momentum = Quaternion(angle, Vector(x, y, z));
+  *this->momentum = Quaternion(angle, v);
+
+  this->momentum->debug();
 }
 
@@ -82 +89 @@
 
   if (this->momentum != NULL)
-    this->shiftDir(*this->momentum * dt);
+  {
+    this->shiftDir((*this->momentum * dt ).getNormalized());
+    //this->getAbsDir().debug();
+  }
 }

trunk/src/world_entities/npcs/generic_npc.cc

@@ -82 +82 @@
 {
   this->setClassID(CL_GENERIC_NPC, "GenericNPC");
+
   this->toList(OM_GROUP_00);
 
@@ -206 +207 @@
 /**
  * each animation has to be initialized here
+ */
+/**
+ *
  */
 void GenericNPC::initNPC()
@@ -578 +582 @@
 
 
-void GenericNPC::destroy()
+void GenericNPC::destroy(WorldEntity* killer)
 {
   int randi = (int)(5.0f * (float)rand()/(float)RAND_MAX);

trunk/src/world_entities/npcs/generic_npc.h

@@ -77 +77 @@
 
 
-  void destroy();
+  virtual void destroy(WorldEntity* killer);
 
   private:

trunk/src/world_entities/npcs/ground_turret.cc

@@ -176 +176 @@
 }
 
-void GroundTurret::destroy()
+void GroundTurret::destroy(WorldEntity* killer)
 {
   this->setAbsDirSoft(Quaternion(-90, Vector(0,0,1)), 90);

trunk/src/world_entities/npcs/ground_turret.h

@@ -25 +25 @@
   virtual void leftWorld ();
 
-  virtual void destroy();
+  virtual void destroy(WorldEntity* killer);
 
   virtual void draw() const;

trunk/src/world_entities/npcs/npc.cc

@@ -19 +19 @@
 
 #include "npc.h"
-
-
-using namespace std;
 
 
@@ -51 +48 @@
 void NPC::loadParams(const TiXmlElement* root)
 {
-  if(root != NULL)
    WorldEntity::loadParams(root);
 }

trunk/src/world_entities/npcs/npc_test.cc

@@ -23 +23 @@
 #include "shader.h"
 #include "state.h"
-#include "stdlibincl.h"
 #include "debug.h"
 
+#include "loading/factory.h"
+#include "loading/load_param.h"
 
-using namespace std;
+#include "effects/explosion.h"
+
+CREATE_FACTORY(NPC2, CL_NPC_TEST2);
 
 
-NPC2::NPC2()
+NPC2::NPC2(const TiXmlElement* root)
   : NPC(NULL)
 {
@@ -36 +39 @@
 
   if ((float)rand()/RAND_MAX > .5f)
-    this->loadModel("models/ships/bolido.obj", 3);
+    this->loadModel("models/ships/bolido.obj", 6);
   else
-    this->loadModel("models/ships/gobblin.obj", 3);
+    this->loadModel("models/ships/gobblin.obj", 6);
+
+
+
 
   this->shader = NULL;
@@ -44 +50 @@
     this->shader = Shader::getShader("shaders/toon.vert", "shaders/toon.frag");
 
-  this->obj = gluNewQuadric();
+  this->randomRotAxis = VECTOR_RAND(1);
 
-  this->randomRotAxis = VECTOR_RAND(1);
+  if (root != NULL)
+    this->loadParams(root);
 }
 
@@ -54 +61 @@
   if (this->shader)
     Shader::unload(this->shader);
-  gluDeleteQuadric(this->obj);
+}
+
+
+void NPC2::loadParams(const TiXmlElement* root)
+{
+  NPC::loadParams(root);
+
+}
+
+
+void NPC2::destroy(WorldEntity* killer)
+{
+  Explosion::explode(this, Vector(10,10,10));
+  this->toList(OM_DEAD);
+
 }
 
@@ -67 +88 @@
 void NPC2::draw() const
 {
-//   glMatrixMode(GL_MODELVIEW);
-//   glPushMatrix();
-//   float matrix[4][4];
-//
-//   /* translate */
-//   glTranslatef (this->getAbsCoor ().x,
-//                 this->getAbsCoor ().y,
-//                 this->getAbsCoor ().z);
-//   /* rotate */
-//   this->getAbsDir ().matrix (matrix);
-//   glMultMatrixf((float*)matrix);
-//
+  glMatrixMode(GL_MODELVIEW);
+  glPushMatrix();
+  float matrix[4][4];
+
+  /* translate */
+  glTranslatef (this->getAbsCoor ().x,
+                this->getAbsCoor ().y,
+                this->getAbsCoor ().z);
+  /* rotate */
+  this->getAbsDir ().matrix (matrix);
+  glMultMatrixf((float*)matrix);
+
 //   if (this->shader != NULL && this->shader != Shader::getActiveShader())
 //     shader->activateShader();
-//   gluSphere(this->obj, 3, 10, 10);
+
+  this->getModel()->draw();
 //   shader->deactivateShader();
-//
-//
-// /*  if (this->model)
-//     this->model->draw();*/
-//   glPopMatrix();
+
+
+/*  if (this->model)
+    this->model->draw();*/
+  glPopMatrix();
 }
 
@@ -97 +119 @@
   //if (directin.len() < 100)
 //  this->shiftCoor(direction *dt * 5 * exp(-direction.len() / 30.0));
-  this->shiftDir(Quaternion(dt, this->randomRotAxis));
+//  this->shiftDir(Quaternion(dt, this->randomRotAxis));
 
 }

trunk/src/world_entities/npcs/npc_test.h

@@ -11 +11 @@
 
  public:
-  NPC2 ();
+  NPC2 (const TiXmlElement* root);
   virtual ~NPC2 ();
 
+  virtual void loadParams(const TiXmlElement* root);
 
   void addAI(AI* ai);
+
+  virtual void destroy(WorldEntity* killer);
 
   virtual void tick(float dt);
@@ -23 +26 @@
    Vector   randomRotAxis;
    Shader*  shader;
-   GLUquadricObj* obj;
-
 };
 

trunk/src/world_entities/npcs/npc_test1.cc

@@ -24 +24 @@
 #include "power_ups/turret_power_up.h"
 #include "power_ups/laser_power_up.h"
-
-using namespace std;
 
 

trunk/src/world_entities/playable.cc

@@ -67 +67 @@
   this->bDead = false;
 
-  //subscribe to collision reaction
-  this->subscribeReaction(CREngine::CR_PHYSICS_GROUND_WALK, CL_BSP_ENTITY);
 
   registerVar( new SynchronizeableInt( &score, &score, "score" ) );
@@ -393 +391 @@
   PRINTF(0)("Playable respawn\n");
   // only if this is the spaceship of the player
-  if( this == State::getPlayer()->getPlayable())
+  if( State::getGameRules() && State::getPlayer() && this == State::getPlayer()->getPlayable())
     State::getGameRules()->onPlayerSpawn();
 
@@ -403 +401 @@
 
 
-void Playable::destroy()
-{
-  Explosion::explode(dynamic_cast<PNode*>(this), Vector(1.0f, 1.0f, 1.0f));
-
-
+void Playable::destroy(WorldEntity* killer)
+{
   if( !this->bDead)
   {
@@ -416 +411 @@
       if( this == State::getPlayer()->getPlayable())
         State::getGameRules()->onPlayerDeath();
-
-      //     this->toList(OM_GROUP_05);
-      //HACK: moves the entity to an unknown place far far away: in the future, GameRules will look for that
-      this->setAbsCoor(-2000.0, -2000.0, -2000.0);
-
-      //explosion hack
-
     }
     this->bDead = true;
+    
+    if( State::getGameRules() != NULL)
+      State::getGameRules()->registerKill(Kill(killer, this));
   }
 }

trunk/src/world_entities/playable.h

@@ -80 +80 @@
 
   // WorldEntity Extensions
-  virtual void destroy();
+  virtual void destroy(WorldEntity* killer);
   virtual void respawn();
   virtual void collidesWith(WorldEntity* entity, const Vector& location);
@@ -90 +90 @@
   static const std::string& playmodeToString(Playable::Playmode playmode);
   static const std::string playmodeNames[];
+  
+  inline bool beFire(){ return this->bFire; }
+  inline void fire(bool bF){ this->bFire = bF;}
 
 protected:

trunk/src/world_entities/projectiles/guided_missile.cc

@@ -35 +35 @@
   this->setClassID(CL_GUIDED_MISSILE, "GuidedMissile");
 
-  this->loadModel("models/projectiles/orx-rocket.obj", .3);
+  this->loadModel("models/projectiles/orx-rocket.obj", 2.0);
   this->loadExplosionSound("sound/explosions/explosion_4.wav");
 
@@ -88 +88 @@
     GuidedMissile::trailParticles->setLifeSpan(1.0, .3);
     GuidedMissile::trailParticles->setRadius(0.0, .5);
-    GuidedMissile::trailParticles->setRadius(0.2, 2.0);
-    GuidedMissile::trailParticles->setRadius(.5, .8);
-    GuidedMissile::trailParticles->setRadius(1.0, .8);
+    GuidedMissile::trailParticles->setRadius(0.2, 4.0);
+    GuidedMissile::trailParticles->setRadius(.5, 1.5);
+    GuidedMissile::trailParticles->setRadius(1.0, 1.5);
     GuidedMissile::trailParticles->setColor(0.0, 1,0,0,.7);
     GuidedMissile::trailParticles->setColor(0.2, .8,.8,0,.5);
@@ -135 +135 @@
 {
   if (this->hitEntity != entity)
-    this->destroy();
+    this->destroy( entity );
   this->hitEntity = entity;
 }
@@ -180 +180 @@
  *  the function gets called, when the projectile is destroyed
  */
-void GuidedMissile::destroy ()
-{
-  Projectile::destroy();
+void GuidedMissile::destroy (WorldEntity* killer)
+{
+
+  printf("THIS SHOULD WORLk\n");
+
+  Projectile::destroy( killer );
   PRINTF(5)("DESTROY GuidedMissile\n");
   this->lifeCycle = .95; //!< @todo calculate this usefully.

trunk/src/world_entities/projectiles/guided_missile.h

@@ -26 +26 @@
     virtual void collidesWith(WorldEntity* entity, const Vector& location);
 
-    virtual void destroy ();
+    virtual void destroy (WorldEntity* killer);
 
     virtual void tick (float time);

trunk/src/world_entities/projectiles/hyperblast.cc

@@ -126 +126 @@
  *  the function gets called, when the projectile is destroyed
 */
-void Hyperblast::destroy ()
+void Hyperblast::destroy (WorldEntity* killer)
 {
-  Projectile::destroy();
+  Projectile::destroy( killer );
 
   PRINTF(5)("DESTROY Hyperblast\n");

trunk/src/world_entities/projectiles/hyperblast.h

@@ -27 +27 @@
     virtual void collidesWith(WorldEntity* entity, const Vector& location);
 
-    virtual void destroy ();
+    virtual void destroy (WorldEntity* killer);
 
     virtual void tick (float time);

trunk/src/world_entities/projectiles/laser.cc

@@ -42 +42 @@
 
   this->setMinEnergy(10);
-  this->setHealthMax(10);
+  this->setHealthMax(0);
   this->lifeSpan = 5.0;
 
@@ -88 +88 @@
   }
 
-  this->setHealth(10);
+  this->setDamage(0);
+  this->setHealth(0);
 }
 
@@ -107 +108 @@
 {
   if (this->hitEntity != entity && entity->isA(CL_NPC))
-    this->destroy();
+    this->destroy( entity );
   this->hitEntity = entity;
 }
@@ -128 +129 @@
  *  the function gets called, when the projectile is destroyed
 */
-void Laser::destroy ()
+void Laser::destroy (WorldEntity* killer)
 {
-  Projectile::destroy();
+  Projectile::destroy( killer );
   PRINTF(5)("DESTROY Laser\n");
   this->lifeCycle = .95; //!< @todo calculate this usefully.

trunk/src/world_entities/projectiles/laser.h

@@ -27 +27 @@
     virtual void collidesWith(WorldEntity* entity, const Vector& location);
 
-    virtual void destroy ();
+    virtual void destroy (WorldEntity* killer);
 
     virtual void tick (float dt);

trunk/src/world_entities/projectiles/projectile.cc

@@ -41 +41 @@
   /* character attributes */
   this->setHealth(1.0f);
-  this->setDamage(100.0f); // default damage of a projectile set to 100.0 damage points
+  this->setDamage(1.0f); // default damage of a projectile set to 100.0 damage points
 
   this->explosionBuffer = NULL;
@@ -162 +162 @@
 
   if (this->tickLifeCycle(dt))
-    this->destroy();
+    this->destroy( NULL );
 }
 
@@ -169 +169 @@
  *  the function gets called, when the projectile is destroyed
 */
-void Projectile::destroy ()
+void Projectile::destroy (WorldEntity* killer)
 {
   if (this->explosionBuffer != NULL)

trunk/src/world_entities/projectiles/projectile.h

@@ -41 +41 @@
     virtual void deactivate() = 0;
 
-    virtual void destroy ();
+    virtual void destroy (WorldEntity* killer);
 
     virtual void tick (float dt);

trunk/src/world_entities/projectiles/rocket.cc

@@ -128 +128 @@
 {
   if (this->hitEntity != entity)
-    this->destroy();
+    this->destroy( entity );
   this->hitEntity = entity;
 }
@@ -149 +149 @@
  *  the function gets called, when the projectile is destroyed
 */
-void Rocket::destroy ()
+void Rocket::destroy (WorldEntity* killer)
 {
-  Projectile::destroy();
+  Projectile::destroy( killer );
 
   PRINTF(5)("DESTROY Rocket\n");

trunk/src/world_entities/projectiles/rocket.h

@@ -27 +27 @@
     virtual void collidesWith(WorldEntity* entity, const Vector& location);
 
-    virtual void destroy ();
+    virtual void destroy (WorldEntity* killer);
 
     virtual void tick (float time);

trunk/src/world_entities/projectiles/test_bullet.cc

@@ -119 +119 @@
 {
   if (this->hitEntity != entity && entity->isA(CL_NPC))
-    this->destroy();
+    this->destroy( entity );
   this->hitEntity = entity;
 }
@@ -147 +147 @@
  *  the function gets called, when the projectile is destroyed
 */
-void TestBullet::destroy ()
+void TestBullet::destroy (WorldEntity* killer)
 {
   PRINTF(5)("DESTROY TestBullet\n");

trunk/src/world_entities/projectiles/test_bullet.h

@@ -27 +27 @@
     virtual void collidesWith(WorldEntity* entity, const Vector& location);
 
-    virtual void destroy ();
+    virtual void destroy (WorldEntity* killer);
 
     virtual void tick (float time);

trunk/src/world_entities/script_trigger.cc

@@ -29 +29 @@
              ->addMethod("getAbsCoorZ", ExecutorLua0ret<PNode, float>(&PNode::getAbsCoorZ))
             //Properties
+             ->addMethod("setName", ExecutorLua1<BaseObject, const std::string&>(&BaseObject::setName))
              ->addMethod("setTarget", ExecutorLua1<ScriptTrigger, const std::string&>(&ScriptTrigger::setTarget))
              ->addMethod("setTriggerParent", ExecutorLua1<ScriptTrigger, const std::string&>(&ScriptTrigger::setTriggerParent))
@@ -51 +52 @@
   this->toList(OM_COMMON);
 
+  radius = 10;
   returnCount = 1;
   scriptFinished = false;
@@ -71 +73 @@
   
   }
+  
 }
 
@@ -215 +218 @@
 void ScriptTrigger::setScript(const std::string& file)
 {
-
   ScriptManager* scriptManager = State::getScriptManager();
   if (scriptManager != NULL)

trunk/src/world_entities/skydome.cc

@@ -1 +1 @@
 /*
    orxonox - the future of 3D-vertical-scrollers
- 
+
    Copyright (C) 2006 orx
- 
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2, or (at your option)
    any later version.
- 
+
 ### File Specific:
    main-programmer: hdavid, amaechler
@@ -47 +47 @@
   this->toList(OM_BACKGROUND);
   this->toReflectionList();
-  
+  this->indices = NULL;
+  this->vertices = NULL;
+  this->planeVertices = NULL;
+  this->shader = NULL;
   activateDome = false;
 
@@ -91 +94 @@
   if(!activateDome)
     return;
-  
+
   glPushAttrib(GL_ENABLE_BIT);
 
   glDisable(GL_LIGHTING);
   glDisable(GL_BLEND);
+  glDisable(GL_FOG);
 
   glEnable(GL_TEXTURE_3D);
@@ -105 +109 @@
   glTranslatef(0.0f,pRadius,0.0f);
 
-
   glBegin(GL_TRIANGLES);
-
   for (int i=0; i < numIndices; i++)
   {
@@ -115 +117 @@
     glVertex3f(planeVertices[indices[i]].x, planeVertices[indices[i]].y, planeVertices[indices[i]].z);
   }
-
   glEnd();
 
+  WorldEntity::draw(); 
+
   glPopMatrix();
 
@@ -128 +131 @@
 void Skydome::generateSkyPlane(int divisions, float planetRadius, float atmosphereRadius, float hTile, float vTile)
 {
-  PRINTF(0)("Generating a sky plane");
+  PRINTF(0)("Generating a sky plane\n");
 
   // Make sure our vertex array is clear

trunk/src/world_entities/space_ships/cruizer.cc

@@ -78 +78 @@
   dynamic_cast<Element2D*>(this->getWeaponManager().getFixedTarget())->setVisibility( false);
 
-  this->loadModel("models/ships/human_cruizer.obj", 0.05);
+ // this->loadModel("models/ships/human_cruizer.obj", 0.05);
 
 }

trunk/src/world_entities/space_ships/helicopter.cc

@@ -43 +43 @@
                             ->addMethod("getAbsCoorY", ExecutorLua0ret<PNode, float>(&PNode::getAbsCoorY))
                             ->addMethod("getAbsCoorZ", ExecutorLua0ret<PNode, float>(&PNode::getAbsCoorZ))
-                            
+
                        );
 
@@ -124 +124 @@
 void Helicopter::init()
 {
+  this->chopperBuffer = NULL;
+
   this->setClassID(CL_HELICOPTER, "Helicopter");
-
   PRINTF(4)("HELICOPTER INIT\n");
 

trunk/src/world_entities/space_ships/helicopter.h

@@ -39 +39 @@
 
     virtual void process(const Event &event);
-    
+
     virtual void moveUp(bool move){bAscend = move;};
     virtual void moveDown(bool move){bDescend = move;};
@@ -78 +78 @@
     float                 airViscosity;
 
-    OrxSound::SoundSource soundSource;
-    OrxSound::SoundBuffer*chopperBuffer;
+    OrxSound::SoundSource  soundSource;
+    OrxSound::SoundBuffer* chopperBuffer;
 
 };

trunk/src/world_entities/space_ships/hover.cc

@@ -25 +25 @@
 
 #include "util/loading/factory.h"
+//#include "util/loading/resource_manager.h"
+
 #include "key_mapper.h"
 #include "state.h"
@@ -34 +36 @@
 CREATE_FACTORY(Hover, CL_HOVER);
 
+#include "script_class.h"
+CREATE_SCRIPTABLE_CLASS(Hover, CL_HOVER,
+                        addMethod("hasPlayer", ExecutorLua0ret<Playable,bool>(&Playable::hasPlayer))
+                        //Coordinates
+                        ->addMethod("setAbsCoor", ExecutorLua3<PNode,float,float,float>(&PNode::setAbsCoor))
+                        ->addMethod("getAbsCoorX", ExecutorLua0ret<PNode, float>(&PNode::getAbsCoorX))
+                        ->addMethod("getAbsCoorY", ExecutorLua0ret<PNode, float>(&PNode::getAbsCoorY))
+                        ->addMethod("getAbsCoorZ", ExecutorLua0ret<PNode, float>(&PNode::getAbsCoorZ))
+                       );
+
 /**
  *  destructs the hover, deletes alocated memory
@@ -40 +52 @@
 {
   this->setPlayer(NULL);
+
+  //if (this->hoverBuffer != NULL)
+  //  ResourceManager::getInstance()->unload(this->hoverBuffer);
 }
 
@@ -58 +73 @@
 
   this->loadParams(doc.RootElement());
+
+  //load sound
+  //if (this->hoverBuffer != NULL)
+  //  ResourceManager::getInstance()->unload(this->hoverBuffer);
+  //this->hoverBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load("sound/engine/hover.wav", WAV);
+
 }
 
@@ -97 +118 @@
 void Hover::init()
 {
+
+  //this->hitEntity = NULL;
+  //this->hoverBuffer = NULL;
+
   //  this->setRelDir(Quaternion(M_PI, Vector(1,0,0)));
   this->setClassID(CL_HOVER, "Hover");
@@ -112 +137 @@
   this->cameraLook = 0.0f;
   this->rotation = 0.0f;
-  this->acceleration = 25.0f;
+  this->acceleration = 15.0f;
   this->airFriction = 3.0f;
 
@@ -206 +231 @@
   State::getCameraNode()->setRelCoorSoft(-10, 0,0);
   State::getCameraTargetNode()->setParentSoft(&this->cameraNode);
+
+  //this->soundSource.play(this->hoverBuffer, 0.3f, true);
+
 }
 

trunk/src/world_entities/space_ships/hover.h

@@ -7 +7 @@
 #ifndef _HOVER_H
 #define _HOVER_H
+
+//#include "sound_buffer.h"
+//#include "sound_source.h"
 
 #include "playable.h"
@@ -68 +71 @@
     float                 airViscosity;
 
-    WorldEntity* hitEntity;
+    WorldEntity*          hitEntity;
+
+    //OrxSound::SoundSource  soundSource;
+    //OrxSound::SoundBuffer* hoverBuffer;
 };
 

trunk/src/world_entities/space_ships/space_ship.cc

@@ -58 +58 @@
 CREATE_SCRIPTABLE_CLASS(SpaceShip, CL_SPACE_SHIP,
                         addMethod("hasPlayer", ExecutorLua0ret<Playable,bool>(&Playable::hasPlayer))
+                        ->addMethod("fire", ExecutorLua1<Playable, bool>(&Playable::fire))
+                        ->addMethod("loadModel", ExecutorLua2<WorldEntity,const std::string& ,float>(&WorldEntity::loadModel2))
+                        ->addMethod("setName", ExecutorLua1<BaseObject,const std::string&>(&BaseObject::setName))
+                        ->addMethod("hide", ExecutorLua0<WorldEntity>(&WorldEntity::hide))
+                        ->addMethod("unhide", ExecutorLua0<WorldEntity>(&WorldEntity::unhide))
                        //Coordinates
                         ->addMethod("setAbsCoor", ExecutorLua3<PNode,float,float,float>(&PNode::setAbsCoor))
@@ -352 +357 @@
 //     return;
 
-  // spaceship controlled movement
+  // spaceship controlled movement fire(bool bF){ this->bFire = bF;}
   //if (this->getOwner() == this->getHostID())
     this->calculateVelocity(time);
@@ -404 +409 @@
   Vector accel(0.0, 0.0, 0.0);
   /*
-  Vector rot(0.0, 0.0, 0.0); // wird benötigt für Helicopter
+  Vector rot(0.0, 0.0, 0.0); // wird ben�igt fr Helicopter
   */
   //float rotVal = 0.0;
@@ -513 +518 @@
 }
 
-void SpaceShip::destroy( )
+void SpaceShip::destroy( WorldEntity* killer )
 {
   PRINTF(0)("spaceship destroy\n");

trunk/src/world_entities/space_ships/space_ship.h

@@ -37 +37 @@
     virtual void leftWorld();
     
-    virtual void destroy();
+    virtual void destroy(WorldEntity* killer);
     virtual void respawn();
 

trunk/src/world_entities/space_ships/spacecraft_2d.cc

@@ -35 +35 @@
 #include "debug.h"
 
+#include "script_class.h"
+
+
 CREATE_FACTORY(Spacecraft2D, CL_SPACECRAFT_2D);
 
-/**
- *  destructs the spacecraft_2d, deletes alocated memory
- */
-Spacecraft2D::~Spacecraft2D ()
-{
-  this->setPlayer(NULL);
-  delete this->toTravelHeight;
-}
+
+CREATE_SCRIPTABLE_CLASS(Spacecraft2D, CL_SPACECRAFT_2D,
+                        addMethod("hasPlayer", ExecutorLua0ret<Playable,bool>(&Playable::hasPlayer))
+                        //Coordinates
+                        ->addMethod("setAbsCoor", ExecutorLua3<PNode,float,float,float>(&PNode::setAbsCoor))
+                        ->addMethod("getAbsCoorX", ExecutorLua0ret<PNode, float>(&PNode::getAbsCoorX))
+                        ->addMethod("getAbsCoorY", ExecutorLua0ret<PNode, float>(&PNode::getAbsCoorY))
+                        ->addMethod("getAbsCoorZ", ExecutorLua0ret<PNode, float>(&PNode::getAbsCoorZ))
+                        ->addMethod("setAirFriction", ExecutorLua1<Spacecraft2D, float>(&Spacecraft2D::setAirFriction))
+                       );
+
 
 /**
@@ -76 +82 @@
     this->loadParams(root);
 
+
+
   //weapons:
-  Weapon* wpRight = new TestGun(0);
-  wpRight->setName("testGun Right");
-  Weapon* wpLeft = new TestGun(1);
-  wpLeft->setName("testGun Left");
-  //Weapon* cannon = dynamic_cast<Weapon*>(Factory::fabricate(CL_HYPERBLASTER));
+  Weapon* wpRight = dynamic_cast<Weapon*>(Factory::fabricate(CL_LASER_CANNON));
+  wpRight->setName("Cannon_Right");
+  Weapon* wpLeft = dynamic_cast<Weapon*>(Factory::fabricate(CL_LASER_CANNON));
+  wpLeft->setName("Cannon_Left");
+
+  Weapon* turretLeft = dynamic_cast<Weapon*>(Factory::fabricate(CL_BOOMERANG_GUN));
+  wpRight->setName("Turret_Left");
+  Weapon* turretRight = dynamic_cast<Weapon*>(Factory::fabricate(CL_BOOMERANG_GUN));
+  wpLeft->setName("Turret_Right");
 
   //  cannon->setName("BFG");
@@ -87 +99 @@
   this->addWeapon(wpLeft, 1, 0);
   this->addWeapon(wpRight,1 ,1);
+  this->addWeapon(turretLeft, 1, 2);
+  this->addWeapon(turretRight, 1, 3);
+
   //this->addWeapon(cannon, 0, 2);
 
   this->getWeaponManager().changeWeaponConfig(1);
   dynamic_cast<Element2D*>(this->getWeaponManager().getFixedTarget())->setVisibility( false);
+}
+
+
+/**
+ * @brief destructs the spacecraft_2d, deletes alocated memory
+ */
+Spacecraft2D::~Spacecraft2D ()
+{
+  this->setPlayer(NULL);
+  delete this->toTravelHeight;
 }
 
@@ -109 +134 @@
   this->cameraLook = 0.0f;
   this->rotation = 0.0f;
-  this->acceleration = 10.0f;
-  this->airFriction = 2.0f;
-
-
-  this->setHealthMax(100);
-  this->setHealth(100);
+  this->acceleration = 20.0f;
+  this->airFriction = 0.0f;
+
+
+  this->setHealthMax(1000);
+  this->setHealth(1000);
+  this->setDamage(100.0f);
+
 
 
@@ -122 +149 @@
   this->travelNode = new PNode();
 
+  this->loadModel("models/ships/mantawing.obj", 5.0f);
 
   // camera - issue
@@ -166 +194 @@
   this->getWeaponManager().setSlotCount(5);
 
-  this->getWeaponManager().setSlotPosition(0, Vector(-0.28, 1.186, -2.750));
+  this->getWeaponManager().setSlotPosition(0, Vector(1.843, -0.335, 2.029) * 5.0);
   this->getWeaponManager().setSlotCapability(0, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
 
-  this->getWeaponManager().setSlotPosition(1, Vector(-0.28, 1.186, 2.750));
+  this->getWeaponManager().setSlotPosition(1, Vector(1.843, -0.335, -2.029) * 5.0);
   this->getWeaponManager().setSlotCapability(1, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
 
-  this->getWeaponManager().setSlotPosition(2, Vector(-1.63, .809, -.003));
-  this->getWeaponManager().setSlotCapability(2, WTYPE_HEAVY);
-
   /// TODO: THESE ARE TOO MUCH
-  this->getWeaponManager().setSlotPosition(3, Vector(-1.63, .678, -.652));
-  this->getWeaponManager().setSlotDirection(3, Quaternion(-24/180 * M_PI, Vector(1,0,0)));
-
-  this->getWeaponManager().setSlotPosition(4, Vector(-1.63, .678, .652));
-  this->getWeaponManager().setSlotDirection(4, Quaternion(24/180 * M_PI, Vector(1,0,0)));
+  this->getWeaponManager().setSlotPosition(2, Vector(-0.351, -.238, 1.406) * 5.0);
+  this->getWeaponManager().setSlotDirection(2, Quaternion(-1.7, Vector(0,1,0)));
+
+  this->getWeaponManager().setSlotPosition(3, Vector(-0.351, -.238, -1.406) * 5.0);
+  this->getWeaponManager().setSlotDirection(3, Quaternion(1.7, Vector(0,1,0)));
 
   this->cameraNode.setRelCoor(1,5,0);
@@ -193 +218 @@
   registerVar( new SynchronizeableFloat( &cameraLook, &cameraLook, "cameraLook", PERMISSION_OWNER ) );
   registerVar( new SynchronizeableFloat( &rotation, &rotation, "rotation", PERMISSION_OWNER ) );
+
+
+
 }
 
@@ -285 +313 @@
 
         State::getCameraNode()->setParentSoft(this->travelNode);
-        State::getCameraNode()->setRelCoorSoft(-3, 50,0);
+        State::getCameraNode()->setRelCoorSoft(-3, 100,0);
         State::getCameraTargetNode()->setParentSoft(this->travelNode);
-        State::getCameraTargetNode()->setRelCoorSoft(0,0,0);
+        State::getCameraTargetNode()->setRelCoorSoft(5,0,1);
 
 
@@ -406 +434 @@
         if (this->toTravelHeight != NULL)
         {
-          this->travelNode->shiftCoor(Vector(0, (*toTravelHeight - this->travelNode->getAbsCoor().y) * dt, 0));
+          this->travelNode->shiftCoor(Vector(0, (*toTravelHeight - this->travelNode->getAbsCoor().y) * dt * 10.0, 0));
           if (fabsf(this->travelNode->getAbsCoor().y - *this->toTravelHeight) < .1)
           {
@@ -416 +444 @@
 
         accel.y = 0.0;
+
         Vector accelerationDir = this->getAbsDir().apply(accel * this->acceleration);
         accelerationDir.y = 0.0;
@@ -424 +453 @@
 
         this->velocity += (accelerationDir - damping)* dt;
+
+        if (this->getRelCoor().z > this->travelDistance.y && velocity.z > 0.0)
+          this->velocity.z = 0.0f;
+        if (this->getRelCoor().z < -this->travelDistance.y && velocity.z < 0.0)
+          this->velocity.z = 0.0f;
+
+        if (this->getRelCoor().x > this->travelDistance.x && velocity.x > 0.0)
+          this->velocity.x = 0.0f;
+        if (this->getRelCoor().x < -this->travelDistance.x && velocity.x < 0.0)
+          this->velocity.x = 0.0f;
+
+
         this->shiftCoor (this->velocity * dt);
-        this->setRelDirSoft(Quaternion(0, Vector(0,0,0)), 1.0f);
+        if (accel.z == 0)
+          this->setRelDirSoft(Quaternion(0, Vector(0,0,0)), 5.0f);
+        else
+          this->setRelDirSoft(Quaternion(this->velocity.z * .004, Vector(1,0,0)), 4.5f);
       }
       break;
@@ -475 +519 @@
       else if (cameraLook < -M_PI_4)
         cameraLook = -M_PI_4;
-      //this->cameraNode.setRelDirSoft(this->direction,10);
     }
   }

trunk/src/world_entities/space_ships/spacecraft_2d.h

@@ -27 +27 @@
     void setTravelDistance(const Vector2D& distance);
     void setTravelDistance(float x, float y);
+
+    void setAirFriction(float friction) { this->airFriction = friction; };
 
 

trunk/src/world_entities/spawning_point.cc

@@ -57 +57 @@
   
   MessageManager::getInstance()->registerMessageHandler( MSGID_RESPAWN, respawnMessageHandler, NULL );
+  
+  this->setSynchronized( true );
 }
 
@@ -102 +104 @@
 void SpawningPoint::spawn(Playable* entity)
 {
+  const std::list<BaseObject*> * list = ClassList::getList( CL_PLAYABLE );
+  
+  bool found = false;
+  
+  if ( !list )
+    return;
+    
+  for ( std::list<BaseObject*>::const_iterator it = list->begin(); it != list->end(); it++ )
+  {
+    if ( *it == entity )
+    {
+      found = true;
+      break;
+    }
+  }
+  
+  if ( !found )
+    return;
+
   PRINTF(0)("Spawningpoint spawns Entity (%s)\n", entity->getClassName());
 
@@ -137 +158 @@
       this->spawn(it->entity);
       
-      if ( SharedNetworkData::getInstance()->isGameServer() )
+      const std::list<BaseObject*> * list = ClassList::getList( CL_PLAYABLE );
+  
+      bool found = false;
+  
+      if ( !list )
+        return;
+    
+      for ( std::list<BaseObject*>::const_iterator it2 = list->begin(); it2 != list->end(); it2++ )
+      {
+        if ( *it2 == it->entity )
+        {
+          found = true;
+          break;
+        }
+      }
+  
+      if ( found && SharedNetworkData::getInstance()->isGameServer() )
         this->sendRespawnMessage( it->entity->getUniqueID() );
 
@@ -194 +231 @@
   assert( Converter::byteArrayToInt( data+INTSIZE, &uniqueId ) == INTSIZE );
   
+  PRINTF(0)("SPAWNMESSAGE %d\n", uniqueId);
+  
   SpawningPoint * sp = NULL;
   Playable      * playable = NULL;
@@ -203 +242 @@
     for ( std::list<BaseObject*>::const_iterator it = list->begin(); it != list->end(); it++ )
     {
-      if ( dynamic_cast<SpawningPoint*>(*it)->getUniqueID() == uniqueId )
+      PRINTF(0)("%d:%d\n", dynamic_cast<SpawningPoint*>(*it)->getUniqueID(), spUniqueId);
+      if ( dynamic_cast<SpawningPoint*>(*it)->getUniqueID() == spUniqueId )
       {
         sp = dynamic_cast<SpawningPoint*>(*it);
@@ -213 +253 @@
   if ( !sp )
   {
-    PRINTF(2)("could not find spawning point\n");
+    PRINTF(0)("could not find spawning point\n");
     return false;
   }
@@ -233 +273 @@
   if ( !playable )
   {
-    PRINTF(2)("could not find playable\n");
+    PRINTF(0)("could not find playable\n");
     return false;
   }

trunk/src/world_entities/test_entity.cc

@@ -116 +116 @@
   if( this->lastCollided != entity)
   {
-    this->destroy();
+    this->destroy( entity );
     this->lastCollided = entity;
 
@@ -126 +126 @@
 
 
-void TestEntity::destroy()
+void TestEntity::destroy(WorldEntity* killer)
 {
   if( this->bDeath)

trunk/src/world_entities/test_entity.h

@@ -25 +25 @@
   void setAnim(int animationIndex, int animPlaybackMode);
 
-  virtual void destroy();
+  virtual void destroy(WorldEntity* killer);
 
   virtual void tick (float time);

trunk/src/world_entities/weapons/fps_sniper_rifle.cc

@@ -33 +33 @@
 #include "fps_sniper_rifle.h"
 
+
+#include "effects/explosion.h"
 
 using namespace std;
@@ -145 +147 @@
     return;
 
-  pj->setParent(PNode::getNullParent());
+//   Explosion::explode(this, Vector(0.1,0.1,0.1));
 
-  pj->setVelocity(this->getAbsDir().apply(Vector(1,0,0))*250 + VECTOR_RAND(5));
+  pj->setParent(this);
+  pj->setParentMode(PNODE_ROTATE_AND_MOVE);
 
-  pj->setAbsCoor(this->getEmissionPoint());
+  pj->setVelocity(this->getAbsDir().apply(Vector(1,0,0))*550 + VECTOR_RAND(5) );
+
+  pj->setAbsCoor(this->getEmissionPoint() + this->getAbsDirX() * 25.0f);
   pj->setAbsDir(this->getAbsDir());
   pj->activate();

trunk/src/world_entities/world_entity.cc

@@ -85 +85 @@
 
   this->toList(OM_NULL);
-  
+
   registerVar( new SynchronizeableString( &this->md2TextureFileName, &this->md2TextureFileName, "md2TextureFileName" ) );
   modelFileName_handle = registerVarId( new SynchronizeableString( &modelFileName, &modelFileName, "modelFileName" ) );
   scaling_handle = registerVarId( new SynchronizeableFloat( &scaling, &scaling, "scaling" ) );
   list_handle = registerVarId( new SynchronizeableInt( (int*)&objectListNumber, &list_write, "list" ) );
-  
+
   health_handle = registerVarId( new SynchronizeableFloat( &this->health, &this->health_write, "health" ) );
   healthMax_handle = registerVarId( new SynchronizeableFloat( &this->healthMax, &this->healthMax_write, "maxHealth" ) );
@@ -209 +209 @@
         this->buildObbTree(obbTreeDepth);
     }
-    else /*if(fileName.find(".md3") != std::string::npos)*/
+    else if(fileName.find(".md3") != std::string::npos)
     {
       PRINTF(4)("fetching MD3 file: %s\n", fileName.c_str());
@@ -414 +414 @@
 bool WorldEntity::registerCollision(WorldEntity* entityA, WorldEntity* entityB, BoundingVolume* bvA, BoundingVolume* bvB)
 {
+  PRINTF(5)("registering collision of type: %s vs %s\n", entityA->getClassName(), entityB->getClassName());
   // is there any handler listening?
   if( !this->bReactive)
@@ -571 +572 @@
  */
 void WorldEntity::reset()
-{}
+{
+  this->setHealth( this->getHealthMax() );
+}
 
 /**
@@ -742 +745 @@
   this->decreaseHealth(damage);
 
-  PRINTF(0)("Hit me: %s now only %f/%f health\n", this->getClassName(), this->getHealth(), this->getHealthMax());
+  PRINTF(5)("Hit me: %s now only %f/%f health\n", this->getClassName(), this->getHealth(), this->getHealthMax());
 
   if( this->getHealth() > 0)
@@ -750 +753 @@
   else
   {
-    this->destroy();
-
-    if( State::getGameRules() != NULL)
-      State::getGameRules()->registerKill(Kill(killer, this));
+    this->destroy( killer );
   }
 }
@@ -761 +761 @@
  * destoys the world entity
  */
-void WorldEntity::destroy()
+void WorldEntity::destroy(WorldEntity* killer)
 {
   this->toList(OM_DEAD);
@@ -841 +841 @@
     this->toList( (OM_LIST)list_write );
   }
-  
+
   if ( std::find( id.begin(), id.end(), health_handle ) != id.end() )
   {
     this->setHealth( health_write );
   }
-  
+
   if ( std::find( id.begin(), id.end(), healthMax_handle ) != id.end() )
   {

trunk/src/world_entities/world_entity.h

@@ -47 +47 @@
 
   void loadModel(const std::string& fileName, float scaling = 1.0f, unsigned int modelNumber = 0, unsigned int obbTreeDepth = 4);
+  void loadModel2(const std::string& fileN, float scal = 1.0f){this->loadModel(fileN,scal,0,4);}
   void setModel(Model* model, unsigned int modelNumber = 0);
   Model* getModel(unsigned int modelNumber = 0) const { return (this->models.size() > modelNumber)? this->models[modelNumber] : NULL; };
@@ -74 +75 @@
 /** @returns a reference to the obb tree of this worldentity */
   inline BVTree* getOBBTree() const { return this->obbTree; };
+  inline void setOBBTree(OBBTree* tree) { /*if( this->obbTree != NULL) delete this->obbTree;*/ this->obbTree = (BVTree*)tree; }
   void drawBVTree(int depth, int drawMode) const;
-  inline AABB* getModelAABB() { return (this->aabbNode)?this->aabbNode->getAABB():NULL;}
+  inline AABB* getModelAABB() const { return (this->aabbNode)?this->aabbNode->getAABB():NULL;}
 
   /* --- Collision Reaction Block --- */
@@ -101 +103 @@
   virtual void hit(float damage, WorldEntity* killer);
 
-  virtual void destroy();
+  virtual void destroy( WorldEntity* killer );
 
 
@@ -198 +200 @@
   int                     list_write;                      //!< entity's list
   int                     list_handle;                     //!< handle for list changes
-  
+
   float                   health_write;
   int                     health_handle;
-  
+
   float                   healthMax_write;
   int                     healthMax_handle;