Changeset 7461 in orxonox.OLD

Timestamp:

May 1, 2006, 1:47:53 PM (18 years ago)

Author:

patrick

Message:

orxonox: the mission goal framework is nearly completed

Location:

trunk/src

Files:

• defs/class_id.h (modified) (2 diffs)
• story_entities/game_world_data.cc (modified) (1 diff)
• util/Makefile.am (modified) (2 diffs)
• util/game_rules.cc (modified) (2 diffs)
• util/game_rules.h (modified) (1 diff)
• util/kill_target.cc (added)
• util/kill_target.h (added)
• util/mission_goal.cc (modified) (2 diffs)
• util/mission_goal.h (modified) (1 diff)
• util/signal_handler.cc (modified) (5 diffs)
• util/singleplayer_shootemup.cc (modified) (1 diff)

trunk/src/defs/class_id.h

@@ -133 +133 @@
   CL_GAME_WORLD_DATA            =    0x00102000,
   CL_GAME_RULES                 =    0x00104000,
+  CL_MISSION_GOAL               =    0x00105000,
 
   CL_CAMPAIGN                   =    0x00000101,
@@ -144 +145 @@
   CL_MOVIE_LOADER               =    0x00000109,
 
-  CL_MULTIPLAYER_TEAM_DEATHMATCH=    0x00000111,
-  CL_SINGLEPLAYER_SHOOTEMUP     =    0x00000112,
-
-  CL_MISSION_GOAL               =    0x00000113,
+  CL_MULTIPLAYER_TEAM_DEATHMATCH=    0x00104001,
+  CL_SINGLEPLAYER_SHOOTEMUP     =    0x00104002,
+
+  CL_KILL_TARGET                =    0x00105001,
+
+
 
   /// SUPER-PNodes

trunk/src/story_entities/game_world_data.cc

@@ -379 +379 @@
   while( element != NULL)
   {
-    PRINTF(4)("============ GameRules ==");
-    PRINTF(4)("creating %s\n", element->Value());
+    PRINTF(2)("============ GameRules ==\n");
+    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;
     }
     else

trunk/src/util/Makefile.am

@@ -8 +8 @@
                         state.cc \
                         hud.cc \
+                        \
                         game_rules.cc \
-                        mission_goal.cc\
                         multiplayer_team_deathmatch.cc \
                         singleplayer_shootemup.cc \
+                        \
+                        mission_goal.cc\
+                        kill_target.cc\
+                        \
                         signal_handler.cc \
                         \
@@ -27 +31 @@
                         state.h \
                         hud.h \
+                        \
                         game_rules.h \
-                        mission_goal.h \
                         multiplayer_team_deathmatch.h \
                         singleplayer_shootemup.h \
+                        \
+                        mission_goal.cc\
+                        kill_target.h\
                         signal_handler.h \
                         \

trunk/src/util/game_rules.cc

@@ -18 +18 @@
 
 #include "util/loading/load_param.h"
+#include "util/loading/factory.h"
+
+#include "util/mission_goal.h"
+
 
 
@@ -42 +46 @@
 {
   BaseObject::loadParams(root);
+
+  LoadParamXML(root, "MissionGoal", this, GameRules, loadMissionGoal)
+      .describe("an XML-Element to load the missions from");
 }
 
+
+
+void GameRules::loadMissionGoal(const TiXmlElement* root)
+{
+  const TiXmlElement* element = root->FirstChildElement();
+  while( element != NULL)
+  {
+    PRINTF(2)("============ MissionGoal\n");
+    PRINTF(2)("Adding Mission Goal:%s\n", element->Value());
+    BaseObject* created = Factory::fabricate(element);
+    if (created != NULL && created->isA(CL_GAME_RULES))
+    {
+      MissionGoal* mg = dynamic_cast<MissionGoal*>(created);
+      this->addMissionGoal(mg);
+      // if there is a valid game rule loaded, break because it is not thought to load multiple game rules
+      break;
+    }
+    else
+    {
+      PRINTF(1)("Could not create a %s\n", element->Value());
+      delete created;
+    }
+    element = element->NextSiblingElement();
+  }
+}
+

trunk/src/util/game_rules.h

@@ -26 +26 @@
 
     virtual void loadParams(const TiXmlElement* root = NULL);
+    void loadMissionGoal(const TiXmlElement* root = NULL);
 
 

trunk/src/util/mission_goal.cc

@@ -25 +25 @@
  * @todo this constructor is not jet implemented - do it
 */
-MissionGoal::MissionGoal ()
+MissionGoal::MissionGoal (const TiXmlElement* root)
 {
    this->setClassID(CL_MISSION_GOAL, "MissionGoal");
+
+   if( root != NULL)
+     this->loadParams(root);
 }
 
@@ -38 +41 @@
 
 }
+
+
+void MissionGoal::loadParams(const TiXmlElement* root)
+{
+  BaseObject::loadParams(root);
+}

trunk/src/util/mission_goal.h

@@ -27 +27 @@
 
  public:
-  MissionGoal();
+  MissionGoal(const TiXmlElement* root);
   virtual ~MissionGoal();
 

trunk/src/util/signal_handler.cc

@@ -15 +15 @@
 
 #include "signal_handler.h"
+#include <assert.h>
 
 #ifndef __WIN32__
@@ -28 +29 @@
   this->type = type;
   this->appName = appName;
-  
+
   catchSignal( SIGSEGV );
   catchSignal( SIGABRT );
@@ -75 +76 @@
 
   assert( pipe(fd) != -1 );
-  
+
   int pid = fork();
 
@@ -86 +87 @@
     sleep(2);
 
-    
+
     return;
   }
@@ -98 +99 @@
       exit(0);
     }
-    
+
     char command[256];
     if ( getInstance()->type == GDB_RUN_WRITE_TO_FILE )

trunk/src/util/singleplayer_shootemup.cc

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