[Pingus-CVS] CVS: Games/Pingus/src Makefile.am,1.105,1.106 worldobj_data_factory.cxx,1.21,1.22 xml_plf.cxx,1.21,1.22

[torangan]

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

Modified Files:
        Makefile.am worldobj_data_factory.cxx xml_plf.cxx 
Log Message:
splitted Hotspot


Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Makefile.am,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -d -r1.105 -r1.106
--- Makefile.am 20 Sep 2002 08:52:46 -0000      1.105
+++ Makefile.am 21 Sep 2002 16:52:39 -0000      1.106
@@ -123,7 +123,6 @@
 display.hxx \
 display_graphic_context.hxx \
 display_graphic_context.cxx \
-editor_hotspot.hxx \
 entrance.cxx \
 entrance.hxx \
 entrance_data.cxx \
@@ -165,10 +164,6 @@
 gui_obj.cxx \
 gui_screen.cxx \
 gui_screen.hxx \
-hotspot.cxx \
-hotspot.hxx \
-hotspot_data.cxx \
-hotspot_data.hxx \
 html_browser.cxx \
 html_browser.hxx \
 hurry_up.cxx \

Index: worldobj_data_factory.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobj_data_factory.cxx,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- worldobj_data_factory.cxx   18 Sep 2002 15:00:37 -0000      1.21
+++ worldobj_data_factory.cxx   21 Sep 2002 16:52:39 -0000      1.22
@@ -22,11 +22,9 @@
 #include "pingus_error.hxx"
 
 // Special Objects
-#include "hotspot_data.hxx"
 #include "entrance_data.hxx"
 #include "worldobj_data_factory.hxx"
 
-#include "worldobjsdata/worldobj_group_data.hxx"
 #include "exit_data.hxx"
 #include "worldobjsdata/bumper_data.hxx"
 #include "worldobjsdata/conveyor_belt_data.hxx"
@@ -34,6 +32,7 @@
 #include "worldobjsdata/groundpiece_data.hxx"
 #include "worldobjsdata/guillotine_data.hxx"
 #include "worldobjsdata/hammer_data.hxx"
+#include "worldobjsdata/hotspot_data.hxx"
 #include "worldobjsdata/ice_block_data.hxx"
 #include "worldobjsdata/info_box_data.hxx"
 #include "worldobjsdata/laser_exit_data.hxx"
@@ -47,6 +46,7 @@
 #include "worldobjsdata/switch_door_data.hxx"
 #include "worldobjsdata/teleporter_data.hxx"
 #include "worldobjsdata/thunderstorm_background_data.hxx"
+#include "worldobjsdata/worldobj_group_data.hxx"
 
 using namespace WorldObjsData;
 

Index: xml_plf.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/xml_plf.cxx,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- xml_plf.cxx 17 Sep 2002 16:23:30 -0000      1.21
+++ xml_plf.cxx 21 Sep 2002 16:52:39 -0000      1.22
@@ -24,11 +24,10 @@
 #include "pingus_error.hxx"
 #include "string_converter.hxx"
 #include "worldobj_data_factory.hxx"
-#include "worldobjsdata/worldobj_group_data.hxx"
 #include "exit_data.hxx"
 #include "entrance_data.hxx"
-#include "hotspot_data.hxx"
 #include "liquid_data.hxx"
+#include "worldobjsdata/hotspot_data.hxx"
 #include "worldobjsdata/worldobj_group_data.hxx"
 
 using namespace std;
@@ -136,7 +135,7 @@
            }
          else if (XMLhelper::equal_str(cur->name, "hotspot"))
            {
-             worldobjs_data.push_back(new HotspotData (doc, cur));
+             worldobjs_data.push_back(new WorldObjsData::HotspotData (doc, 
cur));
            }
          else if (XMLhelper::equal_str(cur->name, "liquid"))
            {
@@ -200,7 +199,7 @@
        }
       else if (XMLhelper::equal_str(cur->name, "hotspot"))
        {
-         worldobjs_data.push_back(new HotspotData (doc, cur));
+         worldobjs_data.push_back(new WorldObjsData::HotspotData (doc, cur));
        }
       else if (XMLhelper::equal_str(cur->name, "liquid"))
        {