[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] r2950 - in branches/pingus_sdl: . src src/worldmap
From: |
jsalmon3 |
Subject: |
[Pingus-CVS] r2950 - in branches/pingus_sdl: . src src/worldmap |
Date: |
Thu, 16 Aug 2007 05:24:43 +0200 |
Author: jsalmon3
Date: 2007-08-16 05:24:37 +0200 (Thu, 16 Aug 2007)
New Revision: 2950
Modified:
branches/pingus_sdl/TODO
branches/pingus_sdl/src/story_screen.cpp
branches/pingus_sdl/src/worldmap/worldmap.cpp
Log:
Fixed the credits screen after the story
Modified: branches/pingus_sdl/TODO
===================================================================
--- branches/pingus_sdl/TODO 2007-08-16 03:03:50 UTC (rev 2949)
+++ branches/pingus_sdl/TODO 2007-08-16 03:24:37 UTC (rev 2950)
@@ -65,8 +65,6 @@
- lacks background: data/levels/tutorial/snow10-grumbel.pingus
-- finishing the last level doesn't show the credits screen after the story
-
Nice to Have:
=============
Modified: branches/pingus_sdl/src/story_screen.cpp
===================================================================
--- branches/pingus_sdl/src/story_screen.cpp 2007-08-16 03:03:50 UTC (rev
2949)
+++ branches/pingus_sdl/src/story_screen.cpp 2007-08-16 03:24:37 UTC (rev
2950)
@@ -249,8 +249,13 @@
StatManager::instance()->get_bool("credits-seen", credits_seen);
if (!credits_seen)
ScreenManager::instance()->replace_screen(Credits::instance(),
false);
+ else
+
ScreenManager::instance()->replace_screen(WorldMapNS::WorldMapManager::instance());
}
-
ScreenManager::instance()->replace_screen(WorldMapNS::WorldMapManager::instance
());
+ else
+ {
+
ScreenManager::instance()->replace_screen(WorldMapNS::WorldMapManager::instance());
+ }
}
}
}
Modified: branches/pingus_sdl/src/worldmap/worldmap.cpp
===================================================================
--- branches/pingus_sdl/src/worldmap/worldmap.cpp 2007-08-16 03:03:50 UTC
(rev 2949)
+++ branches/pingus_sdl/src/worldmap/worldmap.cpp 2007-08-16 03:24:37 UTC
(rev 2950)
@@ -405,7 +405,8 @@
bool
WorldMap::is_final_map()
{
- return false;
////(WorldMapManager::instance()->get_metamap()->get_final_worldmap() ==
short_name);
+ return pingus->get_node() == final_node;
+//// return (WorldMapManager::instance()->get_metamap()->get_final_worldmap()
== short_name);
}
std::string
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] r2950 - in branches/pingus_sdl: . src src/worldmap,
jsalmon3 <=