[Pingus-CVS] r4166 - branches/pingus-hanusz/src

[grumbel]

Author: grumbel
Date: 2011-06-17 20:56:05 +0200 (Fri, 17 Jun 2011)
New Revision: 4166

Modified:
   branches/pingus-hanusz/src/client.cpp
   branches/pingus-hanusz/src/game_session.cpp
   branches/pingus-hanusz/src/game_session.hpp
Log:
Do not allow user ESC presses in mid game


Modified: branches/pingus-hanusz/src/client.cpp
===================================================================
--- branches/pingus-hanusz/src/client.cpp       2011-06-17 17:22:53 UTC (rev 
4165)
+++ branches/pingus-hanusz/src/client.cpp       2011-06-17 18:56:05 UTC (rev 
4166)
@@ -222,7 +222,10 @@
 void
 Client:: on_escape_press ()
 {
-  server->set_finished();
+  if (maintainer_mode)
+  {
+    server->set_finished();
+  }
 }
 
 void
@@ -240,7 +243,7 @@
 void
 Client::on_armageddon_press ()
 {
-  server->send_armageddon_event();
+  //server->send_armageddon_event();
 }
 
 void

Modified: branches/pingus-hanusz/src/game_session.cpp
===================================================================
--- branches/pingus-hanusz/src/game_session.cpp 2011-06-17 17:22:53 UTC (rev 
4165)
+++ branches/pingus-hanusz/src/game_session.cpp 2011-06-17 18:56:05 UTC (rev 
4166)
@@ -84,12 +84,6 @@
   client->on_shutdown();
 }
 
-PingusGameSessionResult
-PingusGameSession::get_result ()
-{
-  return PingusGameSessionResult ();
-}
-
 bool
 PingusGameSession::draw(DrawingContext& gc)
 {
@@ -187,13 +181,16 @@
 void
 PingusGameSession::on_armageddon_press ()
 {
-  client->on_armageddon_press ();
+  //client->on_armageddon_press ();
 }
 
 void
 PingusGameSession::on_escape_press ()
 {
-  client->on_escape_press ();
+  if (maintainer_mode)
+  {
+    client->on_escape_press ();
+  }
 }
 
 

Modified: branches/pingus-hanusz/src/game_session.hpp
===================================================================
--- branches/pingus-hanusz/src/game_session.hpp 2011-06-17 17:22:53 UTC (rev 
4165)
+++ branches/pingus-hanusz/src/game_session.hpp 2011-06-17 18:56:05 UTC (rev 
4166)
@@ -62,9 +62,6 @@
   /** Clean up */
   ~PingusGameSession ();
 
-  /** Get the results of the last gaming session */
-  PingusGameSessionResult get_result ();
-
   // Overloaded Screen functions
   /** Draw this screen */
   bool draw(DrawingContext& gc);