[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src/editor object_selector.cxx,1.23,1.24
From: |
torangan |
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src/editor object_selector.cxx,1.23,1.24 |
Date: |
21 Sep 2002 16:52:42 -0000 |
Update of /usr/local/cvsroot/Games/Pingus/src/editor
In directory dark:/tmp/cvs-serv25092/editor
Modified Files:
object_selector.cxx
Log Message:
splitted Hotspot
Index: object_selector.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/object_selector.cxx,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- object_selector.cxx 18 Sep 2002 15:00:37 -0000 1.23
+++ object_selector.cxx 21 Sep 2002 16:52:40 -0000 1.24
@@ -37,8 +37,9 @@
#include "../my_gettext.hxx"
#include "../system.hxx"
#include "../path_manager.hxx"
-#include "../editor_hotspot.hxx"
+#include "../string_converter.hxx"
+#include "../worldobjsdata/hotspot_data.hxx"
#include "../worldobjsdata/solid_color_background_data.hxx"
#include "../worldobjsdata/starfield_background_data.hxx"
#include "../worldobjsdata/surface_background_data.hxx"
@@ -49,6 +50,7 @@
#include "../editorobjs/fake_exit_obj.hxx"
#include "../editorobjs/guillotine_obj.hxx"
#include "../editorobjs/hammer_obj.hxx"
+#include "../editorobjs/hotspot_obj.hxx"
#include "../editorobjs/ice_block_obj.hxx"
#include "../editorobjs/info_box_obj.hxx"
#include "../editorobjs/laser_exit_obj.hxx"
@@ -163,9 +165,7 @@
data.desc = ResDescriptor("resource:" + filename, str);
data.speed = -1;
- EditorObjLst objs;
- objs.push_back(new EditorHotspot(data));
- return objs;
+ return data.create_EditorObj();
}
return EditorObjLst();
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src/editor object_selector.cxx,1.23,1.24,
torangan <=
- Prev by Date:
[Pingus-CVS] CVS: Games/Pingus/src/worldobjs Makefile.am,1.13,1.14
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus/src editor_hotspot.hxx,1.7,NONE hotspot.cxx,1.6,NONE hotspot.hxx,1.5,NONE hotspot_data.cxx,1.5,NONE hotspot_data.hxx,1.6,NONE
- Previous by thread:
[Pingus-CVS] CVS: Games/Pingus/src/worldobjs Makefile.am,1.13,1.14
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus/src editor_hotspot.hxx,1.7,NONE hotspot.cxx,1.6,NONE hotspot.hxx,1.5,NONE hotspot_data.cxx,1.5,NONE hotspot_data.hxx,1.6,NONE
- Index(es):