[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] r3625 - trunk/pingus/src
From: |
grumbel at BerliOS |
Subject: |
[Pingus-CVS] r3625 - trunk/pingus/src |
Date: |
Wed, 2 Jul 2008 21:35:53 +0200 |
Author: grumbel
Date: 2008-07-02 21:35:47 +0200 (Wed, 02 Jul 2008)
New Revision: 3625
Modified:
trunk/pingus/src/credits.cpp
trunk/pingus/src/credits.hpp
trunk/pingus/src/pingus_main.cpp
trunk/pingus/src/pingus_menu.cpp
trunk/pingus/src/story_screen.cpp
Log:
Removed pointless instance() handling in Credits
Modified: trunk/pingus/src/credits.cpp
===================================================================
--- trunk/pingus/src/credits.cpp 2008-07-02 18:00:56 UTC (rev 3624)
+++ trunk/pingus/src/credits.cpp 2008-07-02 19:35:47 UTC (rev 3625)
@@ -59,8 +59,6 @@
}
};
-Credits* Credits::instance_ = 0;
-
Credits::Credits()
{
scene_context = new SceneContext();
@@ -312,29 +310,7 @@
//PingusSound::play_music("pingus-5.it");
}
-Credits*
-Credits::instance ()
-{
- if (instance_)
- return instance_;
- else
- return instance_ = new Credits ();
-}
-
void
-Credits::init()
-{
- instance_ = 0;
-}
-
-void
-Credits::deinit()
-{
- delete instance_;
- instance_ = 0;
-}
-
-void
Credits::on_pause_press ()
{
}
Modified: trunk/pingus/src/credits.hpp
===================================================================
--- trunk/pingus/src/credits.hpp 2008-07-02 18:00:56 UTC (rev 3624)
+++ trunk/pingus/src/credits.hpp 2008-07-02 19:35:47 UTC (rev 3625)
@@ -26,12 +26,10 @@
#include "font.hpp"
#include "display/scene_context.hpp"
#include "sprite.hpp"
-
+
class Credits : public GUIScreen
{
private:
- static Credits* instance_;
-
SceneContext* scene_context;
bool fast_scrolling;
@@ -59,28 +57,21 @@
Credits ();
virtual ~Credits ();
- static void init();
- static void deinit();
-
void update (float);
void draw_background (DrawingContext& gc);
void on_startup ();
- static Credits* instance ();
-
void on_pause_press ();
void on_fast_forward_press ();
void on_escape_press ();
-
private:
Credits (const Credits&);
Credits& operator= (const Credits&);
};
-
-
+
#endif
/* EOF */
Modified: trunk/pingus/src/pingus_main.cpp
===================================================================
--- trunk/pingus/src/pingus_main.cpp 2008-07-02 18:00:56 UTC (rev 3624)
+++ trunk/pingus/src/pingus_main.cpp 2008-07-02 19:35:47 UTC (rev 3625)
@@ -676,7 +676,7 @@
}
else if (cmd_options.credits.is_set() && cmd_options.credits.get())
{ // just show the credits screen
- ScreenManager::instance()->push_screen(Credits::instance(), false);
+ ScreenManager::instance()->push_screen(new Credits(), true);
}
else if (cmd_options.font.is_set() && cmd_options.font.get())
{ // run the Font Test
@@ -816,7 +816,6 @@
PingusMenuManager::init();
Sound::PingusSound::init();
PinguActionFactory::init();
- Credits::init();
WorldMapNS::WorldMapManager::instance();
fps_counter.init();
@@ -830,7 +829,6 @@
console.deinit();
Fonts::deinit();
- Credits::deinit();
PinguActionFactory::deinit();
Sound::PingusSound::deinit();
PingusMenuManager::deinit();
Modified: trunk/pingus/src/pingus_menu.cpp
===================================================================
--- trunk/pingus/src/pingus_menu.cpp 2008-07-02 18:00:56 UTC (rev 3624)
+++ trunk/pingus/src/pingus_menu.cpp 2008-07-02 19:35:47 UTC (rev 3625)
@@ -117,7 +117,7 @@
void
PingusMenu::show_credits()
{
- ScreenManager::instance()->push_screen(Credits::instance(), false);
+ ScreenManager::instance()->push_screen(new Credits(), true);
}
void
Modified: trunk/pingus/src/story_screen.cpp
===================================================================
--- trunk/pingus/src/story_screen.cpp 2008-07-02 18:00:56 UTC (rev 3624)
+++ trunk/pingus/src/story_screen.cpp 2008-07-02 19:35:47 UTC (rev 3625)
@@ -250,7 +250,7 @@
// Check if final credits have been seen
StatManager::instance()->get_bool("credits-seen", credits_seen);
if (!credits_seen)
- ScreenManager::instance()->replace_screen(Credits::instance(),
false);
+ ScreenManager::instance()->replace_screen(new Credits(), true);
else
ScreenManager::instance()->replace_screen(WorldMapNS::WorldMapManager::instance());
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] r3625 - trunk/pingus/src,
grumbel at BerliOS <=