[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src Display.hh,1.10,1.11 Story.cc,1.13,1.
From: |
grumbel |
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src Display.hh,1.10,1.11 Story.cc,1.13,1.14 SurfaceButton.hh,1.21,1.22 globals.cc,1.39,1.40 |
Date: |
6 Jun 2002 14:05:46 -0000 |
Update of /usr/local/cvsroot/Games/Pingus/src
In directory dark:/tmp/cvs-serv23361
Modified Files:
Display.hh Story.cc SurfaceButton.hh globals.cc
Log Message:
some more namespace seperation
Index: Display.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Display.hh,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Display.hh 21 Jan 2002 11:13:54 -0000 1.10
+++ Display.hh 6 Jun 2002 14:05:44 -0000 1.11
@@ -24,51 +24,41 @@
#include <ClanLib/display.h>
#include <list>
-///
+/** A flip display hook can be used to attach an event to a
+ flip_screen(). An example usage for this is a software mouse
+ cursor or a frame counter */
class DisplayHook
{
protected:
- ///
bool is_visible;
public:
- ///
DisplayHook();
- ///
virtual ~DisplayHook() {}
/** Called sortly before a flip_display () */
virtual void on_event() = 0;
- ///
virtual void toggle_display();
};
-///
+/** This is a kind of wrapper class around CL_Display, it provides
+ ways to set the cursor and hooks for flip_display() */
class Display
{
private:
- ///
static bool displaying_cursor;
- ///
static std::list<DisplayHook*> display_hooks;
public:
- ///
static void draw_rect(int x1, int y1, int x2, int y2, float r, float g,
float b, float a);
- ///
static void show_cursor(bool show_async=true);
- ///
static void hide_cursor();
- ///
static void set_cursor(CL_MouseCursorProvider *provider, int frame=0);
- ///
static bool cursor_shown();
- ///
+
static void flip_display(bool sync=false);
- ///
+
static void add_flip_screen_hook(DisplayHook*);
- ///
static void remove_flip_screen_hook(DisplayHook*);
-}///
-;
+};
#endif
Index: Story.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Story.cc,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- Story.cc 1 Jun 2002 18:05:35 -0000 1.13
+++ Story.cc 6 Jun 2002 14:05:44 -0000 1.14
@@ -127,7 +127,7 @@
{
manager->disable_events ();
// FIXME: This looks ugly...
- PingusWorldMapManager worldmap_manager;
+ Pingus::WorldMapManager worldmap_manager;
worldmap_manager.display();
manager->enable_events ();
manager->set_menu (&manager->mainmenu);
Index: SurfaceButton.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/SurfaceButton.hh,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- SurfaceButton.hh 17 Jan 2002 23:34:33 -0000 1.21
+++ SurfaceButton.hh 6 Jun 2002 14:05:44 -0000 1.22
@@ -138,7 +138,7 @@
{
private:
PingusMenu* menu;
- PingusWorldMapManager worldmap_manager;
+ Pingus::WorldMapManager worldmap_manager;
public:
StoryButton(PingusMenu* menu);
~StoryButton();
Index: globals.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/globals.cc,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- globals.cc 21 Jan 2002 12:06:09 -0000 1.39
+++ globals.cc 6 Jun 2002 14:05:44 -0000 1.40
@@ -25,7 +25,7 @@
bool music_enabled = false;
bool sound_enabled = false;
bool gimmicks_enabled = false;
-bool intro_disabled = true;
+bool intro_disabled = false;
bool record_demo = false;
bool play_demo = false;
bool cursor_enabled = false;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src Display.hh,1.10,1.11 Story.cc,1.13,1.14 SurfaceButton.hh,1.21,1.22 globals.cc,1.39,1.40,
grumbel <=
- Prev by Date:
[Pingus-CVS] CVS: Games/Pingus/src Debug.cc,1.1,1.2 Debug.hh,1.1,1.2 PingusStream.cc,1.1,1.2 PingusStream.hh,1.1,1.2
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus/src/worldmap PingusWorldMap.cc,1.37,1.38 PingusWorldMap.hh,1.21,1.22 PingusWorldMapGraph.cc,1.31,1.32 PingusWorldMapGraph.hh,1.20,1.21 PingusWorldMapManager.cc,1.21,1.22 PingusWorldMapManager.hh,1.8,1.9 PingusWorldMapNode.cc,1.2,1.3 PingusWorldMapStat.cc,1.5,1.6
- Previous by thread:
[Pingus-CVS] CVS: Games/Pingus/src Debug.cc,1.1,1.2 Debug.hh,1.1,1.2 PingusStream.cc,1.1,1.2 PingusStream.hh,1.1,1.2
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus/src/worldmap PingusWorldMap.cc,1.37,1.38 PingusWorldMap.hh,1.21,1.22 PingusWorldMapGraph.cc,1.31,1.32 PingusWorldMapGraph.hh,1.20,1.21 PingusWorldMapManager.cc,1.21,1.22 PingusWorldMapManager.hh,1.8,1.9 PingusWorldMapNode.cc,1.2,1.3 PingusWorldMapStat.cc,1.5,1.6
- Index(es):