Changeset 7935 for code/branches/usability

Timestamp:

Feb 20, 2011, 5:29:02 PM (14 years ago)

Author:

landauf

Message:

• opening the ingame menu pauses the game, closing the ingame menu unpauses the game
• added a text overlay to the default HUD which shows a notice if the game is paused

Location:

code/branches/usability

Files:

• data/gui/scripts/InGameMenu.lua (modified) (1 diff)
• data/overlays/debug.oxo (modified) (1 diff)
• src/modules/overlays/OverlaysPrereqs.h (modified) (1 diff)
• src/modules/overlays/hud/CMakeLists.txt (modified) (1 diff)
• src/modules/overlays/hud/PauseNotice.cc (added)
• src/modules/overlays/hud/PauseNotice.h (added)
• src/orxonox/gamestates/GSRoot.cc (modified) (4 diffs)
• src/orxonox/gamestates/GSRoot.h (modified) (1 diff)

code/branches/usability/data/gui/scripts/InGameMenu.lua

@@ -33 +33 @@
         P:setSelection(1, 1)
     end
+
+    orxonox.execute("setPause 1")
+end
+
+function P.onQuit()
+    orxonox.execute("setPause 0")
 end
 

code/branches/usability/data/overlays/debug.oxo

@@ -66 +66 @@
     />
 
+    <PauseNotice
+     name     = "pausenotice"
+     position = "0.5, 0.3"
+     font     = "VeraMono"
+     textsize = 0.03
+     colour   = "1.0, 1.0, 1.0, 1.0"
+     align    = "center"
+    />
+
     <AnnounceMessage
      name     = "announcemessage"

code/branches/usability/src/modules/overlays/OverlaysPrereqs.h

@@ -89 +89 @@
     class KillMessage;
     class LastManStandingInfos;
+    class PauseNotice;
     class TeamBaseMatchScore;
     class UnderAttackHealthBar;

code/branches/usability/src/modules/overlays/hud/CMakeLists.txt

@@ -16 +16 @@
   GametypeFadingMessage.cc
   LastManStandingInfos.cc
+  PauseNotice.cc
 )

code/branches/usability/src/orxonox/gamestates/GSRoot.cc

@@ -43 +43 @@
 
     static const std::string __CC_setTimeFactor_name = "setTimeFactor";
+    static const std::string __CC_setPause_name = "setPause";
     static const std::string __CC_pause_name = "pause";
 
     SetConsoleCommand("printObjects", &GSRoot::printObjects).hide();
     SetConsoleCommand(__CC_setTimeFactor_name, &GSRoot::setTimeFactor).accessLevel(AccessLevel::Master).defaultValues(1.0);
+    SetConsoleCommand(__CC_setPause_name,      &GSRoot::setPause     ).accessLevel(AccessLevel::Master).hide();
     SetConsoleCommand(__CC_pause_name,         &GSRoot::pause        ).accessLevel(AccessLevel::Master);
 
@@ -83 +85 @@
 
         ModifyConsoleCommand(__CC_setTimeFactor_name).setObject(this);
+        ModifyConsoleCommand(__CC_setPause_name).setObject(this);
         ModifyConsoleCommand(__CC_pause_name).setObject(this);
     }
@@ -89 +92 @@
     {
         ModifyConsoleCommand(__CC_setTimeFactor_name).setObject(0);
+        ModifyConsoleCommand(__CC_setPause_name).setObject(0);
         ModifyConsoleCommand(__CC_pause_name).setObject(0);
     }
@@ -157 +161 @@
     }
 
+    void GSRoot::setPause(bool pause)
+    {
+        if (GameMode::isMaster())
+        {
+            if (pause != this->bPaused_)
+                this->pause();
+        }
+    }
+
     void GSRoot::changedTimeFactor(float factor_new, float factor_old)
     {

code/branches/usability/src/orxonox/gamestates/GSRoot.h

@@ -51 +51 @@
         // when taking the function address.
         void setTimeFactor(float factor);
+        void setPause(bool pause);
         void pause();