[Pingus-CVS] CVS: Games/Pingus/src/worldobjs bumper.cxx,1.5,1.6 bumper.hxx,1.3,1.4 conveyor_belt.cxx,1.15,1.16 conveyor_belt.hxx,1.11,1.12 ice_block.cxx,1.15,1.16 ice_block.hxx,1.10,1.11 smasher.cxx,1.6,1.7 smasher.hxx,1.3,1.4 switch_door.cxx,1.17,1.18 switch_door.hxx,1.13,1.14

[grumbel]

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

Modified Files:
        bumper.cxx bumper.hxx conveyor_belt.cxx conveyor_belt.hxx 
        ice_block.cxx ice_block.hxx smasher.cxx smasher.hxx 
        switch_door.cxx switch_door.hxx 
Log Message:
- fixed a few draw_colmap() instead of on_startup() things
- something unrelated: just noticed that the climber no longer works

Index: bumper.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/bumper.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- bumper.cxx  16 Sep 2002 20:31:09 -0000      1.5
+++ bumper.cxx  16 Sep 2002 22:51:33 -0000      1.6
@@ -69,7 +69,7 @@
 }
 
 void
-Bumper::draw_colmap()
+Bumper::on_startup()
 {
   std::cout << "Drawing colmap entry" << std::endl;
 

Index: bumper.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/bumper.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- bumper.hxx  9 Sep 2002 16:55:07 -0000       1.3
+++ bumper.hxx  16 Sep 2002 22:51:33 -0000      1.4
@@ -45,7 +45,7 @@
   float get_z_pos () const;
     
   void draw (GraphicContext& gc);
-  void draw_colmap ();
+  void on_startup();
   void update (float delta);
 
 private:    

Index: conveyor_belt.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/conveyor_belt.cxx,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- conveyor_belt.cxx   16 Sep 2002 20:31:09 -0000      1.15
+++ conveyor_belt.cxx   16 Sep 2002 22:51:33 -0000      1.16
@@ -54,7 +54,7 @@
 }
 
 void
-ConveyorBelt::draw_colmap ()
+ConveyorBelt::on_startup()
 {
   CL_Surface sur(PingusResource::load_surface("conveyorbelt_cmap", 
"worldobjs"));
   for (int i=0; i < (data->width + 2); ++i)

Index: conveyor_belt.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/conveyor_belt.hxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- conveyor_belt.hxx   15 Sep 2002 11:02:24 -0000      1.11
+++ conveyor_belt.hxx   16 Sep 2002 22:51:33 -0000      1.12
@@ -43,7 +43,7 @@
   ConveyorBelt (WorldObjsData::ConveyorBeltData* data_);
   
   void draw (GraphicContext& gc);
-  void draw_colmap ();
+  void on_startup();
   void update (float delta);
   float get_z_pos () const;
   

Index: ice_block.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/ice_block.cxx,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- ice_block.cxx       16 Sep 2002 20:31:09 -0000      1.15
+++ ice_block.cxx       16 Sep 2002 22:51:33 -0000      1.16
@@ -46,7 +46,7 @@
 }
 
 void
-IceBlock::draw_colmap ()
+IceBlock::on_startup()
 {
   CL_Surface surf(PingusResource::load_surface("iceblock_cmap", "worldobjs"));
 

Index: ice_block.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/ice_block.hxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- ice_block.hxx       15 Sep 2002 11:02:24 -0000      1.10
+++ ice_block.hxx       16 Sep 2002 22:51:33 -0000      1.11
@@ -43,7 +43,7 @@
  ~IceBlock ();
 
   float get_z_pos () const { return 100; }
-  void draw_colmap ();
+  void on_startup();
   void draw (GraphicContext& gc);
   void update (float delta);
   

Index: smasher.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/smasher.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- smasher.cxx 16 Sep 2002 20:31:09 -0000      1.6
+++ smasher.cxx 16 Sep 2002 22:51:33 -0000      1.7
@@ -110,7 +110,7 @@
 }
 
 void
-Smasher::draw_colmap ()
+Smasher::on_startup()
 {
   std::cout << "Drawing colmap entry" << std::endl;
   world->get_colmap()->put(PingusResource::load_surface("Traps/smasher_cmap", 
"traps"),

Index: smasher.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/smasher.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- smasher.hxx 10 Sep 2002 19:24:19 -0000      1.3
+++ smasher.hxx 16 Sep 2002 22:51:33 -0000      1.4
@@ -45,7 +45,7 @@
   float get_z_pos () const;
     
   void draw (GraphicContext& gc);
-  void draw_colmap ();
+  void on_startup();
   void update (float delta);
 
 protected:

Index: switch_door.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/switch_door.cxx,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- switch_door.cxx     16 Sep 2002 20:31:09 -0000      1.17
+++ switch_door.cxx     16 Sep 2002 22:51:33 -0000      1.18
@@ -46,7 +46,7 @@
 }
 
 void 
-SwitchDoor::draw_colmap ()
+SwitchDoor::on_startup()
 {
   world->get_colmap()->put(door_box,
                            static_cast<int>(data->door_pos.x),

Index: switch_door.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/switch_door.hxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- switch_door.hxx     15 Sep 2002 11:02:24 -0000      1.13
+++ switch_door.hxx     16 Sep 2002 22:51:33 -0000      1.14
@@ -51,7 +51,7 @@
   SwitchDoor (WorldObjsData::SwitchDoorData* data_);
  ~SwitchDoor ();
   
-  void draw_colmap ();
+  void on_startup();
   void draw (GraphicContext& gc);
   void update (float delta);