[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src/worldobjs bumper.cxx,1.8,1.9 bumper.h
From: |
grumbel |
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src/worldobjs bumper.cxx,1.8,1.9 bumper.hxx,1.6,1.7 conveyor_belt.cxx,1.18,1.19 conveyor_belt.hxx,1.15,1.16 entrance.cxx,1.2,1.3 entrance.hxx,1.1,1.2 exit.cxx,1.2,1.3 exit.hxx,1.1,1.2 fake_exit.cxx,1.7,1.8 fake_exit.hxx,1.5,1.6 guillotine.cxx,1.5,1.6 guillotine.hxx,1.5,1.6 hammer.cxx,1.5,1.6 hammer.hxx,1.6,1.7 ice_block.cxx,1.18,1.19 ice_block.hxx,1.14,1.15 info_box.cxx,1.16,1.17 info_box.hxx,1.14,1.15 laser_exit.cxx,1.6,1.7 laser_exit.hxx,1.5,1.6 rain_generator.cxx,1.4,1.5 rain_generator.hxx,1.5,1.6 smasher.cxx,1.10,1.11 smasher.hxx,1.6,1.7 snow_generator.cxx,1.3,1.4 snow_generator.hxx,1.4,1.5 solid_color_background.hxx,1.3,1.4 spike.cxx,1.5,1.6 spike.hxx,1.5,1.6 starfield_background.cxx,1.3,1.4 starfield_background.hxx,1.5,1.6 starfield_background_stars.cxx,1.3,1.4 starfield_background_stars.hxx,1.3,1.4 surface_background.cxx,1.3,1.4 surface_background.hxx,1.4,1.5 switch_door.cxx,1.20,1.21 switch_door.hxx,1.17,1.18 teleporter.cxx,1.12,1.13 teleporter.hxx,1.15,1.16 thunderstorm_background.cxx,1.2,1.3 thunderstorm_background.hxx,1.4,1.5 worldobj_group.cxx,1.4,1.5 worldobj_group.hxx,1.5,1.6 |
Date: |
1 Oct 2002 19:53:49 -0000 |
Update of /usr/local/cvsroot/Games/Pingus/src/worldobjs
In directory dark:/tmp/cvs-serv24138/worldobjs
Modified Files:
bumper.cxx bumper.hxx conveyor_belt.cxx conveyor_belt.hxx
entrance.cxx entrance.hxx exit.cxx exit.hxx fake_exit.cxx
fake_exit.hxx guillotine.cxx guillotine.hxx hammer.cxx
hammer.hxx ice_block.cxx ice_block.hxx info_box.cxx
info_box.hxx laser_exit.cxx laser_exit.hxx rain_generator.cxx
rain_generator.hxx smasher.cxx smasher.hxx snow_generator.cxx
snow_generator.hxx solid_color_background.hxx spike.cxx
spike.hxx starfield_background.cxx starfield_background.hxx
starfield_background_stars.cxx starfield_background_stars.hxx
surface_background.cxx surface_background.hxx switch_door.cxx
switch_door.hxx teleporter.cxx teleporter.hxx
thunderstorm_background.cxx thunderstorm_background.hxx
worldobj_group.cxx worldobj_group.hxx
Log Message:
- riped 'float delta' out of the engine code
- some worldmap stuff
Index: bumper.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/bumper.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- bumper.cxx 28 Sep 2002 11:52:26 -0000 1.8
+++ bumper.cxx 1 Oct 2002 19:53:45 -0000 1.9
@@ -49,7 +49,7 @@
}
void
-Bumper::update (float delta)
+Bumper::update ()
{
PinguHolder* holder = world->get_pingu_p ();
for (PinguIter pingu = holder->begin (); pingu != holder->end (); ++pingu) {
@@ -65,8 +65,6 @@
upwards = false;
}
}
-
- UNUSED_ARG(delta);
}
void
Index: bumper.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/bumper.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- bumper.hxx 27 Sep 2002 18:36:40 -0000 1.6
+++ bumper.hxx 1 Oct 2002 19:53:45 -0000 1.7
@@ -45,7 +45,7 @@
void draw (GraphicContext& gc);
void on_startup();
- void update (float delta);
+ void update ();
private:
void catch_pingu (Pingu* pingu);
Index: conveyor_belt.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/conveyor_belt.cxx,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- conveyor_belt.cxx 28 Sep 2002 11:52:26 -0000 1.18
+++ conveyor_belt.cxx 1 Oct 2002 19:53:46 -0000 1.19
@@ -64,9 +64,9 @@
}
void
-ConveyorBelt::update (float delta)
+ConveyorBelt::update ()
{
- data->counter += data->speed * delta;
+ data->counter += data->speed * 0.025f;
if (data->counter >= 14.0f)
data->counter = 0.0f;
@@ -82,7 +82,7 @@
&& (*pingu)->get_y() < data->pos.y + 10)
{
Vector pos = (*pingu)->get_pos();
- data->pos.x -= data->speed * delta;
+ data->pos.x -= data->speed * 0.025f;
(*pingu)->set_pos(pos);
}
}
Index: conveyor_belt.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/conveyor_belt.hxx,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- conveyor_belt.hxx 28 Sep 2002 11:52:26 -0000 1.15
+++ conveyor_belt.hxx 1 Oct 2002 19:53:46 -0000 1.16
@@ -45,7 +45,7 @@
void draw (GraphicContext& gc);
void on_startup ();
- void update (float delta);
+ void update ();
float get_z_pos () const;
private:
Index: entrance.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/entrance.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- entrance.cxx 28 Sep 2002 11:52:26 -0000 1.2
+++ entrance.cxx 1 Oct 2002 19:53:46 -0000 1.3
@@ -103,7 +103,7 @@
}
void
-Entrance::update (float /*delta*/)
+Entrance::update ()
{
if ( pingu_ready()
&& (world->get_released_pingus() < world->get_allowed_pingus())
Index: entrance.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/entrance.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- entrance.hxx 27 Sep 2002 11:26:49 -0000 1.1
+++ entrance.hxx 1 Oct 2002 19:53:46 -0000 1.2
@@ -50,7 +50,7 @@
virtual bool pingu_ready ();
virtual Pingu* get_pingu ();
- virtual void update (float delta);
+ virtual void update ();
virtual void draw (GraphicContext& gc);
Index: exit.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/exit.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- exit.cxx 28 Sep 2002 11:52:26 -0000 1.2
+++ exit.cxx 1 Oct 2002 19:53:46 -0000 1.3
@@ -70,9 +70,9 @@
}
void
-Exit::update (float delta)
+Exit::update ()
{
- sprite.update(delta);
+ sprite.update();
PinguHolder* holder = world->get_pingu_p();
Index: exit.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/exit.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- exit.hxx 27 Sep 2002 16:01:55 -0000 1.1
+++ exit.hxx 1 Oct 2002 19:53:46 -0000 1.2
@@ -43,7 +43,7 @@
void on_startup ();
void draw (GraphicContext& gc);
- void update (float delta);
+ void update ();
float get_z_pos () const;
Index: fake_exit.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/fake_exit.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- fake_exit.cxx 28 Sep 2002 11:52:26 -0000 1.7
+++ fake_exit.cxx 1 Oct 2002 19:53:46 -0000 1.8
@@ -58,7 +58,7 @@
void
-FakeExit::update (float delta)
+FakeExit::update ()
{
PinguHolder* holder = world->get_pingu_p ();
for (PinguIter pingu = holder->begin (); pingu != holder->end (); ++pingu){
@@ -67,8 +67,6 @@
if (smashing)
++data->counter;
-
- UNUSED_ARG(delta);
}
void
Index: fake_exit.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/fake_exit.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- fake_exit.hxx 27 Sep 2002 18:36:41 -0000 1.5
+++ fake_exit.hxx 1 Oct 2002 19:53:46 -0000 1.6
@@ -47,7 +47,7 @@
void draw (GraphicContext& gc);
- void update (float delta);
+ void update ();
private:
void catch_pingu (Pingu*);
Index: guillotine.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/guillotine.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- guillotine.cxx 27 Sep 2002 18:36:41 -0000 1.5
+++ guillotine.cxx 1 Oct 2002 19:53:46 -0000 1.6
@@ -67,7 +67,7 @@
}
void
-Guillotine::update (float delta)
+Guillotine::update ()
{
if (data->counter.finished()) {
data->counter = 0;
@@ -83,8 +83,6 @@
} else {
++data->idle_counter;
}
-
- UNUSED_ARG(delta);
}
void
Index: guillotine.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/guillotine.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- guillotine.hxx 27 Sep 2002 18:36:41 -0000 1.5
+++ guillotine.hxx 1 Oct 2002 19:53:46 -0000 1.6
@@ -42,7 +42,7 @@
float get_z_pos () const;
- void update (float delta);
+ void update ();
void draw (GraphicContext& gc);
protected:
void catch_pingu (Pingu*);
Index: hammer.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/hammer.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- hammer.cxx 27 Sep 2002 18:36:41 -0000 1.5
+++ hammer.cxx 1 Oct 2002 19:53:46 -0000 1.6
@@ -52,7 +52,7 @@
}
void
-Hammer::update (float delta)
+Hammer::update ()
{
if ( !data->counter)
particle_thrown = false;
@@ -73,7 +73,6 @@
*/
}
++data->counter;
- UNUSED_ARG(delta);
}
void
Index: hammer.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/hammer.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- hammer.hxx 27 Sep 2002 18:36:41 -0000 1.6
+++ hammer.hxx 1 Oct 2002 19:53:46 -0000 1.7
@@ -43,7 +43,7 @@
float get_z_pos () const;
void draw (GraphicContext& gc);
- void update (float delta);
+ void update ();
protected:
void catch_pingu (Pingu*);
Index: ice_block.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/ice_block.cxx,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- ice_block.cxx 28 Sep 2002 11:52:26 -0000 1.18
+++ ice_block.cxx 1 Oct 2002 19:53:46 -0000 1.19
@@ -67,7 +67,7 @@
}
void
-IceBlock::update (float /*delta*/)
+IceBlock::update()
{
if (is_finished)
return;
Index: ice_block.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/ice_block.hxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- ice_block.hxx 28 Sep 2002 11:52:26 -0000 1.14
+++ ice_block.hxx 1 Oct 2002 19:53:46 -0000 1.15
@@ -46,7 +46,7 @@
float get_z_pos () const { return 100; }
void on_startup ();
void draw (GraphicContext& gc);
- void update (float delta);
+ void update ();
private:
IceBlock (const IceBlock&);
Index: info_box.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/info_box.cxx,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- info_box.cxx 28 Sep 2002 11:52:26 -0000 1.16
+++ info_box.cxx 1 Oct 2002 19:53:46 -0000 1.17
@@ -71,9 +71,9 @@
}
void
-InfoBox::update (float delta)
+InfoBox::update ()
{
- data->sprite.update(delta);
+ data->sprite.update();
PinguHolder* holder = world->get_pingu_p();
for (PinguIter pingu = holder->begin (); pingu != holder->end (); ++pingu)
Index: info_box.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/info_box.hxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- info_box.hxx 27 Sep 2002 18:36:41 -0000 1.14
+++ info_box.hxx 1 Oct 2002 19:53:46 -0000 1.15
@@ -41,7 +41,7 @@
~InfoBox ();
void draw (GraphicContext& gc);
- void update (float delta);
+ void update ();
float get_z_pos () const;
private:
Index: laser_exit.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/laser_exit.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- laser_exit.cxx 27 Sep 2002 18:36:41 -0000 1.6
+++ laser_exit.cxx 1 Oct 2002 19:53:46 -0000 1.7
@@ -55,7 +55,7 @@
}
void
-LaserExit::update (float delta)
+LaserExit::update ()
{
PinguHolder* holder = world->get_pingu_p ();
@@ -71,8 +71,6 @@
++data->counter;
}
}
-
- UNUSED_ARG(delta);
}
void
Index: laser_exit.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/laser_exit.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- laser_exit.hxx 27 Sep 2002 18:36:41 -0000 1.5
+++ laser_exit.hxx 1 Oct 2002 19:53:46 -0000 1.6
@@ -43,7 +43,7 @@
float get_z_pos () const;
void draw (GraphicContext& gc);
- void update (float delta);
+ void update ();
protected:
void catch_pingu (Pingu*);
Index: rain_generator.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/rain_generator.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- rain_generator.cxx 28 Sep 2002 11:52:26 -0000 1.4
+++ rain_generator.cxx 1 Oct 2002 19:53:46 -0000 1.5
@@ -55,7 +55,7 @@
}
void
-RainGenerator::update(float delta)
+RainGenerator::update()
{
if (waiter_count < 0.0f && rand () % 150 == 0)
{
@@ -67,9 +67,9 @@
}
if (do_thunder)
- thunder_count -= 10.0 * delta;
+ thunder_count -= 10.0 * 0.025f;
- waiter_count -= 20.0 * delta;
+ waiter_count -= 20.0 * 0.025f;
get_world()->get_particle_holder()->add_particle(new RainParticle(rand() %
world->get_width(), -32));
get_world()->get_particle_holder()->add_particle(new RainParticle(rand() %
world->get_width(), -32));
Index: rain_generator.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/rain_generator.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- rain_generator.hxx 27 Sep 2002 18:36:41 -0000 1.5
+++ rain_generator.hxx 1 Oct 2002 19:53:46 -0000 1.6
@@ -34,7 +34,7 @@
RainGenerator ();
~RainGenerator ();
- void update (float delta);
+ void update ();
void draw (GraphicContext& gc);
float get_z_pos () const { return 1000; }
Index: smasher.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/smasher.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- smasher.cxx 28 Sep 2002 11:52:26 -0000 1.10
+++ smasher.cxx 1 Oct 2002 19:53:46 -0000 1.11
@@ -54,7 +54,7 @@
}
void
-Smasher::update (float delta)
+Smasher::update ()
{
PinguHolder* holder = world->get_pingu_p();
@@ -108,8 +108,6 @@
}
}
}
-
- UNUSED_ARG(delta);
}
void
Index: smasher.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/smasher.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- smasher.hxx 27 Sep 2002 18:36:41 -0000 1.6
+++ smasher.hxx 1 Oct 2002 19:53:46 -0000 1.7
@@ -46,7 +46,7 @@
void draw (GraphicContext& gc);
void on_startup ();
- void update (float delta);
+ void update ();
protected:
void catch_pingu (Pingu* pingu);
Index: snow_generator.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/snow_generator.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- snow_generator.cxx 16 Sep 2002 17:17:17 -0000 1.3
+++ snow_generator.cxx 1 Oct 2002 19:53:46 -0000 1.4
@@ -33,7 +33,7 @@
}
void
-SnowGenerator::update(float /*delta*/)
+SnowGenerator::update()
{
world->get_particle_holder()->add_particle(new SnowParticle(rand() %
world->get_width(), -32));
world->get_particle_holder()->add_particle(new SnowParticle(rand() %
world->get_width(), -32));
Index: snow_generator.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/snow_generator.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- snow_generator.hxx 27 Sep 2002 11:26:49 -0000 1.4
+++ snow_generator.hxx 1 Oct 2002 19:53:46 -0000 1.5
@@ -35,7 +35,7 @@
/** fill the screen with snow flocks */
void on_startup();
void draw(GraphicContext&) {}
- void update(float delta);
+ void update();
float get_z_pos() const { return 1000; }
private:
SnowGenerator (const SnowGenerator&);
Index: solid_color_background.hxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/worldobjs/solid_color_background.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- solid_color_background.hxx 27 Sep 2002 18:36:41 -0000 1.3
+++ solid_color_background.hxx 1 Oct 2002 19:53:46 -0000 1.4
@@ -39,7 +39,7 @@
// FIXME: Make z_position editable
float get_z_pos () const { return -10; }
- void update (float delta) { UNUSED_ARG(delta); }
+ void update () {}
void draw_offset (int x_of, int y_of, float s = 1.0);
Index: spike.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/spike.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- spike.cxx 27 Sep 2002 18:36:41 -0000 1.5
+++ spike.cxx 1 Oct 2002 19:53:46 -0000 1.6
@@ -57,7 +57,7 @@
}
void
-Spike::update (float /*delta*/)
+Spike::update()
{
if (killing)
++data->counter;
Index: spike.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/spike.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- spike.hxx 27 Sep 2002 18:36:41 -0000 1.5
+++ spike.hxx 1 Oct 2002 19:53:46 -0000 1.6
@@ -44,7 +44,7 @@
float get_z_pos () const;
void draw (GraphicContext& gc);
- void update (float delta);
+ void update ();
protected:
void catch_pingu (Pingu*);
Index: starfield_background.cxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/worldobjs/starfield_background.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- starfield_background.cxx 27 Sep 2002 18:36:41 -0000 1.3
+++ starfield_background.cxx 1 Oct 2002 19:53:46 -0000 1.4
@@ -48,12 +48,12 @@
void
-StarfieldBackground::update (float delta)
+StarfieldBackground::update ()
{
for (std::vector<StarfieldBackgroundStars*>::iterator i = stars.begin();
i != stars.end(); ++i)
{
- (*i)->update (delta);
+ (*i)->update ();
}
}
Index: starfield_background.hxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/worldobjs/starfield_background.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- starfield_background.hxx 28 Sep 2002 11:52:26 -0000 1.5
+++ starfield_background.hxx 1 Oct 2002 19:53:46 -0000 1.6
@@ -44,7 +44,7 @@
// FIXME: Make z_pos handling editable via xml
float get_z_pos() const { return -10; }
- void update (float delta);
+ void update ();
void draw (GraphicContext& gc);
private:
Index: starfield_background_stars.cxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/worldobjs/starfield_background_stars.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- starfield_background_stars.cxx 28 Sep 2002 11:52:26 -0000 1.3
+++ starfield_background_stars.cxx 1 Oct 2002 19:53:46 -0000 1.4
@@ -66,7 +66,7 @@
}
void
-StarfieldBackgroundStars::update (float delta)
+StarfieldBackgroundStars::update ()
{
x_pos += x_add;
y_pos += y_add;
@@ -76,7 +76,6 @@
x_pos = -32;
y_pos = rand() % world->get_height();
}
- UNUSED_ARG(delta);
}
void
Index: starfield_background_stars.hxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/worldobjs/starfield_background_stars.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- starfield_background_stars.hxx 27 Sep 2002 11:26:49 -0000 1.3
+++ starfield_background_stars.hxx 1 Oct 2002 19:53:46 -0000 1.4
@@ -51,7 +51,7 @@
float get_z_pos () const { return -100; }
void init ();
- void update (float delta);
+ void update ();
void draw (GraphicContext& gc);
private:
Index: surface_background.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/surface_background.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- surface_background.cxx 28 Sep 2002 11:52:26 -0000 1.3
+++ surface_background.cxx 1 Oct 2002 19:53:46 -0000 1.4
@@ -117,7 +117,7 @@
}
void
-SurfaceBackground::update (float /*delta*/)
+SurfaceBackground::update()
{
counter++;
Index: surface_background.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/surface_background.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- surface_background.hxx 28 Sep 2002 11:52:26 -0000 1.4
+++ surface_background.hxx 1 Oct 2002 19:53:46 -0000 1.5
@@ -51,7 +51,7 @@
float get_z_pos () const;
- void update (float delta);
+ void update ();
void draw (GraphicContext& gc);
private:
Index: switch_door.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/switch_door.cxx,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- switch_door.cxx 28 Sep 2002 11:52:26 -0000 1.20
+++ switch_door.cxx 1 Oct 2002 19:53:46 -0000 1.21
@@ -76,7 +76,7 @@
}
void
-SwitchDoor::update (float /*delta*/)
+SwitchDoor::update ()
{
if (current_door_height > 0)
{
Index: switch_door.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/switch_door.hxx,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- switch_door.hxx 28 Sep 2002 11:52:26 -0000 1.17
+++ switch_door.hxx 1 Oct 2002 19:53:46 -0000 1.18
@@ -54,7 +54,7 @@
void on_startup();
void draw (GraphicContext& gc);
- void update (float delta);
+ void update ();
/// The switch and the door should stay above the pingus
float get_z_pos() const { return 100; }
Index: teleporter.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/teleporter.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- teleporter.cxx 28 Sep 2002 11:52:26 -0000 1.12
+++ teleporter.cxx 1 Oct 2002 19:53:46 -0000 1.13
@@ -58,10 +58,10 @@
}
void
-Teleporter::update (float delta)
+Teleporter::update ()
{
- data->sprite.update(delta);
- data->target_sprite.update(delta);
+ data->sprite.update();
+ data->target_sprite.update();
PinguHolder* holder = world->get_pingu_p();
Index: teleporter.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/teleporter.hxx,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- teleporter.hxx 27 Sep 2002 18:36:41 -0000 1.15
+++ teleporter.hxx 1 Oct 2002 19:53:46 -0000 1.16
@@ -39,7 +39,7 @@
int get_z_pos () { return 0; }
void draw (GraphicContext& gc);
- void update (float delta);
+ void update ();
float get_z_pos () const;
private:
Index: thunderstorm_background.cxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/worldobjs/thunderstorm_background.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- thunderstorm_background.cxx 27 Sep 2002 18:36:41 -0000 1.2
+++ thunderstorm_background.cxx 1 Oct 2002 19:53:46 -0000 1.3
@@ -44,7 +44,7 @@
}
void
-ThunderstormBackground::update (float /*delta*/)
+ThunderstormBackground::update ()
{
++x_pos;
if (x_pos >= static_cast<int>(clouds_sur.get_width()))
Index: thunderstorm_background.hxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/worldobjs/thunderstorm_background.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- thunderstorm_background.hxx 28 Sep 2002 11:52:26 -0000 1.4
+++ thunderstorm_background.hxx 1 Oct 2002 19:53:46 -0000 1.5
@@ -43,7 +43,7 @@
float get_z_pos () const;
- void update (float delta);
+ void update ();
void draw_offset (int x_of, int y_of, float s = 1.0);
private:
Index: worldobj_group.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/worldobj_group.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- worldobj_group.cxx 16 Sep 2002 10:18:51 -0000 1.4
+++ worldobj_group.cxx 1 Oct 2002 19:53:46 -0000 1.5
@@ -28,10 +28,10 @@
}
void
-WorldObjGroup::update (float delta)
+WorldObjGroup::update ()
{
for (std::vector<WorldObj*>::iterator i = objs.begin (); i != objs.end ();
++i)
- (*i)->update (delta);
+ (*i)->update ();
}
void
Index: worldobj_group.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/worldobj_group.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- worldobj_group.hxx 27 Sep 2002 11:26:49 -0000 1.5
+++ worldobj_group.hxx 1 Oct 2002 19:53:46 -0000 1.6
@@ -34,7 +34,7 @@
public:
WorldObjGroup (const WorldObjsData::WorldObjGroupData& data_);
- void update (float delta);
+ void update ();
void draw (GraphicContext& gc);
// FIXME: Position handling is incorrect...
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src/worldobjs bumper.cxx,1.8,1.9 bumper.hxx,1.6,1.7 conveyor_belt.cxx,1.18,1.19 conveyor_belt.hxx,1.15,1.16 entrance.cxx,1.2,1.3 entrance.hxx,1.1,1.2 exit.cxx,1.2,1.3 exit.hxx,1.1,1.2 fake_exit.cxx,1.7,1.8 fake_exit.hxx,1.5,1.6 guillotine.cxx,1.5,1.6 guillotine.hxx,1.5,1.6 hammer.cxx,1.5,1.6 hammer.hxx,1.6,1.7 ice_block.cxx,1.18,1.19 ice_block.hxx,1.14,1.15 info_box.cxx,1.16,1.17 info_box.hxx,1.14,1.15 laser_exit.cxx,1.6,1.7 laser_exit.hxx,1.5,1.6 rain_generator.cxx,1.4,1.5 rain_generator.hxx,1.5,1.6 smasher.cxx,1.10,1.11 smasher.hxx,1.6,1.7 snow_generator.cxx,1.3,1.4 snow_generator.hxx,1.4,1.5 solid_color_background.hxx,1.3,1.4 spike.cxx,1.5,1.6 spike.hxx,1.5,1.6 starfield_background.cxx,1.3,1.4 starfield_background.hxx,1.5,1.6 starfield_background_stars.cxx,1.3,1.4 starfield_background_stars.hxx,1.3,1.4 surface_background.cxx,1.3,1.4 surface_background.hxx,1.4,1.5 switch_door.cxx,1.20,1.21 switch_door.hxx,1.17,1.18 teleporter.cxx,1.12,1.13 teleporter.hxx,1.15,1.16 thunderstorm_background.cxx,1.2,1.3 thunderstorm_background.hxx,1.4,1.5 worldobj_group.cxx,1.4,1.5 worldobj_group.hxx,1.5,1.6,
grumbel <=
- Prev by Date:
[Pingus-CVS] CVS: Games/Pingus/src/actions angel.cxx,1.11,1.12 angel.hxx,1.11,1.12 basher.cxx,1.16,1.17 basher.hxx,1.11,1.12 blocker.cxx,1.11,1.12 blocker.hxx,1.11,1.12 boarder.cxx,1.10,1.11 boarder.hxx,1.10,1.11 bomber.cxx,1.14,1.15 bomber.hxx,1.12,1.13 bridger.cxx,1.19,1.20 bridger.hxx,1.14,1.15 climber.cxx,1.13,1.14 climber.hxx,1.10,1.11 digger.cxx,1.15,1.16 digger.hxx,1.9,1.10 drown.cxx,1.9,1.10 drown.hxx,1.9,1.10 exiter.cxx,1.9,1.10 exiter.hxx,1.9,1.10 faller.cxx,1.25,1.26 faller.hxx,1.14,1.15 floater.cxx,1.17,1.18 floater.hxx,1.11,1.12 jumper.cxx,1.13,1.14 jumper.hxx,1.9,1.10 laser_kill.cxx,1.10,1.11 laser_kill.hxx,1.10,1.11 miner.cxx,1.12,1.13 miner.hxx,1.9,1.10 rocket_launcher.cxx,1.9,1.10 rocket_launcher.hxx,1.9,1.10 slider.cxx,1.11,1.12 slider.hxx,1.9,1.10 smashed.cxx,1.9,1.10 smashed.hxx,1.10,1.11 splashed.cxx,1.9,1.10 splashed.hxx,1.10,1.11 superman.cxx,1.7,1.8 superman.hxx,1.10,1.11 teleported.cxx,1.8,1.9 teleported.hxx,1.9,1.10 waiter.cxx,1.9,1.10 waiter.hxx,1.9,1.10 walker.cxx,1.24,1.25 walker.hxx,1.9,1.10
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus/src/editor editor.hxx,1.18,1.19
- Previous by thread:
[Pingus-CVS] CVS: Games/Pingus/src/actions angel.cxx,1.11,1.12 angel.hxx,1.11,1.12 basher.cxx,1.16,1.17 basher.hxx,1.11,1.12 blocker.cxx,1.11,1.12 blocker.hxx,1.11,1.12 boarder.cxx,1.10,1.11 boarder.hxx,1.10,1.11 bomber.cxx,1.14,1.15 bomber.hxx,1.12,1.13 bridger.cxx,1.19,1.20 bridger.hxx,1.14,1.15 climber.cxx,1.13,1.14 climber.hxx,1.10,1.11 digger.cxx,1.15,1.16 digger.hxx,1.9,1.10 drown.cxx,1.9,1.10 drown.hxx,1.9,1.10 exiter.cxx,1.9,1.10 exiter.hxx,1.9,1.10 faller.cxx,1.25,1.26 faller.hxx,1.14,1.15 floater.cxx,1.17,1.18 floater.hxx,1.11,1.12 jumper.cxx,1.13,1.14 jumper.hxx,1.9,1.10 laser_kill.cxx,1.10,1.11 laser_kill.hxx,1.10,1.11 miner.cxx,1.12,1.13 miner.hxx,1.9,1.10 rocket_launcher.cxx,1.9,1.10 rocket_launcher.hxx,1.9,1.10 slider.cxx,1.11,1.12 slider.hxx,1.9,1.10 smashed.cxx,1.9,1.10 smashed.hxx,1.10,1.11 splashed.cxx,1.9,1.10 splashed.hxx,1.10,1.11 superman.cxx,1.7,1.8 superman.hxx,1.10,1.11 teleported.cxx,1.8,1.9 teleported.hxx,1.9,1.10 waiter.cxx,1.9,1.10 waiter.hxx,1.9,1.10 walker.cxx,1.24,1.25 walker.hxx,1.9,1.10
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus/src/editor editor.hxx,1.18,1.19
- Index(es):