Changeset 7462 in orxonox.OLD for trunk/src

Timestamp:

May 1, 2006, 3:21:40 PM (19 years ago)

Author:

patrick

Message:

mission goals loadable

Location:

trunk/src

Files:

• Makefile.am (modified) (1 diff)
• lib/util/loading/factory.cc (modified) (1 diff)
• story_entities/game_world_data.cc (modified) (1 diff)
• util/game_rules.cc (modified) (3 diffs)
• util/kill_target.cc (modified) (4 diffs)
• util/kill_target.h (modified) (1 diff)
• util/singleplayer_shootemup.cc (modified) (2 diffs)

trunk/src/Makefile.am

@@ -40 +40 @@
                 \
                 util/multiplayer_team_deathmatch.cc \
+                util/singleplayer_shootemup.cc \
+                \
+                util/kill_target.cc \
                 \
                 subprojects/benchmark.cc

trunk/src/lib/util/loading/factory.cc

@@ -117 +117 @@
   if (factory != Factory::factoryList->end())
   {
-    PRINTF(4)("Create a new Object of type %s\n", (*factory)->getName());
+    PRINTF(2)("Create a new Object of type %s\n", (*factory)->getName());
     return (*factory)->fabricateObject(root);
   }

trunk/src/story_entities/game_world_data.cc

@@ -382 +382 @@
     PRINTF(2)("creating %s\n", element->Value());
     BaseObject* created = Factory::fabricate(element);
-    if (created != NULL && created->isA(CL_GAME_RULES))
+    if (created != NULL /*&& created->isA(CL_GAME_RULES)*/)
     {
       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
-      break;
+      return;
     }
     else

trunk/src/util/game_rules.cc

@@ -47 +47 @@
   BaseObject::loadParams(root);
 
+  PRINTF(0)("GameRules::loadParams(...) hit me\n");
   LoadParamXML(root, "MissionGoal", this, GameRules, loadMissionGoal)
       .describe("an XML-Element to load the missions from");
@@ -55 +56 @@
 void GameRules::loadMissionGoal(const TiXmlElement* root)
 {
+  PRINTF(0)("Trying to load MissionGoals\n");
   const TiXmlElement* element = root->FirstChildElement();
   while( element != NULL)
@@ -61 +63 @@
     PRINTF(2)("Adding Mission Goal:%s\n", element->Value());
     BaseObject* created = Factory::fabricate(element);
-    if (created != NULL && created->isA(CL_GAME_RULES))
+    if (created != NULL /*&& created->isA(CL_GAME_RULES)*/)
     {
       MissionGoal* mg = dynamic_cast<MissionGoal*>(created);

trunk/src/util/kill_target.cc

@@ -18 +18 @@
 #include "kill_target.h"
 
+#include "util/loading/factory.h"
+
 using namespace std;
+
+CREATE_FACTORY(KillTarget, CL_KILL_TARGET);
 
 
@@ -29 +33 @@
 {
   this->setClassID(CL_KILL_TARGET, "KillTarget");
-
-  PRINTF(0)("Created a KillTarget Mission Goal <==================================\n");
 
   if( root != NULL)
@@ -49 +51 @@
 {
   MissionGoal::loadParams(root);
+
+  //   LoadParam(root, "death-penalty-timeout", this, SingleplayerShootemup, setDeathPenaltyTimeout)
+//       .describe("sets the time in seconds a player has to wait for respawn");
 }
 
@@ -54 +59 @@
 MissionState KillTarget::checkMissionGoal()
 {}
+

trunk/src/util/kill_target.h

@@ -15 +15 @@
 
 //! A class representing a mission goal to kill a specific amount of a specific object type
-class KillTarget : public MissionGoal {
+class KillTarget : public MissionGoal
+{
 
- public:
-  KillTarget(const TiXmlElement* root);
-  virtual ~KillTarget();
+  public:
+    KillTarget(const TiXmlElement* root);
+    virtual ~KillTarget();
 
-  virtual void loadParams(const TiXmlElement* root);
-
-  virtual MissionState checkMissionGoal();
+    virtual void loadParams(const TiXmlElement* root);
 
 
- protected:
+    void setNumberOfKills( int kills) { this->numberOfKills = kills; }
+    void setTartetClassID( int classID) { this->targetClassID = classID; }
 
+
+    virtual MissionState checkMissionGoal();
+
+
+  private:
+    int numberOfKills;                                                 //!< the amount of kills of this kind
+    int targetClassID;                                                 //!< id of the target class
 };
 

trunk/src/util/singleplayer_shootemup.cc

@@ -41 +41 @@
 
 
+
 /**
  * constructor
@@ -48 +49 @@
 {
   this->setClassID(CL_SINGLEPLAYER_SHOOTEMUP, "SingleplayerShootemup");
-
-  PRINTF(0)("Created a SinglePlayer Shootemup game\n");
 
   if( root != NULL)