[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] r3756 - in trunk/pingus/src: . editor screen
From: |
grumbel at BerliOS |
Subject: |
[Pingus-CVS] r3756 - in trunk/pingus/src: . editor screen |
Date: |
Thu, 10 Jul 2008 07:37:27 +0200 |
Author: grumbel
Date: 2008-07-10 07:37:25 +0200 (Thu, 10 Jul 2008)
New Revision: 3756
Modified:
trunk/pingus/src/editor/editor_screen.cpp
trunk/pingus/src/editor/editor_screen.hpp
trunk/pingus/src/font_test_screen.cpp
trunk/pingus/src/font_test_screen.hpp
trunk/pingus/src/screen/gui_screen.cpp
trunk/pingus/src/screen/gui_screen.hpp
trunk/pingus/src/screen/screen.hpp
Log:
Removed bool return type for draw()
Modified: trunk/pingus/src/editor/editor_screen.cpp
===================================================================
--- trunk/pingus/src/editor/editor_screen.cpp 2008-07-09 13:01:17 UTC (rev
3755)
+++ trunk/pingus/src/editor/editor_screen.cpp 2008-07-10 05:37:25 UTC (rev
3756)
@@ -151,7 +151,7 @@
}
// Draw the background and components
-bool
+void
EditorScreen::draw(DrawingContext& gc)
{
// Black out screen
@@ -239,8 +239,6 @@
"have to change that reference.\n"
));
}
-
- return true;
}
void
Modified: trunk/pingus/src/editor/editor_screen.hpp
===================================================================
--- trunk/pingus/src/editor/editor_screen.hpp 2008-07-09 13:01:17 UTC (rev
3755)
+++ trunk/pingus/src/editor/editor_screen.hpp 2008-07-10 05:37:25 UTC (rev
3756)
@@ -74,7 +74,7 @@
void on_escape_press();
/** Draw the items in the screen */
- bool draw (DrawingContext& gc);
+ void draw (DrawingContext& gc);
/** Update the GUI objects */
void update(const Input::Event& delta);
Modified: trunk/pingus/src/font_test_screen.cpp
===================================================================
--- trunk/pingus/src/font_test_screen.cpp 2008-07-09 13:01:17 UTC (rev
3755)
+++ trunk/pingus/src/font_test_screen.cpp 2008-07-10 05:37:25 UTC (rev
3756)
@@ -35,7 +35,7 @@
reference =
Font(FontDescription(Pathname("images/fonts/reference-iso-8859-1.font",
Pathname::DATA_PATH)));
}
-bool
+void
FontTestScreen::draw(DrawingContext& gc)
{
int checker = 40;
@@ -96,8 +96,6 @@
}
}
gc.pop_modelview();
-
- return true;
}
void
Modified: trunk/pingus/src/font_test_screen.hpp
===================================================================
--- trunk/pingus/src/font_test_screen.hpp 2008-07-09 13:01:17 UTC (rev
3755)
+++ trunk/pingus/src/font_test_screen.hpp 2008-07-10 05:37:25 UTC (rev
3756)
@@ -32,7 +32,7 @@
public:
FontTestScreen(const Pathname& fontfile);
- bool draw(DrawingContext& gc);
+ void draw(DrawingContext& gc);
void update(const Input::Event& event);
void update(float delta) {}
Modified: trunk/pingus/src/screen/gui_screen.cpp
===================================================================
--- trunk/pingus/src/screen/gui_screen.cpp 2008-07-09 13:01:17 UTC (rev
3755)
+++ trunk/pingus/src/screen/gui_screen.cpp 2008-07-10 05:37:25 UTC (rev
3756)
@@ -32,13 +32,12 @@
}
/** Draw this screen */
-bool
+void
GUIScreen::draw(DrawingContext& gc)
{
draw_background(gc);
gui_manager->draw(gc);
draw_foreground(gc);
- return true;
}
void
Modified: trunk/pingus/src/screen/gui_screen.hpp
===================================================================
--- trunk/pingus/src/screen/gui_screen.hpp 2008-07-09 13:01:17 UTC (rev
3755)
+++ trunk/pingus/src/screen/gui_screen.hpp 2008-07-10 05:37:25 UTC (rev
3756)
@@ -39,7 +39,7 @@
/** Draw this screen */
virtual void draw_foreground (DrawingContext&) {}
virtual void draw_background (DrawingContext&) {}
- virtual bool draw(DrawingContext& gc);
+ virtual void draw(DrawingContext& gc);
virtual void update (const Input::Event& event);
virtual void update (float);
Modified: trunk/pingus/src/screen/screen.hpp
===================================================================
--- trunk/pingus/src/screen/screen.hpp 2008-07-09 13:01:17 UTC (rev 3755)
+++ trunk/pingus/src/screen/screen.hpp 2008-07-10 05:37:25 UTC (rev 3756)
@@ -39,9 +39,8 @@
Screen (const Size& size_) : size(size_) { }
virtual ~Screen () {}
- /** Draw this screen @return true if draw was successfull, false if
- frameskip has taken place ('causes a skip of flip_display) */
- virtual bool draw(DrawingContext& gc) =0;
+ /** Draw this screen */
+ virtual void draw(DrawingContext& gc) =0;
/** Pass a delta to the screen */
virtual void update (const Input::Event& event) =0;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] r3756 - in trunk/pingus/src: . editor screen,
grumbel at BerliOS <=