[Pingus-CVS] CVS: Games/Pingus/src/editor editor.cxx,1.4,1.5 object_manager.cxx,1.3,1.4

[grumbel]

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

Modified Files:
        editor.cxx object_manager.cxx 
Log Message:
added my own min/max/mid stuff

Index: editor.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/editor.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- editor.cxx  19 Jun 2002 15:19:26 -0000      1.4
+++ editor.cxx  20 Jun 2002 15:57:38 -0000      1.5
@@ -55,8 +55,8 @@
   return instance_; 
 }
 
-Editor::Editor () : event_handler_ref_counter(0), show_help_screen(true),
-                    move_x(0), move_y(0), tool(SELECTOR_TOOL)
+Editor::Editor () : event_handler_ref_counter(0),
+                    move_x(0), move_y(0), show_help_screen(true), 
tool(SELECTOR_TOOL)
 {
   EditorObj::set_editor(this);
 

Index: object_manager.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/object_manager.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- object_manager.cxx  18 Jun 2002 16:18:14 -0000      1.3
+++ object_manager.cxx  20 Jun 2002 15:57:38 -0000      1.4
@@ -21,6 +21,7 @@
 #include <ClanLib/Display/Input/keyboard.h>
 #include <ClanLib/Display/Input/key.h>
 #include "../globals.hxx"
+#include "../math.hxx"
 #include "../system.hxx"
 #include "../plf_plf.hxx"
 #include "../xml_helper.hxx"
@@ -34,7 +35,7 @@
 #  define for if(0);else for
 #endif
 
-using namespace std;
+using namespace Pingus;
 
 /** */
 static bool EditorObj_z_pos_sorter (const boost::shared_ptr<EditorObj>& a, 
@@ -417,10 +418,10 @@
       && !CL_Keyboard::get_keycode(CL_KEY_RSHIFT))
     delete_selection();
   
-  x1 = min(x_1, x_2);
-  x2 = max(x_1, x_2);
-  y1 = min(y_1, y_2);
-  y2 = max(y_1, y_2);  
+  x1 = Math::min(x_1, x_2);
+  x2 = Math::max(x_1, x_2);
+  y1 = Math::min(y_1, y_2);
+  y2 = Math::max(y_1, y_2);  
 
   for(EditorObjIter i = editor_objs.begin(); i != editor_objs.end(); ++i) 
     {