[Pingus-CVS] CVS: Games/Pingus/src/worldobjs ice_block.cxx,1.4,1.5

[grumbel]

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

Modified Files:
        ice_block.cxx 
Log Message:
- changed gametime to become a member of the World instead of a singleton
- fixed a bug in the walker (a bridge on a hill works now)

Index: ice_block.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/ice_block.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ice_block.cxx       28 Jun 2002 08:32:21 -0000      1.4
+++ ice_block.cxx       28 Jun 2002 09:51:46 -0000      1.5
@@ -28,6 +28,7 @@
 #include "ice_block.hxx"
 #include "../pingu.hxx"
 #include "../boost/smart_ptr.hpp"
+#include "../game_time.hxx"
 
 IceBlockData::IceBlockData () : width(1)
 {
@@ -126,11 +127,11 @@
       if ((*pingu)->get_x() > pos.x && (*pingu)->get_x() < pos.x + 
block_sur.get_width()
          && (*pingu)->get_y() > pos.y - 4 && (*pingu)->get_y() < pos.y + 
block_sur.get_height())
        {
-         last_contact = GameTime::get_ticks ();
+         last_contact = world->get_game_time()->get_ticks ();
        }
     }
 
-  if (last_contact && last_contact + 1000 > GameTime::get_ticks ())
+  if (last_contact && last_contact + 1000 > world->get_game_time ()->get_ticks 
())
     {
       //std::cout << "IceBlock: Catched Pingu: " << thickness  << std::endl;
       thickness -= 0.01f;