[Pingus-CVS] r3597 - in trunk/pingus/src: . editor

[grumbel at BerliOS]

Author: grumbel
Date: 2008-06-30 20:52:17 +0200 (Mon, 30 Jun 2008)
New Revision: 3597

Modified:
   trunk/pingus/src/editor/editor_screen.cpp
   trunk/pingus/src/game_session.cpp
   trunk/pingus/src/game_session.hpp
   trunk/pingus/src/game_session_result.cpp
   trunk/pingus/src/game_session_result.hpp
   trunk/pingus/src/result_screen.cpp
   trunk/pingus/src/start_screen.cpp
Log:
Renamed PingusGameSession to GameSession

Modified: trunk/pingus/src/editor/editor_screen.cpp
===================================================================
--- trunk/pingus/src/editor/editor_screen.cpp   2008-06-30 17:19:13 UTC (rev 
3596)
+++ trunk/pingus/src/editor/editor_screen.cpp   2008-06-30 18:52:17 UTC (rev 
3597)
@@ -336,7 +336,7 @@
       return;
     }
   PingusLevel level(tmp);
-  ScreenManager::instance()->push_screen(new PingusGameSession(level, false), 
true);
+  ScreenManager::instance()->push_screen(new GameSession(level, false), true);
 }
 
 void

Modified: trunk/pingus/src/game_session.cpp
===================================================================
--- trunk/pingus/src/game_session.cpp   2008-06-30 17:19:13 UTC (rev 3596)
+++ trunk/pingus/src/game_session.cpp   2008-06-30 18:52:17 UTC (rev 3597)
@@ -32,7 +32,7 @@
 #include "globals.hpp"
 #include "debug.hpp"
 
-PingusGameSession::PingusGameSession (const PingusLevel& arg_plf, bool 
arg_show_result_screen)
+GameSession::GameSession (const PingusLevel& arg_plf, bool 
arg_show_result_screen)
   : plf(arg_plf),
     show_result_screen(arg_show_result_screen)
 {
@@ -55,10 +55,10 @@
   world_delay = 0;
 
   left_over_time = 0;
-  pout(PINGUS_DEBUG_LOADING) << "PingusGameSession" << std::endl;
+  pout(PINGUS_DEBUG_LOADING) << "GameSession" << std::endl;
 }
 
-PingusGameSession::~PingusGameSession ()
+GameSession::~GameSession ()
 {
   if (maintainer_mode)
     std::cout << "XXXXXXXX"
@@ -69,25 +69,25 @@
 }
 
 void
-PingusGameSession::on_startup()
+GameSession::on_startup()
 {
   client->on_startup();
 }
 
 void
-PingusGameSession::on_shutdown()
+GameSession::on_shutdown()
 {
   client->on_shutdown();
 }
 
-PingusGameSessionResult
-PingusGameSession::get_result ()
+GameSessionResult
+GameSession::get_result()
 {
-  return PingusGameSessionResult ();
+  return GameSessionResult();
 }
 
 bool
-PingusGameSession::draw(DrawingContext& gc)
+GameSession::draw(DrawingContext& gc)
 {
   ++number_of_redraws;
   client->draw (gc);
@@ -95,7 +95,7 @@
 }
 
 void
-PingusGameSession::update (const GameDelta& delta)
+GameSession::update (const GameDelta& delta)
 {
   // FIXME: Timing code could need another rewrite...
   if (server->is_finished())
@@ -174,25 +174,25 @@
 }
 
 void
-PingusGameSession::on_pause_press ()
+GameSession::on_pause_press ()
 {
   client->on_pause_press ();
 }
 
 void
-PingusGameSession::on_fast_forward_press ()
+GameSession::on_fast_forward_press ()
 {
   client->on_fast_forward_press ();
 }
 
 void
-PingusGameSession::on_armageddon_press ()
+GameSession::on_armageddon_press ()
 {
   client->on_armageddon_press ();
 }
 
 void
-PingusGameSession::on_escape_press ()
+GameSession::on_escape_press ()
 {
   client->on_escape_press ();
 }

Modified: trunk/pingus/src/game_session.hpp
===================================================================
--- trunk/pingus/src/game_session.hpp   2008-06-30 17:19:13 UTC (rev 3596)
+++ trunk/pingus/src/game_session.hpp   2008-06-30 18:52:17 UTC (rev 3597)
@@ -27,12 +27,12 @@
 
 class Client;
 class Server;
