[Super-tux-commit] supertux/lib/video drawing_context.cpp,1.12,1.13 drawing_context.h,1.11,1.12 font.cpp,1.14,1.15 font.h,1.9,1.10 screen.cpp,1.6,1.7 surface.cpp,1.17,1.18 surface.h,1.9,1.10

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

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

Modified Files:
	drawing_context.cpp drawing_context.h font.cpp font.h 
	screen.cpp surface.cpp surface.h 
Log Message:
furhter improve collision detection by reintroducing time of collision, still more issues to solve

Index: font.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/lib/video/font.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- font.cpp	20 Nov 2004 22:14:37 -0000	1.14
+++ font.cpp	24 Nov 2004 14:10:24 -0000	1.15
@@ -23,11 +23,11 @@
 #include <cstdlib>
 #include <cstring>
 
-#include "../app/globals.h"
-#include "../video/screen.h"
-#include "../video/font.h"
-#include "../video/drawing_context.h"
-#include "../utils/lispreader.h"
+#include "app/globals.h"
+#include "screen.h"
+#include "font.h"
+#include "drawing_context.h"
+#include "utils/lispreader.h"
 
 using namespace SuperTux;
 

Index: drawing_context.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/lib/video/drawing_context.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- drawing_context.cpp	23 Nov 2004 16:47:24 -0000	1.12
+++ drawing_context.cpp	24 Nov 2004 14:10:24 -0000	1.13
@@ -22,10 +22,10 @@
 #include <cassert>
 #include <iostream>
 
-#include "../video/drawing_context.h"
-#include "../video/surface.h"
-#include "../app/globals.h"
-#include "../video/font.h"
+#include "drawing_context.h"
+#include "surface.h"
+#include "app/globals.h"
+#include "font.h"
 
 using namespace SuperTux;
 

Index: drawing_context.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/lib/video/drawing_context.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- drawing_context.h	23 Nov 2004 02:00:32 -0000	1.11
+++ drawing_context.h	24 Nov 2004 14:10:24 -0000	1.12
@@ -24,9 +24,9 @@
 
 #include "SDL.h"
 
-#include "../math/vector.h"
-#include "../video/screen.h"
-#include "../video/surface.h"
+#include "math/vector.h"
+#include "video/screen.h"
+#include "video/surface.h"
 
 namespace SuperTux
   {

Index: font.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/lib/video/font.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- font.h	16 Sep 2004 15:04:16 -0000	1.9
+++ font.h	24 Nov 2004 14:10:24 -0000	1.10
@@ -23,8 +23,8 @@
 
 #include <string>
 
-#include "../video/surface.h"
-#include "../math/vector.h"
+#include "video/surface.h"
+#include "math/vector.h"
 
 namespace SuperTux
   {

Index: surface.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/lib/video/surface.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- surface.cpp	23 Nov 2004 16:47:24 -0000	1.17
+++ surface.cpp	24 Nov 2004 14:10:24 -0000	1.18
@@ -27,10 +27,10 @@
 #include "SDL.h"
 #include "SDL_image.h"
 
-#include "../video/surface.h"
-#include "../video/screen.h"
-#include "../app/globals.h"
-#include "../app/setup.h"
+#include "video/surface.h"
+#include "video/screen.h"
+#include "app/globals.h"
+#include "app/setup.h"
 
 using namespace SuperTux;
 

Index: surface.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/lib/video/surface.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- surface.h	23 Nov 2004 16:47:24 -0000	1.9
+++ surface.h	24 Nov 2004 14:10:24 -0000	1.10
@@ -29,8 +29,8 @@
 
 #include "SDL.h"
 
-#include "../math/vector.h"
-#include "../video/screen.h"
+#include "math/vector.h"
+#include "video/screen.h"
 
 namespace SuperTux
   {

Index: screen.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/lib/video/screen.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- screen.cpp	20 Nov 2004 22:14:37 -0000	1.6
+++ screen.cpp	24 Nov 2004 14:10:24 -0000	1.7
@@ -35,10 +35,10 @@
 #include <ctype.h>
 #endif
 
-#include "../video/screen.h"
-#include "../app/globals.h"
-#include "../video/drawing_context.h"
-#include "../math/vector.h"
+#include "screen.h"
+#include "app/globals.h"
+#include "video/drawing_context.h"
+#include "math/vector.h"
 
 using namespace SuperTux;