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

Timestamp:

May 1, 2006, 4:52:33 PM (19 years ago)

Author:

patrick

Message:

orxonox: mission goals get checked now, verbose output.

Location:

trunk/src/util

Files:

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

trunk/src/util/kill_target.cc

@@ -60 +60 @@
 
 
-MissionState KillTarget::checkMissionGoal()
+MissionState KillTarget::checkMissionGoal(float dt)
 {}
 

trunk/src/util/kill_target.h

@@ -30 +30 @@
 
 
-    virtual MissionState checkMissionGoal();
+    virtual MissionState checkMissionGoal(float dt);
 
 

trunk/src/util/mission_goal.cc

@@ -17 +17 @@
 
 #include "mission_goal.h"
+#include "game_rules.h"
 
+#include "state.h"
 #include "util/loading/load_param.h"
 
@@ -30 +32 @@
 {
    this->setClassID(CL_MISSION_GOAL, "MissionGoal");
+
+   this->missionState = MS_PASSIVE;
+   // add the mission to the current game rule
+   GameRules* gr = State::getGameRules();
+   if( gr)
+     gr->addMissionGoal(this);
 
    if( root != NULL)

trunk/src/util/mission_goal.h

@@ -16 +16 @@
 {
   MS_ACCOMPLISHED = 0,
-  MS_RUNNING,
+  MS_ACCEPTED,
   MS_FAILED,
+  MS_PASSIVE,
 
   MS_NUMBER
@@ -47 +48 @@
   inline MissionState getMissionState() { return this->missionState; }
 
-  virtual MissionState checkMissionGoal() = 0;
+  virtual MissionState checkMissionGoal(float dt) = 0;
 
 

trunk/src/util/singleplayer_shootemup.cc

@@ -20 +20 @@
 #include "util/loading/factory.h"
 
-#include "render2D/billboard.h"
-#include "state.h"
-#include "class_list.h"
-
-#include "player.h"
-#include "playable.h"
-#include "space_ships/space_ship.h"
-
-
-#include "shared_network_data.h"
-#include "terrain.h"
-#include "class_list.h"
-#include "space_ships/space_ship.h"
+#include "mission_goal.h"
 
 
@@ -67 +55 @@
   GameRules::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, "max-kills", this, SingleplayerShootemup, setMaxKills)
-//       .describe("sets the maximal kills for winning condition");
-//
-//   LoadParam(root, "death-screen-image", this, SingleplayerShootemup, setDeathScreen)
-//       .describe("sets the death screen image");
+   LoadParam(root, "death-screen-image", this, SingleplayerShootemup, setDeathScreen)
+       .describe("sets the death screen image");
 
 }
@@ -109 +91 @@
 void SingleplayerShootemup::tick(float dt)
 {
-  this->checkGameRules();
+  this->checkGameRules(dt);
 }
 
@@ -123 +105 @@
  * check the game rules for consistency
  */
-void SingleplayerShootemup::checkGameRules()
-{}
+void SingleplayerShootemup::checkGameRules(float dt)
+{
+  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());
+    }
+  }
+}
 
 

trunk/src/util/singleplayer_shootemup.h

@@ -35 +35 @@
 
   protected:
-    virtual void checkGameRules();
+    virtual void checkGameRules(float dt);