[Pingus-CVS] CVS: Games/Pingus/src Makefile.am,1.149,1.150 pingus_main.cxx,1.83,1.84 playfield.cxx,1.33,1.34 playfield.hxx,1.14,1.15 story_screen.cxx,1.17,1.18 pingu_info.cxx,1.8,NONE pingu_info.hxx,1.5,NONE

[grumbel]

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

Modified Files:
        Makefile.am pingus_main.cxx playfield.cxx playfield.hxx 
        story_screen.cxx 
Removed Files:
        pingu_info.cxx pingu_info.hxx 
Log Message:
- removed obsolete file
- fixed double-click bug in story

Index: Makefile.am
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/Makefile.am,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -d -r1.149 -r1.150
--- Makefile.am 14 Apr 2003 17:56:36 -0000      1.149
+++ Makefile.am 15 Apr 2003 23:12:29 -0000      1.150
@@ -194,8 +194,6 @@
 pingu_enums.hxx \
 pingu_holder.cxx \
 pingu_holder.hxx \
-pingu_info.cxx \
-pingu_info.hxx \
 pingu_map.cxx \
 pingu_map.hxx \
 pingus.hxx \

Index: pingus_main.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/pingus_main.cxx,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- pingus_main.cxx     15 Apr 2003 19:06:50 -0000      1.83
+++ pingus_main.cxx     15 Apr 2003 23:12:29 -0000      1.84
@@ -505,7 +505,7 @@
         << "\n   -l, --level " << _("FILE      ") << _("Load a custom level 
from FILE")
         << "\n   --worldmap "<< _("FILE        ") << _("Load a custom worldmap 
from FILE")
         << "\n   -v, --verbose            " << _("Print some more messages to 
stdout, can be set")
-        << "\n                            " << _("multible times to increase 
verbosity")
+        << "\n                            " << _("multiple times to increase 
verbosity")
         << "\n   -V, --version            " << _("Prints version number and 
exit")
         << "\n   -e, --editor             " << _("Launch the Level editor 
(experimental)")
         << "\n   --disable-auto-scrolling " << _("Disable automatic scrolling")

Index: playfield.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/playfield.cxx,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- playfield.cxx       13 Apr 2003 22:00:55 -0000      1.33
+++ playfield.cxx       15 Apr 2003 23:12:29 -0000      1.34
@@ -263,12 +263,6 @@
   buttons = b;
 }
 
-void 
-Playfield::set_pingu_info(PinguInfo* p)
-{
-  pingu_info = p;
-}
-
 void
 Playfield::set_server(Server* s)
 {

Index: playfield.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/playfield.hxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- playfield.hxx       19 Feb 2003 10:37:31 -0000      1.14
+++ playfield.hxx       15 Apr 2003 23:12:29 -0000      1.15
@@ -28,7 +28,6 @@
 class Pingu;
 class World;
 class Server;
-class PinguInfo;
 class ButtonPanel;
 class Controller;
 
@@ -43,7 +42,6 @@
   Client* client;
   ///Range x_offset2, y_offset2;
   ButtonPanel* buttons;
-  PinguInfo* pingu_info;
   World* world;
   std::vector<View*> view;
   
@@ -88,7 +86,6 @@
   void generate_clipping_rects(int, int, int, int);
 
   /// Members used to communicate between different screen objs
-  void set_pingu_info(PinguInfo*);
   void set_buttons(ButtonPanel*);
   void set_server(Server*);
 

Index: story_screen.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/story_screen.cxx,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- story_screen.cxx    13 Apr 2003 22:00:55 -0000      1.17
+++ story_screen.cxx    15 Apr 2003 23:12:29 -0000      1.18
@@ -142,10 +142,10 @@
 
   if (!page_displayed_completly)
     {
-      int i = Math::min(current_page.text.length(), (unsigned int)(20.0f * 
time_passed));
-      display_text = current_page.text.substr(0, i);
+      unsigned int len = static_cast<unsigned int>(20.0f * time_passed);
+      display_text = current_page.text.substr(0, 
Math::min(current_page.text.length(), len));
 
-      if (current_page.text.length() < (unsigned int)(15.0f * time_passed))
+      if (current_page.text.length() < len)
         {
           page_displayed_completly = true;
         }

--- pingu_info.cxx DELETED ---

--- pingu_info.hxx DELETED ---