diff options
Diffstat (limited to 'engines/drascula')
-rw-r--r-- | engines/drascula/animation.cpp | 2 | ||||
-rw-r--r-- | engines/drascula/converse.cpp | 6 | ||||
-rw-r--r-- | engines/drascula/drascula.cpp | 10 | ||||
-rw-r--r-- | engines/drascula/graphics.cpp | 6 | ||||
-rw-r--r-- | engines/drascula/objects.cpp | 2 | ||||
-rw-r--r-- | engines/drascula/rooms.cpp | 16 | ||||
-rw-r--r-- | engines/drascula/talk.cpp | 8 |
7 files changed, 25 insertions, 25 deletions
diff --git a/engines/drascula/animation.cpp b/engines/drascula/animation.cpp index ad7fe64d0e..d8177441e5 100644 --- a/engines/drascula/animation.cpp +++ b/engines/drascula/animation.cpp @@ -152,7 +152,7 @@ void DrasculaEngine::animation_1_1() { copyBackground(0, 0, 320 - l, 0, l, 200, drawSurface3, screenSurface); copyBackground(l, 0, 0, 0, 320 - l, 200, bgSurface, screenSurface); - copyRect(interf_x[l2], interf_y[l2], 156 - l, 45, 63, 31, + copyRect(interf_x[l2], interf_y[l2], 156 - l, 45, 63, 31, drawSurface2, screenSurface); updateScreen(); p++; diff --git a/engines/drascula/converse.cpp b/engines/drascula/converse.cpp index cef1a17486..81d9c9741a 100644 --- a/engines/drascula/converse.cpp +++ b/engines/drascula/converse.cpp @@ -34,11 +34,11 @@ void DrasculaEngine::playTalkSequence(int sequence) { if (_talkSequences[i].chapter == currentChapter && _talkSequences[i].sequence == sequence) { seen = true; - + doTalkSequenceCommand(_talkSequences[i]); } else if (seen) // Stop searching down the list break; - } + } } void DrasculaEngine::doTalkSequenceCommand(TalkSequenceCommand cmd) { @@ -138,7 +138,7 @@ void DrasculaEngine::converse(int index) { error("missing data file %s", fileName); int size = _arj.size(); - int game1 = kDialogOptionUnselected, + int game1 = kDialogOptionUnselected, game2 = kDialogOptionUnselected, game3 = kDialogOptionUnselected; char phrase1[78], phrase2[78], phrase3[78], phrase4[78]; diff --git a/engines/drascula/drascula.cpp b/engines/drascula/drascula.cpp index 62a758bf9f..2016860f87 100644 --- a/engines/drascula/drascula.cpp +++ b/engines/drascula/drascula.cpp @@ -473,7 +473,7 @@ bool DrasculaEngine::runCurrentChapter() { if (menuScreen == 0 && takeObject == 1) checkObjects(); - + #ifdef _WIN32_WCE if (rightMouseButton) if (menuScreen) { @@ -502,7 +502,7 @@ bool DrasculaEngine::runCurrentChapter() { // Do not show the inventory screen in chapter 5, if the right mouse button is clicked // while the plug (object 16) is held // Fixes bug #2059621 - "DRASCULA: Plug bug" - if (rightMouseButton == 1 && menuScreen == 0 && + if (rightMouseButton == 1 && menuScreen == 0 && !(currentChapter == 5 && pickedObject == 16)) { #endif delay(100); @@ -578,7 +578,7 @@ bool DrasculaEngine::runCurrentChapter() { } else if (currentChapter == 6 && key == Common::KEYCODE_0 && roomNumber == 61) { loadPic("alcbar.alg", bgSurface, 255); } - + if (leftMouseButton != 0 || rightMouseButton != 0 || key != 0) if (currentChapter != 3) framesWithoutAction = 0; @@ -799,7 +799,7 @@ void DrasculaEngine::reduce_hare_chico(int xx1, int yy1, int xx2, int yy2, int w for (n = 0; n < newHeight; n++) { for (m = 0; m < newWidth; m++) { - copyRect((int)pixelX, (int)pixelY, xx2 + m, yy2 + n, + copyRect((int)pixelX, (int)pixelY, xx2 + m, yy2 + n, 1, 1, dir_inicio, dir_fin); pixelX += totalX; @@ -874,7 +874,7 @@ bool DrasculaEngine::loadDrasculaDat() { } ver = in.readByte(); - + if (ver != DRASCULA_DAT_VER) { snprintf(buf, 256, "File 'drascula.dat' is wrong version. Expected %d but got %d. Get it from the ScummVM website", DRASCULA_DAT_VER, ver); GUIErrorMessage(buf); diff --git a/engines/drascula/graphics.cpp b/engines/drascula/graphics.cpp index de35de5ab2..d97f95c5ef 100644 --- a/engines/drascula/graphics.cpp +++ b/engines/drascula/graphics.cpp @@ -224,7 +224,7 @@ void DrasculaEngine::print_abc(const char *said, int screenX, int screenY) { } // if } // for - copyRect(letterX, letterY, screenX, screenY, + copyRect(letterX, letterY, screenX, screenY, CHAR_WIDTH, CHAR_HEIGHT, tableSurface, screenSurface); screenX = screenX + CHAR_WIDTH; @@ -276,7 +276,7 @@ void DrasculaEngine::print_abc_opc(const char *said, int screenY, int game) { } // if } // for - copyRect(letterX, letterY, screenX, screenY, + copyRect(letterX, letterY, screenX, screenY, CHAR_WIDTH_OPC, CHAR_HEIGHT_OPC, backSurface, screenSurface); screenX = screenX + CHAR_WIDTH_OPC; @@ -516,7 +516,7 @@ int DrasculaEngine::playFrameSSN() { free(BufferSSN); waitFrameSSN(); if (FrameSSN) - mixVideo(VGA, screenSurface); + mixVideo(VGA, screenSurface); else memcpy(VGA, screenSurface, 64000); _system->copyRectToScreen((const byte *)VGA, 320, 0, 0, 320, 200); diff --git a/engines/drascula/objects.cpp b/engines/drascula/objects.cpp index c9c99aafa8..a64ee7e0cc 100644 --- a/engines/drascula/objects.cpp +++ b/engines/drascula/objects.cpp @@ -207,7 +207,7 @@ int DrasculaEngine::whichObject() { for (n = 1; n < 43; n++) { if (mouseX > _itemLocations[n].x && mouseY > _itemLocations[n].y && - mouseX < _itemLocations[n].x + OBJWIDTH && + mouseX < _itemLocations[n].x + OBJWIDTH && mouseY < _itemLocations[n].y + OBJHEIGHT) break; } diff --git a/engines/drascula/rooms.cpp b/engines/drascula/rooms.cpp index 027685f56a..7aa4af059d 100644 --- a/engines/drascula/rooms.cpp +++ b/engines/drascula/rooms.cpp @@ -1060,7 +1060,7 @@ void DrasculaEngine::updateRefresh() { // Check generic updaters for (int i = 0; i < _roomUpdatesSize; i++) { if (_roomUpdates[i].roomNum == roomNumber) { - if (_roomUpdates[i].flag < 0 || + if (_roomUpdates[i].flag < 0 || flags[_roomUpdates[i].flag] == _roomUpdates[i].flagValue) { if (_roomUpdates[i].type == 0) { copyBackground(_roomUpdates[i].sourceX, _roomUpdates[i].sourceY, @@ -1174,7 +1174,7 @@ void DrasculaEngine::update_2() { h = 22; } - copyRect(batX[actorFrames[kFrameBat]], batY[actorFrames[kFrameBat]], + copyRect(batX[actorFrames[kFrameBat]], batY[actorFrames[kFrameBat]], 239, 19, w, h, drawSurface3, screenSurface); difference = getTime() - savedTime; if (difference >= 6) { @@ -1214,7 +1214,7 @@ void DrasculaEngine::update_9_pre() { int blindY[] = {51, 51, 51, 51, 51, 51, 51, 127, 127}; int difference; - copyRect(blindX[actorFrames[kFrameBlind]], blindY[actorFrames[kFrameBlind]], + copyRect(blindX[actorFrames[kFrameBlind]], blindY[actorFrames[kFrameBlind]], 122, 57, 41, 72, drawSurface3, screenSurface); if (flags[9] == 0) { difference = getTime() - savedTime; @@ -1299,7 +1299,7 @@ void DrasculaEngine::update_18_pre() { if (flags[21] == 0) { copyBackground(1, 69, 120, 58, 56, 61, drawSurface3, screenSurface); - copyBackground(snore_x[actorFrames[kFrameSnore]], + copyBackground(snore_x[actorFrames[kFrameSnore]], snore_y[actorFrames[kFrameSnore]], 124, 59, 40, 37, drawSurface3, screenSurface); } else @@ -1877,7 +1877,7 @@ bool DrasculaEngine::exitRoom(int l) { int roomNum = 0; // Player can't exit the inn in chapter 1 - if (currentChapter == 1 && objectNum[l] == 104) { + if (currentChapter == 1 && objectNum[l] == 104) { return false; } @@ -1887,7 +1887,7 @@ bool DrasculaEngine::exitRoom(int l) { } updateDoor(l); - if (isDoor[l] != 0 && + if (isDoor[l] != 0 && ((currentChapter != 3 && currentChapter != 5) || visible[l] == 1)) { hideCursor(); @@ -1918,7 +1918,7 @@ bool DrasculaEngine::exitRoom(int l) { if (objectNum[l] == 173) { animation_35_2(); return true; - } + } if (objectNum[l] == 146 && flags[39] == 1) { flags[5] = 1; flags[11] = 1; @@ -1966,7 +1966,7 @@ void DrasculaEngine::updateDoor(int doorNum) { return; for (int i = 0; i < ARRAYSIZE(doors); i++) { - if (doors[i].chapter == currentChapter && + if (doors[i].chapter == currentChapter && objectNum[doorNum] == doors[i].doorNum) { isDoor[doorNum] = flags[doors[i].flag]; return; diff --git a/engines/drascula/talk.cpp b/engines/drascula/talk.cpp index 4ecc3e20f2..8fc52a18b5 100644 --- a/engines/drascula/talk.cpp +++ b/engines/drascula/talk.cpp @@ -75,7 +75,7 @@ void DrasculaEngine::talk_igor(int index, int talkerType) { copyBackground(); updateRefresh_pre(); } - + if (talkerType == kIgorDch) { placeIgor(); placeDrascula(); @@ -119,7 +119,7 @@ void DrasculaEngine::talk_igor(int index, int talkerType) { } } while (!isTalkFinished()); - if ((talkerType == kIgorFront && currentChapter == 6) || + if ((talkerType == kIgorFront && currentChapter == 6) || talkerType == kIgorDoor || talkerType == kIgorSeated || talkerType == kIgorWig) { updateRoom(); } @@ -776,7 +776,7 @@ void DrasculaEngine::talk_htel(int index) { copyBackground(x_talk[face], 1, 45, 24, 92, 108, frontSurface, screenSurface); else copyBackground(x_talk[face], 1, 45, 24, 92, 108, backSurface, screenSurface); - + if (!_subtitlesDisabled) centerText(said, 90, 50); @@ -912,7 +912,7 @@ void DrasculaEngine::talk_generic(const char* said, const char* filename, int* f copyBackground(); updateRefresh_pre(); - copyBackground(faces[face], coords[0], coords[1], coords[2], + copyBackground(faces[face], coords[0], coords[1], coords[2], coords[3], coords[4], surface, screenSurface); moveCharacters(); updateRefresh(); |