-class PingusGameSessionResult;
+class GameSessionResult;
 class DemoPlayer;
 
 /** You can use this class to start up a game session, which consist
     of a single level. */
-class PingusGameSession : public Screen
+class GameSession : public Screen
 {
 private:
   /// The level data
@@ -59,13 +59,13 @@
   unsigned int number_of_redraws;
 
 public:
-  PingusGameSession(const PingusLevel& arg_plf, bool arg_show_result_screen);
+  GameSession(const PingusLevel& arg_plf, bool arg_show_result_screen);
 
   /** Clean up */
-  ~PingusGameSession ();
+  ~GameSession ();
 
   /** Get the results of the last gaming session */
-  PingusGameSessionResult get_result ();
+  GameSessionResult get_result ();
 
   // Overloaded Screen functions
   /** Draw this screen */
@@ -83,8 +83,8 @@
   void on_escape_press ();
 
 private:
-  PingusGameSession (const PingusGameSession&);
-  PingusGameSession& operator= (const PingusGameSession&);
+  GameSession (const GameSession&);
+  GameSession& operator= (const GameSession&);
 };
 
 

Modified: trunk/pingus/src/game_session_result.cpp
===================================================================
--- trunk/pingus/src/game_session_result.cpp    2008-06-30 17:19:13 UTC (rev 
3596)
+++ trunk/pingus/src/game_session_result.cpp    2008-06-30 18:52:17 UTC (rev 
3597)
@@ -20,25 +20,25 @@
 #include "game_session_result.hpp"
 
 
-PingusGameSessionResult::PingusGameSessionResult ()
+GameSessionResult::GameSessionResult ()
 {
 }
 
 bool
-PingusGameSessionResult::finished ()
+GameSessionResult::finished ()
 {
   // FIXME: Always success
   return true;
 }
 
 float
-PingusGameSessionResult::percentage_saved ()
+GameSessionResult::percentage_saved ()
 {
   return 100.0;
 }
 
 float
-PingusGameSessionResult::percentage_time ()
+GameSessionResult::percentage_time ()
 {
   return 100.0;
 }

Modified: trunk/pingus/src/game_session_result.hpp
===================================================================
--- trunk/pingus/src/game_session_result.hpp    2008-06-30 17:19:13 UTC (rev 
3596)
+++ trunk/pingus/src/game_session_result.hpp    2008-06-30 18:52:17 UTC (rev 
3597)
@@ -26,13 +26,13 @@
 /** With this class you can obtain information about the success or
     failure of a level, in addition you can get details like how many
     penguins where saved or killed, etc. */
-class PingusGameSessionResult
+class GameSessionResult
 {
 public:
-  PingusGameSessionResult ();
+  GameSessionResult ();
 
-  PingusGameSessionResult (const PingusGameSessionResult&) { }
-  PingusGameSessionResult& operator= (const PingusGameSessionResult&) { return 
*this; }
+  GameSessionResult (const GameSessionResult&) { }
+  GameSessionResult& operator= (const GameSessionResult&) { return *this; }
 
   /** Gives information if the level was succeeded or not
       @return true if the level was succeeded, otherwise false */

Modified: trunk/pingus/src/result_screen.cpp
===================================================================
--- trunk/pingus/src/result_screen.cpp  2008-06-30 17:19:13 UTC (rev 3596)
+++ trunk/pingus/src/result_screen.cpp  2008-06-30 18:52:17 UTC (rev 3597)
@@ -286,8 +286,7 @@
 void
 ResultScreen::retry_level()
 {
-  ScreenManager::instance()->replace_screen(new PingusGameSession (result.plf, 
true),
-                                            true);
+  ScreenManager::instance()->replace_screen(new GameSession (result.plf, 
true), true);
 }
 
 void

Modified: trunk/pingus/src/start_screen.cpp
===================================================================
--- trunk/pingus/src/start_screen.cpp   2008-06-30 17:19:13 UTC (rev 3596)
+++ trunk/pingus/src/start_screen.cpp   2008-06-30 18:52:17 UTC (rev 3597)
@@ -226,7 +226,7 @@
 void
 StartScreen::start_game()
 {
-  PingusGameSession* game_session = new PingusGameSession(plf, true);
+  GameSession* game_session = new GameSession(plf, true);
   ScreenManager::instance()->replace_screen(game_session, true);
 }