[Scummvm-cvs-logs] CVS: residual Makefile.common,1.9,1.10 main.cpp,1.37,1.38 smush.cpp,1.48,1.49
Pawel Kolodziejski
aquadran at users.sourceforge.net
Tue Dec 28 22:33:01 CET 2004
Update of /cvsroot/scummvm/residual
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3618
Modified Files:
Makefile.common main.cpp smush.cpp
Log Message:
imuse is now compilable
Index: Makefile.common
===================================================================
RCS file: /cvsroot/scummvm/residual/Makefile.common,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Makefile.common 28 Dec 2004 08:05:17 -0000 1.9
+++ Makefile.common 29 Dec 2004 06:32:06 -0000 1.10
@@ -26,6 +26,13 @@
mixer/mixer.o \
mixer/rate.o \
mixer/audiostream.o \
+ imuse/imuse.o \
+ imuse/imuse_mcmp_mgr.o \
+ imuse/imuse_music.o \
+ imuse/imuse_script.o \
+ imuse/imuse_sndmgr.o \
+ imuse/imuse_tables.o \
+ imuse/imuse_track.o \
actor.o \
bitmap.o \
blocky16.o \
@@ -49,6 +56,7 @@
scene.o \
screen.o \
smush.o \
+ sound.o \
textobject.o \
textsplit.o \
timer.o \
Index: main.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/main.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- main.cpp 28 Dec 2004 08:05:17 -0000 1.37
+++ main.cpp 29 Dec 2004 06:32:07 -0000 1.38
@@ -27,6 +27,7 @@
#include "timer.h"
#include "smush.h"
#include "mixer/mixer.h"
+#include "imuse/imuse.h"
#include "driver_gl.h"
@@ -49,6 +50,7 @@
extern SoundMixer *g_mixer;
extern Timer *g_timer;
+extern Imuse *g_imuse;
static bool parseBoolStr(const char *val) {
if (val == NULL || val[0] == 0)
@@ -114,14 +116,11 @@
atexit(saveRegistry);
g_mixer = new SoundMixer();
+ g_mixer->setVolume(255);
g_timer = new Timer();
g_smush = new Smush();
-
g_driver = new Driver(640, 480, 24);
-
- g_mixer->setVolume(255);
-
-// Mixer::instance()->start();
+ g_imuse = new Imuse(10);
Bitmap *splash_bm = ResourceLoader::instance()->loadBitmap("splash.bm");
@@ -162,6 +161,7 @@
lua_removelibslists();
lua_close();
+ delete g_imuse;
delete g_smush;
delete g_timer;
delete g_mixer;
Index: smush.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/smush.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- smush.cpp 28 Dec 2004 18:21:05 -0000 1.48
+++ smush.cpp 29 Dec 2004 06:32:07 -0000 1.49
@@ -34,7 +34,6 @@
void vimaInit(uint16 *destTable);
void decompressVima(const byte *src, int16 *dest, int destLen, uint16 *destTable);
-extern SoundMixer *g_mixer;
void Smush::timerCallback(void *refCon) {
g_smush->handleFrame();
More information about the Scummvm-git-logs
mailing list