[Scummvm-cvs-logs] SF.net SVN: scummvm: [21462] scummvm/trunk/engines/scumm/he
kirben at users.sourceforge.net
kirben at users.sourceforge.net
Sun Mar 26 01:22:01 CET 2006
Revision: 21462
Author: kirben
Date: 2006-03-26 01:21:07 -0800 (Sun, 26 Mar 2006)
ViewCVS: http://svn.sourceforge.net/scummvm/?rev=21462&view=rev
Log Message:
-----------
Always use the correct string slot for HE games specific cases in decodeParseString()
Modified Paths:
--------------
scummvm/trunk/engines/scumm/he/script_v100he.cpp
scummvm/trunk/engines/scumm/he/script_v60he.cpp
scummvm/trunk/engines/scumm/he/script_v72he.cpp
Modified: scummvm/trunk/engines/scumm/he/script_v100he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/script_v100he.cpp 2006-03-26 09:09:35 UTC (rev 21461)
+++ scummvm/trunk/engines/scumm/he/script_v100he.cpp 2006-03-26 09:21:07 UTC (rev 21462)
@@ -2937,7 +2937,7 @@
push(colors);
getStackList(args, ARRAYSIZE(args));
for (i = 0; i < 16; i++)
- _charsetColorMap[i] = _charsetData[_string[1]._default.charset][i] = (unsigned char)args[i];
+ _charsetColorMap[i] = _charsetData[_string[m]._default.charset][i] = (unsigned char)args[i];
_string[m].color = _charsetColorMap[0];
}
break;
@@ -2975,7 +2975,7 @@
_actorToPrintStrFor = pop();
if (_actorToPrintStrFor != 0xFF) {
a = derefActor(_actorToPrintStrFor, "decodeParseString");
- _string[0].color = a->_talkColor;
+ _string[m].color = a->_talkColor;
}
}
break;
Modified: scummvm/trunk/engines/scumm/he/script_v60he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/script_v60he.cpp 2006-03-26 09:09:35 UTC (rev 21461)
+++ scummvm/trunk/engines/scumm/he/script_v60he.cpp 2006-03-26 09:21:07 UTC (rev 21462)
@@ -1301,7 +1301,7 @@
push(colors);
getStackList(args, ARRAYSIZE(args));
for (i = 0; i < 16; i++)
- _charsetColorMap[i] = _charsetData[_string[1]._default.charset][i] = (unsigned char)args[i];
+ _charsetColorMap[i] = _charsetData[_string[m]._default.charset][i] = (unsigned char)args[i];
_string[m].color = _charsetColorMap[0];
}
break;
Modified: scummvm/trunk/engines/scumm/he/script_v72he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/script_v72he.cpp 2006-03-26 09:09:35 UTC (rev 21461)
+++ scummvm/trunk/engines/scumm/he/script_v72he.cpp 2006-03-26 09:21:07 UTC (rev 21462)
@@ -2302,7 +2302,7 @@
push(colors);
getStackList(args, ARRAYSIZE(args));
for (i = 0; i < 16; i++)
- _charsetColorMap[i] = _charsetData[_string[1]._default.charset][i] = (unsigned char)args[i];
+ _charsetColorMap[i] = _charsetData[_string[m]._default.charset][i] = (unsigned char)args[i];
_string[m].color = _charsetColorMap[0];
}
break;
@@ -2312,7 +2312,7 @@
_actorToPrintStrFor = pop();
if (_actorToPrintStrFor != 0xFF) {
a = derefActor(_actorToPrintStrFor, "decodeParseString");
- _string[0].color = a->_talkColor;
+ _string[m].color = a->_talkColor;
}
}
break;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list