[Scummvm-cvs-logs] CVS: scummvm script_v2.cpp,1.23,1.24 scumm.h,1.56,1.57 sound.cpp,1.20,1.21
James Brown
ender at users.sourceforge.net
Tue Mar 5 08:14:04 CET 2002
Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv28339
Modified Files:
script_v2.cpp scumm.h sound.cpp
Log Message:
Fixed the actor crash bug properly. NOTE: This -will- break ALL saved games
made with previous versions.
Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script_v2.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** script_v2.cpp 5 Mar 2002 09:58:12 -0000 1.23
--- script_v2.cpp 5 Mar 2002 16:13:09 -0000 1.24
***************
*** 1763,1766 ****
--- 1763,1767 ----
a = derefActorSafe(_curActor, "o6_actorSet");
+ if (!a) return;
switch(b) {
Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm.h,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** scumm.h 5 Mar 2002 09:24:42 -0000 1.56
--- scumm.h 5 Mar 2002 16:13:09 -0000 1.57
***************
*** 41,49 ****
NUM_LOCALSCRIPT = 60,
NUM_SHADOW_PALETTE = 8,
- #if defined(FULL_THROTTLE)
NUM_ACTORS = 30
- #else
- NUM_ACTORS = 13
- #endif
};
--- 41,45 ----
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** sound.cpp 27 Feb 2002 22:53:01 -0000 1.20
--- sound.cpp 5 Mar 2002 16:13:09 -0000 1.21
***************
*** 386,391 ****
}
- #define NUM_MIXER 4
-
MixerChannel *Scumm::allocateMixer() {
int i;
--- 386,389 ----
More information about the Scummvm-git-logs
mailing list