pingus-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Pingus-CVS] CVS: Games/Pingus/src/worldobjs ice_block.cxx,1.10,1.11 inf


From: grumbel
Subject: [Pingus-CVS] CVS: Games/Pingus/src/worldobjs ice_block.cxx,1.10,1.11 info_box.cxx,1.8,1.9 switch_door.cxx,1.9,1.10
Date: 10 Sep 2002 14:33:10 -0000

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

Modified Files:
        ice_block.cxx info_box.cxx switch_door.cxx 
Log Message:
well, not a nice fix for the SpriteObj reference problem, but a working one.
a better solution might be to sync the position data of spriteobj and the 
editorobj on a write call, since its not needed before

Index: ice_block.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/ice_block.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- ice_block.cxx       4 Sep 2002 19:40:20 -0000       1.10
+++ ice_block.cxx       10 Sep 2002 14:33:07 -0000      1.11
@@ -146,7 +146,7 @@
 }
 
 EditorIceBlockObj::EditorIceBlockObj (const IceBlockData& data)
-  : SpriteEditorObj ("iceblock", "worldobjs", pos)
+  : SpriteEditorObj ("iceblock", "worldobjs", &pos)
 {
   pos      = data.pos;
   IceBlockData::width = data.width;

Index: info_box.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/info_box.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- info_box.cxx        5 Sep 2002 11:26:35 -0000       1.8
+++ info_box.cxx        10 Sep 2002 14:33:08 -0000      1.9
@@ -159,7 +159,7 @@
 
 EditorInfoBox::EditorInfoBox(const InfoBoxData& data)
   : InfoBoxData (data),
-    SpriteEditorObj ("infobox", "worldobjs", pos)
+    SpriteEditorObj ("infobox", "worldobjs", &pos)
 {
   sprite.set_align_center_bottom ();
 }

Index: switch_door.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/switch_door.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- switch_door.cxx     5 Sep 2002 11:26:35 -0000       1.9
+++ switch_door.cxx     10 Sep 2002 14:33:08 -0000      1.10
@@ -230,9 +230,10 @@
 ///////////////////////////////
 
 EditorSwitchDoorSwitchObj::EditorSwitchDoorSwitchObj (EditorSwitchDoorObj* 
data)
-  : SpriteEditorObj ("switchdoor_switch", "worldobjs", data->switch_pos),
-  door (data)
+  : SpriteEditorObj ("switchdoor_switch", "worldobjs"),
+    door (data)
 {
+  pos_ref = &door->switch_pos;
 }
 
 std::string 





reply via email to

[Prev in Thread] Current Thread [Next in Thread]