[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src/worldobjs entrance.cxx,1.3,1.4 entran
From: |
grumbel |
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src/worldobjs entrance.cxx,1.3,1.4 entrance.hxx,1.2,1.3 hotspot.cxx,1.4,1.5 hotspot.hxx,1.4,1.5 |
Date: |
2 Oct 2002 19:20:21 -0000 |
Update of /usr/local/cvsroot/Games/Pingus/src/worldobjs
In directory dark:/tmp/cvs-serv14838/worldobjs
Modified Files:
entrance.cxx entrance.hxx hotspot.cxx hotspot.hxx
Log Message:
some cleanup
Index: entrance.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/entrance.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- entrance.cxx 1 Oct 2002 19:53:46 -0000 1.3
+++ entrance.cxx 2 Oct 2002 19:20:19 -0000 1.4
@@ -59,8 +59,8 @@
}
}
-Pingu*
-Entrance::get_pingu ()
+void
+Entrance::create_pingu ()
{
static int last_direction;
Direction d;
@@ -99,7 +99,7 @@
pingu->set_direction(d);
break;
}
- return pingu;
+
}
void
@@ -109,7 +109,9 @@
&& (world->get_released_pingus() < world->get_allowed_pingus())
&& (! world->check_armageddon()))
{
- world->get_pingu_p()->add(get_pingu());
+ create_pingu();
+
+ // FIXME: Evil, world should care about that itself
world->inc_released_pingus();
}
}
Index: entrance.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/entrance.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- entrance.hxx 1 Oct 2002 19:53:46 -0000 1.2
+++ entrance.hxx 2 Oct 2002 19:20:19 -0000 1.3
@@ -48,7 +48,7 @@
float get_z_pos () const;
virtual bool pingu_ready ();
- virtual Pingu* get_pingu ();
+ virtual void create_pingu ();
virtual void update ();
Index: hotspot.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/hotspot.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- hotspot.cxx 28 Sep 2002 11:52:26 -0000 1.4
+++ hotspot.cxx 2 Oct 2002 19:20:19 -0000 1.5
@@ -38,6 +38,12 @@
delete data;
}
+void
+Hotspot::update()
+{
+ sprite.update();
+}
+
void
Hotspot::draw (GraphicContext& gc)
{
Index: hotspot.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/hotspot.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- hotspot.hxx 27 Sep 2002 18:36:41 -0000 1.4
+++ hotspot.hxx 2 Oct 2002 19:20:19 -0000 1.5
@@ -40,6 +40,7 @@
~Hotspot ();
void draw (GraphicContext& gc);
+ void update();
float get_z_pos () const;
private:
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src/worldobjs entrance.cxx,1.3,1.4 entrance.hxx,1.2,1.3 hotspot.cxx,1.4,1.5 hotspot.hxx,1.4,1.5,
grumbel <=
- Prev by Date:
[Pingus-CVS] CVS: Games/Pingus/src/worldobjsdata liquid_data.cxx,1.4,1.5
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus/src capture_rectangle.cxx,1.8,1.9 client.cxx,1.25,1.26 game_session.cxx,1.14,1.15 pingu.cxx,1.29,1.30 pingu.hxx,1.19,1.20 pingu_holder.cxx,1.11,1.12 pingu_holder.hxx,1.9,1.10 playfield.cxx,1.23,1.24 server.cxx,1.18,1.19 server.hxx,1.8,1.9
- Previous by thread:
[Pingus-CVS] CVS: Games/Pingus/src/worldobjsdata liquid_data.cxx,1.4,1.5
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus/src capture_rectangle.cxx,1.8,1.9 client.cxx,1.25,1.26 game_session.cxx,1.14,1.15 pingu.cxx,1.29,1.30 pingu.hxx,1.19,1.20 pingu_holder.cxx,1.11,1.12 pingu_holder.hxx,1.9,1.10 playfield.cxx,1.23,1.24 server.cxx,1.18,1.19 server.hxx,1.8,1.9
- Index(es):