[Pingus-CVS] CVS: Games/Pingus/src Makefile.am,1.109,1.110 worldobj_data_factory.cxx,1.24,1.25 xml_plf.cxx,1.24,1.25 exit.cxx,1.7,NONE exit.hxx,1.6,NONE exit_data.cxx,1.7,NONE exit_data.hxx,1.6,NONE

[torangan]

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

Modified Files:
        Makefile.am worldobj_data_factory.cxx xml_plf.cxx 
Removed Files:
        exit.cxx exit.hxx exit_data.cxx exit_data.hxx 
Log Message:
splitted Exit


Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Makefile.am,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -d -r1.109 -r1.110
--- Makefile.am 27 Sep 2002 11:26:43 -0000      1.109
+++ Makefile.am 27 Sep 2002 16:01:55 -0000      1.110
@@ -122,10 +122,6 @@
 display.hxx \
 display_graphic_context.hxx \
 display_graphic_context.cxx \
-exit.cxx \
-exit.hxx \
-exit_data.cxx \
-exit_data.hxx \
 exit_menu.cxx \
 exit_menu.hxx \
 fade_out.cxx \

Index: worldobj_data_factory.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobj_data_factory.cxx,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- worldobj_data_factory.cxx   27 Sep 2002 11:26:44 -0000      1.24
+++ worldobj_data_factory.cxx   27 Sep 2002 16:01:55 -0000      1.25
@@ -17,16 +17,13 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include "xml_helper.hxx"
 #include "pingus_error.hxx"
-
-// Special Objects
 #include "worldobj_data_factory.hxx"
-
-#include "exit_data.hxx"
+#include "xml_helper.hxx"
 #include "worldobjsdata/bumper_data.hxx"
 #include "worldobjsdata/conveyor_belt_data.hxx"
 #include "worldobjsdata/entrance_data.hxx"
+#include "worldobjsdata/exit_data.hxx"
 #include "worldobjsdata/fake_exit_data.hxx"
 #include "worldobjsdata/groundpiece_data.hxx"
 #include "worldobjsdata/guillotine_data.hxx"

Index: xml_plf.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/xml_plf.cxx,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- xml_plf.cxx 27 Sep 2002 11:26:44 -0000      1.24
+++ xml_plf.cxx 27 Sep 2002 16:01:55 -0000      1.25
@@ -24,8 +24,8 @@
 #include "pingus_error.hxx"
 #include "string_converter.hxx"
 #include "worldobj_data_factory.hxx"
-#include "exit_data.hxx"
 #include "worldobjsdata/entrance_data.hxx"
+#include "worldobjsdata/exit_data.hxx"
 #include "worldobjsdata/hotspot_data.hxx"
 #include "worldobjsdata/liquid_data.hxx"
 #include "worldobjsdata/worldobj_group_data.hxx"
@@ -123,7 +123,7 @@
            }
          else if (XMLhelper::equal_str(cur->name, "exit"))
            {
-             worldobjs_data.push_back (new ExitData(doc, cur));
+             worldobjs_data.push_back (new WorldObjsData::ExitData(doc, cur));
            }
          else if (XMLhelper::equal_str(cur->name, "entrance"))
            {
@@ -187,7 +187,7 @@
        }
       else if (XMLhelper::equal_str(cur->name, "exit"))
        {
-         worldobjs_data.push_back(new ExitData(doc, cur));
+         worldobjs_data.push_back(new WorldObjsData::ExitData(doc, cur));
        }
       else if (XMLhelper::equal_str(cur->name, "entrance"))
        {

--- exit.cxx DELETED ---

--- exit.hxx DELETED ---

--- exit_data.cxx DELETED ---

--- exit_data.hxx DELETED ---