[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.359,1.360 script_v2.cpp,2.277,2.278
kirben
kirben at users.sourceforge.net
Wed May 18 18:56:09 CEST 2005
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28198/scumm
Modified Files:
actor.cpp script_v2.cpp
Log Message:
Correct subtitle colors in C64 maniac.
Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.359
retrieving revision 1.360
diff -u -d -r1.359 -r1.360
--- actor.cpp 15 May 2005 19:27:46 -0000 1.359
+++ actor.cpp 19 May 2005 01:54:36 -0000 1.360
@@ -852,6 +852,9 @@
}
}
+static const int c64MMActorTalkColor[25] = {
+ 1, 7, 2, 14, 8, 15, 3, 7, 7, 15, 1, 13, 1, 4, 5, 5, 4, 3, 1, 5, 1, 1, 1, 1, 7
+};
static const int v1MMActorTalkColor[25] = {
1, 7, 2, 14, 8, 1, 3, 7, 7, 12, 1, 13, 1, 4, 5, 5, 4, 3, 1, 5, 1, 1, 1, 7, 7
};
@@ -859,8 +862,13 @@
void ScummEngine::setupV1ActorTalkColor() {
int i;
- for (i = 1; i < _numActors; i++)
- _actors[i]._talkColor = v1MMActorTalkColor[i];
+ for (i = 1; i < _numActors; i++) {
+ if (_platform == Common::kPlatformC64) {
+ _actors[i]._talkColor = c64MMActorTalkColor[i];
+ } else {
+ _actors[i]._talkColor = v1MMActorTalkColor[i];
+ }
+ }
}
void ScummEngine::showActors() {
Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.277
retrieving revision 2.278
diff -u -d -r2.277 -r2.278
--- script_v2.cpp 18 May 2005 00:46:30 -0000 2.277
+++ script_v2.cpp 19 May 2005 01:54:37 -0000 2.278
@@ -421,10 +421,12 @@
_string[textSlot].center = false;
_string[textSlot].overhead = false;
- if (_gameId == GID_MANIAC) {
- // Demos don't set subtitle color before display first subtitle.
- if (_demoMode && _actorToPrintStrFor == 0xFF)
+ if (_gameId == GID_MANIAC && _actorToPrintStrFor == 0xFF) {
+ if (_platform == Common::kPlatformC64) {
+ _string[textSlot].color = 14;
+ } else if (_demoMode) {
_string[textSlot].color = (_version == 2) ? 15 : 1;
+ }
}
actorTalk(buffer);
More information about the Scummvm-git-logs
mailing list