[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] r3696 - trunk/pingus/src/worldmap
From: |
grumbel at BerliOS |
Subject: |
[Pingus-CVS] r3696 - trunk/pingus/src/worldmap |
Date: |
Sat, 5 Jul 2008 23:13:46 +0200 |
Author: grumbel
Date: 2008-07-05 23:13:45 +0200 (Sat, 05 Jul 2008)
New Revision: 3696
Modified:
trunk/pingus/src/worldmap/worldmap.cpp
trunk/pingus/src/worldmap/worldmap_screen.cpp
Log:
Minimal code cleanup, workaround for story being always shown
Modified: trunk/pingus/src/worldmap/worldmap.cpp
===================================================================
--- trunk/pingus/src/worldmap/worldmap.cpp 2008-07-05 19:54:25 UTC (rev
3695)
+++ trunk/pingus/src/worldmap/worldmap.cpp 2008-07-05 21:13:45 UTC (rev
3696)
@@ -158,7 +158,6 @@
Worldmap::on_startup()
{
Sound::PingusSound::play_music(worldmap.get_music());
- update_locked_nodes();
}
void
@@ -292,9 +291,11 @@
void
Worldmap::update_locked_nodes()
-{ // FIXME: This shouldn't be a polling function
+{
+ // FIXME: This shouldn't be a polling function
path_graph->graph.for_each_node(unlock_nodes(path_graph));
+#if 0
bool credits_unlocked = false;
StatManager::instance()->get_bool(worldmap.get_short_name() +
"-endstory-seen", credits_unlocked);
@@ -306,7 +307,7 @@
{
if (dot->finished())
{
- ScreenManager::instance()->replace_screen(new
StoryScreen(worldmap.get_end_story()));
+ ScreenManager::instance()->push_screen(new
StoryScreen(worldmap.get_end_story()));
}
}
else
@@ -314,6 +315,7 @@
std::cout << "Error: Worldmap: Last level missing" << std::endl;
}
}
+#endif
}
// Determine starting node
Modified: trunk/pingus/src/worldmap/worldmap_screen.cpp
===================================================================
--- trunk/pingus/src/worldmap/worldmap_screen.cpp 2008-07-05 19:54:25 UTC
(rev 3695)
+++ trunk/pingus/src/worldmap/worldmap_screen.cpp 2008-07-05 21:13:45 UTC
(rev 3696)
@@ -170,7 +170,7 @@
{
ScreenManager::instance ()->pop_screen ();
}
-
+
WorldmapScreenEnterButton::WorldmapScreenEnterButton(WorldmapScreen*
worldmap_screen)
: GUI::SurfaceButton(Display::get_width() - 119, Display::get_height() - 37,
ResDescriptor("core/worldmap/enter_button_normal"),
@@ -209,8 +209,8 @@
{
worldmap_screen->get_worldmap()->enter_level();
}
-
-WorldmapScreen::WorldmapScreen ()
+
+WorldmapScreen::WorldmapScreen()
: levelname_bg(Sprite("core/worldmap/levelname_bg")),
is_init(false),
exit_worldmap(false)
@@ -224,6 +224,10 @@
gui_manager->add(new WorldmapScreenStoryButton(this), true);
}
+WorldmapScreen::~WorldmapScreen ()
+{
+}
+
void
WorldmapScreen::load (const std::string& filename)
{
@@ -247,10 +251,6 @@
worldmap->on_startup ();
}
-WorldmapScreen::~WorldmapScreen ()
-{
-}
-
void
WorldmapScreen::on_escape_press ()
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] r3696 - trunk/pingus/src/worldmap,
grumbel at BerliOS <=