[Pingus-CVS] CVS: Games/Pingus/src/editorobjs conveyor_belt_obj.cxx,1.1,1.2 conveyor_belt_obj.hxx,1.1,1.2 ice_block_obj.cxx,1.1,1.2 switch_door_obj.cxx,1.2,1.3 switch_door_obj.hxx,1.2,1.3

[grumbel]

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

Modified Files:
        conveyor_belt_obj.cxx conveyor_belt_obj.hxx ice_block_obj.cxx 
        switch_door_obj.cxx switch_door_obj.hxx 
Log Message:
- fixed a few crash bugs in switchdoor, iceblock and conveyorbelt

Index: conveyor_belt_obj.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/conveyor_belt_obj.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- conveyor_belt_obj.cxx       14 Sep 2002 19:06:34 -0000      1.1
+++ conveyor_belt_obj.cxx       15 Sep 2002 11:02:24 -0000      1.2
@@ -19,12 +19,16 @@
 
 #include "../editor/editor_view.hxx"
 #include "../worldobjsdata/conveyor_belt_data.hxx"
+#include "../pingus_resource.hxx"
 #include "conveyor_belt_obj.hxx"
 
 namespace EditorObjs {
 
 ConveyorBeltObj::ConveyorBeltObj (WorldObjsData::ConveyorBeltData* data_)
-  : data(new WorldObjsData::ConveyorBeltData(*data_))
+  : data(new WorldObjsData::ConveyorBeltData(*data_)),
+    left_sur  (PingusResource::load_surface ("conveyorbelt_left",   
"worldobjs")),
+    right_sur (PingusResource::load_surface ("conveyorbelt_right",  
"worldobjs")),
+    middle_sur(PingusResource::load_surface ("conveyorbelt_middle", 
"worldobjs"))
 {
 }
 
@@ -37,17 +41,17 @@
 void
 ConveyorBeltObj::draw (EditorNS::EditorView * view)
 {
-  view->draw(data->left_sur, data->pos, static_cast<int>(data->counter));
+  view->draw(left_sur, data->pos, static_cast<int>(data->counter));
   for (int i=0; i < data->width; ++i)
     {
-      view->draw(data->middle_sur,
-                 static_cast<int>(data->pos.x) + data->left_sur.get_width() + 
i * data->middle_sur.get_width(),
+      view->draw(middle_sur,
+                 static_cast<int>(data->pos.x) + left_sur.get_width() + i * 
middle_sur.get_width(),
                 static_cast<int>(data->pos.y),
                 static_cast<int>(data->counter));
     }
     
-  view->draw(data->right_sur,
-            static_cast<int>(data->pos.x) + data->left_sur.get_width() + 
data->width * data->middle_sur.get_width(),
+  view->draw(right_sur,
+            static_cast<int>(data->pos.x) + left_sur.get_width() + data->width 
* middle_sur.get_width(),
             static_cast<int>(data->pos.y),
             static_cast<int>(data->counter));
             
@@ -55,7 +59,7 @@
   if (data->counter > 14)
     data->counter = 0;
   else if (data->counter < 0)
-    data->counter = data->middle_sur.get_num_frames() - 1;
+    data->counter = middle_sur.get_num_frames() - 1;
 
 }
 
@@ -88,15 +92,15 @@
 int 
 ConveyorBeltObj::get_width ()
 {
-  return   data->left_sur  .get_width()
-         + data->right_sur .get_width()
-        + data->middle_sur.get_width() * data->width;
+  return   left_sur  .get_width()
+         + right_sur .get_width()
+        + middle_sur.get_width() * data->width;
 }
 
 int 
 ConveyorBeltObj::get_height ()
 {
-  return data->middle_sur.get_height();
+  return middle_sur.get_height();
 }
 
 float

Index: conveyor_belt_obj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/conveyor_belt_obj.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- conveyor_belt_obj.hxx       14 Sep 2002 19:06:34 -0000      1.1
+++ conveyor_belt_obj.hxx       15 Sep 2002 11:02:24 -0000      1.2
@@ -35,6 +35,10 @@
 private:
   WorldObjsData::ConveyorBeltData* const data;
 
+  CL_Surface left_sur;
+  CL_Surface right_sur;
+  CL_Surface middle_sur;
+
 public:
   ConveyorBeltObj (WorldObjsData::ConveyorBeltData* data_);
 

Index: ice_block_obj.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/ice_block_obj.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ice_block_obj.cxx   14 Sep 2002 19:06:34 -0000      1.1
+++ ice_block_obj.cxx   15 Sep 2002 11:02:24 -0000      1.2
@@ -23,8 +23,8 @@
 namespace EditorObjs {
 
 IceBlockObj::IceBlockObj (WorldObjsData::IceBlockData* data_)
-  : SpriteEditorObj ("iceblock", "worldobjs", &data->pos),
-    data(new WorldObjsData::IceBlockData(*data_))
+  : SpriteEditorObj ("iceblock", "worldobjs", &data_->pos),
+    data(new WorldObjsData::IceBlockData(*data_))   
 {
 }
 

Index: switch_door_obj.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/switch_door_obj.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- switch_door_obj.cxx 14 Sep 2002 19:06:34 -0000      1.2
+++ switch_door_obj.cxx 15 Sep 2002 11:02:24 -0000      1.3
@@ -20,12 +20,17 @@
 #include <fstream>
 #include "switch_door_obj.hxx"
 #include "../editor/editor_view.hxx"
+#include "../pingus_resource.hxx"
 #include "../worldobjsdata/switch_door_data.hxx"
 
 namespace EditorObjs { 
 
 SwitchDoorObj::SwitchDoorObj (WorldObjsData::SwitchDoorData* data_)
-                            : data(new WorldObjsData::SwitchDoorData(*data_))
+  : data(new WorldObjsData::SwitchDoorData(*data_)),
+    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"))
 {
 }
 
@@ -49,13 +54,13 @@
 int
 SwitchDoorObj::get_width ()
 {
-  return data->door_box.get_width();
+  return door_box.get_width();
 }
 
 int
 SwitchDoorObj::get_height ()
 {
-  return data->door_box.get_height();
+  return door_box.get_height();
 }
 
 /** Create this object (and child objects) with resonable defaults
@@ -92,16 +97,17 @@
 {
   view->draw_line(data->door_pos, data->switch_pos, 1.0, 0.0, 0.0);
 
-  view->draw(data->door_box, 
+  view->draw(door_box, 
              static_cast<int>(data->door_pos.x),
             static_cast<int>(data->door_pos.y));
 
   for (int i = 0; i < data->door_height; ++i)
     {
-      view->draw(data->door_tile, 
+      view->draw(door_tile, 
                 static_cast<int>(data->door_pos.x), 
-                static_cast<int>(data->door_pos.y + (i * 
data->door_tile.get_height())
-                                                  + 
data->door_box.get_height()));
+                static_cast<int>(data->door_pos.y 
+                                 + (i * door_tile.get_height())
+                                 + door_box.get_height()));
     }
 }
 

Index: switch_door_obj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/switch_door_obj.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- switch_door_obj.hxx 14 Sep 2002 19:06:34 -0000      1.2
+++ switch_door_obj.hxx 15 Sep 2002 11:02:24 -0000      1.3
@@ -32,7 +32,12 @@
 {
 private:
   WorldObjsData::SwitchDoorData* const data;
-  
+
+  CL_Surface door_box;
+  CL_Surface door_tile;
+  CL_Surface door_tile_cmap;
+  CL_Surface switch_sur;
+ 
 public:
   friend class SwitchDoorSwitchObj;