Changeset 7482 in orxonox.OLD for trunk/src

Timestamp:

May 2, 2006, 11:08:45 PM (19 years ago)

Author:

patrick

Message:

orxonox: working on kill event processing (game rule specific)

Location:

trunk/src

Files:

• defs/class_id.h (modified) (1 diff)
• lib/graphics/importer/height_map.cc (modified) (1 diff)
• story_entities/game_world_data.cc (modified) (2 diffs)
• util/Makefile.am (modified) (2 diffs)
• util/game_rules.h (modified) (3 diffs)
• util/kill.cc (added)
• util/kill.h (added)
• world_entities/playable.cc (modified) (2 diffs)

trunk/src/defs/class_id.h

@@ -149 +149 @@
 
   CL_KILL_TARGET                =    0x00105001,
-
+#warning new classid entry
+  CL_KILL                       =    0x00105005,                  //FIXME: Bensch, this is actualy a BaseObject no idea where to put
 
 

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

@@ -95 +95 @@
 #define shiftZ this->heightMapReference->shiftZ
 #define normalVectorField this->heightMapReference->normalVectorField
+
 
   this->x = this->heightMapReference->offsetX + ( this->heightMapReference->heightMap->h - ((i1 + i2) / 2)) * scaleX;

trunk/src/story_entities/game_world_data.cc

@@ -325 +325 @@
   LoadParam(root, "Music", this, GameWorldData, setSoundTrack);
 
-
   LoadParamXML(root, "GameRule", this, GameWorldData, loadGameRule);
 
@@ -386 +385 @@
       this->gameRule = dynamic_cast<GameRules*>(created);
       State::setGameRules(this->gameRule);
-      // if there is a valid game rule loaded, break because it is not thought to load multiple game rules
+      // if there is a valid game rule loaded, return because it is not thought to load multiple game rules
       return;
     }

trunk/src/util/Makefile.am

@@ -15 +15 @@
                         mission_goal.cc\
                         kill_target.cc\
+                        kill.cc \
                         \
                         signal_handler.cc \
@@ -38 +39 @@
                         mission_goal.cc\
                         kill_target.h\
+                        kill.h \
+                        \
                         signal_handler.h \
                         \

trunk/src/util/game_rules.h

@@ -16 +16 @@
 class Player;
 class MissionGoal;
+class Kill;
 
 
@@ -32 +33 @@
     inline void addMissionGoal(MissionGoal* missionGoal) { this->missionList.push_back(missionGoal); }
 
+    inline void registerKill(const Kill& kill) { /*this->killList.push_back(&kill);*/ }
 
     virtual void onPlayerSpawn() {}
@@ -50 +52 @@
     Player*                     localPlayer;            //!< reference to the local player
     std::vector<MissionGoal*>   missionList;            //!< list of mission goals
+
+    const std::vector<Kill*>          killList;               //!<  list of kills in the world
 };
 

trunk/src/world_entities/playable.cc

@@ -35 +35 @@
 
 #include "effects/explosion.h"
+#include "kill.cc"
 
 #include "shell_command.h"
@@ -366 +367 @@
     {
       this->die();
+
+      if( State::getGameRules() != NULL)
+        State::getGameRules()->registerKill(Kill(entity, this));
     }
   }