[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.260,1.261 costume.cpp,1.133,1.134 script_v2.cpp,2.246,2.247 scumm.cpp,1.106,1.107
Travis Howell
kirben at users.sourceforge.net
Mon Jul 26 06:54:07 CEST 2004
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8925/scumm
Modified Files:
actor.cpp costume.cpp script_v2.cpp scumm.cpp
Log Message:
Cleanup
Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.260
retrieving revision 1.261
diff -u -d -r1.260 -r1.261
--- actor.cpp 18 Jul 2004 23:41:49 -0000 1.260
+++ actor.cpp 26 Jul 2004 13:53:24 -0000 1.261
@@ -1212,7 +1212,7 @@
return;
}
- if (((_gameId == GID_MANIAC) && (_version == 1)) || getTalkingActor() > 0x7F) {
+ if (getTalkingActor() > 0x7F) {
_charsetColor = (byte)_string[0].color;
} else {
a = derefActor(getTalkingActor(), "actorTalk(2)");
Index: costume.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/costume.cpp,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -d -r1.133 -r1.134
--- costume.cpp 25 Jul 2004 09:21:57 -0000 1.133
+++ costume.cpp 26 Jul 2004 13:53:24 -0000 1.134
@@ -342,10 +342,10 @@
}
}
-static const int v1_mm_actor_palatte_1[25] = {
+static const int v1MMActorPalatte1[25] = {
8, 8, 8, 8, 4, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8
};
-static const int v1_mm_actor_palatte_2[25] = {
+static const int v1MMActorPalatte2[25] = {
0, 7, 2, 6, 9, 1, 3, 7, 7, 1, 1, 9, 1, 4, 5, 5, 4, 1, 0, 5, 4, 2, 2, 7, 7
};
@@ -384,8 +384,8 @@
palette[2] = 11;
palette[3] = 11;
} else if (_vm->_gameId == GID_MANIAC) {
- palette[1] = v1_mm_actor_palatte_1[actor];
- palette[2] = v1_mm_actor_palatte_2[actor];
+ palette[1] = v1MMActorPalatte1[actor];
+ palette[2] = v1MMActorPalatte2[actor];
} else {
palette[1] = 8;
palette[2] = _palette[actor];
Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.246
retrieving revision 2.247
diff -u -d -r2.246 -r2.247
--- script_v2.cpp 5 Apr 2004 23:54:55 -0000 2.246
+++ script_v2.cpp 26 Jul 2004 13:53:24 -0000 2.247
@@ -379,8 +379,6 @@
return readVar(fetchScriptByte());
}
-int v1_mm_actor_speech_color[] = {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, 0};
-
void ScummEngine_v2::decodeParseString() {
byte buffer[512];
byte *ptr = buffer;
@@ -423,9 +421,6 @@
// Demos don't set subtitle color before display first subtitle.
if (_demoMode && _actorToPrintStrFor == 0xFF)
_string[textSlot].color = (_version == 2) ? 15 : 1;
- // V1 Mansion Mansion uses dynamic color table for subtitles
- else if (_version == 1 && _actorToPrintStrFor != 0xFF)
- _string[textSlot].color = v1_mm_actor_speech_color[_actorToPrintStrFor];
}
actorTalk(buffer);
@@ -709,9 +704,7 @@
a->setActorCostume(arg);
break;
case 5: // SO_TALK_COLOR
- if ((_gameId == GID_MANIAC) && (_version == 1))
- v1_mm_actor_speech_color[act] = arg;
- else if (_gameId == GID_MANIAC && _demoMode && arg == 1)
+ if (_gameId == GID_MANIAC && _version == 2 && _demoMode && arg == 1)
a->talkColor = 15;
else
a->talkColor = arg;
Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -d -r1.106 -r1.107
--- scumm.cpp 26 Jul 2004 06:23:47 -0000 1.106
+++ scumm.cpp 26 Jul 2004 13:53:24 -0000 1.107
@@ -1101,6 +1101,8 @@
}
}
+int v1MMActorTalkColor[] = {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, 0};
+
void ScummEngine::scummInit() {
int i;
@@ -1162,8 +1164,10 @@
_actors[i].initActor(1);
// this is from IDB
- if ((_version == 1) || (_gameId == GID_MANIAC && _demoMode))
+ if ((_version == 1) || (_gameId == GID_MANIAC && _demoMode)) {
_actors[i].setActorCostume(i);
+ _actors[i].talkColor = v1MMActorTalkColor[i];
+ }
}
// HACK Some palette changes needed for demo script
More information about the Scummvm-git-logs
mailing list