[Pingus-CVS] CVS: Games/Pingus/src Makefile.static,1.9,1.10 liquid.cxx,1.7,1.8 true_server.cxx,1.8,1.9 true_server.hxx,1.4,1.5

[grumbel]

Update of /usr/local/cvsroot/Games/Pingus/src
In directory dark:/tmp/cvs-serv32687/src

Modified Files:
        Makefile.static liquid.cxx true_server.cxx true_server.hxx 
Log Message:
- some release preperations

Index: Makefile.static
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Makefile.static,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Makefile.static     20 Jan 2002 14:25:12 -0000      1.9
+++ Makefile.static     24 Sep 2002 14:51:36 -0000      1.10
@@ -1,6 +1,20 @@
-LDADD = caimagemanipulation/libcaimagemanipulation.a         
worldobjs/libpingus_worldobjs.a   traps/libpingu_traps.a                  
actions/libpingu_actions.a              entrances/libpingus_entrances.a         
particles/libpingus_particle.a          editor/libpingus_editor.a               
backgrounds/libpingus_backgrounds.a               war/libpingus_war.a         
worldmap/libpingus_worldmap.a         generic/libpingus_generic.a
+LDADD = caimagemanipulation/libcaimagemanipulation.a \
+        worldobjsdata/libpingus_worldobjsdata.a \
+        worldobjs/libpingus_worldobjs.a \
+        editorobjs/libpingus_editorobjs.a \
+       actions/libpingu_actions.a \
+       entrances/libpingus_entrances.a \
+       particles/libpingus_particle.a \
+       editor/libpingus_editor.a \
+       gui/libpingus_gui.a \
+       worldmap/libpingus_worldmap.a \
+        input/libpingus_input.a \
+        input/axes/libpingus_input_axes.a \
+        input/buttons/libpingus_input_buttons.a \
+       input/pointers/libpingus_input_pointers.a \
+       input/scrollers/libpingus_input_scrollers.a
 
-LIBS =   -lclanCore -lclanDisplay -lclanApp -lclanPNG -lclanJPEG -lHermes \
+LIBS = -lclanGUI -lclanCore -lclanDisplay -lclanApp -lclanPNG -lclanJPEG 
-lHermes \
 -lclanDisplay -lclanMikMod -lclanVorbis -logg -lvorbis -logg -lmikmod 
-lclanCore -lclanSound \
 -L/usr/X11R6/lib/ \
 -lpthread \
@@ -26,7 +40,7 @@
 pingus.static.comp : pingus.static
        cp pingus.static pingus.static.comp
        strip pingus.static.comp
-       upx-nrv -q --best pingus.static.comp
+       upx-ucl -q --best pingus.static.comp
 
 pingus.static: Makefile.static pingus
        $(CXX) -s -O2 -Wall -static -o pingus.static *.o $(LDADD)  $(LIBS) 

Index: liquid.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/liquid.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- liquid.cxx  16 Sep 2002 20:31:09 -0000      1.7
+++ liquid.cxx  24 Sep 2002 14:51:36 -0000      1.8
@@ -54,7 +54,9 @@
 void
 Liquid::draw (GraphicContext& gc)
 {
-  for(int x = static_cast<int>(pos.x); x <= pos.x + width; x += 
sur.get_width())
+  for(int x = static_cast<int>(pos.x);
+      x < pos.x + width;
+      x += sur.get_width())
     gc.draw(sur, x, static_cast<int>(pos.y), static_cast<int>(counter));
   
   ++counter;

Index: true_server.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/true_server.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- true_server.cxx     14 Sep 2002 23:40:35 -0000      1.8
+++ true_server.cxx     24 Sep 2002 14:51:36 -0000      1.9
@@ -58,8 +58,6 @@
 
       if (fast_forward)
        {
-         
-
          // To let the game run faster we just update it multiple
          // times
          for (int i = 0; i < 4; ++i)
@@ -74,6 +72,11 @@
          world->update(delta);
        }
     }
+  else
+    {
+      std::cout << "Sleeping: " << time_till_next_update() << std::endl;
+      CL_System::sleep(time_till_next_update());
+    }
 }
 
 bool
@@ -97,6 +100,12 @@
       return true;
     }
   }
+}
+
+int
+TrueServer::time_till_next_update()
+{
+  return last_time + local_game_speed - CL_System::get_time();
 }
 
 void

Index: true_server.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/true_server.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- true_server.hxx     23 Aug 2002 15:49:51 -0000      1.4
+++ true_server.hxx     24 Sep 2002 14:51:36 -0000      1.5
@@ -41,7 +41,6 @@
   TrueServer(PLF* plf);
   virtual ~TrueServer();
 
-  bool enough_time_passed(void);
   void update(float delta);
   bool needs_redraw();
   /** Return a reference to the plf used for this level */
@@ -56,6 +55,9 @@
   bool get_armageddon ();
   
 private:
+  bool enough_time_passed(void);
+  int  time_till_next_update();
+  
   TrueServer (const TrueServer&);
   TrueServer operator= (const TrueServer&);
 };