[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src plf.cxx,1.5,1.6 plf.hxx,1.3,1.4 spot_
From: |
grumbel |
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src plf.cxx,1.5,1.6 plf.hxx,1.3,1.4 spot_map.cxx,1.12,1.13 worldobj_data_factory.cxx,1.10,1.11 |
Date: |
14 Sep 2002 23:31:14 -0000 |
Update of /usr/local/cvsroot/Games/Pingus/src
In directory dark:/tmp/cvs-serv18104
Modified Files:
plf.cxx plf.hxx spot_map.cxx worldobj_data_factory.cxx
Log Message:
- some cleanup, removed unused member functions
- added object sorter to the editor (should probally be sorted automatically on
each update)
Index: plf.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/plf.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- plf.cxx 5 Sep 2002 12:40:22 -0000 1.5
+++ plf.cxx 14 Sep 2002 23:31:12 -0000 1.6
@@ -55,7 +55,7 @@
{
return backgrounds;
}*/
-
+/*
ResDescriptor
PLF::get_foreground()
{
@@ -78,6 +78,7 @@
return ret_val;
}
}
+*/
/*
MapType
PLF::map_type()
@@ -85,6 +86,7 @@
return maptype;
}
*/
+/*
ResDescriptor
PLF::get_mapfile()
{
@@ -98,7 +100,7 @@
break;
}
return col;
-}
+}*/
int
PLF::get_startx()
@@ -197,11 +199,11 @@
return author;
}
-void
+/*void
PLF::set_psm_filename(string name)
{
psm_filename = name;
-}
+}*/
std::vector<GroundpieceData>
PLF::get_groundpieces(void)
Index: plf.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/plf.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- plf.hxx 23 Aug 2002 15:49:50 -0000 1.3
+++ plf.hxx 14 Sep 2002 23:31:12 -0000 1.4
@@ -86,16 +86,14 @@
std::vector<WorldObjData*> worldobjs_data;
public:
- ///
PLF();
- ///
virtual ~PLF();
+
+ //ResDescriptor get_foreground(void);
///
- ResDescriptor get_foreground(void);
- ///
- ResDescriptor get_mapfile(void);
+ //ResDescriptor get_mapfile(void);
///
- void set_psm_filename(std::string name);
+ //void set_psm_filename(std::string name);
/** Returns the ResDescriptor where the music for this level can be
found. The ResDescriptor points normaly to a file. */
Index: spot_map.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/spot_map.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- spot_map.cxx 11 Sep 2002 12:45:57 -0000 1.12
+++ spot_map.cxx 14 Sep 2002 23:31:12 -0000 1.13
@@ -102,22 +102,8 @@
PingusSpotMap::PingusSpotMap(PLF* plf)
{
colmap = 0;
-
- switch(plf->get_foreground().type)
- {
- case ResDescriptor::RD_RESOURCE:
- PingusError::raise("PingusSpotMap: ResType RESOURCE is not implemented,
sorry");
- break;
-
- case ResDescriptor::RD_FILE:
- load(plf);
- gen_tiles();
- break;
-
- default:
- PingusError::raise("PingusSpotMap: Unknown resource type, bailing out");
- break;
- }
+ load(plf);
+ gen_tiles();
}
PingusSpotMap::~PingusSpotMap(void)
@@ -154,8 +140,6 @@
void
PingusSpotMap::load(PLF* plf)
{
- ResDescriptor name = plf->get_foreground();
-
width = plf->get_width();
height = plf->get_height();
Index: worldobj_data_factory.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobj_data_factory.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- worldobj_data_factory.cxx 14 Sep 2002 19:06:33 -0000 1.10
+++ worldobj_data_factory.cxx 14 Sep 2002 23:31:12 -0000 1.11
@@ -62,11 +62,11 @@
instance_ = new WorldObjDataFactory ();
// Registring Factories
- //new WorldObjDataFactoryImpl<TrapData>("trap");
new WorldObjDataFactoryImpl<LiquidData>("liquid");
new WorldObjDataFactoryImpl<HotspotData>("hotspot");
new WorldObjDataFactoryImpl<EntranceData>("entrance");
+ // traps
new WorldObjDataFactoryImpl<BumperData>("bumper");
new WorldObjDataFactoryImpl<FakeExitData>("fake_exit");
new WorldObjDataFactoryImpl<GuillotineData>("guillotine");
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src plf.cxx,1.5,1.6 plf.hxx,1.3,1.4 spot_map.cxx,1.12,1.13 worldobj_data_factory.cxx,1.10,1.11,
grumbel <=
- Prev by Date:
[Pingus-CVS] CVS: Games/Pingus/src/editor editor_event.cxx,1.32,1.33 object_manager.cxx,1.28,1.29 object_manager.hxx,1.17,1.18
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus/src demo_player.cxx,1.3,1.4 plf.hxx,1.4,1.5 server.cxx,1.14,1.15 server.hxx,1.5,1.6 true_server.cxx,1.7,1.8
- Previous by thread:
[Pingus-CVS] CVS: Games/Pingus/src/editor editor_event.cxx,1.32,1.33 object_manager.cxx,1.28,1.29 object_manager.hxx,1.17,1.18
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus/src demo_player.cxx,1.3,1.4 plf.hxx,1.4,1.5 server.cxx,1.14,1.15 server.hxx,1.5,1.6 true_server.cxx,1.7,1.8
- Index(es):