[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src/editor editor_view.cxx,1.1,1.2
From: |
grumbel |
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src/editor editor_view.cxx,1.1,1.2 |
Date: |
20 Jun 2002 16:48:13 -0000 |
Update of /usr/local/cvsroot/Games/Pingus/src/editor
In directory dark:/tmp/cvs-serv22378/editor
Modified Files:
editor_view.cxx
Log Message:
Some win32 fixes
Index: editor_view.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/editor_view.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- editor_view.cxx 12 Jun 2002 19:11:31 -0000 1.1
+++ editor_view.cxx 20 Jun 2002 16:48:11 -0000 1.2
@@ -21,9 +21,9 @@
#include <ClanLib/Display/Display/display.h>
#include "../sprite.hxx"
#include "editor_view.hxx"
+#include "../math.hxx"
-using std::min;
-using std::max;
+using namespace Pingus;
EditorView::EditorView (int x1, int y1, int x2, int y2,
int /*x_offset*/, int /*y_offset*/)
@@ -63,10 +63,10 @@
{
CL_Rect rect;
- rect.x1 = min (arg_rect.x1, arg_rect.x2);
- rect.x2 = max (arg_rect.x1, arg_rect.x2);
- rect.y1 = min (arg_rect.y1, arg_rect.y2);
- rect.y2 = max (arg_rect.y1, arg_rect.y2);
+ rect.x1 = Math::min (arg_rect.x1, arg_rect.x2);
+ rect.x2 = Math::max (arg_rect.x1, arg_rect.x2);
+ rect.y1 = Math::min (arg_rect.y1, arg_rect.y2);
+ rect.y2 = Math::max (arg_rect.y1, arg_rect.y2);
CL_Vector pos1 = screen_to_world (CL_Vector(rect.x1, rect.y1));
CL_Vector pos2 = screen_to_world (CL_Vector(rect.x2, rect.y2));
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src/editor editor_view.cxx,1.1,1.2,
grumbel <=
- Prev by Date:
[Pingus-CVS] CVS: Games/Pingus/src/editor editor.cxx,1.4,1.5 object_manager.cxx,1.3,1.4
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus/src Makefile.am,1.77,1.78 console.cxx,1.2,1.3 fade_out.cxx,1.1,1.2 multiline_text.cxx,1.2,1.3 pingus_resource.cxx,1.3,1.4 pingus_resource.hxx,1.2,1.3 smallmap.cxx,1.3,1.4 spot_map.cxx,1.3,1.4 world.cxx,1.6,1.7
- Previous by thread:
[Pingus-CVS] CVS: Games/Pingus/src/editor editor.cxx,1.4,1.5 object_manager.cxx,1.3,1.4
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus/src Makefile.am,1.77,1.78 console.cxx,1.2,1.3 fade_out.cxx,1.1,1.2 multiline_text.cxx,1.2,1.3 pingus_resource.cxx,1.3,1.4 pingus_resource.hxx,1.2,1.3 smallmap.cxx,1.3,1.4 spot_map.cxx,1.3,1.4 world.cxx,1.6,1.7
- Index(es):