[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src/editor object_manager.cxx,1.5,1.6
From: |
grumbel |
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src/editor object_manager.cxx,1.5,1.6 |
Date: |
21 Jun 2002 08:11:29 -0000 |
Update of /usr/local/cvsroot/Games/Pingus/src/editor
In directory dark:/tmp/cvs-serv18562/editor
Modified Files:
object_manager.cxx
Log Message:
Some patch for the last patch
Index: object_manager.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/object_manager.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- object_manager.cxx 21 Jun 2002 07:45:35 -0000 1.5
+++ object_manager.cxx 21 Jun 2002 08:11:27 -0000 1.6
@@ -44,7 +44,7 @@
return a->get_z_pos () < b->get_z_pos ();
}
-// #ifdef WIN32
+#ifdef WIN32
//FIXME: ingo: This is a workaround around the std::list::sort()
//FIXME: problem under MSVC6. This is copy&paste from an usenet
//FIXME: article, so it might work or not, never tested it.
@@ -54,7 +54,7 @@
//{
// return EditorObj_z_pos_sorter (a, b);
//}
-//#endif
+#endif
ObjectManager::ObjectManager()
{
@@ -178,15 +178,15 @@
editor_objs.insert(editor_objs.end(), temp.begin(), temp.end() );
}
-// #ifdef WIN32
+#ifdef WIN32
//FIXME: ingo: This is a workaround around the std::list::sort()
//FIXME: problem under MSVC6. This is copy&paste from an usenet
//FIXME: article, so it might work or not, never tested it.
// Alpha notes that this does NOT work.
// world_obj.sort(std::greater<CWorldObjPtr>());
-// #else
-// editor_objs.sort(EditorObj_z_pos_sorter);
-// #endif
+#else
+ editor_objs.sort(EditorObj_z_pos_sorter);
+#endif
std::cout << "Reading props" << std::endl;
description = plf->get_description();
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src/editor object_manager.cxx,1.5,1.6,
grumbel <=
- Prev by Date:
[Pingus-CVS] CVS: Games/Pingus/src debug_stream.hxx,1.2,1.3 world.cxx,1.8,1.9
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus/src debug_stream.cxx,1.2,1.3 debug_stream.hxx,1.3,1.4
- Previous by thread:
[Pingus-CVS] CVS: Games/Pingus/src debug_stream.hxx,1.2,1.3 world.cxx,1.8,1.9
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus/src debug_stream.cxx,1.2,1.3 debug_stream.hxx,1.3,1.4
- Index(es):