super-tux-commit

[Matze B. <mat...@us...>]

Update of /cvsroot/super-tux/supertux/lib/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17739/lib/gui

Modified Files:
	button.cpp button.h menu.cpp menu.h mousecursor.cpp 
	mousecursor.h 
Log Message:
furhter improve collision detection by reintroducing time of collision, still more issues to solve

Index: mousecursor.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/lib/gui/mousecursor.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- mousecursor.h	22 Jul 2004 19:07:50 -0000	1.4
+++ mousecursor.h	24 Nov 2004 14:10:21 -0000	1.5
@@ -22,8 +22,8 @@
 
 #include <string>
 
-#include "../special/timer.h"
-#include "../video/surface.h"
+#include "special/timer.h"
+#include "video/surface.h"
 
 namespace SuperTux
   {

Index: menu.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/lib/gui/menu.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- menu.cpp	24 Nov 2004 03:42:56 -0000	1.17
+++ menu.cpp	24 Nov 2004 14:10:21 -0000	1.18
@@ -31,13 +31,13 @@
 #include <string>
 #include <cassert>
 
-#include "../app/globals.h"
-#include "../gui/menu.h"
-#include "../video/screen.h"
-#include "../video/drawing_context.h"
-#include "../app/setup.h"
-#include "../app/gettext.h"
-#include "../math/vector.h"
+#include "app/globals.h"
+#include "menu.h"
+#include "video/screen.h"
+#include "video/drawing_context.h"
+#include "app/setup.h"
+#include "app/gettext.h"
+#include "math/vector.h"
 
 using namespace SuperTux;
 

Index: menu.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/lib/gui/menu.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- menu.h	18 Nov 2004 15:09:53 -0000	1.7
+++ menu.h	24 Nov 2004 14:10:21 -0000	1.8
@@ -27,10 +27,10 @@
 
 #include "SDL.h"
 
-#include "../video/surface.h"
-#include "../video/font.h"
-#include "../special/timer.h"
-#include "../gui/mousecursor.h"
+#include "video/surface.h"
+#include "video/font.h"
+#include "special/timer.h"
+#include "mousecursor.h"
 
 namespace SuperTux
   {

Index: mousecursor.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/lib/gui/mousecursor.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- mousecursor.cpp	20 Nov 2004 22:14:35 -0000	1.4
+++ mousecursor.cpp	24 Nov 2004 14:10:21 -0000	1.5
@@ -19,8 +19,8 @@
 
 #include <config.h>
 
-#include "../video/drawing_context.h"
-#include "../gui/mousecursor.h"
+#include "video/drawing_context.h"
+#include "gui/mousecursor.h"
 
 using namespace SuperTux;
 

Index: button.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/lib/gui/button.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- button.h	24 Sep 2004 15:08:04 -0000	1.6
+++ button.h	24 Nov 2004 14:10:21 -0000	1.7
@@ -21,8 +21,8 @@
 #include <vector>
 #include <string>
 
-#include "../math/vector.h"
-#include "../video/drawing_context.h"
+#include "math/vector.h"
+#include "video/drawing_context.h"
 
 namespace SuperTux
   {

Index: button.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/lib/gui/button.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- button.cpp	20 Nov 2004 22:14:35 -0000	1.8
+++ button.cpp	24 Nov 2004 14:10:21 -0000	1.9
@@ -20,10 +20,10 @@
 #include "SDL.h"
 #include <iostream>
 
-#include "../gui/button.h"
-#include "../gui/mousecursor.h"
-#include "../app/globals.h"
-#include "../video/font.h"
+#include "button.h"
+#include "mousecursor.h"
+#include "app/globals.h"
+#include "video/font.h"
 
 using namespace SuperTux;