[Super-tux-commit] supertux/lib/app globals.h,1.10,1.11 setup.cpp,1.18,1.19

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

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

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

Index: setup.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/lib/app/setup.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- setup.cpp	24 Nov 2004 00:44:45 -0000	1.18
+++ setup.cpp	24 Nov 2004 14:10:20 -0000	1.19
@@ -43,14 +43,14 @@
 
 #include <cctype>
 
-#include "../app/globals.h"
-#include "../app/setup.h"
-#include "../video/screen.h"
-#include "../video/surface.h"
-#include "../gui/menu.h"
-#include "../utils/configfile.h"
-#include "../audio/sound_manager.h"
-#include "../app/gettext.h"
+#include "globals.h"
+#include "setup.h"
+#include "video/screen.h"
+#include "video/surface.h"
+#include "gui/menu.h"
+#include "utils/configfile.h"
+#include "audio/sound_manager.h"
+#include "gettext.h"
 
 using namespace SuperTux;
 

Index: globals.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/lib/app/globals.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- globals.h	23 Nov 2004 22:21:49 -0000	1.10
+++ globals.h	24 Nov 2004 14:10:20 -0000	1.11
@@ -26,7 +26,7 @@
 
 #include "SDL.h"
 
-#include "../video/font.h"
+#include "video/font.h"
 #include "tinygettext.h"
 
 namespace SuperTux