Changeset 7463 in orxonox.OLD for trunk/src/util

Timestamp:

May 1, 2006, 4:03:01 PM (19 years ago)

Author:

patrick

Message:

mission goals now get loaded correctly with all attributes

Location:

trunk/src/util

Files:

• kill_target.cc (modified) (2 diffs)
• kill_target.h (modified) (1 diff)
• mission_goal.cc (modified) (2 diffs)
• mission_goal.h (modified) (2 diffs)

trunk/src/util/kill_target.cc

@@ -19 +19 @@
 
 #include "util/loading/factory.h"
+#include "util/loading/load_param.h"
 
 using namespace std;
@@ -52 +53 @@
   MissionGoal::loadParams(root);
 
-  //   LoadParam(root, "death-penalty-timeout", this, SingleplayerShootemup, setDeathPenaltyTimeout)
-//       .describe("sets the time in seconds a player has to wait for respawn");
+  LoadParam(root, "numberofkills", this, KillTarget, setNumberOfKills)
+       .describe("sets the number of kills a target has to be killed");
+  LoadParam(root, "targetclassid", this, KillTarget, setTargetClassID)
+      .describe("sets the targets class id");
 }
 

trunk/src/util/kill_target.h

@@ -26 +26 @@
 
     void setNumberOfKills( int kills) { this->numberOfKills = kills; }
-    void setTartetClassID( int classID) { this->targetClassID = classID; }
+    void setTargetClassID( int classID) { this->targetClassID = classID; }
+    void setTargetClassName( char* className) {}
 
 

trunk/src/util/mission_goal.cc

@@ -17 +17 @@
 
 #include "mission_goal.h"
+
+#include "util/loading/load_param.h"
 
 using namespace std;
@@ -42 +44 @@
 }
 
-
+/**
+ * loading parameter function: more help on the wiki pages
+ */
 void MissionGoal::loadParams(const TiXmlElement* root)
 {
   BaseObject::loadParams(root);
+
+  LoadParam(root, "title", this, MissionGoal, setMissionName)
+      .describe("sets the title of the mission");
+  LoadParam(root, "description", this, MissionGoal, setMissionDescription)
+      .describe("sets the mission description");
 }
+

trunk/src/util/mission_goal.h

@@ -32 +32 @@
   virtual void loadParams(const TiXmlElement* root);
 
+  /** sets the mission name @param missionName: the string containig the mission title */
+  inline void setMissionName(const std::string& missionName) { this->missionName = missionName; }
+  /** @return the mission title */
+  inline std::string getMissionName() { return this->missionName; }
+
   /** sets the mission description @param descrtiption: the string containing the description */
-  inline void setMissionDescription(std::string description) { this->missionDescription = description; }
+  inline void setMissionDescription(const std::string& description) { this->missionDescription = description; }
   /** gets the mission description @returns the string containing the description */
   inline std::string getMissionDescription() { return this->missionDescription; }
+
+  /** sets the mission state @param missionState  state of the mission*/
+  inline void setMissionState(MissionState state) { this->missionState = state; }
+  /** @returns the current mission state */
+  inline MissionState getMissionState() { return this->missionState; }
 
   virtual MissionState checkMissionGoal() = 0;
@@ -41 +51 @@
 
  protected:
+   std::string      missionName;                                           //!< the title of the mission
    // perhaps there will be more than one description soon: a long and short version for different parsts in the gui
    std::string      missionDescription;                                    //!< the text description of the mission