aboutsummaryrefslogtreecommitdiff
path: root/engines/drascula
diff options
context:
space:
mode:
Diffstat (limited to 'engines/drascula')
-rw-r--r--engines/drascula/animation.cpp144
-rw-r--r--engines/drascula/drascula.cpp8
-rw-r--r--engines/drascula/drascula.h2
-rw-r--r--engines/drascula/graphics.cpp18
-rw-r--r--engines/drascula/interface.cpp2
-rw-r--r--engines/drascula/rooms.cpp28
-rw-r--r--engines/drascula/saveload.cpp6
-rw-r--r--engines/drascula/talk.cpp56
8 files changed, 132 insertions, 132 deletions
diff --git a/engines/drascula/animation.cpp b/engines/drascula/animation.cpp
index 66f903e3e3..feb6cb93ca 100644
--- a/engines/drascula/animation.cpp
+++ b/engines/drascula/animation.cpp
@@ -44,7 +44,7 @@ void DrasculaEngine::updateAnim2(int y, int px, int py, int width, int height, i
for (int n = 0; n < count; n++) {
x++;
- copyBackground(px, py, px, py, width, height, drawSurface1, screenSurface);
+ copyBackground(px, py, px, py, width, height, bgSurface, screenSurface);
copyRect(x, y, px, py, width, height, src, screenSurface);
updateScreen(px, py, px, py, width, height, screenSurface);
x = x + width;
@@ -121,7 +121,7 @@ void DrasculaEngine::animation_1_1() {
clearRoom();
loadPic(96, frontSurface, COMPLETE_PAL);
- loadPic(103, drawSurface1, HALF_PAL);
+ loadPic(103, bgSurface, HALF_PAL);
loadPic(104, drawSurface3);
loadPic("aux104.alg", drawSurface2);
@@ -134,7 +134,7 @@ void DrasculaEngine::animation_1_1() {
for (l2 = 0; l2 < 3; l2++)
for (l = 0; l < 7; l++) {
- copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
+ copyBackground(0, 0, 0, 0, 320, 200, bgSurface, screenSurface);
copyBackground(interf_x[l], interf_y[l], 156, 45, 63, 31, drawSurface2, screenSurface);
updateScreen();
if (getScan() == Common::KEYCODE_ESCAPE) {
@@ -153,7 +153,7 @@ void DrasculaEngine::animation_1_1() {
for (l = 0; l < 180; l++) {
copyBackground(0, 0, 320 - l, 0, l, 200, drawSurface3, screenSurface);
- copyBackground(l, 0, 0, 0, 320 - l, 200, drawSurface1, screenSurface);
+ copyBackground(l, 0, 0, 0, 320 - l, 200, bgSurface, screenSurface);
pixelPos[0] = interf_x[l2];
pixelPos[1] = interf_y[l2];
@@ -175,7 +175,7 @@ void DrasculaEngine::animation_1_1() {
}
if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
- copyBackground(0, 0, 0, 0, 320, 200, screenSurface, drawSurface1);
+ copyBackground(0, 0, 0, 0, 320, 200, screenSurface, bgSurface);
talk_dr_grande(1);
if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
@@ -183,7 +183,7 @@ void DrasculaEngine::animation_1_1() {
clearRoom();
- loadPic(100, drawSurface1, HALF_PAL);
+ loadPic(100, bgSurface, HALF_PAL);
loadPic("auxigor.alg", frontSurface);
loadPic("auxdr.alg", backSurface);
trackDrascula = 0;
@@ -193,14 +193,14 @@ void DrasculaEngine::animation_1_1() {
igorX = 66;
igorY = 97;
- copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
+ copyBackground(0, 0, 0, 0, 320, 200, bgSurface, screenSurface);
placeIgor();
placeDrascula();
updateScreen();
talk_igor(8, kIgorDch);
if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
- copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
+ copyBackground(0, 0, 0, 0, 320, 200, bgSurface, screenSurface);
placeIgor();
placeDrascula();
updateScreen();
@@ -253,7 +253,7 @@ void DrasculaEngine::animation_1_1() {
if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
clearRoom();
- loadPic(100, drawSurface1, HALF_PAL);
+ loadPic(100, bgSurface, HALF_PAL);
MusicFadeout();
stopMusic();
if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
@@ -297,13 +297,13 @@ void DrasculaEngine::animation_1_1() {
if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
trackDrascula = 3;
- copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
+ copyBackground(0, 0, 0, 0, 320, 200, bgSurface, screenSurface);
placeIgor();
placeDrascula();
updateScreen();
pause(1);
trackDrascula = 0;
- copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
+ copyBackground(0, 0, 0, 0, 320, 200, bgSurface, screenSurface);
placeIgor();
placeDrascula();
updateScreen();
@@ -311,13 +311,13 @@ void DrasculaEngine::animation_1_1() {
if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
trackDrascula = 3;
- copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
+ copyBackground(0, 0, 0, 0, 320, 200, bgSurface, screenSurface);
placeIgor();
placeDrascula();
updateScreen();
pause(1);
trackDrascula = 1;
- copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
+ copyBackground(0, 0, 0, 0, 320, 200, bgSurface, screenSurface);
placeIgor();
placeDrascula();
updateScreen();
@@ -329,13 +329,13 @@ void DrasculaEngine::animation_1_1() {
if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
trackDrascula = 3;
- copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
+ copyBackground(0, 0, 0, 0, 320, 200, bgSurface, screenSurface);
placeIgor();
placeDrascula();
updateScreen();
pause(1);
trackDrascula = 0;
- copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
+ copyBackground(0, 0, 0, 0, 320, 200, bgSurface, screenSurface);
placeIgor();
placeDrascula();
updateScreen();
@@ -450,7 +450,7 @@ void DrasculaEngine::animation_2_1() {
break;
clearRoom();
- loadPic(16, drawSurface1, HALF_PAL);
+ loadPic(16, bgSurface, HALF_PAL);
if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
loadPic("auxbj.alg", drawSurface3);
@@ -676,14 +676,14 @@ void DrasculaEngine::animation_1_2() {
void DrasculaEngine::animation_2_2() {
trackProtagonist = 0;
- copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
+ copyBackground(0, 0, 0, 0, 320, 200, bgSurface, screenSurface);
moveCharacters();
updateRefresh();
updateScreen();
loadPic("an2_1.alg", frontSurface);
loadPic("an2_2.alg", extraSurface);
- copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
+ copyBackground(0, 0, 0, 0, 320, 200, bgSurface, screenSurface);
copyBackground(1, 1, 201, 87, 50, 52, frontSurface, screenSurface);
updateScreen();
@@ -697,7 +697,7 @@ void DrasculaEngine::animation_2_2() {
updateAnim(55, 201, 87, 50, 52, 6, extraSurface);
updateAnim(109, 201, 87, 50, 52, 2, extraSurface);
- copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
+ copyBackground(0, 0, 0, 0, 320, 200, bgSurface, screenSurface);
updateScreen();
finishSound();
@@ -724,7 +724,7 @@ void DrasculaEngine::animation_4_2() {
pause(8);
clearRoom();
- loadPic("ciego1.alg", drawSurface1, HALF_PAL); // ciego = blind
+ loadPic("ciego1.alg", bgSurface, HALF_PAL); // ciego = blind
loadPic("ciego2.alg", drawSurface3);
loadPic("ciego3.alg", extraSurface);
loadPic("ciego4.alg", backSurface);
@@ -733,7 +733,7 @@ void DrasculaEngine::animation_4_2() {
if (_lang == kSpanish)
textSurface = frontSurface;
- copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
+ copyBackground(0, 0, 0, 0, 320, 200, bgSurface, screenSurface);
updateScreen();
pause(10);
@@ -757,13 +757,13 @@ void DrasculaEngine::animation_4_2() {
talk_blind(7);
talk_hacker(63);
talk_blind(8);
- copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
+ copyBackground(0, 0, 0, 0, 320, 200, bgSurface, screenSurface);
updateScreen();
_system->delayMillis(1000);
talk_hacker(64);
talk_blind(9);
- copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
+ copyBackground(0, 0, 0, 0, 320, 200, bgSurface, screenSurface);
updateScreen();
pause(14);
@@ -771,7 +771,7 @@ void DrasculaEngine::animation_4_2() {
clearRoom();
playMusic(roomMusic);
- loadPic(9, drawSurface1, HALF_PAL);
+ loadPic(9, bgSurface, HALF_PAL);
loadPic("aux9.alg", drawSurface3);
loadPic(96, frontSurface);
loadPic(97, extraSurface);
@@ -818,7 +818,7 @@ void DrasculaEngine::animation_14_2() {
loadPic("an14_2.alg", backSurface);
for (int n = -160; n <= 0; n = n + 5 + l) {
- copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
+ copyBackground(0, 0, 0, 0, 320, 200, bgSurface, screenSurface);
updateRefresh_pre();
moveCharacters();
moveVonBraun();
@@ -831,7 +831,7 @@ void DrasculaEngine::animation_14_2() {
flags[24] = 1;
- memcpy(drawSurface1, screenSurface, 64000);
+ memcpy(bgSurface, screenSurface, 64000);
playSound(7);
hiccup(15);
@@ -867,12 +867,12 @@ void DrasculaEngine::animation_16_2() {
if (_lang != kSpanish)
color_abc(kColorDarkGreen);
- loadPic("his1.alg", drawSurface1, HALF_PAL);
+ loadPic("his1.alg", bgSurface, HALF_PAL);
if (_lang == kSpanish)
black();
- copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
+ copyBackground(0, 0, 0, 0, 320, 200, bgSurface, screenSurface);
if (_lang != kSpanish)
centerText(_texthis[_lang][1], 180, 180);
@@ -901,8 +901,8 @@ void DrasculaEngine::animation_16_2() {
goto asco;
clearRoom();
- loadPic("his2.alg", drawSurface1, HALF_PAL);
- copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
+ loadPic("his2.alg", bgSurface, HALF_PAL);
+ copyBackground(0, 0, 0, 0, 320, 200, bgSurface, screenSurface);
if (_lang != kSpanish)
centerText(_texthis[_lang][2], 180, 180);
@@ -927,8 +927,8 @@ void DrasculaEngine::animation_16_2() {
goto asco;
clearRoom();
- loadPic("his3.alg", drawSurface1, HALF_PAL);
- copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
+ loadPic("his3.alg", bgSurface, HALF_PAL);
+ copyBackground(0, 0, 0, 0, 320, 200, bgSurface, screenSurface);
if (_lang != kSpanish)
centerText(_texthis[_lang][3], 180, 180);
@@ -950,7 +950,7 @@ void DrasculaEngine::animation_16_2() {
fadeToBlack(1);
clearRoom();
- loadPic("his4_1.alg", drawSurface1, HALF_PAL);
+ loadPic("his4_1.alg", bgSurface, HALF_PAL);
loadPic("his4_2.alg", drawSurface3);
copyBackground(0, 0, 0, 0, 320, 200, drawSurface3, screenSurface);
@@ -974,7 +974,7 @@ void DrasculaEngine::animation_16_2() {
for (int l = 1; l < 200; l++) {
copyBackground(0, 0, 0, l, 320, 200 - l, drawSurface3, screenSurface);
- copyBackground(0, 200 - l, 0, 0, 320, l, drawSurface1, screenSurface);
+ copyBackground(0, 200 - l, 0, 0, 320, l, bgSurface, screenSurface);
updateScreen();
key = getScan();
if (key != 0)
@@ -987,7 +987,7 @@ void DrasculaEngine::animation_16_2() {
asco:
loadPic(roomDisk, drawSurface3);
- loadPic(roomNumber, drawSurface1, HALF_PAL);
+ loadPic(roomNumber, bgSurface, HALF_PAL);
black();
updateRoom();
updateScreen();
@@ -1107,7 +1107,7 @@ void DrasculaEngine::animation_23_joined() {
loadPic("an23.alg", backSurface);
for (int n = 0; n < 34; n++) {
- copyRect(p_x, p_y, p_x, p_y, 36, 74, drawSurface1, screenSurface);
+ copyRect(p_x, p_y, p_x, p_y, 36, 74, bgSurface, screenSurface);
copyRect(x[n], y[n], p_x, p_y, 36, 74, backSurface, screenSurface);
updateRefresh();
updateScreen(p_x, p_y, p_x, p_y, 36, 74, screenSurface);
@@ -1127,7 +1127,7 @@ void DrasculaEngine::animation_23_joined2() {
loadPic("an23_2.alg", backSurface);
for (int n = 0; n < 14; n++) {
- copyRect(p_x, p_y, p_x, p_y, 33, 71, drawSurface1, screenSurface);
+ copyRect(p_x, p_y, p_x, p_y, 33, 71, bgSurface, screenSurface);
copyRect(x[n], y[n], p_x, p_y, 33, 71, backSurface, screenSurface);
updateRefresh();
updateScreen(p_x,p_y, p_x,p_y, 33,71, screenSurface);
@@ -1141,14 +1141,14 @@ void DrasculaEngine::animation_25_2() {
int cabinPos[6] = { 150, 6, 69, 0, 158, 161 };
loadPic("an14_2.alg", backSurface);
- loadPic(18, drawSurface1);
+ loadPic(18, bgSurface);
flags[24] = 0;
playSound(6);
for (int n = 0; n >= -160; n = n - 8) {
- copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
+ copyBackground(0, 0, 0, 0, 320, 200, bgSurface, screenSurface);
updateRefresh_pre();
moveCharacters();
@@ -1289,7 +1289,7 @@ void DrasculaEngine::animation_35_2() {
updateAnim(1, 70, 90, 46, 80, 6, frontSurface);
updateAnim(82, 70, 90, 46, 80, 2, frontSurface);
- copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
+ copyBackground(0, 0, 0, 0, 320, 200, bgSurface, screenSurface);
updateScreen();
@@ -1392,7 +1392,7 @@ void DrasculaEngine::animation_6_3() {
for (frame = 0; frame < 6; frame++) {
pause(3);
- copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
+ copyBackground(0, 0, 0, 0, 320, 200, bgSurface, screenSurface);
copyRect(yoda_x[frame], yoda_y[frame], px, py, 78, 90, frontSurface, screenSurface);
updateScreen(px, py, px, py, 78, 90, screenSurface);
}
@@ -1409,7 +1409,7 @@ void DrasculaEngine::animation_ray() {
loadPic("anr_1.alg", frontSurface, HALF_PAL);
loadPic("anr_2.alg", extraSurface);
loadPic("anr_3.alg", backSurface);
- loadPic("anr_4.alg", drawSurface1);
+ loadPic("anr_4.alg", bgSurface);
loadPic("anr_5.alg", drawSurface3);
updateScreen(0, 0, 0, 0, 320, 200, frontSurface);
@@ -1422,7 +1422,7 @@ void DrasculaEngine::animation_ray() {
pause(3);
updateScreen(0, 0, 0, 0, 320, 200, backSurface);
pause(3);
- updateScreen(0, 0, 0, 0, 320, 200, drawSurface1);
+ updateScreen(0, 0, 0, 0, 320, 200, bgSurface);
pause(3);
updateScreen(0, 0, 0, 0, 320, 200, backSurface);
pause(3);
@@ -1560,7 +1560,7 @@ void DrasculaEngine::animation_5_5(){
for (frame = 0; frame < 9; frame++) {
pause(3);
- copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
+ copyBackground(0, 0, 0, 0, 320, 200, bgSurface, screenSurface);
copyRect(boneX[frame], boneY[frame], pixelX, pixelY, 97, 64, backSurface, screenSurface);
updateScreen(pixelX, pixelY, pixelX,pixelY, 97,64, screenSurface);
}
@@ -1570,7 +1570,7 @@ void DrasculaEngine::animation_5_5(){
for (frame = 0; frame < 9; frame++) {
pause(3);
- copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
+ copyBackground(0, 0, 0, 0, 320, 200, bgSurface, screenSurface);
copyRect(boneX[frame], boneY[frame], pixelX, pixelY, 97, 64, frontSurface, screenSurface);
updateScreen(pixelX, pixelY, pixelX,pixelY, 97, 64, screenSurface);
}
@@ -1585,11 +1585,11 @@ void DrasculaEngine::animation_5_5(){
updateScreen();
- loadPic(101, drawSurface1, HALF_PAL);
+ loadPic(101, bgSurface, HALF_PAL);
loadPic("3an5_3.alg", backSurface);
loadPic("3an5_4.alg", extraSurface);
- updateScreen(0, 0, 0, 0, 320, 200, drawSurface1);
+ updateScreen(0, 0, 0, 0, 320, 200, bgSurface);
pause(9);
for (frame = 0; frame < 5; frame++) {
pause(3);
@@ -1601,7 +1601,7 @@ void DrasculaEngine::animation_5_5(){
copyBackground(flyX[frame], 1, 174, 79, 61, 109, extraSurface, screenSurface);
updateScreen(174, 79, 174, 79, 61, 109, screenSurface);
}
- updateScreen(0, 0, 0, 0, 320, 200, drawSurface1);
+ updateScreen(0, 0, 0, 0, 320, 200, bgSurface);
playSound(1);
finishSound();
@@ -1611,7 +1611,7 @@ void DrasculaEngine::animation_5_5(){
clearRoom();
- loadPic(49, drawSurface1, HALF_PAL);
+ loadPic(49, bgSurface, HALF_PAL);
}
void DrasculaEngine::animation_6_5() {
@@ -1931,7 +1931,7 @@ void DrasculaEngine::animation_5_6() {
animate("man.bin", 14);
for (int n = -125; n <= 0; n = n + 2) {
- copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
+ copyBackground(0, 0, 0, 0, 320, 200, bgSurface, screenSurface);
updateRefresh_pre();
pos_pen[3] = n;
copyRectClip(pos_pen, drawSurface3, screenSurface);
@@ -1994,7 +1994,7 @@ void DrasculaEngine::animation_9_6() {
// Also check animation_2_1(), where the same hack was used
// by the original
roomNumber = -1;
- loadPic("nota2.alg", drawSurface1, HALF_PAL);
+ loadPic("nota2.alg", bgSurface, HALF_PAL);
black();
trackProtagonist = 1;
curX -= 21;
@@ -2008,7 +2008,7 @@ void DrasculaEngine::animation_9_6() {
updateScreen();
playMusic(9);
clearRoom();
- loadPic("nota.alg", drawSurface1, COMPLETE_PAL);
+ loadPic("nota.alg", bgSurface, COMPLETE_PAL);
color_abc(kColorWhite);
talk_solo(_textbj[_lang][24], "bj24.als");
talk_solo(_textbj[_lang][25], "bj25.als");
@@ -2018,7 +2018,7 @@ void DrasculaEngine::animation_9_6() {
trackProtagonist = 3;
clearRoom();
loadPic(96, frontSurface, COMPLETE_PAL);
- loadPic("nota2.alg", drawSurface1, HALF_PAL);
+ loadPic("nota2.alg", bgSurface, HALF_PAL);
talk(296);
talk(297);
talk(298);
@@ -2026,11 +2026,11 @@ void DrasculaEngine::animation_9_6() {
talk(299);
talk(300);
updateRoom();
- copyBackground(0, 0, 0, 0, 320, 200, screenSurface, drawSurface1);
+ copyBackground(0, 0, 0, 0, 320, 200, screenSurface, bgSurface);
updateScreen();
color_abc(kColorLightGreen);
talk_solo(_textmisc[_lang][2], "s15.als");
- loadPic("nota2.alg", drawSurface1);
+ loadPic("nota2.alg", bgSurface);
trackProtagonist = 0;
updateRoom();
updateScreen();
@@ -2052,7 +2052,7 @@ void DrasculaEngine::animation_9_6() {
void DrasculaEngine::animation_10_6() {
playSound(14);
- copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
+ copyBackground(0, 0, 0, 0, 320, 200, bgSurface, screenSurface);
updateRefresh_pre();
copyBackground(164, 85, 155, 48, 113, 114, drawSurface3, screenSurface);
updateScreen();
@@ -2097,7 +2097,7 @@ void DrasculaEngine::animation_18_6() {
}
void DrasculaEngine::animation_19_6() {
- copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
+ copyBackground(0, 0, 0, 0, 320, 200, bgSurface, screenSurface);
copyBackground(140, 23, 161, 69, 35, 80, drawSurface3, screenSurface);
updateRefresh_pre();
@@ -2381,9 +2381,9 @@ void DrasculaEngine::animation_7_2() {
loadPic("an7_3.alg", frontSurface);
if (flags[3] == 1)
- copyBackground(258, 110, 85, 44, 23, 53, drawSurface3, drawSurface1);
+ copyBackground(258, 110, 85, 44, 23, 53, drawSurface3, bgSurface);
- copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
+ copyBackground(0, 0, 0, 0, 320, 200, bgSurface, screenSurface);
updateScreen();
@@ -2416,7 +2416,7 @@ void DrasculaEngine::animation_7_2() {
updateAnim2(75, 80, 64, 51, 73, 6, backSurface);
updateAnim2(1, 80, 64, 51, 73, 6, extraSurface);
- copyBackground(80, 64, 80, 64, 51, 73, drawSurface1, screenSurface);
+ copyBackground(80, 64, 80, 64, 51, 73, bgSurface, screenSurface);
copyRect(1, 75, 80, 64, 51, 73, extraSurface, screenSurface);
updateScreen(80, 64, 80, 64, 51, 73, screenSurface);
@@ -2475,13 +2475,13 @@ void DrasculaEngine::animation_6_2() {
textSurface = frontSurface;
clearRoom();
- loadPic("ciego1.alg", drawSurface1, HALF_PAL); // ciego = blind
+ loadPic("ciego1.alg", bgSurface, HALF_PAL); // ciego = blind
loadPic("ciego2.alg", drawSurface3);
loadPic("ciego3.alg", extraSurface);
loadPic("ciego4.alg", backSurface);
loadPic("ciego5.alg", frontSurface);
- copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
+ copyBackground(0, 0, 0, 0, 320, 200, bgSurface, screenSurface);
updateScreen();
pause(1);
@@ -2493,7 +2493,7 @@ void DrasculaEngine::animation_6_2() {
pause(4);
talk_hacker(67);
- copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
+ copyBackground(0, 0, 0, 0, 320, 200, bgSurface, screenSurface);
updateScreen();
pause(10);
@@ -2501,7 +2501,7 @@ void DrasculaEngine::animation_6_2() {
clearRoom();
playMusic(roomMusic);
- loadPic(9, drawSurface1, HALF_PAL);
+ loadPic(9, bgSurface, HALF_PAL);
loadPic("aux9.alg", drawSurface3);
loadPic(96, frontSurface);
loadPic(97, extraSurface);
@@ -2523,7 +2523,7 @@ void DrasculaEngine::animation_33_2() {
pause(8);
clearRoom();
- loadPic("ciego1.alg", drawSurface1, HALF_PAL); // ciego = blind
+ loadPic("ciego1.alg", bgSurface, HALF_PAL); // ciego = blind
loadPic("ciego2.alg", drawSurface3);
loadPic("ciego3.alg", extraSurface);
loadPic("ciego4.alg", backSurface);
@@ -2532,7 +2532,7 @@ void DrasculaEngine::animation_33_2() {
if (_lang == kSpanish)
textSurface = frontSurface;
- copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
+ copyBackground(0, 0, 0, 0, 320, 200, bgSurface, screenSurface);
updateScreen();
pause(10);
@@ -2545,7 +2545,7 @@ void DrasculaEngine::animation_33_2() {
talk_blind(10);
talk_hacker(65);
- copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
+ copyBackground(0, 0, 0, 0, 320, 200, bgSurface, screenSurface);
updateScreen();
pause(14);
@@ -2553,7 +2553,7 @@ void DrasculaEngine::animation_33_2() {
clearRoom();
playMusic(roomMusic);
- loadPic(9, drawSurface1, HALF_PAL);
+ loadPic(9, bgSurface, HALF_PAL);
loadPic("aux9.alg", drawSurface3);
loadPic(96, frontSurface);
loadPic(97, extraSurface);
@@ -2656,10 +2656,10 @@ void DrasculaEngine::animation_6_4() {
roomNumber = 26;
clearRoom();
- loadPic(26, drawSurface1, HALF_PAL);
+ loadPic(26, bgSurface, HALF_PAL);
loadPic("aux26.alg", drawSurface3);
loadPic("auxigor.alg", frontSurface);
- copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
+ copyBackground(0, 0, 0, 0, 320, 200, bgSurface, screenSurface);
update_26_pre();
igorX = 104;
igorY = 71;
@@ -2671,7 +2671,7 @@ void DrasculaEngine::animation_6_4() {
clearRoom();
loadPic(96, frontSurface);
loadPic(roomDisk, drawSurface3);
- loadPic(roomNumber, drawSurface1, HALF_PAL);
+ loadPic(roomNumber, bgSurface, HALF_PAL);
withoutVerb();
updateRoom();
}
@@ -2701,7 +2701,7 @@ void DrasculaEngine::activatePendulum() {
flags[1] = 2;
hare_se_ve = 0;
roomNumber = 102;
- loadPic(102, drawSurface1, HALF_PAL);
+ loadPic(102, bgSurface, HALF_PAL);
loadPic("an_p1.alg", drawSurface3);
loadPic("an_p2.alg", extraSurface);
loadPic("an_p3.alg", frontSurface);
diff --git a/engines/drascula/drascula.cpp b/engines/drascula/drascula.cpp
index e9a613b2c2..dd5f0968ff 100644
--- a/engines/drascula/drascula.cpp
+++ b/engines/drascula/drascula.cpp
@@ -226,7 +226,7 @@ int DrasculaEngine::go() {
loadPic(96, frontSurface, COMPLETE_PAL);
loadPic("pts.alg", drawSurface2);
} else if (currentChapter == 3) {
- loadPic("aux13.alg", drawSurface1, COMPLETE_PAL);
+ loadPic("aux13.alg", bgSurface, COMPLETE_PAL);
loadPic(96, frontSurface);
loadPic(97, extraSurface);
loadPic(99, backSurface);
@@ -529,7 +529,7 @@ bool DrasculaEngine::runCurrentChapter() {
if (!confirmExit())
return false;
} else if (currentChapter == 6 && key == Common::KEYCODE_0 && roomNumber == 61) {
- loadPic("alcbar.alg", drawSurface1, 255);
+ loadPic("alcbar.alg", bgSurface, 255);
}
if (leftMouseButton != 0 || rightMouseButton != 0 || key != 0)
@@ -753,7 +753,7 @@ void DrasculaEngine::hipo_sin_nadie(int counter){
do {
counter--;
- copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
+ copyBackground(0, 0, 0, 0, 320, 200, bgSurface, screenSurface);
if (currentChapter == 3)
updateScreen(0, 0, 0, y, 320, 200, screenSurface);
else
@@ -777,7 +777,7 @@ void DrasculaEngine::hipo_sin_nadie(int counter){
}
} while (counter > 0);
- copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
+ copyBackground(0, 0, 0, 0, 320, 200, bgSurface, screenSurface);
updateScreen();
}
diff --git a/engines/drascula/drascula.h b/engines/drascula/drascula.h
index 54d6784ec5..8fff8bd5c2 100644
--- a/engines/drascula/drascula.h
+++ b/engines/drascula/drascula.h
@@ -278,7 +278,7 @@ public:
// Graphics buffers/pointers
byte *VGA;
- byte *drawSurface1;
+ byte *bgSurface;
byte *backSurface;
byte *drawSurface3;
byte *drawSurface2;
diff --git a/engines/drascula/graphics.cpp b/engines/drascula/graphics.cpp
index d30f0eeca1..64591a856e 100644
--- a/engines/drascula/graphics.cpp
+++ b/engines/drascula/graphics.cpp
@@ -37,8 +37,8 @@ void DrasculaEngine::allocMemory() {
assert(frontSurface);
backSurface = (byte *)malloc(64000);
assert(backSurface);
- drawSurface1 = (byte *)malloc(64000);
- assert(drawSurface1);
+ bgSurface = (byte *)malloc(64000);
+ assert(bgSurface);
drawSurface2 = (byte *)malloc(64000);
assert(drawSurface2);
drawSurface3 = (byte *)malloc(64000);
@@ -51,7 +51,7 @@ void DrasculaEngine::allocMemory() {
void DrasculaEngine::freeMemory() {
free(screenSurface);
- free(drawSurface1);
+ free(bgSurface);
free(backSurface);
free(drawSurface2);
free(tableSurface);
@@ -61,7 +61,7 @@ void DrasculaEngine::freeMemory() {
}
void DrasculaEngine::moveCursor() {
- copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
+ copyBackground(0, 0, 0, 0, 320, 200, bgSurface, screenSurface);
updateRefresh_pre();
moveCharacters();
@@ -388,7 +388,7 @@ void DrasculaEngine::screenSaver() {
clearRoom();
- loadPic("sv.alg", drawSurface1, HALF_PAL);
+ loadPic("sv.alg", bgSurface, HALF_PAL);
// inicio_ghost();
copia = (byte *)malloc(64000);
@@ -407,9 +407,9 @@ void DrasculaEngine::screenSaver() {
yr = mouseY;
for (;;) {
- // efecto(drawSurface1);
+ // efecto(bgSurface);
- memcpy(copia, drawSurface1, 64000);
+ memcpy(copia, bgSurface, 64000);
coeff += 0.1f;
coeff2 = coeff;
@@ -451,7 +451,7 @@ void DrasculaEngine::screenSaver() {
y1_ = checkWrapY(y1_);
off2 = 320 * y1_ + x1_;
- VGA[320 * i + j] = ghost[drawSurface1[off2] + (copia[off1] << 8)];
+ VGA[320 * i + j] = ghost[bgSurface[off2] + (copia[off1] << 8)];
}
}
_system->copyRectToScreen((const byte *)VGA, 320, 0, 0, 320, 200);
@@ -473,7 +473,7 @@ void DrasculaEngine::screenSaver() {
free(copia);
free(ghost);
- loadPic(roomNumber, drawSurface1, HALF_PAL);
+ loadPic(roomNumber, bgSurface, HALF_PAL);
}
void DrasculaEngine::playFLI(const char *filefli, int vel) {
diff --git a/engines/drascula/interface.cpp b/engines/drascula/interface.cpp
index daf3e69a54..c81d617cde 100644
--- a/engines/drascula/interface.cpp
+++ b/engines/drascula/interface.cpp
@@ -120,7 +120,7 @@ void DrasculaEngine::enterName() {
strcpy(select2, " ");
for (;;) {
select2[v] = '-';
- copyBackground(115, 14, 115, 14, 176, 9, drawSurface1, screenSurface);
+ copyBackground(115, 14, 115, 14, 176, 9, bgSurface, screenSurface);
print_abc(select2, 117, 15);
updateScreen();
key = getScan();
diff --git a/engines/drascula/rooms.cpp b/engines/drascula/rooms.cpp
index c19eff3b0b..475b6c4b49 100644
--- a/engines/drascula/rooms.cpp
+++ b/engines/drascula/rooms.cpp
@@ -195,7 +195,7 @@ bool DrasculaEngine::room_3(int fl) {
talk(149);
talk(150);
} else if (pickedObject == kVerbPick && fl == 165) {
- copyBackground(0, 0, 0,0, 320, 200, drawSurface1, screenSurface);
+ copyBackground(0, 0, 0,0, 320, 200, bgSurface, screenSurface);
updateRefresh_pre();
copyRect(44, 1, curX, curY, 41, 70, drawSurface2, screenSurface);
updateRefresh();
@@ -252,7 +252,7 @@ bool DrasculaEngine::room_6(int fl) {
else if (pickedObject == kVerbClose && fl == 138)
closeDoor(0, 1);
else if (pickedObject == kVerbOpen && fl == 143 && flags[2] == 0) {
- copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
+ copyBackground(0, 0, 0, 0, 320, 200, bgSurface, screenSurface);
updateRefresh_pre();
copyRect(228, 102, curX + 5, curY - 1, 47, 73, drawSurface3, screenSurface);
updateScreen();
@@ -263,7 +263,7 @@ bool DrasculaEngine::room_6(int fl) {
updateScreen();
finishSound();
} else if (pickedObject == kVerbClose && fl == 143 && flags[2] == 1) {
- copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
+ copyBackground(0, 0, 0, 0, 320, 200, bgSurface, screenSurface);
flags[2] = 0;
updateRefresh_pre();
copyRect(228, 102, curX + 5, curY - 1, 47, 73, drawSurface3, screenSurface);
@@ -274,7 +274,7 @@ bool DrasculaEngine::room_6(int fl) {
updateScreen();
finishSound();
} else if (pickedObject == kVerbOpen && fl == 139 && flags[1] == 0) {
- copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
+ copyBackground(0, 0, 0, 0, 320, 200, bgSurface, screenSurface);
updateRefresh_pre();
copyRect(267, 1, curX - 14, curY - 2, 52, 73, drawSurface3, screenSurface);
updateScreen();
@@ -287,7 +287,7 @@ bool DrasculaEngine::room_6(int fl) {
updateScreen();
finishSound();
} else if (pickedObject == kVerbPick && fl == 140) {
- copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
+ copyBackground(0, 0, 0, 0, 320, 200, bgSurface, screenSurface);
updateRefresh_pre();
copyRect(267, 1, curX - 14, curY - 2, 52, 73, drawSurface3, screenSurface);
updateScreen();
@@ -407,7 +407,7 @@ bool DrasculaEngine::room_15(int fl) {
talk_sync(_text[_lang][46], "46.als", "4442444244244");
trackProtagonist = 1;
} else if (pickedObject == 18 && fl == 188 && flags[26] == 0) {
- copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
+ copyBackground(0, 0, 0, 0, 320, 200, bgSurface, screenSurface);
copyRect(133, 135, curX + 6, curY, 39, 63, drawSurface3, screenSurface);
updateScreen();
playSound(8);
@@ -497,7 +497,7 @@ bool DrasculaEngine::room_18(int fl) {
else if (pickedObject == kVerbTalk && fl == 55 && flags[36] == 1)
talk(109);
else if (pickedObject == kVerbPick && fl == 182) {
- copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
+ copyBackground(0, 0, 0, 0, 320, 200, bgSurface, screenSurface);
updateRefresh_pre();
copyRect(44, 1, curX, curY, 41, 70, drawSurface2, screenSurface);
updateRefresh();
@@ -519,7 +519,7 @@ bool DrasculaEngine::room_18(int fl) {
trackProtagonist = 3;
updateRoom();
updateScreen();
- copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
+ copyBackground(0, 0, 0, 0, 320, 200, bgSurface, screenSurface);
updateRefresh_pre();
copyRect(1, 1, curX - 1, curY + 3, 42, 67, drawSurface2, screenSurface);
updateRefresh();
@@ -922,11 +922,11 @@ bool DrasculaEngine::room_59(int fl) {
hare_se_ve = 0;
updateRoom();
copyRect(101, 34, curX - 4, curY - 1, 37, 70, drawSurface3, screenSurface);
- copyBackground(0, 0, 0, 0, 320, 200, screenSurface, drawSurface1);
+ copyBackground(0, 0, 0, 0, 320, 200, screenSurface, bgSurface);
updateScreen();
hare_se_ve = 1;
clearRoom();
- loadPic("tlef0.alg", drawSurface1, COMPLETE_PAL);
+ loadPic("tlef0.alg", bgSurface, COMPLETE_PAL);
loadPic("tlef1.alg", drawSurface3);
loadPic("tlef2.alg", frontSurface);
loadPic("tlef3.alg", backSurface);
@@ -950,7 +950,7 @@ bool DrasculaEngine::room_59(int fl) {
loadPic("aux59.alg", drawSurface3);
loadPic(96, frontSurface, COMPLETE_PAL);
loadPic(99, backSurface);
- loadPic(59, drawSurface1, HALF_PAL);
+ loadPic(59, bgSurface, HALF_PAL);
trackProtagonist = 3;
talk(245);
withoutVerb();
@@ -1343,7 +1343,7 @@ void DrasculaEngine::update_58() {
void DrasculaEngine::update_59_pre() {
if (flags[9] == 1) {
- copyBackground(65, 103, 65, 103, 49, 38, drawSurface1, screenSurface);
+ copyBackground(65, 103, 65, 103, 49, 38, bgSurface, screenSurface);
copyRect(1, 105, 65, 103, 49, 38, drawSurface3, screenSurface);
}
}
@@ -1710,7 +1710,7 @@ void DrasculaEngine::enterRoom(int roomIndex) {
}
loadPic(roomDisk, drawSurface3);
- loadPic(roomNumber, drawSurface1, HALF_PAL);
+ loadPic(roomNumber, bgSurface, HALF_PAL);
copyBackground(0, 171, 0, 0, OBJWIDTH, OBJHEIGHT, backSurface, drawSurface3);
@@ -1974,7 +1974,7 @@ bool DrasculaEngine::exitRoom(int l) {
}
void DrasculaEngine::updateRoom() {
- copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
+ copyBackground(0, 0, 0, 0, 320, 200, bgSurface, screenSurface);
updateRefresh_pre();
if (currentChapter == 3) {
if (flags[0] == 0)
diff --git a/engines/drascula/saveload.cpp b/engines/drascula/saveload.cpp
index 9e5b0aa74d..008784f209 100644
--- a/engines/drascula/saveload.cpp
+++ b/engines/drascula/saveload.cpp
@@ -53,7 +53,7 @@ bool DrasculaEngine::saveLoadScreen() {
sav->readLine(names[n], 23);
delete sav;
- loadPic("savescr.alg", drawSurface1, HALF_PAL);
+ loadPic("savescr.alg", bgSurface, HALF_PAL);
color_abc(kColorLightGreen);
@@ -61,7 +61,7 @@ bool DrasculaEngine::saveLoadScreen() {
for (;;) {
y = 27;
- copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
+ copyBackground(0, 0, 0, 0, 320, 200, bgSurface, screenSurface);
for (n = 0; n < NUM_SAVES; n++) {
print_abc(names[n], 116, y);
y = y + 9;
@@ -154,7 +154,7 @@ bool DrasculaEngine::saveLoadScreen() {
}
clearRoom();
- loadPic(roomNumber, drawSurface1, HALF_PAL);
+ loadPic(roomNumber, bgSurface, HALF_PAL);
selectionMade = 0;
return true;
diff --git a/engines/drascula/talk.cpp b/engines/drascula/talk.cpp
index 6aa09b2505..4d3187a0fd 100644
--- a/engines/drascula/talk.cpp
+++ b/engines/drascula/talk.cpp
@@ -70,18 +70,18 @@ void DrasculaEngine::talk_igor(int index, int talkerType) {
do {
if (talkerType == kIgorDch || talkerType == kIgorFront) {
face = _rnd->getRandomNumber(7);
- copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
+ copyBackground(0, 0, 0, 0, 320, 200, bgSurface, screenSurface);
updateRefresh_pre();
} else if (talkerType == kIgorSeated || talkerType == kIgorWig) {
face = _rnd->getRandomNumber(3);
- copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
+ copyBackground(0, 0, 0, 0, 320, 200, bgSurface, screenSurface);
updateRefresh_pre();
}
if (talkerType == kIgorDch) {
placeIgor();
placeDrascula();
- copyBackground(igorX + 17, igorY, igorX + 17, igorY, 37, 24, drawSurface1, screenSurface);
+ copyBackground(igorX + 17, igorY, igorX + 17, igorY, 37, 24, bgSurface, screenSurface);
copyRect(x_talk0[face], 148, igorX + 17, igorY, 25, 24, frontSurface, screenSurface);
updateRefresh();
if (withVoices == 0)
@@ -94,7 +94,7 @@ void DrasculaEngine::talk_igor(int index, int talkerType) {
if (currentChapter == 1)
placeDrascula();
if (currentChapter == 1 || currentChapter == 6)
- copyBackground(igorX, igorY, igorX, igorY, 29, 25, drawSurface1, screenSurface);
+ copyBackground(igorX, igorY, igorX, igorY, 29, 25, bgSurface, screenSurface);
copyRect(x_talk1[face], 173, igorX, igorY, 29, 25, frontSurface, screenSurface);
updateRefresh();
if (withVoices == 0)
@@ -127,7 +127,7 @@ void DrasculaEngine::talk_igor(int index, int talkerType) {
}
if (talkerType == kIgorDch || (talkerType == kIgorFront && currentChapter == 1)) {
- copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
+ copyBackground(0, 0, 0, 0, 320, 200, bgSurface, screenSurface);
placeIgor();
placeDrascula();
}
@@ -152,7 +152,7 @@ void DrasculaEngine::talk_drascula(int index, int talkerType) {
do {
face = _rnd->getRandomNumber(7);
- copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
+ copyBackground(0, 0, 0, 0, 320, 200, bgSurface, screenSurface);
updateRefresh_pre();
@@ -161,7 +161,7 @@ void DrasculaEngine::talk_drascula(int index, int talkerType) {
if (currentChapter == 6)
moveCharacters();
- copyBackground(drasculaX, drasculaY, drasculaX, drasculaY, 38 + offset, 31, drawSurface1, screenSurface);
+ copyBackground(drasculaX, drasculaY, drasculaX, drasculaY, 38 + offset, 31, bgSurface, screenSurface);
if (currentChapter == 6)
copyRect(x_talk[face], offset2, drasculaX + offset, drasculaY, 38, 31, drawSurface2, screenSurface);
else
@@ -179,7 +179,7 @@ void DrasculaEngine::talk_drascula(int index, int talkerType) {
} while (!isTalkFinished(&length));
if (talkerType == 0)
- copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
+ copyBackground(0, 0, 0, 0, 320, 200, bgSurface, screenSurface);
if (talkerType == 1 && currentChapter == 6)
updateRoom();
@@ -204,7 +204,7 @@ void DrasculaEngine::talk_solo(const char *said, const char *filename) {
talkInit(filename);
if (currentChapter == 6)
- copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
+ copyBackground(0, 0, 0, 0, 320, 200, bgSurface, screenSurface);
do {
if (withVoices == 0) {
@@ -219,7 +219,7 @@ void DrasculaEngine::talk_solo(const char *said, const char *filename) {
} while (!isTalkFinished(&length));
if (currentChapter == 6) {
- copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
+ copyBackground(0, 0, 0, 0, 320, 200, bgSurface, screenSurface);
updateScreen();
}
}
@@ -260,7 +260,7 @@ void DrasculaEngine::talk_bartender(int index, int talkerType) {
face = _rnd->getRandomNumber(5);
}
- copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
+ copyBackground(0, 0, 0, 0, 320, 200, bgSurface, screenSurface);
updateRefresh_pre();
@@ -299,12 +299,12 @@ void DrasculaEngine::talk_bj(int index) {
if (currentChapter != 5) {
face = _rnd->getRandomNumber(4);
- copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
+ copyBackground(0, 0, 0, 0, 320, 200, bgSurface, screenSurface);
updateRefresh_pre();
copyBackground(bjX + 2, bjY - 1, bjX + 2, bjY - 1, 27, 40,
- drawSurface1, screenSurface);
+ bgSurface, screenSurface);
copyRect(x_talk[face], 99, bjX + 2, bjY - 1, 27, 40,
drawSurface3, screenSurface);
@@ -375,7 +375,7 @@ void DrasculaEngine::talk(const char *said, const char *filename) {
do {
face = _rnd->getRandomNumber(5);
- copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
+ copyBackground(0, 0, 0, 0, 320, 200, bgSurface, screenSurface);
updateRefresh_pre();
if (currentChapter == 2)
@@ -510,12 +510,12 @@ void DrasculaEngine::talk_vonBraun(int index) {
talkInit(filename);
- copyBackground(vonBraunX + 5, 64, OBJWIDTH + 1, 0, 25, 27, drawSurface1, drawSurface3);
+ copyBackground(vonBraunX + 5, 64, OBJWIDTH + 1, 0, 25, 27, bgSurface, drawSurface3);
do {
if (trackVonBraun == 1) {
face = _rnd->getRandomNumber(5);
- copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
+ copyBackground(0, 0, 0, 0, 320, 200, bgSurface, screenSurface);
moveCharacters();
moveVonBraun();
@@ -580,13 +580,13 @@ void DrasculaEngine::talk_blind(int index) {
color_abc(kColorBrown);
- copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
+ copyBackground(0, 0, 0, 0, 320, 200, bgSurface, screenSurface);
updateScreen();
talkInit(filename);
do {
- copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
+ copyBackground(0, 0, 0, 0, 320, 200, bgSurface, screenSurface);
pos_blind[5] = 149;
char c = toupper(syncChar[p]);
@@ -623,7 +623,7 @@ void DrasculaEngine::talk_hacker(int index) {
const char *said = _textd[_lang][index];
int length = strlen(said);
- copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
+ copyBackground(0, 0, 0, 0, 320, 200, bgSurface, screenSurface);
updateScreen();
color_abc(kColorYellow);
@@ -683,7 +683,7 @@ void DrasculaEngine::talk_pen(const char *said, const char *filename, int talker
else
face = _rnd->getRandomNumber(4);
- copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
+ copyBackground(0, 0, 0, 0, 320, 200, bgSurface, screenSurface);
updateRefresh_pre();
if (talkerType == 0)
@@ -706,7 +706,7 @@ void DrasculaEngine::talk_pen(const char *said, const char *filename, int talker
} while (!isTalkFinished(&length));
flags[1] = 0;
- copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
+ copyBackground(0, 0, 0, 0, 320, 200, bgSurface, screenSurface);
updateRefresh_pre();
updateScreen();
}
@@ -726,11 +726,11 @@ void DrasculaEngine::talk_bj_bed(int index) {
do {
face = _rnd->getRandomNumber(4);
- copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
+ copyBackground(0, 0, 0, 0, 320, 200, bgSurface, screenSurface);
updateRefresh_pre();
- copyBackground(65, 103, 65, 103, 49, 38, drawSurface1, screenSurface);
+ copyBackground(65, 103, 65, 103, 49, 38, bgSurface, screenSurface);
copyRect(x_talk[face], 105, 65, 103, 49, 38, drawSurface3, screenSurface);
moveCharacters();
updateRefresh();
@@ -771,7 +771,7 @@ void DrasculaEngine::talk_htel(int index) {
else
faceBuffer = (char *)backSurface;
- copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
+ copyBackground(0, 0, 0, 0, 320, 200, bgSurface, screenSurface);
copyBackground(x_talk[face], 1, 45, 24, 92, 108, (byte *)faceBuffer, screenSurface);
@@ -782,7 +782,7 @@ void DrasculaEngine::talk_htel(int index) {
pause(3);
} while (!isTalkFinished(&length));
- copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
+ copyBackground(0, 0, 0, 0, 320, 200, bgSurface, screenSurface);
updateScreen();
}
@@ -808,7 +808,7 @@ void DrasculaEngine::talk_sync(const char *said, const char *filename, const cha
strncpy(buf, &syncChar[p], 1);
face = atoi(buf);
- copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
+ copyBackground(0, 0, 0, 0, 320, 200, bgSurface, screenSurface);
updateRefresh_pre();
if (currentChapter == 2)
@@ -918,7 +918,7 @@ void DrasculaEngine::talk_dr_grande(int index) {
do {
face = _rnd->getRandomNumber(3);
- copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
+ copyBackground(0, 0, 0, 0, 320, 200, bgSurface, screenSurface);
copyBackground(interf_x[l] + 24, interf_y[l], 0, 45, 39, 31, drawSurface2, screenSurface);
copyBackground(x_talk[face], 1, 171, 68, 45, 48, drawSurface2, screenSurface);
l++;
@@ -946,7 +946,7 @@ void DrasculaEngine::talk_generic(const char* said, const char* filename, int* f
do {
face = _rnd->getRandomNumber(faceCount - 1);
- copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
+ copyBackground(0, 0, 0, 0, 320, 200, bgSurface, screenSurface);
updateRefresh_pre();
copyBackground(faces[face], coords[0], coords[1], coords[2],
coords[3], coords[4], surface, screenSurface);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 06:35:50 +0000