aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorFilippos Karapetis2008-06-02 20:46:00 +0000
committerFilippos Karapetis2008-06-02 20:46:00 +0000
commit6f09c5a9286f97a1fac6e85fa4092295bc779440 (patch)
tree03e02068e2a64812b92d4ed763edacb95e372000 /engines
parentb0c7714cfa2a65dcb9c701aede5fa0e862adf392 (diff)
downloadscummvm-rg350-6f09c5a9286f97a1fac6e85fa4092295bc779440.tar.gz
scummvm-rg350-6f09c5a9286f97a1fac6e85fa4092295bc779440.tar.bz2
scummvm-rg350-6f09c5a9286f97a1fac6e85fa4092295bc779440.zip
rayo_x -> rayX
PASO_HARE_X/PASO_HARE_Y -> STEP_X/STEP_Y PIES_HARE -> FEET_HEIGHT ALTO_TALK_HARE -> TALK_HEIGHT ANCHO_TALK_HARE -> TALK_WIDTH salgo -> roomExit num_cara -> faceBuffer pantalla -> curScreen svn-id: r32503
Diffstat (limited to 'engines')
-rw-r--r--engines/drascula/animation.cpp4
-rw-r--r--engines/drascula/drascula.cpp102
-rw-r--r--engines/drascula/drascula.h12
-rw-r--r--engines/drascula/talk.cpp78
4 files changed, 98 insertions, 98 deletions
diff --git a/engines/drascula/animation.cpp b/engines/drascula/animation.cpp
index d389ddb6ee..018b6e2a04 100644
--- a/engines/drascula/animation.cpp
+++ b/engines/drascula/animation.cpp
@@ -1681,7 +1681,7 @@ void DrasculaEngine::animation_12_5() {
DacPalette256 bgPalette3;
int frame;
- const int rayo_x[] = {1, 46, 91, 136, 181, 226, 271, 181};
+ const int rayX[] = {1, 46, 91, 136, 181, 226, 271, 181};
const int frusky_x[] = {100, 139, 178, 217, 100, 178, 217, 139, 100, 139};
const int elfrusky_x[] = {1, 68, 135, 1, 68, 135, 1, 68, 135, 68, 1, 135, 68, 135, 68};
//const int humo_x[] = {1, 29, 57, 85, 113, 141, 169, 197, 225};
@@ -1738,7 +1738,7 @@ void DrasculaEngine::animation_12_5() {
pause(4);
updateRoom();
- copyRect(rayo_x[frame], 1, 41, 0, 44, 44, backSurface, screenSurface);
+ copyRect(rayX[frame], 1, 41, 0, 44, 44, backSurface, screenSurface);
copyRect(frusky_x[frame], 113, 205, 50, 38, 86, drawSurface3, screenSurface);
updateScreen();
}
diff --git a/engines/drascula/drascula.cpp b/engines/drascula/drascula.cpp
index 29bc4aad8b..4c3580caf1 100644
--- a/engines/drascula/drascula.cpp
+++ b/engines/drascula/drascula.cpp
@@ -122,9 +122,9 @@ int DrasculaEngine::go() {
checkFlags = 1;
doBreak = 0;
walkToObject = 0;
- stepX = PASO_HARE_X; stepY = PASO_HARE_Y;
- alto_hare = CHARACTER_HEIGHT; ancho_hare = CHARACTER_WIDTH; feetHeight = PIES_HARE;
- alto_talk = ALTO_TALK_HARE; ancho_talk = ANCHO_TALK_HARE;
+ stepX = STEP_X; stepY = STEP_Y;
+ alto_hare = CHARACTER_HEIGHT; ancho_hare = CHARACTER_WIDTH; feetHeight = FEET_HEIGHT;
+ talkHeight = TALK_HEIGHT; talkWidth = TALK_WIDTH;
hasAnswer = 0;
conta_blind_vez = 0;
changeColor = 0;
@@ -563,8 +563,8 @@ bool DrasculaEngine::escoba() {
while (1) {
if (characterMoved == 0) {
- stepX = PASO_HARE_X;
- stepY = PASO_HARE_Y;
+ stepX = STEP_X;
+ stepY = STEP_Y;
}
if (characterMoved == 0 && walkToObject == 1) {
sentido_hare = sentido_final;
@@ -910,11 +910,11 @@ void DrasculaEngine::carga_escoba(const char *nom_fich) {
if (currentChapter == 2) {
if (martin == 0) {
- stepX = PASO_HARE_X;
- stepY = PASO_HARE_Y;
+ stepX = STEP_X;
+ stepY = STEP_Y;
alto_hare = CHARACTER_HEIGHT;
ancho_hare = CHARACTER_WIDTH;
- feetHeight = PIES_HARE;
+ feetHeight = FEET_HEIGHT;
loadPic("97.alg", extraSurface, 1);
loadPic("96.alg", frontSurface, 1);
loadPic("99.alg", backSurface, 1);
@@ -2195,8 +2195,8 @@ void DrasculaEngine::hare_claro() {
void DrasculaEngine::startWalking() {
characterMoved = 1;
- stepX = PASO_HARE_X;
- stepY = PASO_HARE_Y;
+ stepX = STEP_X;
+ stepY = STEP_Y;
if (currentChapter == 2) {
if ((sitio_x < hare_x) && (sitio_y <= (hare_y + alto_hare)))
@@ -2230,48 +2230,48 @@ void DrasculaEngine::pon_hare() {
int pos_hare[6];
int r;
- if (characterMoved == 1 && stepX == PASO_HARE_X) {
+ if (characterMoved == 1 && stepX == STEP_X) {
for (r = 0; r < stepX; r++) {
if (currentChapter != 2) {
if (sentido_hare == 0 && sitio_x - r == hare_x + ancho_hare / 2) {
characterMoved = 0;
- stepX = PASO_HARE_X;
- stepY = PASO_HARE_Y;
+ stepX = STEP_X;
+ stepY = STEP_Y;
}
if (sentido_hare == 1 && sitio_x + r == hare_x + ancho_hare / 2) {
characterMoved = 0;
- stepX = PASO_HARE_X;
- stepY = PASO_HARE_Y;
+ stepX = STEP_X;
+ stepY = STEP_Y;
hare_x = sitio_x - ancho_hare / 2;
hare_y = sitio_y - alto_hare;
}
} else if (currentChapter == 2) {
if (sentido_hare == 0 && sitio_x - r == hare_x) {
characterMoved = 0;
- stepX = PASO_HARE_X;
- stepY = PASO_HARE_Y;
+ stepX = STEP_X;
+ stepY = STEP_Y;
}
if (sentido_hare == 1 && sitio_x + r == hare_x + ancho_hare) {
characterMoved = 0;
- stepX = PASO_HARE_X;
- stepY = PASO_HARE_Y;
+ stepX = STEP_X;
+ stepY = STEP_Y;
hare_x = sitio_x - ancho_hare + 4;
hare_y = sitio_y - alto_hare;
}
}
}
}
- if (characterMoved == 1 && stepY == PASO_HARE_Y) {
+ if (characterMoved == 1 && stepY == STEP_Y) {
for (r = 0; r < stepY; r++) {
if (sentido_hare == 2 && sitio_y - r == hare_y + alto_hare) {
characterMoved = 0;
- stepX = PASO_HARE_X;
- stepY = PASO_HARE_Y;
+ stepX = STEP_X;
+ stepY = STEP_Y;
}
if (sentido_hare == 3 && sitio_y + r == hare_y + alto_hare) {
characterMoved = 0;
- stepX = PASO_HARE_X;
- stepY = PASO_HARE_Y;
+ stepX = STEP_X;
+ stepY = STEP_Y;
}
}
}
@@ -2423,7 +2423,7 @@ void DrasculaEngine::removeObject() {
}
bool DrasculaEngine::exitRoom(int l) {
- char salgo[13];
+ char roomExit[13];
if (currentChapter == 1) {
if (objectNum[l] == 105 && flags[0] == 0)
@@ -2446,10 +2446,10 @@ bool DrasculaEngine::exitRoom(int l) {
return true;
}
clearRoom();
- strcpy(salgo, _targetSurface[l]);
- strcat(salgo, ".ald");
+ strcpy(roomExit, _targetSurface[l]);
+ strcat(roomExit, ".ald");
hare_x = -1;
- carga_escoba(salgo);
+ carga_escoba(roomExit);
}
}
} else if (currentChapter == 2) {
@@ -2479,10 +2479,10 @@ bool DrasculaEngine::exitRoom(int l) {
}
clearRoom();
- strcpy(salgo, _targetSurface[l]);
- strcat(salgo, ".ald");
+ strcpy(roomExit, _targetSurface[l]);
+ strcat(roomExit, ".ald");
hare_x =- 1;
- carga_escoba(salgo);
+ carga_escoba(roomExit);
}
} else if (currentChapter == 3) {
updateDoor(l);
@@ -2497,10 +2497,10 @@ bool DrasculaEngine::exitRoom(int l) {
doBreak = 1;
previousMusic = roomMusic;
clearRoom();
- strcpy(salgo, _targetSurface[l]);
- strcat(salgo, ".ald");
+ strcpy(roomExit, _targetSurface[l]);
+ strcat(roomExit, ".ald");
hare_x =- 1;
- carga_escoba(salgo);
+ carga_escoba(roomExit);
}
} else if (currentChapter == 4) {
updateDoor(l);
@@ -2518,10 +2518,10 @@ bool DrasculaEngine::exitRoom(int l) {
if (objectNum[l] == 108)
lleva_al_hare(171, 78);
clearRoom();
- strcpy(salgo, _targetSurface[l]);
- strcat(salgo, ".ald");
+ strcpy(roomExit, _targetSurface[l]);
+ strcat(roomExit, ".ald");
hare_x = -1;
- carga_escoba(salgo);
+ carga_escoba(roomExit);
}
} else if (currentChapter == 5) {
updateDoor(l);
@@ -2537,10 +2537,10 @@ bool DrasculaEngine::exitRoom(int l) {
previousMusic = roomMusic;
hare_se_ve = 1;
clearRoom();
- strcpy(salgo, _targetSurface[l]);
- strcat(salgo, ".ald");
+ strcpy(roomExit, _targetSurface[l]);
+ strcat(roomExit, ".ald");
hare_x = -1;
- carga_escoba(salgo);
+ carga_escoba(roomExit);
}
} else if (currentChapter == 6) {
updateDoor(l);
@@ -2555,10 +2555,10 @@ bool DrasculaEngine::exitRoom(int l) {
doBreak = 1;
previousMusic = roomMusic;
clearRoom();
- strcpy(salgo, _targetSurface[l]);
- strcat(salgo, ".ald");
+ strcpy(roomExit, _targetSurface[l]);
+ strcat(roomExit, ".ald");
hare_x = -1;
- carga_escoba(salgo);
+ carga_escoba(roomExit);
if (objExit == 105)
animation_19_6();
@@ -2933,11 +2933,11 @@ void DrasculaEngine::quadrant_1() {
if (distance_x < distance_y) {
direccion_hare = 0;
sentido_hare = 2;
- stepX = (int)(distance_x / (distance_y / PASO_HARE_Y));
+ stepX = (int)(distance_x / (distance_y / STEP_Y));
} else {
direccion_hare = 7;
sentido_hare = 0;
- stepY = (int)(distance_y / (distance_x / PASO_HARE_X));
+ stepY = (int)(distance_y / (distance_x / STEP_X));
}
}
@@ -2954,11 +2954,11 @@ void DrasculaEngine::quadrant_2() {
if (distance_x < distance_y) {
direccion_hare = 1;
sentido_hare = 2;
- stepX = (int)(distance_x / (distance_y / PASO_HARE_Y));
+ stepX = (int)(distance_x / (distance_y / STEP_Y));
} else {
direccion_hare = 2;
sentido_hare = 1;
- stepY = (int)(distance_y / (distance_x / PASO_HARE_X));
+ stepY = (int)(distance_y / (distance_x / STEP_X));
}
}
@@ -2975,11 +2975,11 @@ void DrasculaEngine::quadrant_3() {
if (distance_x < distance_y) {
direccion_hare = 5;
sentido_hare = 3;
- stepX = (int)(distance_x / (distance_y / PASO_HARE_Y));
+ stepX = (int)(distance_x / (distance_y / STEP_Y));
} else {
direccion_hare = 6;
sentido_hare = 0;
- stepY = (int)(distance_y / (distance_x / PASO_HARE_X));
+ stepY = (int)(distance_y / (distance_x / STEP_X));
}
}
@@ -2996,11 +2996,11 @@ void DrasculaEngine::quadrant_4() {
if (distance_x < distance_y) {
direccion_hare = 4;
sentido_hare = 3;
- stepX = (int)(distance_x / (distance_y / PASO_HARE_Y));
+ stepX = (int)(distance_x / (distance_y / STEP_Y));
} else {
direccion_hare = 3;
sentido_hare = 1;
- stepY = (int)(distance_y / (distance_x / PASO_HARE_X));
+ stepY = (int)(distance_y / (distance_x / STEP_X));
}
}
diff --git a/engines/drascula/drascula.h b/engines/drascula/drascula.h
index 180c70b5c8..3552bb1c0f 100644
--- a/engines/drascula/drascula.h
+++ b/engines/drascula/drascula.h
@@ -134,13 +134,13 @@ struct CharInfo {
#define CHAR_WIDTH 8
#define CHAR_HEIGHT 6
-#define ALTO_TALK_HARE 25
-#define ANCHO_TALK_HARE 23
-#define PASO_HARE_X 8
-#define PASO_HARE_Y 3
+#define TALK_HEIGHT 25
+#define TALK_WIDTH 23
+#define STEP_X 8
+#define STEP_Y 3
#define CHARACTER_HEIGHT 70
#define CHARACTER_WIDTH 43
-#define PIES_HARE 12
+#define FEET_HEIGHT 12
#define CHAR_WIDTH_OPC 6
#define CHAR_HEIGHT_OPC 5
@@ -265,7 +265,7 @@ public:
int doBreak;
int stepX, stepY;
int alto_hare, ancho_hare, feetHeight;
- int alto_talk, ancho_talk;
+ int talkHeight, talkWidth;
int suelo_x1, suelo_y1, suelo_x2, suelo_y2;
int near, far;
int sentido_final, walkToObject;
diff --git a/engines/drascula/talk.cpp b/engines/drascula/talk.cpp
index 23bfbb2b01..40c5d4a1ab 100644
--- a/engines/drascula/talk.cpp
+++ b/engines/drascula/talk.cpp
@@ -391,59 +391,59 @@ void DrasculaEngine::talk(const char *said, const char *filename) {
updateRefresh_pre();
if (currentChapter == 2)
- copyBackground(hare_x, hare_y, OBJWIDTH + 1, 0, ancho_hare, alto_talk - 1, screenSurface, drawSurface3);
+ copyBackground(hare_x, hare_y, OBJWIDTH + 1, 0, ancho_hare, talkHeight - 1, screenSurface, drawSurface3);
else
copyBackground(hare_x, hare_y, OBJWIDTH + 1, 0, (int)(((float)ancho_hare / 100) * factor_red[hare_y + alto_hare]),
- (int)(((float)(alto_talk - 1) / 100) * factor_red[hare_y + alto_hare]),
+ (int)(((float)(talkHeight - 1) / 100) * factor_red[hare_y + alto_hare]),
screenSurface, drawSurface3);
pon_hare();
if (currentChapter == 2) {
if (!strcmp(menuBackground, "99.alg") || !strcmp(menuBackground, "994.alg"))
- copyBackground(OBJWIDTH + 1, 0, hare_x, hare_y, ancho_hare, alto_talk - 1, drawSurface3, screenSurface);
+ copyBackground(OBJWIDTH + 1, 0, hare_x, hare_y, ancho_hare, talkHeight - 1, drawSurface3, screenSurface);
} else {
copyBackground(OBJWIDTH + 1, 0, hare_x, hare_y, (int)(((float)ancho_hare / 100) * factor_red[hare_y + alto_hare]),
- (int)(((float)(alto_talk - 1) / 100) * factor_red[hare_y + alto_hare]),
+ (int)(((float)(talkHeight - 1) / 100) * factor_red[hare_y + alto_hare]),
drawSurface3, screenSurface);
}
if (sentido_hare == 0) {
if (currentChapter == 2)
- copyRect(x_talk_izq[face], y_mask_talk, hare_x + 8, hare_y - 1, ancho_talk, alto_talk,
+ copyRect(x_talk_izq[face], y_mask_talk, hare_x + 8, hare_y - 1, talkWidth, talkHeight,
extraSurface, screenSurface);
else
reduce_hare_chico(x_talk_izq[face], y_mask_talk, hare_x + (int)((8.0f / 100) * factor_red[hare_y + alto_hare]),
- hare_y, ancho_talk, alto_talk, factor_red[hare_y + alto_hare],
+ hare_y, talkWidth, talkHeight, factor_red[hare_y + alto_hare],
extraSurface, screenSurface);
updateRefresh();
} else if (sentido_hare == 1) {
if (currentChapter == 2)
- copyRect(x_talk_dch[face], y_mask_talk, hare_x + 12, hare_y, ancho_talk, alto_talk,
+ copyRect(x_talk_dch[face], y_mask_talk, hare_x + 12, hare_y, talkWidth, talkHeight,
extraSurface, screenSurface);
else
reduce_hare_chico(x_talk_dch[face], y_mask_talk, hare_x + (int)((12.0f / 100) * factor_red[hare_y + alto_hare]),
- hare_y, ancho_talk, alto_talk, factor_red[hare_y + alto_hare], extraSurface, screenSurface);
+ hare_y, talkWidth, talkHeight, factor_red[hare_y + alto_hare], extraSurface, screenSurface);
updateRefresh();
} else if (sentido_hare == 2) {
if (currentChapter == 2)
- copyRect(x_talk_izq[face], y_mask_talk, hare_x + 12, hare_y, ancho_talk, alto_talk,
+ copyRect(x_talk_izq[face], y_mask_talk, hare_x + 12, hare_y, talkWidth, talkHeight,
frontSurface, screenSurface);
else
reduce_hare_chico(x_talk_izq[face], y_mask_talk,
suma_1_pixel + hare_x + (int)((12.0f / 100) * factor_red[hare_y + alto_hare]),
- hare_y, ancho_talk, alto_talk, factor_red[hare_y + alto_hare],
+ hare_y, talkWidth, talkHeight, factor_red[hare_y + alto_hare],
frontSurface, screenSurface);
updateRefresh();
} else if (sentido_hare == 3) {
if (currentChapter == 2)
- copyRect(x_talk_dch[face], y_mask_talk, hare_x + 8, hare_y, ancho_talk, alto_talk,
+ copyRect(x_talk_dch[face], y_mask_talk, hare_x + 8, hare_y, talkWidth, talkHeight,
frontSurface, screenSurface);
else
reduce_hare_chico(x_talk_dch[face], y_mask_talk,
suma_1_pixel + hare_x + (int)((8.0f / 100) * factor_red[hare_y + alto_hare]),
- hare_y, ancho_talk,alto_talk, factor_red[hare_y + alto_hare],
+ hare_y, talkWidth,talkHeight, factor_red[hare_y + alto_hare],
frontSurface, screenSurface);
updateRefresh();
}
@@ -635,7 +635,7 @@ void DrasculaEngine::talk_blind(int index) {
const char *said = _textd[_lang][index + TEXTD_START - 1];
const char *sincronia = _textd1[_lang][index - 1];
- byte *num_cara;
+ byte *faceBuffer;
int p = 0;
int pos_blind[6];
int length = strlen(said);
@@ -664,17 +664,17 @@ void DrasculaEngine::talk_blind(int index) {
pos_blind[0] = 132;
if (c == '0' || c == '1')
- num_cara = drawSurface3;
+ faceBuffer = drawSurface3;
else if (c == '2' || c == '3')
- num_cara = extraSurface;
+ faceBuffer = extraSurface;
else if (c == '4' || c == '5')
- num_cara = backSurface;
+ faceBuffer = backSurface;
else {
- num_cara = frontSurface;
+ faceBuffer = frontSurface;
pos_blind[5] = 146;
}
- copyRectClip( pos_blind, num_cara, screenSurface);
+ copyRectClip( pos_blind, faceBuffer, screenSurface);
if (withVoices == 0)
centerText(said, 310, 71);
@@ -865,9 +865,9 @@ void DrasculaEngine::talk_htel(int index) {
char filename[20];
sprintf(filename, "%i.als", index);
const char *said = _text[_lang][index];
- char *num_cara;
+ char *faceBuffer;
int x_talk[3] = {1, 94, 187};
- int face, pantalla;
+ int face, curScreen;
int length = strlen(said);
color_abc(kColorYellow);
@@ -876,18 +876,18 @@ void DrasculaEngine::talk_htel(int index) {
do {
face = _rnd->getRandomNumber(2);
- pantalla = _rnd->getRandomNumber(2);
+ curScreen = _rnd->getRandomNumber(2);
- if (face == 0 && pantalla == 0)
- num_cara = (char *)drawSurface3;
- else if (pantalla == 1)
- num_cara = (char *)frontSurface;
+ if (face == 0 && curScreen == 0)
+ faceBuffer = (char *)drawSurface3;
+ else if (curScreen == 1)
+ faceBuffer = (char *)frontSurface;
else
- num_cara = (char *)backSurface;
+ faceBuffer = (char *)backSurface;
copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
- copyBackground(x_talk[face], 1, 45, 24, 92, 108, (byte *)num_cara, screenSurface);
+ copyBackground(x_talk[face], 1, 45, 24, 92, 108, (byte *)faceBuffer, screenSurface);
if (withVoices == 0)
centerText(said, 90, 50);
@@ -926,47 +926,47 @@ void DrasculaEngine::talk_sinc(const char *said, const char *filename, const cha
updateRefresh_pre();
if (currentChapter == 2)
- copyBackground(hare_x, hare_y, OBJWIDTH + 1, 0, ancho_hare, alto_talk - 1, screenSurface, drawSurface3);
+ copyBackground(hare_x, hare_y, OBJWIDTH + 1, 0, ancho_hare, talkHeight - 1, screenSurface, drawSurface3);
else
copyBackground(hare_x, hare_y, OBJWIDTH + 1, 0, (int)(((float)ancho_hare / 100) * factor_red[hare_y + alto_hare]),
- (int)(((float)(alto_talk - 1) / 100) * factor_red[hare_y + alto_hare]), screenSurface, drawSurface3);
+ (int)(((float)(talkHeight - 1) / 100) * factor_red[hare_y + alto_hare]), screenSurface, drawSurface3);
pon_hare();
if (currentChapter == 2) {
if (alto_hare != 56)
- copyBackground(OBJWIDTH + 1, 0, hare_x, hare_y, ancho_hare, alto_talk - 1, drawSurface3, screenSurface);
+ copyBackground(OBJWIDTH + 1, 0, hare_x, hare_y, ancho_hare, talkHeight - 1, drawSurface3, screenSurface);
} else
copyBackground(OBJWIDTH + 1, 0, hare_x, hare_y, (int)(((float)ancho_hare / 100) * factor_red[hare_y + alto_hare]),
- (int)(((float)(alto_talk - 1) / 100) * factor_red[hare_y + alto_hare]), drawSurface3, screenSurface);
+ (int)(((float)(talkHeight - 1) / 100) * factor_red[hare_y + alto_hare]), drawSurface3, screenSurface);
if (sentido_hare == 0) {
if (currentChapter == 2)
- copyRect(x_talk_izq[face], y_mask_talk, hare_x + 8, hare_y - 1, ancho_talk, alto_talk, extraSurface, screenSurface);
+ copyRect(x_talk_izq[face], y_mask_talk, hare_x + 8, hare_y - 1, talkWidth, talkHeight, extraSurface, screenSurface);
else
reduce_hare_chico(x_talk_izq[face], y_mask_talk, (int)(hare_x + (8.0f / 100) * factor_red[hare_y + alto_hare]),
- hare_y, ancho_talk, alto_talk, factor_red[hare_y + alto_hare], extraSurface, screenSurface);
+ hare_y, talkWidth, talkHeight, factor_red[hare_y + alto_hare], extraSurface, screenSurface);
updateRefresh();
} else if (sentido_hare == 1) {
if (currentChapter == 2)
- copyRect(x_talk_dch[face], y_mask_talk, hare_x + 12, hare_y, ancho_talk, alto_talk, extraSurface, screenSurface);
+ copyRect(x_talk_dch[face], y_mask_talk, hare_x + 12, hare_y, talkWidth, talkHeight, extraSurface, screenSurface);
else
reduce_hare_chico(x_talk_dch[face], y_mask_talk, (int)(hare_x + (12.0f / 100) * factor_red[hare_y + alto_hare]),
- hare_y, ancho_talk, alto_talk, factor_red[hare_y + alto_hare], extraSurface, screenSurface);
+ hare_y, talkWidth, talkHeight, factor_red[hare_y + alto_hare], extraSurface, screenSurface);
updateRefresh();
} else if (sentido_hare == 2) {
if (currentChapter == 2)
- copyRect(x_talk_izq[face], y_mask_talk, hare_x + 12, hare_y, ancho_talk, alto_talk, frontSurface, screenSurface);
+ copyRect(x_talk_izq[face], y_mask_talk, hare_x + 12, hare_y, talkWidth, talkHeight, frontSurface, screenSurface);
else
reduce_hare_chico(x_talk_izq[face], y_mask_talk,
(int)(suma_1_pixel + hare_x + (12.0f / 100) * factor_red[hare_y + alto_hare]), hare_y,
- ancho_talk, alto_talk, factor_red[hare_y + alto_hare], frontSurface, screenSurface);
+ talkWidth, talkHeight, factor_red[hare_y + alto_hare], frontSurface, screenSurface);
updateRefresh();
} else if (sentido_hare == 3) {
if (currentChapter == 2)
- copyRect(x_talk_dch[face], y_mask_talk, hare_x + 8, hare_y, ancho_talk, alto_talk, frontSurface, screenSurface);
+ copyRect(x_talk_dch[face], y_mask_talk, hare_x + 8, hare_y, talkWidth, talkHeight, frontSurface, screenSurface);
else
reduce_hare_chico(x_talk_dch[face], y_mask_talk,
(int)(suma_1_pixel + hare_x + (8.0f / 100) * factor_red[hare_y + alto_hare]), hare_y,
- ancho_talk, alto_talk, factor_red[hare_y + alto_hare], frontSurface, screenSurface);
+ talkWidth, talkHeight, factor_red[hare_y + alto_hare], frontSurface, screenSurface);
updateRefresh();
}