diff options
| author | Willem Jan Palenstijn | 2013-09-24 13:55:54 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2013-09-24 13:55:54 +0200 |
| commit | 6417192584873f98737a0928adefeb9aa9cad894 (patch) | |
| tree | 0d238f05c406ae70fff8c907bd10d29a16f2d6a4 /engines/drascula/animation.cpp | |
| parent | f3514534ce46bad5e3ffadfdf0b3af403045e5ef (diff) | |
| parent | 74cc4aec8aa80da2541857e3120b31a566ccdff3 (diff) | |
| download | scummvm-rg350-6417192584873f98737a0928adefeb9aa9cad894.tar.gz scummvm-rg350-6417192584873f98737a0928adefeb9aa9cad894.tar.bz2 scummvm-rg350-6417192584873f98737a0928adefeb9aa9cad894.zip | |
Merge branch 'master' into zvision
Conflicts:
video/avi_decoder.cpp
Diffstat (limited to 'engines/drascula/animation.cpp')
| -rw-r--r-- | engines/drascula/animation.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/engines/drascula/animation.cpp b/engines/drascula/animation.cpp index 52cab6cd32..1145c8c3ff 100644 --- a/engines/drascula/animation.cpp +++ b/engines/drascula/animation.cpp @@ -426,7 +426,7 @@ void DrasculaEngine::animation_2_1() { if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE) || shouldQuit()) break; - roomNumber = 16; + _roomNumber = 16; if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE) || shouldQuit()) break; @@ -512,7 +512,7 @@ void DrasculaEngine::animation_2_1() { // room number to -1 for the same purpose // Also check animation_9_6(), where the same hack was used by // the original - roomNumber = -1; + _roomNumber = -1; if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE) || shouldQuit()) break; pause(8); @@ -734,7 +734,7 @@ void DrasculaEngine::animation_14_2() { void DrasculaEngine::asco() { loadPic(roomDisk, drawSurface3); - loadPic(roomNumber, bgSurface, HALF_PAL); + loadPic(_roomNumber, bgSurface, HALF_PAL); black(); updateRoom(); updateScreen(); @@ -1661,7 +1661,7 @@ void DrasculaEngine::animation_9_6() { // We set the room number to -1 for the same purpose. // Also check animation_2_1(), where the same hack was used // by the original - roomNumber = -2; + _roomNumber = -2; loadPic("nota2.alg", bgSurface, HALF_PAL); black(); trackProtagonist = 1; @@ -2176,9 +2176,9 @@ void DrasculaEngine::animation_5_4(){ void DrasculaEngine::animation_6_4() { debug(4, "animation_6_4()"); - int prevRoom = roomNumber; + int prevRoom = _roomNumber; - roomNumber = 26; + _roomNumber = 26; clearRoom(); loadPic(26, bgSurface, HALF_PAL); loadPic("aux26.alg", drawSurface3); @@ -2191,11 +2191,11 @@ void DrasculaEngine::animation_6_4() { updateScreen(); pause(40); talk_igor(26, kIgorFront); - roomNumber = prevRoom; + _roomNumber = prevRoom; clearRoom(); loadPic(96, frontSurface); loadPic(roomDisk, drawSurface3); - loadPic(roomNumber, bgSurface, HALF_PAL); + loadPic(_roomNumber, bgSurface, HALF_PAL); selectVerb(kVerbNone); updateRoom(); } @@ -2224,7 +2224,7 @@ void DrasculaEngine::activatePendulum() { flags[1] = 2; hare_se_ve = 0; - roomNumber = 102; + _roomNumber = 102; loadPic(102, bgSurface, HALF_PAL); loadPic("an_p1.alg", drawSurface3); loadPic("an_p2.alg", extraSurface); |