[Scummvm-cvs-logs] CVS: scummvm/scumm script_v72he.cpp,2.279,2.280
kirben
kirben at users.sourceforge.net
Mon May 2 00:21:40 CEST 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/sword2/driver animation.h,1.36,1.37 d_sound.cpp,1.146,1.147 render.cpp,1.75,1.76 sprite.cpp,1.48,1.49
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm wiz_he.cpp,2.71,2.72 wiz_he.h,2.19,2.20
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6076/scumm
Modified Files:
script_v72he.cpp
Log Message:
Add work around for script bug in the first version of pajama.
Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.279
retrieving revision 2.280
diff -u -d -r2.279 -r2.280
--- script_v72he.cpp 1 May 2005 06:54:27 -0000 2.279
+++ script_v72he.cpp 2 May 2005 07:20:44 -0000 2.280
@@ -1569,13 +1569,23 @@
void ScummEngine_v72he::o72_talkActor() {
Actor *a;
- _actorToPrintStrFor = pop();
+ int act = pop();
_string[0].loadDefault();
- if (_actorToPrintStrFor != 0xFF) {
- a = derefActor(_actorToPrintStrFor, "o72_talkActor");
- _string[0].color = a->_talkColor;
+
+ // A value of 225 can occur when examining the gold in the mine of pajama, after mining the gold.
+ // This is a script bug, the script should set the subtitle color, not actor number.
+ // This script bug was fixed in the updated version of pajama.
+ if (act == 225) {
+ _string[0].color = act;
+ } else {
+ _actorToPrintStrFor = act;
+ if (_actorToPrintStrFor != 0xFF) {
+ a = derefActor(_actorToPrintStrFor, "o72_talkActor");
+ _string[0].color = a->_talkColor;
+ }
}
+
actorTalk(_scriptPointer);
_scriptPointer += resStrLen(_scriptPointer) + 1;
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/sword2/driver animation.h,1.36,1.37 d_sound.cpp,1.146,1.147 render.cpp,1.75,1.76 sprite.cpp,1.48,1.49
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm wiz_he.cpp,2.71,2.72 wiz_he.h,2.19,2.20
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list