Update of /cvsroot/super-tux/supertux/lib/audio
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5941/lib/audio
Modified Files:
musicref.cpp sound_manager.cpp sound_manager.h
Log Message:
The BIG COMMIT(tm)
This is it, expect a broken supertux I only fixed the most annoying issues so
far, lots more are still waiting in the TODO list, but I had to bring this stuff
to cvs sometime. Changes:
- Completely new collision detection scheme, which collides all objects with
each other once per frame, instead of single objects manually testing for
collisions
- New collision detection routines which support slopes and provide additional
info on collisions: penetration depth, hit normal vector
- Lots of general cleanup/refactoring
- Splitted the monolithic badguy class and reimplemented most of them as single
classes with a badguy base class.
- Splitted the monolithic Special class into several classes
- Rewrote the timer and all timing related stuff to work on float and seconds
(not like the mixup before where you had frame_ratio, msecs and secs in
different parts of the app)
- Support for unisolid tiles
- Created a flying platform prototype (doesn't work completely yet)
- rename InteractiveObjects to triggers and implemented a new sequence trigger,
(only supported sequence is endsequence at the moment)
- transformed the bonusblocks and bricks into objects
Index: sound_manager.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/lib/audio/sound_manager.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- sound_manager.cpp 25 Jul 2004 19:03:34 -0000 1.4
+++ sound_manager.cpp 20 Nov 2004 22:14:35 -0000 1.5
@@ -17,6 +17,8 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#include <config.h>
+
#include <cmath>
#include <cassert>
Index: sound_manager.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/lib/audio/sound_manager.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- sound_manager.h 25 Jul 2004 19:03:34 -0000 1.6
+++ sound_manager.h 20 Nov 2004 22:14:35 -0000 1.7
@@ -47,7 +47,6 @@
class SoundManager
{
public:
-
/// Play sound.
void play_sound(Mix_Chunk* sound);
/// Play sound relative to two Vectors.
@@ -161,7 +160,6 @@
bool m_music_enabled;
bool m_sound_enabled;
bool audio_device; /* != 0: available and initialized */
-
};
Mix_Chunk* IDToSound(int id);
Index: musicref.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/lib/audio/musicref.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- musicref.cpp 22 Jul 2004 19:07:49 -0000 1.3
+++ musicref.cpp 20 Nov 2004 22:14:35 -0000 1.4
@@ -18,6 +18,8 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#include <config.h>
+
#include "../audio/musicref.h"
using namespace SuperTux;
|
