[Pingus-CVS] r2751 - branches/pingus_sdl/src

[nehalmistry]

Author: nehalmistry
Date: 2007-07-17 18:57:15 +0200 (Tue, 17 Jul 2007)
New Revision: 2751

Modified:
   branches/pingus_sdl/src/story_screen.cpp
Log:
fix assertion error

Modified: branches/pingus_sdl/src/story_screen.cpp
===================================================================
--- branches/pingus_sdl/src/story_screen.cpp    2007-07-17 16:41:48 UTC (rev 
2750)
+++ branches/pingus_sdl/src/story_screen.cpp    2007-07-17 16:57:15 UTC (rev 
2751)
@@ -59,7 +59,7 @@
   void draw (DrawingContext& gc);
   void update(float delta);
 
-  void skip_to_end();
+  void skip_story();
   /** starts to display the next text page */
   void next_text();
   WorldMapNS::WorldMapStory* get_story() const { return story; }
@@ -121,8 +121,7 @@
 
   void on_click()
   {
-       story_comp->skip_to_end();
-       story_comp->next_text();
+       story_comp->skip_story();
   }
 };
 
@@ -201,10 +200,12 @@
   Sound::PingusSound::play_music(story_comp->get_story()->get_music(), .7f);
 }
 
-void StoryScreenComponent::skip_to_end()
+void StoryScreenComponent::skip_story()
 {
        page_displayed_completly = true;
-       pages.clear();
+       while (pages.size() > 1)
+               pages.pop_back();
+       next_text();
 }
 
 void