[Scummvm-cvs-logs] CVS: scummvm/scumm script_v100he.cpp,2.182,2.183 script_v72he.cpp,2.320,2.321 sound_he.cpp,2.3,2.4
kirben
kirben at users.sourceforge.net
Thu Jan 5 00:43:04 CET 2006
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20215/scumm
Modified Files:
script_v100he.cpp script_v72he.cpp sound_he.cpp
Log Message:
Sets random talk state, if value is zero.
Fixes song in puttrace.
Index: script_v100he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v100he.cpp,v
retrieving revision 2.182
retrieving revision 2.183
diff -u -d -r2.182 -r2.183
--- script_v100he.cpp 5 Jan 2006 07:06:47 -0000 2.182
+++ script_v100he.cpp 5 Jan 2006 08:42:48 -0000 2.183
@@ -431,7 +431,7 @@
for (i = 0; i < k; ++i) {
a->setUserCondition(args[i] & 0x7F, args[i] & 0x80);
}
- debug(1,"o100_actorOps: case 21 (%d)", k);
+ debug(1,"o100_actorOps: case 22 (%d)", k);
break;
case 25: // SO_COSTUME
a->setActorCostume(pop());
@@ -559,9 +559,10 @@
break;
case 142:
k = pop();
+ if (k == 0)
+ k = _rnd.getRandomNumberRng(1, 10);
a->_heNoTalkAnimation = 1;
a->setTalkCondition(k);
- debug(1,"o100_actorOps: case 24 (%d)", k);
break;
case 143: // SO_TEXT_OFFSET
a->_talkPosY = pop();
Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.320
retrieving revision 2.321
diff -u -d -r2.320 -r2.321
--- script_v72he.cpp 5 Jan 2006 07:06:47 -0000 2.320
+++ script_v72he.cpp 5 Jan 2006 08:42:48 -0000 2.321
@@ -1139,9 +1139,10 @@
break;
case 24: // HE 80+
k = pop();
+ if (k == 0)
+ k = _rnd.getRandomNumberRng(1, 10);
a->_heNoTalkAnimation = 1;
a->setTalkCondition(k);
- debug(1,"o72_actorOps: case 24 (%d)", k);
break;
case 43: // HE 90+
// HE games use reverse order of layering, so we adjust
Index: sound_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound_he.cpp,v
retrieving revision 2.3
retrieving revision 2.4
diff -u -d -r2.3 -r2.4
--- sound_he.cpp 5 Jan 2006 07:55:23 -0000 2.3
+++ sound_he.cpp 5 Jan 2006 08:42:48 -0000 2.4
@@ -96,7 +96,7 @@
}
if (chan != -1) {
- debug(1, "getSoundVar: sound %d var %d result %d\n", sound, var, _heChannel[chan].soundVars[var]);
+ debug(0, "getSoundVar: sound %d var %d result %d", sound, var, _heChannel[chan].soundVars[var]);
return _heChannel[chan].soundVars[var];
} else {
return 0;
@@ -113,6 +113,7 @@
}
if (chan != -1) {
+ debug(0, "setSoundVar: sound %d var %d val %d", sound, var, val);
_heChannel[chan].soundVars[var] = val;
}
}
More information about the Scummvm-git-logs
mailing list