[Pingus-CVS] CVS: Games/Pingus/src delta_manager.hxx,1.8,1.9 result_screen.cxx,1.10,1.11 server.cxx,1.25,1.26 server.hxx,1.13,1.14 story_screen.cxx,1.8,1.9 true_server.cxx,1.17,1.18 true_server.hxx,1.11,1.12

[grumbel]

Update of /var/lib/cvs/Games/Pingus/src
In directory dark:/tmp/cvs-serv2262/src

Modified Files:
        delta_manager.hxx result_screen.cxx server.cxx server.hxx 
        story_screen.cxx true_server.cxx true_server.hxx 
Log Message:
- added story
- fixed some small bugs

Index: delta_manager.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/delta_manager.hxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- delta_manager.hxx   28 Dec 2002 16:57:38 -0000      1.8
+++ delta_manager.hxx   5 Apr 2003 18:36:50 -0000       1.9
@@ -21,6 +21,7 @@
 #define HEADER_PINGUS_DELTA_MANAGER_HXX
 
 #include <assert.h>
+#include <iostream>
 #include <ClanLib/Core/System/system.h>
 #include "pingus.hxx"
 
@@ -50,8 +51,16 @@
   
   float get () const
   {
-    assert (CL_System::get_time () >= last_time);
-    return (CL_System::get_time () - last_time) / 1000.0f;
+    unsigned int t = CL_System::get_time ();
+    if (t < last_time)
+      { // catching time travel
+        std::cout << "Time Travel: first: " << last_time << " second: " << t 
<< std::endl;
+        return 0.0f;
+      }
+    else
+      {
+        return (CL_System::get_time () - last_time) / 1000.0f;
+      }
   }
   
   /** @return time in miliseconds passed since the start of the DeltaManager */

Index: result_screen.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/result_screen.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- result_screen.cxx   3 Apr 2003 17:03:24 -0000       1.10
+++ result_screen.cxx   5 Apr 2003 18:36:50 -0000       1.11
@@ -179,7 +179,7 @@
       else if (result.killed >= 5)
         message = _("Not everybody could get saved, but still good work!");
       else
-        message = _("What can I say, you made it, congratulasions!");
+        message = _("What can I say, you made it, congratulations!");
     }
   else
     {

Index: server.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/server.cxx,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- server.cxx  29 Dec 2002 23:29:00 -0000      1.25
+++ server.cxx  5 Apr 2003 18:36:50 -0000       1.26
@@ -88,12 +88,6 @@
   return goal_manager->is_finished();
 }
 
