[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src world.cxx,1.3,1.4
From: |
torangan |
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src world.cxx,1.3,1.4 |
Date: |
14 Jun 2002 13:40:12 -0000 |
Update of /usr/local/cvsroot/Games/Pingus/src
In directory dark:/tmp/cvs-serv13437
Modified Files:
world.cxx
Log Message:
undo of the last change which proved not to be a good idea after all
Index: world.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/world.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- world.cxx 14 Jun 2002 11:34:35 -0000 1.3
+++ world.cxx 14 Jun 2002 13:40:10 -0000 1.4
@@ -82,12 +82,12 @@
{
delete particle_holder;
+ // skip PingusHolder at the first position to delete it last
for (WorldObjIter it = world_obj->begin(); it != world_obj->end(); ++it) {
delete *it;
}
delete world_obj;
- delete pingus;
}
// Merge the different layers on the screen together
@@ -206,6 +206,8 @@
world_obj->push_back(obj);
}
+ world_obj->push_back(pingus);
+
// After all objects are in world_obj, sort them to there z_pos
#ifdef WIN32
//FIXME: ingo: This is a workaround around the std::list::sort()
@@ -217,6 +219,7 @@
#endif
// FIXME: If the above thing causes throuble under windows we could
// use a vector instead of a list and use stable_sort() instead.
+
// Drawing all world objs to the colmap
for(WorldObjIter obj = world_obj->begin(); obj != world_obj->end(); ++obj)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src world.cxx,1.3,1.4,
torangan <=