[Pingus-CVS] r4099 - in trunk/pingus/src/pingus: components screens

[grumbel at BerliOS]

Author: grumbel
Date: 2009-12-03 05:59:35 +0100 (Thu, 03 Dec 2009)
New Revision: 4099

Modified:
   trunk/pingus/src/pingus/components/button_panel.cpp
   trunk/pingus/src/pingus/components/button_panel.hpp
   trunk/pingus/src/pingus/screens/game_session.cpp
Log:
Use just Server in ButtonPanel, not GameSession


Modified: trunk/pingus/src/pingus/components/button_panel.cpp
===================================================================
--- trunk/pingus/src/pingus/components/button_panel.cpp 2009-12-03 04:56:36 UTC 
(rev 4098)
+++ trunk/pingus/src/pingus/components/button_panel.cpp 2009-12-03 04:59:35 UTC 
(rev 4099)
@@ -18,13 +18,12 @@
 
 #include "engine/display/drawing_context.hpp"
 #include "pingus/fonts.hpp"
-#include "pingus/screens/game_session.hpp"
 #include "pingus/server.hpp"
 #include "util/string_util.hpp"
 
-ButtonPanel::ButtonPanel(GameSession* s, const Vector2i& pos) :
+ButtonPanel::ButtonPanel(Server* s, const Vector2i& pos) :
   RectComponent(Rect()),
-  session(s),
+  server(s),
   background("core/buttons/buttonbackground"),
   highlight("core/buttons/buttonbackgroundhl"),
   buttons(),
@@ -32,7 +31,7 @@
   show_tip(false),
   tip_button(0)
 {
-  ActionHolder* aholder = session->get_server()->get_action_holder();
+  ActionHolder* aholder = server->get_action_holder();
 
   std::vector<ActionName::Enum> actions = aholder->get_available_actions();
 
@@ -60,7 +59,7 @@
 void
 ButtonPanel::draw(DrawingContext& gc)
 {
-  ActionHolder* aholder = session->get_server()->get_action_holder();
+  ActionHolder* aholder = server->get_action_holder();
 
   for(std::vector<ActionButton>::size_type i = 0; i < buttons.size(); ++i)
   {

Modified: trunk/pingus/src/pingus/components/button_panel.hpp
===================================================================
--- trunk/pingus/src/pingus/components/button_panel.hpp 2009-12-03 04:56:36 UTC 
(rev 4098)
+++ trunk/pingus/src/pingus/components/button_panel.hpp 2009-12-03 04:59:35 UTC 
(rev 4099)
@@ -23,7 +23,7 @@
 #include "engine/gui/rect_component.hpp"
 #include "pingus/components/action_button.hpp"
 
-class GameSession;
+class Server;
 
 class ButtonPanel : public GUI::RectComponent
 {
@@ -39,7 +39,7 @@
     {}
   };
 
-  GameSession* session;
+  Server* server;
   Sprite background;
   Sprite highlight;
 
@@ -50,7 +50,7 @@
   std::vector<ActionButton>::size_type tip_button;
 
 public:
-  ButtonPanel(GameSession* s, const Vector2i& pos);
+  ButtonPanel(Server* s, const Vector2i& pos);
   virtual ~ButtonPanel();
 
   void draw(DrawingContext& gc);

Modified: trunk/pingus/src/pingus/screens/game_session.cpp
===================================================================
--- trunk/pingus/src/pingus/screens/game_session.cpp    2009-12-03 04:56:36 UTC 
(rev 4098)
+++ trunk/pingus/src/pingus/screens/game_session.cpp    2009-12-03 04:59:35 UTC 
(rev 4099)
@@ -61,7 +61,7 @@
   // -- Client stuff
   
   // These object will get deleted by the gui_manager
-  button_panel = new ButtonPanel(this, Vector2i(0, (size.height - 150)/2));
+  button_panel = new ButtonPanel(get_server(), Vector2i(0, (size.height - 
150)/2));
 
   int world_width  = server->get_world()->get_width();
   int world_height = server->get_world()->get_height();