thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCI: adding workaround for sq4 room 391

Browse source 
svn-id: r51238
This commit is contained in:
Martin Kiewitz 2010-07-24 07:55:29 +00:00
parent bc04a8377b
commit c8cde0735f
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
engines/sci/engine/workarounds.cpp
View file

@ -107,6 +107,7 @@ const SciWorkaroundEntry kAbs_workarounds[] = {
const SciWorkaroundEntry kDisplay_workarounds[] = { const SciWorkaroundEntry kDisplay_workarounds[] = {
{ GID_ISLANDBRAIN, 300, 300, 0, "geneDude", "show", -1, 0, { WORKAROUND_IGNORE, 0 } }, // when looking at the gene explanation chart - a parameter is an object { GID_ISLANDBRAIN, 300, 300, 0, "geneDude", "show", -1, 0, { WORKAROUND_IGNORE, 0 } }, // when looking at the gene explanation chart - a parameter is an object
{ GID_SQ4, 391, 391, 0, "doCatalog", "mode", 0x84, 0, { WORKAROUND_IGNORE, 0 } }, // clicking on catalog in roboter sale - a parameter is an object { GID_SQ4, 391, 391, 0, "doCatalog", "mode", 0x84, 0, { WORKAROUND_IGNORE, 0 } }, // clicking on catalog in roboter sale - a parameter is an object
{ GID_SQ4, 391, 391, 0, "choosePlug", "changeState", -1, 0, { WORKAROUND_IGNORE, 0 } }, // ordering connector in roboter sale - a parameter is an object
SCI_WORKAROUNDENTRY_TERMINATOR SCI_WORKAROUNDENTRY_TERMINATOR
}; };

15
engines/sci/graphics/paint16.cpp
View file

@ -464,7 +464,7 @@ void GfxPaint16::kernelGraphRedrawBox(Common::Rect rect) {
#define SCI_DISPLAY_DONTSHOWBITS 121 #define SCI_DISPLAY_DONTSHOWBITS 121
reg_t GfxPaint16::kernelDisplay(const char *text, int argc, reg_t *argv) { reg_t GfxPaint16::kernelDisplay(const char *text, int argc, reg_t *argv) {
int displayArg; reg_t displayArg;
TextAlignment alignment = SCI_TEXT16_ALIGNMENT_LEFT; TextAlignment alignment = SCI_TEXT16_ALIGNMENT_LEFT;
int16 colorPen = -1, colorBack = -1, width = -1, bRedraw = 1; int16 colorPen = -1, colorBack = -1, width = -1, bRedraw = 1;
bool doSaveUnder = false; bool doSaveUnder = false;
@ -481,12 +481,11 @@ reg_t GfxPaint16::kernelDisplay(const char *text, int argc, reg_t *argv) {
_ports->textGreyedOutput(false); _ports->textGreyedOutput(false);
// processing codes in argv // processing codes in argv
while (argc > 0) { while (argc > 0) {
if (argv[0].segment) displayArg = argv[0];
displayArg = 0xFFFF; if (displayArg.segment)
else displayArg.offset = 0xFFFF;
displayArg = argv[0].toUint16();
argc--; argv++; argc--; argv++;
switch (displayArg) { switch (displayArg.offset) {
case SCI_DISPLAY_MOVEPEN: case SCI_DISPLAY_MOVEPEN:
_ports->moveTo(argv[0].toUint16(), argv[1].toUint16()); _ports->moveTo(argv[0].toUint16(), argv[1].toUint16());
argc -= 2; argv += 2; argc -= 2; argv += 2;
@ -536,7 +535,7 @@ reg_t GfxPaint16::kernelDisplay(const char *text, int argc, reg_t *argv) {
case SCI_DISPLAY_DUMMY2: case SCI_DISPLAY_DUMMY2:
if (!((g_sci->getGameId() == GID_LONGBOW) && (g_sci->isDemo()))) if (!((g_sci->getGameId() == GID_LONGBOW) && (g_sci->isDemo())))
error("Unknown kDisplay argument %X", displayArg); error("Unknown kDisplay argument %X", displayArg);
if (displayArg == SCI_DISPLAY_DUMMY2) { if (displayArg.offset == SCI_DISPLAY_DUMMY2) {
if (argc) { if (argc) {
argc--; argv++; argc--; argv++;
} else { } else {
@ -548,7 +547,7 @@ reg_t GfxPaint16::kernelDisplay(const char *text, int argc, reg_t *argv) {
SciTrackOriginReply originReply; SciTrackOriginReply originReply;
SciWorkaroundSolution solution = trackOriginAndFindWorkaround(0, kDisplay_workarounds, &originReply); SciWorkaroundSolution solution = trackOriginAndFindWorkaround(0, kDisplay_workarounds, &originReply);
if (solution.type == WORKAROUND_NONE) if (solution.type == WORKAROUND_NONE)
error("Unknown kDisplay argument (%04x:%04x) from method %s::%s (script %d, localCall %x)", PRINT_REG(argv[0]), originReply.objectName.c_str(), originReply.methodName.c_str(), originReply.scriptNr, originReply.localCallOffset); error("Unknown kDisplay argument (%04x:%04x) from method %s::%s (script %d, localCall %x)", PRINT_REG(displayArg), originReply.objectName.c_str(), originReply.methodName.c_str(), originReply.scriptNr, originReply.localCallOffset);
assert(solution.type == WORKAROUND_IGNORE); assert(solution.type == WORKAROUND_IGNORE);
break; break;
} }