[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.9,1.10 conveyo
From: |
grumbel |
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src/worldobjs bumper.cxx,1.9,1.10 conveyor_belt.cxx,1.19,1.20 entrance.cxx,1.4,1.5 exit.cxx,1.3,1.4 fake_exit.cxx,1.8,1.9 guillotine.cxx,1.6,1.7 hammer.cxx,1.8,1.9 ice_block.cxx,1.19,1.20 info_box.cxx,1.17,1.18 laser_exit.cxx,1.7,1.8 smasher.cxx,1.11,1.12 spike.cxx,1.6,1.7 switch_door.cxx,1.21,1.22 teleporter.cxx,1.13,1.14 |
Date: |
4 Oct 2002 13:46:59 -0000 |
Update of /usr/local/cvsroot/Games/Pingus/src/worldobjs
In directory dark:/tmp/cvs-serv22173/worldobjs
Modified Files:
bumper.cxx conveyor_belt.cxx entrance.cxx exit.cxx
fake_exit.cxx guillotine.cxx hammer.cxx ice_block.cxx
info_box.cxx laser_exit.cxx smasher.cxx spike.cxx
switch_door.cxx teleporter.cxx
Log Message:
clean up the PinguHolder/World relation ship a bit
Index: bumper.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/bumper.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- bumper.cxx 1 Oct 2002 19:53:45 -0000 1.9
+++ bumper.cxx 4 Oct 2002 13:46:56 -0000 1.10
@@ -51,7 +51,7 @@
void
Bumper::update ()
{
- PinguHolder* holder = world->get_pingu_p ();
+ PinguHolder* holder = world->get_pingus();
for (PinguIter pingu = holder->begin (); pingu != holder->end (); ++pingu) {
catch_pingu(*pingu);
}
Index: conveyor_belt.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/conveyor_belt.cxx,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- conveyor_belt.cxx 1 Oct 2002 19:53:46 -0000 1.19
+++ conveyor_belt.cxx 4 Oct 2002 13:46:56 -0000 1.20
@@ -73,7 +73,7 @@
else if (data->counter < 0.0f)
data->counter = middle_sur.get_num_frames() - 1;
- PinguHolder* holder = world->get_pingu_p();
+ PinguHolder* holder = world->get_pingus();
for (PinguIter pingu = holder->begin(); pingu != holder->end(); ++pingu)
{
if ( (*pingu)->get_x() > data->pos.x
Index: entrance.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/entrance.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- entrance.cxx 2 Oct 2002 19:20:19 -0000 1.4
+++ entrance.cxx 4 Oct 2002 13:46:56 -0000 1.5
@@ -65,7 +65,7 @@
static int last_direction;
Direction d;
- Pingu* pingu = world->get_pingu_p()->create_pingu(data->pos, data->owner_id);
+ Pingu* pingu = world->get_pingus()->create_pingu(data->pos, data->owner_id);
switch (data->direction)
{
@@ -106,13 +106,11 @@
Entrance::update ()
{
if ( pingu_ready()
- && (world->get_released_pingus() < world->get_allowed_pingus())
+ && (world->get_pingus()->get_number_of_released()
+ < static_cast<int>(world->get_allowed_pingus()))
&& (! world->check_armageddon()))
{
create_pingu();
-
- // FIXME: Evil, world should care about that itself
- world->inc_released_pingus();
}
}
Index: exit.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/exit.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- exit.cxx 1 Oct 2002 19:53:46 -0000 1.3
+++ exit.cxx 4 Oct 2002 13:46:56 -0000 1.4
@@ -74,7 +74,7 @@
{
sprite.update();
- PinguHolder* holder = world->get_pingu_p();
+ PinguHolder* holder = world->get_pingus();
for (PinguIter pingu = holder->begin(); pingu != holder->end(); ++pingu)
{
Index: fake_exit.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/fake_exit.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- fake_exit.cxx 1 Oct 2002 19:53:46 -0000 1.8
+++ fake_exit.cxx 4 Oct 2002 13:46:56 -0000 1.9
@@ -60,7 +60,7 @@
void
FakeExit::update ()
{
- PinguHolder* holder = world->get_pingu_p ();
+ PinguHolder* holder = world->get_pingus();
for (PinguIter pingu = holder->begin (); pingu != holder->end (); ++pingu){
catch_pingu(*pingu);
}
Index: guillotine.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/guillotine.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- guillotine.cxx 1 Oct 2002 19:53:46 -0000 1.6
+++ guillotine.cxx 4 Oct 2002 13:46:56 -0000 1.7
@@ -74,7 +74,7 @@
killing = false;
}
- PinguHolder* holder = world->get_pingu_p ();
+ PinguHolder* holder = world->get_pingus();
for (PinguIter pingu = holder->begin (); pingu != holder->end (); ++pingu)
catch_pingu(*pingu);
Index: hammer.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/hammer.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- hammer.cxx 1 Oct 2002 23:40:19 -0000 1.8
+++ hammer.cxx 4 Oct 2002 13:46:56 -0000 1.9
@@ -57,7 +57,7 @@
if (sprite.finished())
{
- PinguHolder* holder = world->get_pingu_p ();
+ PinguHolder* holder = world->get_pingus();
for (PinguIter pingu_it = holder->begin (); pingu_it != holder->end ();
++pingu_it)
{
Index: ice_block.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/ice_block.cxx,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- ice_block.cxx 1 Oct 2002 19:53:46 -0000 1.19
+++ ice_block.cxx 4 Oct 2002 13:46:56 -0000 1.20
@@ -72,7 +72,7 @@
if (is_finished)
return;
- PinguHolder* holder = world->get_pingu_p();
+ PinguHolder* holder = world->get_pingus();
for (PinguIter pingu = holder->begin(); pingu != holder->end(); ++pingu)
{
Index: info_box.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/info_box.cxx,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- info_box.cxx 1 Oct 2002 19:53:46 -0000 1.17
+++ info_box.cxx 4 Oct 2002 13:46:56 -0000 1.18
@@ -75,7 +75,7 @@
{
data->sprite.update();
- PinguHolder* holder = world->get_pingu_p();
+ PinguHolder* holder = world->get_pingus();
for (PinguIter pingu = holder->begin (); pingu != holder->end (); ++pingu)
{
if ((*pingu)->is_inside (static_cast<int>(data->pos.x - 16),
Index: laser_exit.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/laser_exit.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- laser_exit.cxx 1 Oct 2002 19:53:46 -0000 1.7
+++ laser_exit.cxx 4 Oct 2002 13:46:56 -0000 1.8
@@ -58,7 +58,7 @@
LaserExit::update ()
{
- PinguHolder* holder = world->get_pingu_p ();
+ PinguHolder* holder = world->get_pingus();
for (PinguIter pingu = holder->begin (); pingu != holder->end (); ++pingu){
catch_pingu(*pingu);
}
Index: smasher.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/smasher.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- smasher.cxx 1 Oct 2002 19:53:46 -0000 1.11
+++ smasher.cxx 4 Oct 2002 13:46:56 -0000 1.12
@@ -57,7 +57,7 @@
Smasher::update ()
{
- PinguHolder* holder = world->get_pingu_p();
+ PinguHolder* holder = world->get_pingus();
for (PinguIter pingu = holder->begin (); pingu != holder->end (); ++pingu)
catch_pingu(*pingu);
Index: spike.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/spike.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- spike.cxx 1 Oct 2002 19:53:46 -0000 1.6
+++ spike.cxx 4 Oct 2002 13:46:56 -0000 1.7
@@ -62,7 +62,7 @@
if (killing)
++data->counter;
- PinguHolder* holder = world->get_pingu_p ();
+ PinguHolder* holder = world->get_pingus();
for (PinguIter pingu = holder->begin (); pingu != holder->end (); ++pingu){
catch_pingu(*pingu);
}
Index: switch_door.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/switch_door.cxx,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- switch_door.cxx 1 Oct 2002 19:53:46 -0000 1.21
+++ switch_door.cxx 4 Oct 2002 13:46:56 -0000 1.22
@@ -83,7 +83,7 @@
if (!is_opening)
{
// Check if a pingu is passing the switch
- PinguHolder* holder = world->get_pingu_p();
+ PinguHolder* holder = world->get_pingus();
for (PinguIter pingu = holder->begin (); pingu != holder->end ();
++pingu)
{
Index: teleporter.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/teleporter.cxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- teleporter.cxx 1 Oct 2002 19:53:46 -0000 1.13
+++ teleporter.cxx 4 Oct 2002 13:46:56 -0000 1.14
@@ -63,7 +63,7 @@
data->sprite.update();
data->target_sprite.update();
- PinguHolder* holder = world->get_pingu_p();
+ PinguHolder* holder = world->get_pingus();
for (PinguIter pingu = holder->begin (); pingu != holder->end (); ++pingu)
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src/worldobjs bumper.cxx,1.9,1.10 conveyor_belt.cxx,1.19,1.20 entrance.cxx,1.4,1.5 exit.cxx,1.3,1.4 fake_exit.cxx,1.8,1.9 guillotine.cxx,1.6,1.7 hammer.cxx,1.8,1.9 ice_block.cxx,1.19,1.20 info_box.cxx,1.17,1.18 laser_exit.cxx,1.7,1.8 smasher.cxx,1.11,1.12 spike.cxx,1.6,1.7 switch_door.cxx,1.21,1.22 teleporter.cxx,1.13,1.14,
grumbel <=
- Prev by Date:
[Pingus-CVS] CVS: Games/Pingus/src/actions angel.cxx,1.12,1.13 basher.cxx,1.17,1.18 blocker.cxx,1.12,1.13 bridger.cxx,1.20,1.21 digger.hxx,1.10,1.11 floater.cxx,1.18,1.19
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus/src Makefile.am,1.113,1.114 capture_rectangle.cxx,1.10,1.11 demo_session.cxx,1.2,1.3 level_result.cxx,1.4,1.5 pingu_enums.hxx,1.7,1.8 pingu_holder.cxx,1.13,1.14 pingu_holder.hxx,1.11,1.12 pingus_counter.cxx,1.8,1.9 pingus_counter_bar.cxx,1.2,1.3 playfield.cxx,1.25,1.26 server_event.cxx,1.2,1.3 smallmap.cxx,1.17,1.18 world.cxx,1.28,1.29 world.hxx,1.15,1.16
- Previous by thread:
[Pingus-CVS] CVS: Games/Pingus/src/actions angel.cxx,1.12,1.13 basher.cxx,1.17,1.18 blocker.cxx,1.12,1.13 bridger.cxx,1.20,1.21 digger.hxx,1.10,1.11 floater.cxx,1.18,1.19
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus/src Makefile.am,1.113,1.114 capture_rectangle.cxx,1.10,1.11 demo_session.cxx,1.2,1.3 level_result.cxx,1.4,1.5 pingu_enums.hxx,1.7,1.8 pingu_holder.cxx,1.13,1.14 pingu_holder.hxx,1.11,1.12 pingus_counter.cxx,1.8,1.9 pingus_counter_bar.cxx,1.2,1.3 playfield.cxx,1.25,1.26 server_event.cxx,1.2,1.3 smallmap.cxx,1.17,1.18 world.cxx,1.28,1.29 world.hxx,1.15,1.16
- Index(es):