Changeset 7486 in orxonox.OLD for trunk/src

Timestamp:

May 2, 2006, 11:44:10 PM (19 years ago)

Author:

patrick

Message:

orxonox: kill event redesigned

Location:

trunk/src

Files:

• defs/class_id.h (modified) (1 diff)
• util/game_rules.h (modified) (2 diffs)
• util/kill.cc (modified) (1 diff)
• util/kill.h (modified) (1 diff)

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/util/game_rules.h

@@ -33 +33 @@
     /** adding an mission goal to the game rules @param missionGoal the mission goal to add */
     inline void addMissionGoal(MissionGoal* missionGoal) { this->missionList.push_back(missionGoal); }
-
-    inline void registerKill(const Kill& kill) { /*this->killList.push_back(kill);*/ }
+    /** adding a kill event to the kill list @param kill the kill object containing all infos */
+    inline void registerKill(const Kill& kill) { this->killList.push_back(kill); }
 
     virtual void onPlayerSpawn() {}
@@ -54 +54 @@
     std::vector<MissionGoal*>   missionList;            //!< list of mission goals
 
-    const std::vector<Kill>          killList;               //!<  list of kills in the world
+    std::vector<Kill>          killList;               //!<  list of kills in the world
 };
 

trunk/src/util/kill.cc

@@ -22 +22 @@
 
 
-/**
- * standard constructor
- */
-Kill::Kill (WorldEntity* killer, WorldEntity* victim)
-{
-  this->setClassID(CL_KILL, "Kill");
-
-  this->killer = killer;
-  this->victim = victim;
-}
-
-
-/**
- * standard constructor
- */
-Kill::Kill (WorldEntity* killer, Playable* victim)
-{
-  this->setClassID(CL_KILL, "Kill");
-
-  this->killer = killer;
-  this->victim = (WorldEntity*)victim;
-}
-
-
-/**
- * standard deconstructor
-*/
-Kill::~Kill ()
-{
-  // delete what has to be deleted here
-}

trunk/src/util/kill.h

@@ -15 +15 @@
 
 //! A representing a kill event
-class Kill : public BaseObject
+class Kill
 {
 
   public:
-    Kill(WorldEntity* killer, WorldEntity* victim);
-    Kill(WorldEntity* killer, Playable* victim);
-    virtual ~Kill();
+    Kill(WorldEntity* killer, WorldEntity* victim) {  this->killer = killer; this->victim = victim; }
+    Kill(WorldEntity* killer, Playable* victim) {this->killer = killer; this->victim = (WorldEntity*)victim;}
+    virtual ~Kill() {}
 
     /** @returns reference to the killer world entity, does not need to exist */
-    inline WorldEntity* getKiller() { return this->killer; }
+    inline WorldEntity* getKiller() const { return this->killer; }
     /** @returns reference to the victim world entity, does not need to exist */
-    inline WorldEntity* getVictim() { return this->victim; }
+    inline WorldEntity* getVictim() const { return this->victim; }
 
   private: