[Super-tux-commit] supertux/lib/utils configfile.cpp,1.8,1.9 configfile.h,1.6,1.7 lispreader.cpp,1.6,1.7 lispreader.h,1.4,1.5 lispwriter.cpp,1.4,1.5

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

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

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

Index: lispwriter.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/lib/utils/lispwriter.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- lispwriter.cpp	20 Nov 2004 22:14:36 -0000	1.4
+++ lispwriter.cpp	24 Nov 2004 14:10:23 -0000	1.5
@@ -21,7 +21,7 @@
 
 #include <iostream>
 
-#include "../utils/lispwriter.h"
+#include "lispwriter.h"
 
 using namespace SuperTux;
 

Index: configfile.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/lib/utils/configfile.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- configfile.cpp	20 Nov 2004 22:14:36 -0000	1.8
+++ configfile.cpp	24 Nov 2004 14:10:23 -0000	1.9
@@ -22,10 +22,10 @@
 #include <cstdlib>
 #include <string>
 
-#include "../utils/configfile.h"
-#include "../app/setup.h"
-#include "../app/globals.h"
-#include "../audio/sound_manager.h"
+#include "configfile.h"
+#include "app/setup.h"
+#include "app/globals.h"
+#include "audio/sound_manager.h"
 
 using namespace SuperTux;
 

Index: configfile.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/lib/utils/configfile.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- configfile.h	23 Nov 2004 16:47:23 -0000	1.6
+++ configfile.h	24 Nov 2004 14:10:23 -0000	1.7
@@ -20,7 +20,7 @@
 #ifndef SUPERTUX_CONFIGFILE_H
 #define SUPERTUX_CONFIGFILE_H
 
-#include "../utils/lispreader.h"
+#include "lispreader.h"
 
 namespace SuperTux {
 

Index: lispreader.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/lib/utils/lispreader.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- lispreader.cpp	21 Nov 2004 08:36:28 -0000	1.6
+++ lispreader.cpp	24 Nov 2004 14:10:23 -0000	1.7
@@ -31,9 +31,9 @@
 #include <cstring>
 #include <cassert>
 
-#include "../app/globals.h"
-#include "../app/setup.h"
-#include "../utils/lispreader.h"
+#include "app/globals.h"
+#include "app/setup.h"
+#include "lispreader.h"
 
 using namespace SuperTux;
 

Index: lispreader.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/lib/utils/lispreader.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- lispreader.h	20 Nov 2004 22:14:36 -0000	1.4
+++ lispreader.h	24 Nov 2004 14:10:23 -0000	1.5
@@ -31,7 +31,7 @@
 
 #include <zlib.h>
 
-#include "../utils/exceptions.h"
+#include "utils/exceptions.h"
 
 namespace SuperTux {