[Pingus-CVS] CVS: Games/Pingus/src Makefile.static,1.14,1.15 cheat.cxx,1.1,1.2 game_session.cxx,1.32,1.33 smallmap.cxx,1.33,1.34

[grumbel]

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

Modified Files:
        Makefile.static cheat.cxx game_session.cxx smallmap.cxx 
Log Message:
bunch of small things


Index: Makefile.static
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Makefile.static,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- Makefile.static     10 Mar 2003 11:47:58 -0000      1.14
+++ Makefile.static     16 Mar 2003 23:07:02 -0000      1.15
@@ -52,7 +52,7 @@
 -lz \
 -ltiff \
 -ljpeg \
--lpng \
+libpng.a \
 -lXext \
 -lXt \
 -lX11 \
@@ -71,6 +71,11 @@
 
 pingus.static: Makefile.static pingus
        $(CXX) -s -O2 -Wall -static -o pingus.static $(OBJECTS) $(LDADD)  
$(LIBS) 
+
+upload: /home/ingo/projects/pingus/files/betatesting/linux/$(FILENAME)
+        FILENAME=pingus-`date -I`; \
+        cp -v pingus.static.comp 
/home/ingo/projects/pingus/files/betatesting/linux/$FILENAME; \
+        ( cd /home/ingo/projects/pingus/files/betatesting/linux/; ln -sf 
$FILENAME pingus-current )
 
 clean :
        rm -f pingus.static.comp pingus.static

Index: cheat.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/cheat.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- cheat.cxx   8 Nov 2002 01:38:27 -0000       1.1
+++ cheat.cxx   16 Mar 2003 23:07:02 -0000      1.2
@@ -35,6 +35,7 @@
   else if (cheat == "all-actions" || cheat == "aa") 
     {
       all_actions = true;
+      unlimited_actions = true;
     }
   else if (cheat == "no-time-limit" || cheat == "nt")
     {
@@ -57,7 +58,7 @@
     << "Pingus Cheats\n"
     << "-------------\n"
     << "  unlimited-actions(ua) - the number of available actions is not 
limited\n"
-    << "  all-actions(aa)       - all actions are available in all levels\n"
+    << "  all-actions(aa)       - all actions are available in all levels and 
unlimited\n"
     << "  no-time-limit(nt)     - time limit is disabled everywhere\n"
     << std::endl;
   

Index: game_session.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/game_session.cxx,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- game_session.cxx    10 Mar 2003 11:29:49 -0000      1.32
+++ game_session.cxx    16 Mar 2003 23:07:02 -0000      1.33
@@ -26,6 +26,8 @@
 #include "timer.hxx"
 #include "pingus_resource.hxx"
 #include "plf.hxx"
+#include "pingu_holder.hxx"
+#include "world.hxx"
 #include "result_screen.hxx"
 #include "globals.hxx"
 
@@ -95,7 +97,20 @@
   if (server->is_finished())
     {
       //ScreenManager::instance()->pop_screen();
+      PinguHolder* pingu_holder = server->get_world()->get_pingus();
       Result result;
+      
+      result.plf    = server->get_plf();
+
+      result.saved  = pingu_holder->get_number_of_exited();
+      result.killed = pingu_holder->get_number_of_killed();
+      result.total  = server->get_plf()->get_pingus();
+
+      result.needed = server->get_plf()->get_number_to_save();
+
+      result.max_time  = server->get_plf()->get_time();
+      result.used_time = server->get_time();
+
       ScreenManager::instance()->replace_screen(new ResultScreen(result));
       return;
     }

Index: smallmap.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/smallmap.cxx,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- smallmap.cxx        5 Mar 2003 22:18:51 -0000       1.33
+++ smallmap.cxx        16 Mar 2003 23:07:02 -0000      1.34
@@ -135,18 +135,22 @@
               break;
               
             case Groundtype::GP_WATER:
+            case Groundtype::GP_LAVA:
               cbuffer[i + 0] = 255;
              cbuffer[i + 1] = 0;
              cbuffer[i + 2] = 0;
              cbuffer[i + 3] = 200;
               break;
 
+#if 0
+              // FIXME: temporaty disabled for 0.6.0 release, since all 
liquids are currently lava
             case Groundtype::GP_LAVA:
               cbuffer[i + 0] = 255;
              cbuffer[i + 1] = 200;
              cbuffer[i + 2] = 0;
              cbuffer[i + 3] = 0;
               break;
+#endif
               
             case Groundtype::GP_SOLID:
               cbuffer[i + 0] = 255;
@@ -171,7 +175,7 @@
   //surface_timer.stop();
 
   x_pos = 5;
-  y_pos = CL_Display::get_height() - sur.get_height();
+  y_pos = CL_Display::get_height() - sur.get_height() - 5;
 
   rwidth = CL_Display::get_width() * width / 
client->get_server()->get_world()->get_colmap()->get_width();
   rheight = CL_Display::get_height() * height / 
client->get_server()->get_world()->get_colmap()->get_height();