-void
-Server::set_finished ()
-{
-  goal_manager->set_abort_goal();
-}
-
 ActionHolder*
 Server::get_action_holder ()
 {

Index: server.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/server.hxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- server.hxx  29 Dec 2002 23:29:00 -0000      1.13
+++ server.hxx  5 Apr 2003 18:36:50 -0000       1.14
@@ -32,7 +32,7 @@
 /** A abstract server-like class */
 class Server
 {
-private:
+protected:
   PLF* plf;
   World* world;
 
@@ -62,7 +62,7 @@
 
   /** set the server into the finshed state, this is used when you
       press ESCAPE inside a game */
-  void set_finished();
+  virtual void set_finished() =0;
 
   /* Event handling stuff */
   void send_armageddon_event();

Index: story_screen.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/story_screen.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- story_screen.cxx    4 Apr 2003 11:23:27 -0000       1.8
+++ story_screen.cxx    5 Apr 2003 18:36:50 -0000       1.9
@@ -19,6 +19,7 @@
 
 #include <algorithm>
 #include <ClanLib/Display/Display/surface.h>
+#include "my_gettext.hxx"
 #include "pingus_resource.hxx"
 #include "gui/gui_manager.hxx"
 #include "gui/surface_button.hxx"
@@ -109,39 +110,111 @@
   page_displayed_completly = false;
   time_passed  = 0;
 
-  pages.push_back(StoryPage(ResDescriptor("Story/story0", "story"), 
-                            "äÄÁÓöÖaoeuth htnh30  003 0238p[ 8eu ntuhnt 
hnthneat'hur  rcg rg th th tnh "));
+  pages.push_back
+    (StoryPage
+     (ResDescriptor("Story/story0", "story"), 
+      _("For a long time now the Pingus have lived happily in peace on the\n"
+        "south pole along with all the other animals, everything was in\n"
+        "balance and it seemed like nothing could disrupt there peace.  The\n"
+        "Pingus where happy and it seemed like this could never end.\n")));
 
-  pages.push_back(StoryPage(ResDescriptor("Story/story1", "story"), 
-                            "Page 2Dies ist ein Tet blabla, sehr lang blabla 
und mit umbruechen blabal\n"
-                            "Zeile zwei mehr text blabla umbrauchuauaneh 
usnthu snaotehu nostehusano\n"
-                            "authh nth pte thuat nth auntheun tahneuth oentuh 
oentuhontu hoantuhetuh\n"
-                            "aoeuth htnh30  003 0238p[ 8eu ntuhnt hnthneat'hur 
 rcg rg th th tnh "));
+  pages.push_back
+    (StoryPage
+     (ResDescriptor("Story/story1", "story"), 
+      _("But then one day, things began to change slowly, the sky got darker\n"
+        "and the earth got warmer, first of they thought this was just a\n"
+        "normal fluctuation in the worlds climate, but things seemed to get\n"
+        "worse and worse with every year.")));
 
-  pages.push_back(StoryPage(ResDescriptor("Story/story2", "story"), 
-                            "Page 3Dies ist ein Tet blabla, sehr lang blabla 
und mit umbruechen blabal\n"
-                            "Zeile zwei mehr text blabla umbrauchuauaneh 
usnthu snaotehu nostehusano\n"
-                            "authh nth pte thuat nth auntheun tahneuth oentuh 
oentuhontu hoantuhetuh\n"
-                            "aoeuth htnh30  003 0238p[ 8eu ntuhnt hnthneat'hur 
 rcg rg th th tnh "));  
 
-  pages.push_back(StoryPage(ResDescriptor("Story/story3", "story"), 
-                            "Page 4Dies ist ein Tet blabla, sehr lang blabla 
und mit umbruechen blabal\n"
-                            "Zeile zwei mehr text blabla umbrauchuauaneh 
usnthu snaotehu nostehusano\n"
-                            "authh nth pte thuat nth auntheun tahneuth oentuh 
oentuhontu hoantuhetuh\n"
-                            "aoeuth htnh30  003 0238p[ 8eu ntuhnt hnthneat'hur 
 rcg rg th th tnh "));
+  pages.push_back
+    (StoryPage
+     (ResDescriptor("Story/story2", "story"), 
+      _("The snow began to melt away in a few regions and food became an\n"
+        "issue. Other animals already tend to leave the region to search\n"
+        "for colder areas, but the Pingus knew that this couldn't help,\n"
+        "they knew that they had to do something about this problem.")));
 
-  std::reverse(pages.begin(), pages.end());
+  pages.push_back
+    (StoryPage
+     (ResDescriptor("Story/story3", "story"), 
+      _("So the circle of the eldest came together to decide what to do\n"
+        "about it. They decided to send out an expedition around the world\n"
+        "to find the cause for this warming. The expedition consisted of\n"
+        "hundreds of the bravest Pingus around on the south pole.")));
+    
+  pages.push_back
+    (StoryPage
+     (ResDescriptor("Story/story4", "story"), 
+      _("And they picked you to lead them on there journey around the\n"
+        "world. Since the journey will be dangerous and difficult. Your\n"
+        "first goal is the Island of Mogorok, also know has Tutorial\n"
+        "Island. According to the eldest, this island has always been the\n"
+        "first stop of Pingus which where send out into the world.")));
 
-  current_page = pages.back();
-  page_surface = PingusResource::load_surface(current_page.image);
-  background   = PingusResource::load_surface("menu/startscreenbg", "core");
+  pages.push_back
+    (StoryPage
+     (ResDescriptor("Story/story5", "story"), 
+      _("The island consists of many regions which are ideally to train the\n"
+        "abilities of the Pingus. The Pingus can train there their ability\n"
+        "to build bridges, climb, bash and all the rest of there talents\n"
+        "which they will surly need on there long and dangerous journey.")));
+
+  pages.push_back
+    (StoryPage
+     (ResDescriptor("Story/story6", "story"), 
+      _("While you on the other site can practice there your ability to\n"
+        "command and guide the Pingus. You can also get familiar there with\n"
+        "all the abilities the Pingus provide and learn to master them,\n"
+        "since you will need them all for sure an your journey around the\n"
+        "world.")));
+
+  pages.push_back
+    (StoryPage
+     (ResDescriptor("Story/story6", "story"), 
+      _("Now that you and the Pingus have arrive at tutorial island it\n"
+        "is time to take over the command and begin your mission\n"
+        "\n"
+        "                                                  Good Luck!")));
+
+
+  /* 
+     Now after you and the Pingus have learned the basics and
+     practiced a bit it is time to move on and begin the journey into
+     the world. Since the floe with which the Pingus traveled to the
+     Tutorial Island isn't going to hold the whole way into the warmer
+     climated regions the Pingus have to find something else to guide
+     there on there journey.
+
+     But as the eldest have said, the Tutorial Island provides not
+     only a way to practive, but it is also the starting point into
+     the world, cause the wood if the large tree at the end of the
+     island is brings good wood to construct a float.
+     
+     So the Pingus set out and constructed a some large floats, enough
+     to carry them all. After also packaging up a bunch of provisions
+     they where prepared to finally start of there journey and leave
+     their familiar ground and entering the unknown parts of the
+     world.
+     
+     So the Pingus sat on there float, worrying whats to come and
+     where to go, while floating into the sunset.
+
+     To be continued...
+   */
+
+    std::reverse(pages.begin(), pages.end());
+
+    current_page = pages.back();
+    page_surface = PingusResource::load_surface(current_page.image);
+    background   = PingusResource::load_surface("menu/startscreenbg", "core");
 }
 
 void
 StoryScreenComponent::draw (GraphicContext& gc)
 {
   gc.draw(background, 0, 0);
-  gc.print_center(Fonts::chalk_large, 400, 100, "Chapter 1 - Training Day - 
,bD(B");
+  gc.print_center(Fonts::chalk_large, 400, 100, "Chapter I - Tutorial Island");
   gc.draw(page_surface,  gc.get_width()/2 - page_surface.get_width()/2,
           160);
   gc.print_left(Fonts::chalk_normal, 120, 335, display_text);

Index: true_server.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/true_server.cxx,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- true_server.cxx     29 Dec 2002 23:29:00 -0000      1.17
+++ true_server.cxx     5 Apr 2003 18:36:50 -0000       1.18
@@ -17,9 +17,9 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+#include "goal_manager.hxx"
 #include "true_server.hxx"
 
-
 TrueServer::TrueServer(PLF* arg_plf)
   : Server (arg_plf)
 {
@@ -72,6 +72,13 @@
 TrueServer::get_pause()
 {
   return pause;
+}
+
+void
+TrueServer::set_finished ()
+{
+  goal_manager->set_abort_goal();
+  set_pause(false);
 }
 
 /* EOF */

Index: true_server.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/true_server.hxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- true_server.hxx     4 Oct 2002 16:54:04 -0000       1.11
+++ true_server.hxx     5 Apr 2003 18:36:50 -0000       1.12
@@ -41,6 +41,10 @@
   
   void set_pause(bool);
   bool get_pause();
+
+  /** set the server into the finshed state, this is used when you
+      press ESCAPE inside a game */
+  void set_finished();
   
 private: 
   TrueServer (const TrueServer&);