aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2008-05-30 07:19:09 +0000
committerFilippos Karapetis2008-05-30 07:19:09 +0000
commit54e631a9034c00f9a5519441027cfda2c0532567 (patch)
treee8220eddb98ebed8847d02715c1790ebef834c5f
parenteb28418d4b2c6a3a96c2ecbf87325bfd45f6d7ba (diff)
downloadscummvm-rg350-54e631a9034c00f9a5519441027cfda2c0532567.tar.gz
scummvm-rg350-54e631a9034c00f9a5519441027cfda2c0532567.tar.bz2
scummvm-rg350-54e631a9034c00f9a5519441027cfda2c0532567.zip
rompo -> doBreak
Removed unused variable rompo2 svn-id: r32376
-rw-r--r--engines/drascula/animation.cpp4
-rw-r--r--engines/drascula/drascula.cpp28
-rw-r--r--engines/drascula/drascula.h2
3 files changed, 17 insertions, 17 deletions
diff --git a/engines/drascula/animation.cpp b/engines/drascula/animation.cpp
index 7cff21047b..4e0f2d6c1b 100644
--- a/engines/drascula/animation.cpp
+++ b/engines/drascula/animation.cpp
@@ -2163,7 +2163,7 @@ void DrasculaEngine::animation_12_5() {
lleva_al_hare(40, 169);
lleva_al_hare(-14, 175);
- rompo = 1;
+ doBreak = 1;
previousMusic = roomMusic;
hare_se_ve = 1;
clearRoom();
@@ -2389,7 +2389,7 @@ void DrasculaEngine::animation_6_6() {
decompressPic(extraSurface, 1);
loadPic("99.alg");
decompressPic(backSurface, 1);
- rompo = 1;
+ doBreak = 1;
objExit = 104;
hare_x = -1;
withoutVerb();
diff --git a/engines/drascula/drascula.cpp b/engines/drascula/drascula.cpp
index 26ab9590c3..73a2b55481 100644
--- a/engines/drascula/drascula.cpp
+++ b/engines/drascula/drascula.cpp
@@ -167,7 +167,7 @@ int DrasculaEngine::go() {
frame_y = 0;
hare_x = -1; hare_se_mueve = 0; sentido_hare = 3; num_frame = 0; hare_se_ve = 1;
checkFlags = 1;
- rompo = 0; rompo2 = 0;
+ doBreak = 0;
walkToObject = 0;
stepX = PASO_HARE_X; stepY = PASO_HARE_Y;
alto_hare = CHARACTER_HEIGHT; ancho_hare = CHARACTER_WIDTH; feetHeight = PIES_HARE;
@@ -1291,31 +1291,31 @@ bool DrasculaEngine::comprueba1() {
else {
for (l = 0; l < numRoomObjs; l++) {
if (mouseX >= x1[l] && mouseY >= y1[l]
- && mouseX <= x2[l] && mouseY <= y2[l] && rompo == 0) {
+ && mouseX <= x2[l] && mouseY <= y2[l] && doBreak == 0) {
if (exitRoom(l))
return true;
- if (rompo == 1)
+ if (doBreak == 1)
break;
}
}
if (mouseX > hare_x && mouseY > hare_y
&& mouseX < hare_x + ancho_hare && mouseY < hare_y + alto_hare)
- rompo = 1;
+ doBreak = 1;
for (l = 0; l < numRoomObjs; l++) {
if (mouseX > x1[l] && mouseY > y1[l]
- && mouseX < x2[l] && mouseY < y2[l] && rompo == 0) {
+ && mouseX < x2[l] && mouseY < y2[l] && doBreak == 0) {
sitio_x = sitiobj_x[l];
sitio_y = sitiobj_y[l];
sentido_final = sentidobj[l];
- rompo = 1;
+ doBreak = 1;
walkToObject = 1;
startWalking();
}
}
- if (rompo == 0) {
+ if (doBreak == 0) {
sitio_x = mouseX;
sitio_y = mouseY;
@@ -1330,7 +1330,7 @@ bool DrasculaEngine::comprueba1() {
startWalking();
}
- rompo = 0;
+ doBreak = 0;
}
return false;
@@ -2643,7 +2643,7 @@ bool DrasculaEngine::exitRoom(int l) {
hare_se_mueve = 0;
sentido_hare = sentido_alkeva[l];
objExit = alapuertakeva[l];
- rompo = 1;
+ doBreak = 1;
previousMusic = roomMusic;
if (objectNum[l] == 105) {
@@ -2664,7 +2664,7 @@ bool DrasculaEngine::exitRoom(int l) {
hare_se_mueve = 0;
sentido_hare = sentido_alkeva[l];
objExit = alapuertakeva[l];
- rompo = 1;
+ doBreak = 1;
previousMusic = roomMusic;
if (objectNum[l] == 136)
animation_2_2();
@@ -2700,7 +2700,7 @@ bool DrasculaEngine::exitRoom(int l) {
hare_se_mueve = 0;
sentido_hare = sentido_alkeva[l];
objExit = alapuertakeva[l];
- rompo = 1;
+ doBreak = 1;
previousMusic = roomMusic;
clearRoom();
strcpy(salgo, targetScreen[l]);
@@ -2718,7 +2718,7 @@ bool DrasculaEngine::exitRoom(int l) {
hare_se_mueve = 0;
sentido_hare = sentido_alkeva[l];
objExit = alapuertakeva[l];
- rompo = 1;
+ doBreak = 1;
previousMusic = roomMusic;
if (objectNum[l] == 108)
@@ -2739,7 +2739,7 @@ bool DrasculaEngine::exitRoom(int l) {
hare_se_mueve = 0;
sentido_hare = sentido_alkeva[l];
objExit = alapuertakeva[l];
- rompo = 1;
+ doBreak = 1;
previousMusic = roomMusic;
hare_se_ve = 1;
clearRoom();
@@ -2758,7 +2758,7 @@ bool DrasculaEngine::exitRoom(int l) {
hare_se_mueve = 0;
sentido_hare = sentido_alkeva[l];
objExit = alapuertakeva[l];
- rompo = 1;
+ doBreak = 1;
previousMusic = roomMusic;
clearRoom();
strcpy(salgo, targetScreen[l]);
diff --git a/engines/drascula/drascula.h b/engines/drascula/drascula.h
index fd1e55faec..8f2989eb1b 100644
--- a/engines/drascula/drascula.h
+++ b/engines/drascula/drascula.h
@@ -313,7 +313,7 @@ public:
int frame_y;
int hare_x, hare_y, hare_se_mueve, direccion_hare, sentido_hare, num_frame, hare_se_ve;
int sitio_x, sitio_y, checkFlags;
- int rompo, rompo2;
+ int doBreak;
int stepX, stepY;
int alto_hare, ancho_hare, feetHeight;
int alto_talk, ancho_talk;