[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src Makefile.am,1.107,1.108 worldobj_data
From: |
torangan |
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src Makefile.am,1.107,1.108 worldobj_data_factory.cxx,1.22,1.23 xml_plf.cxx,1.22,1.23 |
Date: |
25 Sep 2002 17:21:40 -0000 |
Update of /usr/local/cvsroot/Games/Pingus/src
In directory dark:/tmp/cvs-serv28111
Modified Files:
Makefile.am worldobj_data_factory.cxx xml_plf.cxx
Log Message:
splitted Liquid
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Makefile.am,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -d -r1.107 -r1.108
--- Makefile.am 24 Sep 2002 17:02:48 -0000 1.107
+++ Makefile.am 25 Sep 2002 17:21:38 -0000 1.108
@@ -181,10 +181,6 @@
level_result.cxx \
level_result.hxx \
libxmlfwd.hxx \
-liquid.cxx \
-liquid.hxx \
-liquid_data.cxx \
-liquid_data.hxx \
loading.cxx \
loading.hxx \
main_menu.cxx \
Index: worldobj_data_factory.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobj_data_factory.cxx,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- worldobj_data_factory.cxx 21 Sep 2002 16:52:39 -0000 1.22
+++ worldobj_data_factory.cxx 25 Sep 2002 17:21:38 -0000 1.23
@@ -17,7 +17,6 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#include "liquid.hxx"
#include "xml_helper.hxx"
#include "pingus_error.hxx"
@@ -36,6 +35,7 @@
#include "worldobjsdata/ice_block_data.hxx"
#include "worldobjsdata/info_box_data.hxx"
#include "worldobjsdata/laser_exit_data.hxx"
+#include "worldobjsdata/liquid_data.hxx"
#include "worldobjsdata/rain_generator_data.hxx"
#include "worldobjsdata/smasher_data.hxx"
#include "worldobjsdata/snow_generator_data.hxx"
Index: xml_plf.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/xml_plf.cxx,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- xml_plf.cxx 21 Sep 2002 16:52:39 -0000 1.22
+++ xml_plf.cxx 25 Sep 2002 17:21:38 -0000 1.23
@@ -26,8 +26,8 @@
#include "worldobj_data_factory.hxx"
#include "exit_data.hxx"
#include "entrance_data.hxx"
-#include "liquid_data.hxx"
#include "worldobjsdata/hotspot_data.hxx"
+#include "worldobjsdata/liquid_data.hxx"
#include "worldobjsdata/worldobj_group_data.hxx"
using namespace std;
@@ -139,7 +139,7 @@
}
else if (XMLhelper::equal_str(cur->name, "liquid"))
{
- worldobjs_data.push_back(new LiquidData (doc, cur));
+ worldobjs_data.push_back(new WorldObjsData::LiquidData (doc,
cur));
}
else if (XMLhelper::equal_str(cur->name, "worldobj"))
{
@@ -203,7 +203,7 @@
}
else if (XMLhelper::equal_str(cur->name, "liquid"))
{
- worldobjs_data.push_back(new LiquidData (doc, cur));
+ worldobjs_data.push_back(new WorldObjsData::LiquidData (doc, cur));
}
else if (XMLhelper::equal_str(cur->name, "worldobj"))
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src Makefile.am,1.107,1.108 worldobj_data_factory.cxx,1.22,1.23 xml_plf.cxx,1.22,1.23,
torangan <=
- Prev by Date:
[Pingus-CVS] CVS: Games/Pingus/src/editor object_selector.cxx,1.24,1.25 plfobj.cxx,1.12,1.13 plfobj.hxx,1.10,1.11
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus/src/worldobjsdata liquid_data.cxx,NONE,1.1 liquid_data.hxx,NONE,1.1 Makefile.am,1.13,1.14
- Previous by thread:
[Pingus-CVS] CVS: Games/Pingus/src/editor object_selector.cxx,1.24,1.25 plfobj.cxx,1.12,1.13 plfobj.hxx,1.10,1.11
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus/src/worldobjsdata liquid_data.cxx,NONE,1.1 liquid_data.hxx,NONE,1.1 Makefile.am,1.13,1.14
- Index(es):