[Scummvm-cvs-logs] SF.net SVN: scummvm: [32409] scummvm/trunk/engines/drascula
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Sat May 31 02:06:05 CEST 2008
Revision: 32409
http://scummvm.svn.sourceforge.net/scummvm/?rev=32409&view=rev
Author: thebluegr
Date: 2008-05-30 17:06:05 -0700 (Fri, 30 May 2008)
Log Message:
-----------
tabernero -> bartender
anexo -> joined
LimitaVGA -> adjustToVGA
velas -> candles
VelocidadDeFundido -> fadeSpeed
anda_parriba -> walkUp
anda_pabajo -> walkDown
Modified Paths:
--------------
scummvm/trunk/engines/drascula/animation.cpp
scummvm/trunk/engines/drascula/drascula.cpp
scummvm/trunk/engines/drascula/drascula.h
scummvm/trunk/engines/drascula/rooms.cpp
scummvm/trunk/engines/drascula/talk.cpp
Modified: scummvm/trunk/engines/drascula/animation.cpp
===================================================================
--- scummvm/trunk/engines/drascula/animation.cpp 2008-05-30 23:53:17 UTC (rev 32408)
+++ scummvm/trunk/engines/drascula/animation.cpp 2008-05-31 00:06:05 UTC (rev 32409)
@@ -403,7 +403,7 @@
if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
- talk_tabernero(22);
+ talk_bartender(22);
if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE))
break;
@@ -597,22 +597,22 @@
loadAndDecompressPic("an11y13.alg", extraSurface, 1);
talk(192);
- talk_tabernero(1);
+ talk_bartender(1);
talk(193);
- talk_tabernero(2);
+ talk_bartender(2);
talk(194);
- talk_tabernero(3);
+ talk_bartender(3);
talk(195);
- talk_tabernero(4);
+ talk_bartender(4);
talk(196);
- talk_tabernero(5);
- talk_tabernero(6);
+ talk_bartender(5);
+ talk_bartender(6);
talk(197);
- talk_tabernero(7);
+ talk_bartender(7);
talk(198);
- talk_tabernero(8);
+ talk_bartender(8);
talk(199);
- talk_tabernero(9);
+ talk_bartender(9);
talk(200);
talk(201);
talk(202);
@@ -1079,9 +1079,9 @@
talk_vb(18);
if (flags[29] == 0)
- animation_23_anexo();
+ animation_23_joined();
else
- animation_23_anexo2();
+ animation_23_joined2();
sentido_vb = 2;
animation_25_2();
@@ -1106,7 +1106,7 @@
rompo_y_salgo = 1;
}
-void DrasculaEngine::animation_23_anexo() {
+void DrasculaEngine::animation_23_joined() {
int n, p_x = hare_x + 2, p_y = hare_y - 3;
int x[] = {1, 38, 75, 112, 75, 112, 75, 112, 149, 112, 149, 112, 149, 186, 223, 260,
1, 38, 75, 112, 149, 112, 149, 112, 149, 112, 149, 186, 223, 260, 260, 260, 260, 223};
@@ -1126,7 +1126,7 @@
loadAndDecompressPic("99.alg", backSurface, 1);
}
-void DrasculaEngine::animation_23_anexo2() {
+void DrasculaEngine::animation_23_joined2() {
int n, p_x = hare_x + 4, p_y = hare_y;
int x[] = {1, 35, 69, 103, 137, 171, 205, 239, 273, 1, 35, 69, 103, 137};
int y[] = {1, 1, 1, 1, 1, 1, 1, 1, 1, 73, 73, 73, 73, 73};
@@ -1711,19 +1711,19 @@
for (fundido = 1; fundido >= 0; fundido--) {
for (color = 0; color < 128; color++)
for (component = 0; component < 3; component++)
- bgPalette1[color][component] = LimitaVGA(bgPalette1[color][component] - 8 + fundido);
+ bgPalette1[color][component] = adjustToVGA(bgPalette1[color][component] - 8 + fundido);
}
for (fundido = 2; fundido >= 0; fundido--) {
for (color = 0; color < 128; color++)
for (component = 0; component < 3; component++)
- bgPalette2[color][component] = LimitaVGA(bgPalette2[color][component] - 8 + fundido);
+ bgPalette2[color][component] = adjustToVGA(bgPalette2[color][component] - 8 + fundido);
}
for (fundido = 3; fundido >= 0; fundido--) {
for (color = 0; color < 128; color++)
for (component = 0; component < 3; component++)
- bgPalette3[color][component] = LimitaVGA(bgPalette3[color][component] - 8 + fundido);
+ bgPalette3[color][component] = adjustToVGA(bgPalette3[color][component] - 8 + fundido);
}
loadAndDecompressPic("3an11_1.alg", backSurface, 1);
@@ -2255,14 +2255,14 @@
loadAndDecompressPic("an11y13.alg", extraSurface, 1);
talk(352);
- talk_tabernero(1);
+ talk_bartender(1);
talk(353);
- talk_tabernero(17);
+ talk_bartender(17);
talk(354);
- talk_tabernero(18);
+ talk_bartender(18);
talk(355);
pause(40);
- talk_tabernero("No, nada", "d82.als");
+ talk_bartender("No, nada", "d82.als");
if (_lang == kSpanish)
textSurface = extraSurface;
@@ -2400,12 +2400,12 @@
loadAndDecompressPic("an11y13.alg", extraSurface, 1);
talk(404);
- talk_tabernero(19);
- talk_tabernero(20);
- talk_tabernero(21);
+ talk_bartender(19);
+ talk_bartender(20);
+ talk_bartender(21);
talk(355);
pause(40);
- talk_tabernero("No, nada", "d82.als");
+ talk_bartender("No, nada", "d82.als");
if (_lang == kSpanish)
textSurface = extraSurface;
Modified: scummvm/trunk/engines/drascula/drascula.cpp
===================================================================
--- scummvm/trunk/engines/drascula/drascula.cpp 2008-05-30 23:53:17 UTC (rev 32408)
+++ scummvm/trunk/engines/drascula/drascula.cpp 2008-05-31 00:06:05 UTC (rev 32409)
@@ -137,7 +137,7 @@
vb_x = 120; sentido_vb = 1; vb_se_mueve = 0; frame_vb = 1;
frame_piano = 0;
frame_drunk = 0;
- frame_velas = 0;
+ frame_candles = 0;
cont_sv = 0;
term_int = 0;
musicStopped = 0;
@@ -1782,7 +1782,7 @@
EndSSN();
}
-void DrasculaEngine::fadeFromBlack(int VelocidadDeFundido) {
+void DrasculaEngine::fadeFromBlack(int fadeSpeed) {
char fundido;
unsigned int color, component;
@@ -1791,10 +1791,10 @@
for (fundido = 0; fundido < 64; fundido++) {
for (color = 0; color < 256; color++) {
for (component = 0; component < 3; component++) {
- palFundido[color][component] = LimitaVGA(gamePalette[color][component] - 63 + fundido);
+ palFundido[color][component] = adjustToVGA(gamePalette[color][component] - 63 + fundido);
}
}
- pause(VelocidadDeFundido);
+ pause(fadeSpeed);
setPalette((byte *)&palFundido);
}
@@ -1820,7 +1820,7 @@
setPalette((byte *)&gamePalette);
}
-char DrasculaEngine::LimitaVGA(char value) {
+char DrasculaEngine::adjustToVGA(char value) {
return (value & 0x3F) * (value > 0);
}
@@ -1971,7 +1971,7 @@
}
}
-void DrasculaEngine::fadeToBlack(int VelocidadDeFundido) {
+void DrasculaEngine::fadeToBlack(int fadeSpeed) {
char fundido;
unsigned int color, component;
@@ -1980,10 +1980,10 @@
for (fundido = 63; fundido >= 0; fundido--) {
for (color = 0; color < 256; color++) {
for (component = 0; component < 3; component++) {
- palFundido[color][component] = LimitaVGA(gamePalette[color][component] - 63 + fundido);
+ palFundido[color][component] = adjustToVGA(gamePalette[color][component] - 63 + fundido);
}
}
- pause(VelocidadDeFundido);
+ pause(fadeSpeed);
setPalette((byte *)&palFundido);
}
@@ -2228,7 +2228,7 @@
for (fundido = oscuridad; fundido >= 0; fundido--) {
for (color = 235; color < 253; color++) {
for (component = 0; component < 3; component++)
- gamePalette[color][component] = LimitaVGA(gamePalette[color][component] - 8 + fundido);
+ gamePalette[color][component] = adjustToVGA(gamePalette[color][component] - 8 + fundido);
}
}
@@ -2280,9 +2280,9 @@
else if ((sitio_x > hare_x + ancho_hare) && (sitio_y > (hare_y + alto_hare)))
quadrant_4();
else if (sitio_y < hare_y + alto_hare)
- anda_parriba();
+ walkUp();
else if (sitio_y > hare_y + alto_hare)
- anda_pabajo();
+ walkDown();
} else {
if ((sitio_x < hare_x + ancho_hare / 2 ) && (sitio_y <= (hare_y + alto_hare)))
quadrant_1();
@@ -3606,13 +3606,13 @@
}
}
-void DrasculaEngine::anda_pabajo() {
+void DrasculaEngine::walkDown() {
direccion_hare = 4;
sentido_hare = 3;
stepX = 0;
}
-void DrasculaEngine::anda_parriba() {
+void DrasculaEngine::walkUp() {
direccion_hare = 0;
sentido_hare = 2;
stepX = 0;
Modified: scummvm/trunk/engines/drascula/drascula.h
===================================================================
--- scummvm/trunk/engines/drascula/drascula.h 2008-05-30 23:53:17 UTC (rev 32408)
+++ scummvm/trunk/engines/drascula/drascula.h 2008-05-31 00:06:05 UTC (rev 32409)
@@ -267,7 +267,7 @@
int factor_red[202];
int frame_piano;
int frame_drunk;
- int frame_velas;
+ int frame_candles;
int color_solo;
int blinking;
int x_igor, y_igor, sentido_igor;
@@ -291,8 +291,8 @@
bool escoba();
void black();
void pickObject(int);
- void anda_parriba();
- void anda_pabajo();
+ void walkUp();
+ void walkDown();
void pon_vb();
void lleva_vb(int pointX);
void hipo_sin_nadie(int counter);
@@ -325,8 +325,8 @@
void animation_21_2();
void animation_22_2();
void animation_23_2();
- void animation_23_anexo();
- void animation_23_anexo2();
+ void animation_23_joined();
+ void animation_23_joined2();
void animation_24_2();
void animation_25_2();
void animation_26_2();
@@ -401,14 +401,14 @@
void addObject(int);
int removeObject(int osj);
void fliplay(const char *filefli, int vel);
- void fadeFromBlack(int VelocidadDeFundido);
- char LimitaVGA(char value);
+ void fadeFromBlack(int fadeSpeed);
+ char adjustToVGA(char value);
void color_abc(int cl);
void centerText(const char *,int,int);
void playSound(int soundNum);
bool animate(const char *animation, int FPS);
void stopSound_corte();
- void fadeToBlack(int VelocidadDeFundido);
+ void fadeToBlack(int fadeSpeed);
void pause(int);
void placeIgor();
void placeBJ();
@@ -425,8 +425,8 @@
void talk_solo(const char *, const char *);
void talk_igor_front(int);
void talk_igor_front(const char *, const char *);
- void talk_tabernero(int);
- void talk_tabernero(const char *said, const char *filename);
+ void talk_bartender(int);
+ void talk_bartender(const char *said, const char *filename);
void talk_igor_door(int);
void talk_igor_door(const char *said, const char *filename);
void talk_igor_wig(int);
Modified: scummvm/trunk/engines/drascula/rooms.cpp
===================================================================
--- scummvm/trunk/engines/drascula/rooms.cpp 2008-05-30 23:53:17 UTC (rev 32408)
+++ scummvm/trunk/engines/drascula/rooms.cpp 2008-05-31 00:06:05 UTC (rev 32409)
@@ -1371,14 +1371,14 @@
}
void DrasculaEngine::update_14_pre() {
- int velas_y[] = {158, 172, 186};
+ int candles_y[] = {158, 172, 186};
int cirio_x[] = {14, 19, 24};
int pianista_x[] = {1, 91, 61, 31, 91, 31, 1, 61, 31};
int drunk_x[] = {1, 42, 83, 124, 165, 206, 247, 1};
int difference;
- copyBackground(123, velas_y[frame_velas], 142, 14, 39, 13, drawSurface3, screenSurface);
- copyBackground(cirio_x[frame_velas], 146, 311, 80, 4, 8, drawSurface3, screenSurface);
+ copyBackground(123, candles_y[frame_candles], 142, 14, 39, 13, drawSurface3, screenSurface);
+ copyBackground(cirio_x[frame_candles], 146, 311, 80, 4, 8, drawSurface3, screenSurface);
if (blinking == 5)
copyBackground(1, 149, 127, 52, 9, 5, drawSurface3, screenSurface);
@@ -1404,9 +1404,9 @@
} else if ((_rnd->getRandomNumber(94) == 15) && (flags[13] == 0))
flags[12] = 1;
- frame_velas++;
- if (frame_velas == 3)
- frame_velas = 0;
+ frame_candles++;
+ if (frame_candles == 3)
+ frame_candles = 0;
frame_piano++;
if (frame_piano == 9)
frame_piano = 0;
@@ -1675,13 +1675,13 @@
}
void DrasculaEngine::update_60_pre() {
- int velas_y[] = {158, 172, 186};
+ int candles_y[] = {158, 172, 186};
int difference;
if (flags[5] == 0)
placeDrascula();
- copyBackground(123, velas_y[frame_velas], 142, 14, 39, 13, drawSurface3, screenSurface);
+ copyBackground(123, candles_y[frame_candles], 142, 14, 39, 13, drawSurface3, screenSurface);
if (flag_tv == 1)
copyBackground(114, 158, 8, 30, 8, 23, drawSurface3, screenSurface);
@@ -1693,9 +1693,9 @@
else if (blinking == 5 && flag_tv == 1)
flag_tv = 0;
if (difference > 6) {
- frame_velas++;
- if (frame_velas == 3)
- frame_velas = 0;
+ frame_candles++;
+ if (frame_candles == 3)
+ frame_candles = 0;
conta_blind_vez = getTime();
}
}
@@ -1710,14 +1710,14 @@
}
void DrasculaEngine::update_62_pre() {
- int velas_y[] = { 158, 172, 186 };
+ int candles_y[] = { 158, 172, 186 };
int cirio_x[] = { 14, 19, 24 };
int pianista_x[] = {1, 91, 61, 31, 91, 31, 1, 61, 31 };
int drunk_x[] = {1, 42, 83, 124, 165, 206, 247, 1 };
int difference;
- copyBackground(123, velas_y[frame_velas], 142, 14, 39, 13, drawSurface3, screenSurface);
- copyBackground(cirio_x[frame_velas], 146, 311, 80, 4, 8, drawSurface3, screenSurface);
+ copyBackground(123, candles_y[frame_candles], 142, 14, 39, 13, drawSurface3, screenSurface);
+ copyBackground(cirio_x[frame_candles], 146, 311, 80, 4, 8, drawSurface3, screenSurface);
if (blinking == 5)
copyBackground(1, 149, 127, 52, 9, 5, drawSurface3, screenSurface);
@@ -1746,9 +1746,9 @@
} else if ((_rnd->getRandomNumber(94) == 15) && (flags[13] == 0))
flags[12] = 1;
- frame_velas++;
- if (frame_velas == 3)
- frame_velas = 0;
+ frame_candles++;
+ if (frame_candles == 3)
+ frame_candles = 0;
frame_piano++;
if (frame_piano == 9)
frame_piano = 0;
Modified: scummvm/trunk/engines/drascula/talk.cpp
===================================================================
--- scummvm/trunk/engines/drascula/talk.cpp 2008-05-30 23:53:17 UTC (rev 32408)
+++ scummvm/trunk/engines/drascula/talk.cpp 2008-05-31 00:06:05 UTC (rev 32409)
@@ -304,13 +304,13 @@
updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
}
-void DrasculaEngine::talk_tabernero(int index) {
+void DrasculaEngine::talk_bartender(int index) {
char name[20];
sprintf(name, "t%i.als", index);
- talk_tabernero(_textt[_lang][index], name);
+ talk_bartender(_textt[_lang][index], name);
}
-void DrasculaEngine::talk_tabernero(const char *said, const char *filename) {
+void DrasculaEngine::talk_bartender(const char *said, const char *filename) {
int x_talk[9] = { 1, 23, 45, 67, 89, 111, 133, 155, 177 };
int face;
int length = strlen(said);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list