[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] r4100 - trunk/pingus/src/pingus/screens
From: |
grumbel at BerliOS |
Subject: |
[Pingus-CVS] r4100 - trunk/pingus/src/pingus/screens |
Date: |
Thu, 3 Dec 2009 06:04:02 +0100 |
Author: grumbel
Date: 2009-12-03 06:04:01 +0100 (Thu, 03 Dec 2009)
New Revision: 4100
Modified:
trunk/pingus/src/pingus/screens/demo_session.cpp
trunk/pingus/src/pingus/screens/demo_session.hpp
Log:
Added ButtonPanel to DemoSession
Modified: trunk/pingus/src/pingus/screens/demo_session.cpp
===================================================================
--- trunk/pingus/src/pingus/screens/demo_session.cpp 2009-12-03 04:59:35 UTC
(rev 4099)
+++ trunk/pingus/src/pingus/screens/demo_session.cpp 2009-12-03 05:04:01 UTC
(rev 4100)
@@ -26,6 +26,7 @@
#include "pingus/components/pingus_counter.hpp"
#include "pingus/components/playfield.hpp"
#include "pingus/components/smallmap.hpp"
+#include "pingus/components/button_panel.hpp"
#include "pingus/pingus_demo.hpp"
#include "pingus/server.hpp"
#include "pingus/world.hpp"
@@ -104,6 +105,7 @@
// Create GUI
pcounter = new PingusCounter(server.get());
gui_manager->add(pcounter);
+ gui_manager->add(new ButtonPanel(server.get(), Vector2i(0, (size.height -
100)/2)));
int world_width = server->get_world()->get_width();
int world_height = server->get_world()->get_height();
Modified: trunk/pingus/src/pingus/screens/demo_session.hpp
===================================================================
--- trunk/pingus/src/pingus/screens/demo_session.hpp 2009-12-03 04:59:35 UTC
(rev 4099)
+++ trunk/pingus/src/pingus/screens/demo_session.hpp 2009-12-03 05:04:01 UTC
(rev 4100)
@@ -37,6 +37,7 @@
class Playfield;
class SmallMap;
class BButton;
+class ButtonPanel;
/** A DemoSession is analog to a GameSession, but instead of loading a
level and letting the player play a game, a demo file will be
@@ -53,7 +54,7 @@
PingusCounter* pcounter;
Playfield* playfield;
SmallMap* small_map;
-
+
BButton* fastforward_button;
BButton* pause_button;
BButton* restart_button;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] r4100 - trunk/pingus/src/pingus/screens,
grumbel at BerliOS <=