[Scummvm-cvs-logs] CVS: residual/imuse imuse.cpp,1.17,1.18 imuse.h,1.17,1.18 imuse_sndmgr.h,1.8,1.9 imuse_track.cpp,1.13,1.14 limits.h,1.1,NONE
Erich Edgar Hoover
compholio at users.sourceforge.net
Wed Jul 20 23:01:43 CEST 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/saga game.cpp,1.81,1.82 interface.cpp,1.120,1.121 script.h,1.94,1.95 sfuncs.cpp,1.140,1.141 sthread.cpp,1.87,1.88
- Next message: [Scummvm-cvs-logs] CVS: residual README,1.25,1.26 TODO,1.49,1.50 actor.cpp,1.54,1.55 costume.cpp,1.30,1.31 costume.h,1.16,1.17 engine.cpp,1.79,1.80 lua.cpp,1.142,1.143 model.cpp,1.28,1.29 model.h,1.10,1.11 smush.cpp,1.62,1.63 smush.h,1.25,1.26
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/residual/imuse
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22694
Modified Files:
imuse.cpp imuse.h imuse_sndmgr.h imuse_track.cpp
Removed Files:
limits.h
Log Message:
Fix for scene changing bug (task cleanup problem) - better SMUSH looping - actor choring now allowed when actor not visible
Index: imuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/imuse/imuse.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- imuse.cpp 14 Jan 2005 20:53:03 -0000 1.17
+++ imuse.cpp 21 Jul 2005 05:59:35 -0000 1.18
@@ -57,6 +57,7 @@
_track[l] = new Track;
_track[l]->trackId = l;
_track[l]->used = false;
+ strcpy(_track[l]->soundName, "");
}
vimaInit(imuseDestTable);
_stateMusicTable = grimStateMusicTable;
Index: imuse.h
===================================================================
RCS file: /cvsroot/scummvm/residual/imuse/imuse.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- imuse.h 17 Jul 2005 23:40:21 -0000 1.17
+++ imuse.h 21 Jul 2005 05:59:35 -0000 1.18
@@ -29,7 +29,10 @@
#include "imuse/imuse_sndmgr.h"
#include "imuse/imuse_mcmp_mgr.h"
-#include "imuse/limits.h"
+// When Manny goes for Glottis' heart in the Petrified Forest we need
+// at least 16 tracks (sp.set)
+#define MAX_IMUSE_TRACKS 16
+#define MAX_IMUSE_FADETRACKS 8
struct ImuseTable {
byte opcode;
Index: imuse_sndmgr.h
===================================================================
RCS file: /cvsroot/scummvm/residual/imuse/imuse_sndmgr.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- imuse_sndmgr.h 17 Jul 2005 23:40:21 -0000 1.8
+++ imuse_sndmgr.h 21 Jul 2005 05:59:35 -0000 1.9
@@ -25,7 +25,6 @@
#include "mixer/mixer.h"
#include "mixer/audiostream.h"
-#include "imuse/limits.h"
class McmpMgr;
class Block;
@@ -33,9 +32,8 @@
class ImuseSndMgr {
public:
-// MAX_IMUSE_SOUNDS should not be hardcoded, it should represent
-// the maximum number of different tracks, see limits.h
-#define MAX_IMUSE_SOUNDS MAX_IMUSE_TRACKS+MAX_IMUSE_FADETRACKS
+// MAX_IMUSE_SOUNDS needs to be hardcoded, ask aquadran
+#define MAX_IMUSE_SOUNDS 16
// The numbering below fixes talking to Domino in his office
// and it also allows Manny to get the info for Mercedes
Index: imuse_track.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/imuse/imuse_track.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- imuse_track.cpp 17 Jul 2005 23:40:21 -0000 1.13
+++ imuse_track.cpp 21 Jul 2005 05:59:35 -0000 1.14
@@ -91,7 +91,7 @@
}
if (i == 0) {
if (debugLevel == DEBUG_IMUSE || debugLevel == DEBUG_WARN || debugLevel == DEBUG_ALL)
- warning("Imuse::startSound(): flushTracks was unnable to free up a track!");
+ warning("Imuse::startSound(): flushTracks was unable to free up a track for %s!", soundName);
}
track->pan = pan * 1000;
@@ -170,7 +170,7 @@
// Since the audio (at least for Eva's keystrokes) can be referenced
// two ways: keyboard.IMU and keyboard.imu, make a case insensitive
// search for the track to make sure we can find it
- if (strcasecmp(track->soundName, soundName) == 0) {
+ if (strlen(track->soundName) != 0 && strcasecmp(track->soundName, soundName) == 0) {
return track;
}
}
--- limits.h DELETED ---
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/saga game.cpp,1.81,1.82 interface.cpp,1.120,1.121 script.h,1.94,1.95 sfuncs.cpp,1.140,1.141 sthread.cpp,1.87,1.88
- Next message: [Scummvm-cvs-logs] CVS: residual README,1.25,1.26 TODO,1.49,1.50 actor.cpp,1.54,1.55 costume.cpp,1.30,1.31 costume.h,1.16,1.17 engine.cpp,1.79,1.80 lua.cpp,1.142,1.143 model.cpp,1.28,1.29 model.h,1.10,1.11 smush.cpp,1.62,1.63 smush.h,1.25,1.26
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list