[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src/worldobjs ice_block.cxx,1.3,1.4
From: |
grumbel |
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src/worldobjs ice_block.cxx,1.3,1.4 |
Date: |
28 Jun 2002 08:32:23 -0000 |
Update of /usr/local/cvsroot/Games/Pingus/src/worldobjs
In directory dark:/tmp/cvs-serv28920/worldobjs
Modified Files:
ice_block.cxx
Log Message:
- some cleanup to the GameTime class
- disabled some parts of the console
Index: ice_block.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/ice_block.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ice_block.cxx 25 Jun 2002 12:20:34 -0000 1.3
+++ ice_block.cxx 28 Jun 2002 08:32:21 -0000 1.4
@@ -126,11 +126,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_time ();
+ last_contact = GameTime::get_ticks ();
}
}
- if (last_contact && last_contact + 1000 > GameTime::get_time ())
+ if (last_contact && last_contact + 1000 > GameTime::get_ticks ())
{
//std::cout << "IceBlock: Catched Pingu: " << thickness << std::endl;
thickness -= 0.01f;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src/worldobjs ice_block.cxx,1.3,1.4,
grumbel <=
- Prev by Date:
[Pingus-CVS] CVS: Games/Pingus/src/editor sprite_editorobj.cxx,1.1,1.2
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus/src entrance.cxx,1.2,1.3 game_time.cxx,1.2,1.3 game_time.hxx,1.2,1.3 global_event.cxx,1.5,1.6 server.cxx,1.5,1.6 world.cxx,1.10,1.11
- Previous by thread:
[Pingus-CVS] CVS: Games/Pingus/src/editor sprite_editorobj.cxx,1.1,1.2
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus/src entrance.cxx,1.2,1.3 game_time.cxx,1.2,1.3 game_time.hxx,1.2,1.3 global_event.cxx,1.5,1.6 server.cxx,1.5,1.6 world.cxx,1.10,1.11
- Index(es):