Changeset 7488 in orxonox.OLD for trunk

Timestamp:

May 3, 2006, 12:03:47 AM (19 years ago)

Author:

patrick

Message:

orxonox: mission manager less verbose and more secure now

Location:

trunk/src

Files:

• story_entities/game_world_data.cc (modified) (1 diff)
• util/game_rules.cc (modified) (1 diff)
• util/game_rules.h (modified) (1 diff)
• util/singleplayer_shootemup.cc (modified) (1 diff)
• world_entities/test_entity.cc (modified) (3 diffs)

trunk/src/story_entities/game_world_data.cc

@@ -352 +352 @@
   /* unload the shaders */
   Shader::suspendShader();
+
+  State::setGameRules(NULL);
 }
 

trunk/src/util/game_rules.cc

@@ -60 +60 @@
   while( element != NULL)
   {
-    PRINTF(2)("============ MissionGoal\n");
-    PRINTF(2)("Adding Mission Goal:%s\n", element->Value());
+    PRINTF(4)("============ MissionGoal\n");
+    PRINTF(4)("Adding Mission Goal:%s\n", element->Value());
     BaseObject* created = Factory::fabricate(element);
     if (created != NULL /*&& created->isA(CL_GAME_RULES)*/)

trunk/src/util/game_rules.h

@@ -34 +34 @@
     inline void addMissionGoal(MissionGoal* missionGoal) { this->missionList.push_back(missionGoal); }
     /** 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); }
+    inline void registerKill(const Kill& kill) { PRINTF(0)("Received Event: Kill\n"); this->killList.push_back(kill); }
 
     virtual void onPlayerSpawn() {}

trunk/src/util/singleplayer_shootemup.cc

@@ -107 +107 @@
 void SingleplayerShootemup::checkGameRules(float dt)
 {
-  PRINTF(0)("===========| Printing Mission State:\n");
+//   PRINTF(0)("===========| Printing Mission State:\n");
   for (std::vector<MissionGoal*>::iterator it = this->missionList.begin(); it != this->missionList.end(); it++)
   {
     if( (*it)->checkMissionGoal(dt) != MS_ACCOMPLISHED)
     {
-      PRINTF(0)("  Mission \"%s\" is not finished yet\n", (*it)->getMissionName().c_str());
+//       PRINTF(0)("  Mission \"%s\" is not finished yet\n", (*it)->getMissionName().c_str());
     }
   }

trunk/src/world_entities/test_entity.cc

@@ -21 +21 @@
 #include "util/loading/factory.h"
 #include "util/loading/load_param.h"
+
+#include "kill.h"
+#include "game_rules.h"
 
 #include "test_entity.h"
@@ -99 +102 @@
     this->dieHard();
     this->lastCollided = entity;
+
+    if(State::getGameRules())
+      State::getGameRules()->registerKill(Kill(entity, this));
   }
 }
@@ -108 +114 @@
   if( this->bDeath)
     return;
+
   this->bDeath = true;
   float anim;