diff options
Diffstat (limited to 'engines/scumm')
26 files changed, 119 insertions, 119 deletions
diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp index 9f65bfbf94..8882abfeb4 100644 --- a/engines/scumm/actor.cpp +++ b/engines/scumm/actor.cpp @@ -2112,7 +2112,7 @@ const byte *Actor::getActorName() { if (_vm->_game.version == 0) { ptr = (const byte *)v0ActorNames[_number - 1]; } else { - ptr = _vm->getResourceAddress(rtActorName, _number); + ptr = _vm->getResourceAddress(rtActorName, _number); } if (ptr == NULL) { diff --git a/engines/scumm/bomp.cpp b/engines/scumm/bomp.cpp index ecd6f16923..ddb6264ccc 100644 --- a/engines/scumm/bomp.cpp +++ b/engines/scumm/bomp.cpp @@ -138,7 +138,7 @@ void bompApplyShadow0(const byte *shadowPalette, const byte *line_buffer, byte * byte tmp = *line_buffer++; if (tmp != transparency) { if (HE7Check) - *dst = shadowPalette[tmp]; + *dst = shadowPalette[tmp]; else *dst = tmp; } diff --git a/engines/scumm/charset.cpp b/engines/scumm/charset.cpp index 207c3a51a4..f427594d54 100644 --- a/engines/scumm/charset.cpp +++ b/engines/scumm/charset.cpp @@ -251,7 +251,7 @@ byte *ScummEngine::get2byteCharPtr(int idx) { default: idx = 0; } - return _2byteFontPtr + ((_2byteWidth + 7) / 8) * _2byteHeight * idx; + return _2byteFontPtr + ((_2byteWidth + 7) / 8) * _2byteHeight * idx; } diff --git a/engines/scumm/cursor.cpp b/engines/scumm/cursor.cpp index 0d0e7b054b..367247544b 100644 --- a/engines/scumm/cursor.cpp +++ b/engines/scumm/cursor.cpp @@ -228,7 +228,7 @@ void ScummEngine_v6::setCursorFromImg(uint img, uint room, uint imgindex) { } else { if (_game.heversion == 0) { setCursorHotspot(READ_LE_UINT16(&imhd->old.hotspot[0].x), - READ_LE_UINT16(&imhd->old.hotspot[0].y)); + READ_LE_UINT16(&imhd->old.hotspot[0].y)); } w = READ_LE_UINT16(&foir.cdhd->v6.w) / 8; h = READ_LE_UINT16(&foir.cdhd->v6.h) / 8; diff --git a/engines/scumm/gfx.cpp b/engines/scumm/gfx.cpp index f28cbb3548..e6663af855 100644 --- a/engines/scumm/gfx.cpp +++ b/engines/scumm/gfx.cpp @@ -3174,7 +3174,7 @@ void ScummEngine::fadeIn(int effect) { // // Hopefully it's safe to do it at this point, at least. _virtscr[kMainVirtScreen].setDirtyRange(0, 0); - transitionEffect(effect - 1); + transitionEffect(effect - 1); break; case 128: unkScreenEffect6(); @@ -3206,11 +3206,11 @@ void ScummEngine::fadeOut(int effect) { if (_game.version < 7) camera._last.x = camera._cur.x; - // TheDig can disable fadeIn(), and may call fadeOut() several times - // successively. Disabling the _screenEffectFlag check forces the screen - // to get cleared. This fixes glitches, at least, in the first cutscenes - // when bypassed of FT and TheDig. - if ((_game.version == 7 || _screenEffectFlag) && effect != 0) { + // TheDig can disable fadeIn(), and may call fadeOut() several times + // successively. Disabling the _screenEffectFlag check forces the screen + // to get cleared. This fixes glitches, at least, in the first cutscenes + // when bypassed of FT and TheDig. + if ((_game.version == 7 || _screenEffectFlag) && effect != 0) { // Fill screen 0 with black memset(vs->getPixels(0, 0), 0, vs->pitch * vs->h); @@ -3301,7 +3301,7 @@ void ScummEngine::transitionEffect(int a) { b = bottom; if (t < 0) t = 0; - _virtscr[kMainVirtScreen].tdirty[l] = _screenTop + t * 8; + _virtscr[kMainVirtScreen].tdirty[l] = _screenTop + t * 8; _virtscr[kMainVirtScreen].bdirty[l] = _screenTop + (b + 1) * 8; } updateDirtyScreen(kMainVirtScreen); diff --git a/engines/scumm/he/floodfill_he.cpp b/engines/scumm/he/floodfill_he.cpp index 4fdfe139fc..d3578e2189 100644 --- a/engines/scumm/he/floodfill_he.cpp +++ b/engines/scumm/he/floodfill_he.cpp @@ -110,15 +110,15 @@ static void floodFillProcess(int x, int y, FloodFillState *ffs, FloodFillPixelCh Common::Rect r; int x_start; FloodFillLine *fflCur = --(*fillLineCur); - int dy = fflCur->inc; - int x_end = fflCur->x2; - int x1 = fflCur->x1; - int x2 = fflCur->x1 + 1; + int dy = fflCur->inc; + int x_end = fflCur->x2; + int x1 = fflCur->x1; + int x2 = fflCur->x1 + 1; r.bottom = r.top = y = fflCur->y + fflCur->inc; - r.left = x2; - r.right = x1; - x = x1; - while (ffs->srcBox.left <= x) { + r.left = x2; + r.right = x1; + x = x1; + while (ffs->srcBox.left <= x) { if (!(*pixelCheckCallback)(x, y, ffs)) { break; } diff --git a/engines/scumm/he/resource_he.cpp b/engines/scumm/he/resource_he.cpp index 0715bf756b..75da8cd04a 100644 --- a/engines/scumm/he/resource_he.cpp +++ b/engines/scumm/he/resource_he.cpp @@ -429,7 +429,7 @@ byte *Win32ResExtractor::extract_group_icon_cursor_resource(WinLibrary *fi, WinR /* get_resource_entry has printed error */ return NULL; } - if (size == 0) { + if (size == 0) { skipped++; continue; } diff --git a/engines/scumm/he/resource_he.h b/engines/scumm/he/resource_he.h index 08f9a8108a..a3237e7b3b 100644 --- a/engines/scumm/he/resource_he.h +++ b/engines/scumm/he/resource_he.h @@ -46,7 +46,7 @@ namespace Scumm { #define PE_HEADER(module) \ ((Win32ImageNTHeaders*)((byte *)(module) + \ - (((DOSImageHeader*)(module))->lfanew))) + (((DOSImageHeader*)(module))->lfanew))) #define PE_SECTIONS(module) \ ((Win32ImageSectionHeader *)((byte *) &PE_HEADER(module)->optional_header + \ diff --git a/engines/scumm/he/script_v60he.cpp b/engines/scumm/he/script_v60he.cpp index 91312a4cfa..836f99b193 100644 --- a/engines/scumm/he/script_v60he.cpp +++ b/engines/scumm/he/script_v60he.cpp @@ -847,16 +847,16 @@ uint8 virtScreenLoadUnpack(vsUnpackCtx *ctx, byte *data) { ctx->size = a; a = (a >> 1) + 1; } else { - a = ctx->size; + a = ctx->size; } - if (ctx->type == 2) { - ctx->b = *(ctx->ptr)++; - } - ctx->size = a - 1; - if (ctx->size == 0) { - ctx->type = 0; - } - decByte = ctx->b; + if (ctx->type == 2) { + ctx->b = *(ctx->ptr)++; + } + ctx->size = a - 1; + if (ctx->size == 0) { + ctx->type = 0; + } + decByte = ctx->b; } return decByte; } diff --git a/engines/scumm/he/script_v72he.cpp b/engines/scumm/he/script_v72he.cpp index c03be592d6..8cc87d74b6 100644 --- a/engines/scumm/he/script_v72he.cpp +++ b/engines/scumm/he/script_v72he.cpp @@ -1958,10 +1958,10 @@ void ScummEngine_v72he::redimArray(int arrayId, int newDim2start, int newDim2end void ScummEngine_v72he::checkArrayLimits(int array, int dim2start, int dim2end, int dim1start, int dim1end) { if (dim1end < dim1start) { error("Across max %d smaller than min %d", dim1end, dim1start); - } - if (dim2end < dim2start) { - error("Down max %d smaller than min %d", dim2end, dim2start); - } + } + if (dim2end < dim2start) { + error("Down max %d smaller than min %d", dim2end, dim2start); + } ArrayHeader *ah = (ArrayHeader *)getResourceAddress(rtString, readVar(array)); assert(ah); if ((int)FROM_LE_32(ah->dim2start) > dim2start || (int)FROM_LE_32(ah->dim2end) < dim2end || (int)FROM_LE_32(ah->dim1start) > dim1start || (int)FROM_LE_32(ah->dim1end) < dim1end) { diff --git a/engines/scumm/he/wiz_he.cpp b/engines/scumm/he/wiz_he.cpp index 644fad7883..df472307eb 100644 --- a/engines/scumm/he/wiz_he.cpp +++ b/engines/scumm/he/wiz_he.cpp @@ -267,8 +267,8 @@ void Wiz::copyAuxImage(uint8 *dst1, uint8 *dst2, const uint8 *src, int dstw, int uint8 *dst2Ptr = dst2 + dstRect.left + dstRect.top * dstw; const uint8 *dataPtr = src; - while (rh--) { - uint16 off = READ_LE_UINT16(dataPtr); dataPtr += 2; + while (rh--) { + uint16 off = READ_LE_UINT16(dataPtr); dataPtr += 2; const uint8 *dataPtrNext = off + dataPtr; uint8 *dst1PtrNext = dst1Ptr + dstw; uint8 *dst2PtrNext = dst2Ptr + dstw; @@ -1302,40 +1302,40 @@ struct PolygonDrawData { int32 tx_acc = tp1->x << 16; int32 sx_acc = sp1->x << 16; int32 sy_acc = sp1->y << 16; - uint16 dy = ABS(tp2->y - tp1->y) + 1; - int32 tx_step = ((tp2->x - tp1->x) << 16) / dy; - int32 sx_step = ((sp2->x - sp1->x) << 16) / dy; - int32 sy_step = ((sp2->y - sp1->y) << 16) / dy; - - int y = tp1->y - mat[0].y; - while (dy--) { - assert(y >= 0 && y < pAreasNum); - PolygonArea *ppa = &pa[y]; - int32 ttx = tx_acc >> 16; - int32 tsx = sx_acc >> 16; - int32 tsy = sy_acc >> 16; - - if (ppa->xmin > ttx) { - ppa->xmin = ttx; - ppa->x1 = tsx; - ppa->y1 = tsy; + uint16 dy = ABS(tp2->y - tp1->y) + 1; + int32 tx_step = ((tp2->x - tp1->x) << 16) / dy; + int32 sx_step = ((sp2->x - sp1->x) << 16) / dy; + int32 sy_step = ((sp2->y - sp1->y) << 16) / dy; + + int y = tp1->y - mat[0].y; + while (dy--) { + assert(y >= 0 && y < pAreasNum); + PolygonArea *ppa = &pa[y]; + int32 ttx = tx_acc >> 16; + int32 tsx = sx_acc >> 16; + int32 tsy = sy_acc >> 16; + + if (ppa->xmin > ttx) { + ppa->xmin = ttx; + ppa->x1 = tsx; + ppa->y1 = tsy; } - if (ppa->xmax < ttx) { - ppa->xmax = ttx; - ppa->x2 = tsx; - ppa->y2 = tsy; + if (ppa->xmax < ttx) { + ppa->xmax = ttx; + ppa->x2 = tsx; + ppa->y2 = tsy; } - tx_acc += tx_step; - sx_acc += sx_step; - sy_acc += sy_step; + tx_acc += tx_step; + sx_acc += sx_step; + sy_acc += sy_step; - if (tp2->y <= tp1->y) { - --y; - } else { - ++y; - } - } + if (tp2->y <= tp1->y) { + --y; + } else { + ++y; + } + } } }; @@ -1411,26 +1411,26 @@ void Wiz::drawWizPolygonTransform(int resNum, int state, Common::Point *wp, int bbox[3].x = 0; bbox[3].y = wizH - 1; - int16 xmin_p, xmax_p, ymin_p, ymax_p; - xmin_p = ymin_p = (int16)0x7FFF; - xmax_p = ymax_p = (int16)0x8000; + int16 xmin_p, xmax_p, ymin_p, ymax_p; + xmin_p = ymin_p = (int16)0x7FFF; + xmax_p = ymax_p = (int16)0x8000; - for (i = 0; i < 4; ++i) { - xmin_p = MIN(wp[i].x, xmin_p); - xmax_p = MAX(wp[i].x, xmax_p); - ymin_p = MIN(wp[i].y, ymin_p); - ymax_p = MAX(wp[i].y, ymax_p); - } + for (i = 0; i < 4; ++i) { + xmin_p = MIN(wp[i].x, xmin_p); + xmax_p = MAX(wp[i].x, xmax_p); + ymin_p = MIN(wp[i].y, ymin_p); + ymax_p = MAX(wp[i].y, ymax_p); + } - int16 xmin_b, xmax_b, ymin_b, ymax_b; - xmin_b = ymin_b = (int16)0x7FFF; - xmax_b = ymax_b = (int16)0x8000; + int16 xmin_b, xmax_b, ymin_b, ymax_b; + xmin_b = ymin_b = (int16)0x7FFF; + xmax_b = ymax_b = (int16)0x8000; for (i = 0; i < 4; ++i) { - xmin_b = MIN(bbox[i].x, xmin_b); - xmax_b = MAX(bbox[i].x, xmax_b); - ymin_b = MIN(bbox[i].y, ymin_b); - ymax_b = MAX(bbox[i].y, ymax_b); + xmin_b = MIN(bbox[i].x, xmin_b); + xmax_b = MAX(bbox[i].x, xmax_b); + ymin_b = MIN(bbox[i].y, ymin_b); + ymax_b = MAX(bbox[i].y, ymax_b); } PolygonDrawData pdd(ymax_p - ymin_p + 1); @@ -1872,7 +1872,7 @@ void Wiz::processWizImage(const WizParameters *params) { displayWizComplexImage(params); break; case 2: - captureWizImage(params->img.resNum, params->box, (params->img.flags & kWIFBlitToFrontVideoBuffer) != 0, params->compType); + captureWizImage(params->img.resNum, params->box, (params->img.flags & kWIFBlitToFrontVideoBuffer) != 0, params->compType); break; case 3: if (params->processFlags & kWPFUseFile) { diff --git a/engines/scumm/help.cpp b/engines/scumm/help.cpp index 4752cfa43a..d9bdf51d19 100644 --- a/engines/scumm/help.cpp +++ b/engines/scumm/help.cpp @@ -46,7 +46,7 @@ int ScummHelp::numPages(byte gameId) { case GID_MONKEY: case GID_MONKEY2: case GID_INDY4: - case GID_TENTACLE: + case GID_TENTACLE: case GID_SAMNMAX: case GID_DIG: case GID_FT: diff --git a/engines/scumm/insane/insane.h b/engines/scumm/insane/insane.h index 6ec5bd4f2a..761ca8b96c 100644 --- a/engines/scumm/insane/insane.h +++ b/engines/scumm/insane/insane.h @@ -81,7 +81,7 @@ class Insane { bool _insaneIsRunning; int32 _numberArray; - int32 _emulTimerId; + int32 _emulTimerId; int32 _emulateInterrupt; int32 _flag1d; int32 _mainTimerId; diff --git a/engines/scumm/insane/insane_enemy.cpp b/engines/scumm/insane/insane_enemy.cpp index 4577512387..6f8bb1f0ca 100644 --- a/engines/scumm/insane/insane_enemy.cpp +++ b/engines/scumm/insane/insane_enemy.cpp @@ -1009,7 +1009,7 @@ int32 Insane::enemy5initializer(int32 actor1, int32 actor2, int32 probability) { int i; for (i = 0; i < 9; i++) - _enemyState[EN_VULTF2][i] = 0; + _enemyState[EN_VULTF2][i] = 0; for (i = 0; i < 9; i++) _enHdlVar[EN_VULTF2][i] = 0; diff --git a/engines/scumm/insane/insane_iact.cpp b/engines/scumm/insane/insane_iact.cpp index b94dee6678..c7f0c7220b 100644 --- a/engines/scumm/insane/insane_iact.cpp +++ b/engines/scumm/insane/insane_iact.cpp @@ -525,7 +525,7 @@ void Insane::iactScene17(byte *renderBitmap, int32 codecparam, int32 setupsan12, void Insane::iactScene21(byte *renderBitmap, int32 codecparam, int32 setupsan12, int32 setupsan13, Chunk &b, int32 size, int32 flags, - int16 par1, int16 par2, int16 par3, int16 par4) { + int16 par1, int16 par2, int16 par3, int16 par4) { // void implementation } diff --git a/engines/scumm/insane/insane_scenes.cpp b/engines/scumm/insane/insane_scenes.cpp index c7610da062..95741e145c 100644 --- a/engines/scumm/insane/insane_scenes.cpp +++ b/engines/scumm/insane/insane_scenes.cpp @@ -1257,7 +1257,7 @@ void Insane::postCase8(byte *renderBitmap, int32 codecparam, int32 setupsan12, } } } - } + } _roadBranch = false; _roadStop = false; @@ -1318,7 +1318,7 @@ void Insane::postCase10(byte *renderBitmap, int32 codecparam, int32 setupsan12, break; } } - } + } _roadBranch = false; _roadStop = false; diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp index fac3ad9975..bb05859c24 100644 --- a/engines/scumm/saveload.cpp +++ b/engines/scumm/saveload.cpp @@ -945,7 +945,7 @@ void ScummEngine::saveOrLoad(Serializer *s) { if (memcmp(md5Backup, _gameMD5, 16) != 0) { warning("Game was saved with different gamedata - you may encounter problems"); debug(1, "You have %s and save is %s.", md5str2, md5str1); - memcpy(_gameMD5, md5Backup, 16); + memcpy(_gameMD5, md5Backup, 16); } } @@ -1068,16 +1068,16 @@ void ScummEngine::saveOrLoad(Serializer *s) { // Old, fragile resource save/load system. Doesn't save resources // with index 0, and breaks whenever we change the limit on a given // resource type. - for (type = rtFirst; type <= rtLast; type++) - if (_res->mode[type] != 1 && type != rtTemp && type != rtBuffer) { - // For V1-V5 games, there used to be no object name resources. - // At some point this changed. But since old savegames rely on - // unchanged resource counts, we have to hard code the following check - if (_game.version < 6 && type == rtObjectName) - continue; - for (idx = 1; idx < _res->num[type]; idx++) - saveLoadResource(s, type, idx); - } + for (type = rtFirst; type <= rtLast; type++) + if (_res->mode[type] != 1 && type != rtTemp && type != rtBuffer) { + // For V1-V5 games, there used to be no object name resources. + // At some point this changed. But since old savegames rely on + // unchanged resource counts, we have to hard code the following check + if (_game.version < 6 && type == rtObjectName) + continue; + for (idx = 1; idx < _res->num[type]; idx++) + saveLoadResource(s, type, idx); + } } diff --git a/engines/scumm/script_v2.cpp b/engines/scumm/script_v2.cpp index 8f4f5e3d97..1506e7b411 100644 --- a/engines/scumm/script_v2.cpp +++ b/engines/scumm/script_v2.cpp @@ -692,7 +692,7 @@ void ScummEngine_v2::o2_actorOps() { a = derefActor(act, "actorOps"); switch (_opcode) { - case 1: // SO_SOUND + case 1: // SO_SOUND a->_sound[0] = arg; break; case 2: // SO_PALETTE diff --git a/engines/scumm/script_v5.cpp b/engines/scumm/script_v5.cpp index cdd3e94215..d54ec4b45a 100644 --- a/engines/scumm/script_v5.cpp +++ b/engines/scumm/script_v5.cpp @@ -2529,7 +2529,7 @@ void ScummEngine_v5::o5_verbOps() { vs->curRect.top += 8; break; } - } else if (_game.id == GID_LOOM && _game.version == 4) { + } else if (_game.id == GID_LOOM && _game.version == 4) { // FIXME: hack loom notes into right spot if ((verb >= 90) && (verb <= 97)) { // Notes switch (verb) { @@ -2878,10 +2878,10 @@ void ScummEngine_v5::decodeParseString() { } - // In SCUMM V1-V3, there were no 'default' values for the text slot - // values. Hence to achieve correct behaviour, we have to keep the - // 'default' values in sync with the active values. - // + // In SCUMM V1-V3, there were no 'default' values for the text slot + // values. Hence to achieve correct behaviour, we have to keep the + // 'default' values in sync with the active values. + // // Note: This is needed for Indy3 (Grail Diary). It's also needed // for Loom, or the lines Bobbin speaks during the intro are put // at position 0,0. diff --git a/engines/scumm/script_v6.cpp b/engines/scumm/script_v6.cpp index 2d195026ef..420ee6a739 100644 --- a/engines/scumm/script_v6.cpp +++ b/engines/scumm/script_v6.cpp @@ -987,7 +987,7 @@ void ScummEngine_v6::o6_cursorCommand() { case 0x97: // SO_USERPUT_SOFT_OFF _userPut--; break; - case 0x99: // SO_CURSOR_IMAGE Set cursor image + case 0x99: // SO_CURSOR_IMAGE Set cursor image { int room, obj; if (_game.heversion >= 70) { @@ -2246,8 +2246,8 @@ void ScummEngine_v6::o6_wait() { // For now, if the value passed in is divisible by 45, assume it is an // angle, and use _curActor as the actor to wait for. offs = fetchScriptWordSigned(); - actnum = pop(); - if (actnum % 45 == 0) { + actnum = pop(); + if (actnum % 45 == 0) { actnum = _curActor; } a = derefActor(actnum, "o6_wait:232b"); diff --git a/engines/scumm/script_v8.cpp b/engines/scumm/script_v8.cpp index 0fdde28124..b97626d3d9 100644 --- a/engines/scumm/script_v8.cpp +++ b/engines/scumm/script_v8.cpp @@ -726,14 +726,14 @@ void ScummEngine_v8::o8_cursorCommand() { case 0xE6: // SO_CURSOR_TRANSPARENT Set cursor transparent color setCursorTransparency(pop()); break; - case 0xE7: // SO_CHARSET_SET + case 0xE7: // SO_CHARSET_SET _string[0]._default.charset = pop(); break; case 0xE8: // SO_CHARSET_COLOR getStackList(args, ARRAYSIZE(args)); // This opcode does nothing (confirmed with disasm) break; - case 0xE9: // SO_CURSOR_PUT + case 0xE9: // SO_CURSOR_PUT { int y = pop(); int x = pop(); @@ -1388,7 +1388,7 @@ void ScummEngine_v8::o8_kernelGetFunctions() { push(ConfMan.getBool("object_labels")); else if (!strcmp(str, "Saveload Page")) push(14); - else // Use defaults + else // Use defaults push(-1); debugC(DEBUG_GENERAL,"o8_kernelGetFunctions: readRegistryValue(%s)", str); } diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp index 3a1d04a5a8..50978f817d 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -956,7 +956,7 @@ int ScummEngine::init() { #endif - // The kGenUnchanged method is only used for 'container files', i.e. files + // The kGenUnchanged method is only used for 'container files', i.e. files // that contain the real game files bundled together in an archive format. // This is the case of the NES, C64 and Mac versions of certain games. // Note: All of these can also occur in 'extracted' form, in which case they @@ -1862,7 +1862,7 @@ load_game: else if (_game.version == 4) // 256 color CD version var = 150; else - var = 100; + var = 100; byte restoreScript = (_game.platform == Common::kPlatformFMTowns) ? 17 : 18; // if verbs should be shown restore them if (VAR(var) == 2) diff --git a/engines/scumm/smush/codec37.cpp b/engines/scumm/smush/codec37.cpp index 22ba1b443d..0c1db13a26 100644 --- a/engines/scumm/smush/codec37.cpp +++ b/engines/scumm/smush/codec37.cpp @@ -295,7 +295,7 @@ void Codec37Decoder::maketable(int pitch, int index) { #define LITERAL_4X1(src, dst, pitch) \ do { \ - int x; \ + int x; \ DECLARE_LITERAL_TEMP(t); \ for (x=0; x<4; x++) { \ READ_LITERAL_PIXEL(src, t); \ diff --git a/engines/scumm/smush/codec47ARM.s b/engines/scumm/smush/codec47ARM.s index dd4377bff6..81bfdb2d22 100644 --- a/engines/scumm/smush/codec47ARM.s +++ b/engines/scumm/smush/codec47ARM.s @@ -75,7 +75,7 @@ level1codeFD: LDR r8,[r13,#48] @ r8 = _tableBig (48 = (9+1+2)*4) @ stall ADD r12,r6,r6,LSL #1 @ r12= tmp*3 - ADD r6,r6,r12,LSL #5 @ r6 = tmp*97 + ADD r6,r6,r12,LSL #5 @ r6 = tmp*97 ADD r8,r8,r6,LSL #2 @ r8 = _tableBig + tmp*388 LDRB r9,[r8,#384] @ r9 = l = tmp_ptr[384] LDRB r6,[r1],#1 @ r6 = val = *_d_src++ diff --git a/engines/scumm/vars.cpp b/engines/scumm/vars.cpp index b8cf665023..6e40b58ae8 100644 --- a/engines/scumm/vars.cpp +++ b/engines/scumm/vars.cpp @@ -656,7 +656,7 @@ void ScummEngine_v80he::resetScummVars() { VAR(VAR_PLATFORM_VERSION) = 70; } else { VAR(VAR_PLATFORM) = 1; - VAR(VAR_PLATFORM_VERSION) = 40; // 31 is Windows 3.1, 40 is Windows 95+ + VAR(VAR_PLATFORM_VERSION) = 40; // 31 is Windows 3.1, 40 is Windows 95+ } VAR(VAR_COLOR_DEPTH) = 256; } diff --git a/engines/scumm/verbs.cpp b/engines/scumm/verbs.cpp index 0648b7a641..eece5a6d24 100644 --- a/engines/scumm/verbs.cpp +++ b/engines/scumm/verbs.cpp @@ -357,8 +357,8 @@ void ScummEngine_v2::checkV2Inventory(int x, int y) { _inventoryOffset -= 2; redrawV2Inventory(); } - } else if (_mouseOverBoxesV2[kInventoryDownArrow].rect.contains(x, y)) { - if (_inventoryOffset + 4 < getInventoryCount(_scummVars[VAR_EGO])) { + } else if (_mouseOverBoxesV2[kInventoryDownArrow].rect.contains(x, y)) { + if (_inventoryOffset + 4 < getInventoryCount(_scummVars[VAR_EGO])) { _inventoryOffset += 2; redrawV2Inventory(); } |