[Super-tux-commit] supertux/lib/audio musicref.cpp,1.4,1.5 musicref.h,1.3,1.4 sound_manager.cpp,1.5,1.6 sound_manager.h,1.7,1.8

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

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

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

Index: sound_manager.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/lib/audio/sound_manager.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- sound_manager.cpp	20 Nov 2004 22:14:35 -0000	1.5
+++ sound_manager.cpp	24 Nov 2004 14:10:20 -0000	1.6
@@ -22,11 +22,11 @@
 #include <cmath>
 #include <cassert>
 
-#include "../audio/sound_manager.h"
-#include "../audio/musicref.h"
-#include "../app/globals.h"
-#include "../app/setup.h"
-#include "../special/moving_object.h"
+#include "audio/sound_manager.h"
+#include "audio/musicref.h"
+#include "app/globals.h"
+#include "app/setup.h"
+#include "special/moving_object.h"
 
 using namespace SuperTux;
 

Index: sound_manager.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/lib/audio/sound_manager.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- sound_manager.h	20 Nov 2004 22:14:35 -0000	1.7
+++ sound_manager.h	24 Nov 2004 14:10:20 -0000	1.8
@@ -25,7 +25,7 @@
 #include <map>
 
 #include "SDL_mixer.h"
-#include "../math/vector.h"
+#include "math/vector.h"
 
 namespace SuperTux
   {

Index: musicref.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/lib/audio/musicref.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- musicref.h	22 Jul 2004 19:07:50 -0000	1.3
+++ musicref.h	24 Nov 2004 14:10:20 -0000	1.4
@@ -20,7 +20,7 @@
 #ifndef SUPERTUX_MUSICREF_H
 #define SUPERTUX_MUSICREF_H
 
-#include "../audio/sound_manager.h"
+#include "sound_manager.h"
 
 namespace SuperTux
   {

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