[Pingus-CVS] CVS: Games/Pingus/src/worldobjsdata conveyor_belt_data.cxx,1.2,1.3 conveyor_belt_data.hxx,1.1,1.2 ice_block_data.cxx,1.2,1.3 ice_block_data.hxx,1.1,1.2 switch_door_data.cxx,1.3,1.4 switch_door_data.hxx,1.1,1.2

[grumbel]

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

Modified Files:
        conveyor_belt_data.cxx conveyor_belt_data.hxx 
        ice_block_data.cxx ice_block_data.hxx switch_door_data.cxx 
        switch_door_data.hxx 
Log Message:
- fixed a few crash bugs in switchdoor, iceblock and conveyorbelt

Index: conveyor_belt_data.cxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/conveyor_belt_data.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- conveyor_belt_data.cxx      15 Sep 2002 09:54:34 -0000      1.2
+++ conveyor_belt_data.cxx      15 Sep 2002 11:02:24 -0000      1.3
@@ -27,10 +27,7 @@
 namespace WorldObjsData {
 
 ConveyorBeltData::ConveyorBeltData () 
-  : left_sur  (PingusResource::load_surface ("conveyorbelt_left",   
"worldobjs")),
-    right_sur (PingusResource::load_surface ("conveyorbelt_right",  
"worldobjs")),
-    middle_sur(PingusResource::load_surface ("conveyorbelt_middle", 
"worldobjs")),
-    width(5),
+  : width(5),
     speed(2),
     counter(0)
 {
@@ -65,14 +62,12 @@
     }
 }
 
-ConveyorBeltData::ConveyorBeltData (const ConveyorBeltData& old) : 
WorldObjData(old),
-                                                                   
pos(old.pos),
-                                                                  
left_sur(old.left_sur),
-                                                                  
right_sur(old.right_sur),
-                                                                  
middle_sur(old.middle_sur),
-                                                                  
width(old.width),
-                                                                  
speed(old.speed),
-                                                                  
counter(old.counter)
+ConveyorBeltData::ConveyorBeltData (const ConveyorBeltData& old)
+  : WorldObjData(old),
+    pos(old.pos),
+    width(old.width),
+    speed(old.speed),
+    counter(old.counter)
 {
 }
 

Index: conveyor_belt_data.hxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/conveyor_belt_data.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- conveyor_belt_data.hxx      14 Sep 2002 19:06:35 -0000      1.1
+++ conveyor_belt_data.hxx      15 Sep 2002 11:02:24 -0000      1.2
@@ -31,9 +31,6 @@
 {
 public:
   CL_Vector pos;
-  CL_Surface left_sur;
-  CL_Surface right_sur;
-  CL_Surface middle_sur;
   int    width;
   double speed;
   float  counter;

Index: ice_block_data.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/ice_block_data.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ice_block_data.cxx  15 Sep 2002 09:54:34 -0000      1.2
+++ ice_block_data.cxx  15 Sep 2002 11:02:24 -0000      1.3
@@ -26,15 +26,15 @@
 
 namespace WorldObjsData {
 
-IceBlockData::IceBlockData () : block_sur(PingusResource::load_surface 
("iceblock", "worldobjs")),
-                                width(1)
+IceBlockData::IceBlockData () 
+  : width(1)
 {
 }
 
-IceBlockData::IceBlockData (const IceBlockData& old) : WorldObjData(old),
-                                                       pos(old.pos),
-                                                       
block_sur(old.block_sur),
-                                                      width(old.width)
+IceBlockData::IceBlockData (const IceBlockData& old) 
+  : WorldObjData(old),
+    pos(old.pos),
+    width(old.width)
 {
 }
 

Index: ice_block_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/ice_block_data.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ice_block_data.hxx  14 Sep 2002 19:06:35 -0000      1.1
+++ ice_block_data.hxx  15 Sep 2002 11:02:24 -0000      1.2
@@ -32,8 +32,6 @@
 public:
   /// The upper/left position  of the iceblock's
   CL_Vector pos;
-  
-  CL_Surface block_sur;
 
   /** The number of iceblocks, only complete blocks are supported */  
   int width;

Index: switch_door_data.cxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/switch_door_data.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- switch_door_data.cxx        15 Sep 2002 09:54:34 -0000      1.3
+++ switch_door_data.cxx        15 Sep 2002 11:02:24 -0000      1.4
@@ -27,11 +27,7 @@
 namespace WorldObjsData {
 
 SwitchDoorData::SwitchDoorData () 
-  : door_box      (PingusResource::load_surface("switchdoor_box"      , 
"worldobjs")),
-    door_tile     (PingusResource::load_surface("switchdoor_tile"     , 
"worldobjs")),
-    door_tile_cmap(PingusResource::load_surface("switchdoor_tile_cmap", 
"worldobjs")),
-    switch_sur    (PingusResource::load_surface("switchdoor_switch"   , 
"worldobjs")),
-    door_height(10)
+  : door_height(10)
 {
 }
 
@@ -98,10 +94,6 @@
 
 SwitchDoorData::SwitchDoorData (const SwitchDoorData& old) 
                               : WorldObjData(old),
-                               door_box(old.door_box),
-                               door_tile(old.door_tile),
-                               door_tile_cmap(old.door_tile_cmap),
-                               switch_sur(old.switch_sur),
                                door_pos(old.door_pos),
                                switch_pos(old.switch_pos),
                                door_height(old.door_height)

Index: switch_door_data.hxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/switch_door_data.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- switch_door_data.hxx        11 Sep 2002 15:27:19 -0000      1.1
+++ switch_door_data.hxx        15 Sep 2002 11:02:24 -0000      1.2
@@ -32,11 +32,6 @@
 class SwitchDoorData : public WorldObjData
 {
 public:
-  CL_Surface door_box;
-  CL_Surface door_tile;
-  CL_Surface door_tile_cmap;
-  CL_Surface switch_sur;
-
   /// The upper/middle pos of the door 
   CL_Vector door_pos;