aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2008-05-26 19:36:38 +0000
committerFilippos Karapetis2008-05-26 19:36:38 +0000
commitf68c1fd00b1f44147a09eacd5574deb222a925d5 (patch)
treecaf20983878b8ec8787bc620695608b3654adf27
parent9af5cca4e2642ef88efef90abf1b3b249bcade5d (diff)
downloadscummvm-rg350-f68c1fd00b1f44147a09eacd5574deb222a925d5.tar.gz
scummvm-rg350-f68c1fd00b1f44147a09eacd5574deb222a925d5.tar.bz2
scummvm-rg350-f68c1fd00b1f44147a09eacd5574deb222a925d5.zip
Cleanup
svn-id: r32300
-rw-r--r--engines/drascula/talk.cpp53
1 files changed, 9 insertions, 44 deletions
diff --git a/engines/drascula/talk.cpp b/engines/drascula/talk.cpp
index fb0f029bdd..ef1115e321 100644
--- a/engines/drascula/talk.cpp
+++ b/engines/drascula/talk.cpp
@@ -902,7 +902,6 @@ void DrasculaEngine::talk_ciego(const char *said, const char *filename, const ch
byte *num_cara;
int p = 0;
int pos_ciego[6];
- int cara = 0;
int longitud;
longitud = strlen(said);
@@ -924,39 +923,23 @@ bucless:
copyBackground(0, 0, 0, 0, 320, 200, dir_dibujo1, dir_zona_pantalla);
pos_ciego[5] = 149;
char c = toupper(sincronia[p]);
- if (c == '0')
- cara = 0;
- if (c == '1')
- cara = 1;
- if (c == '2')
- cara = 2;
- if (c == '3')
- cara = 3;
- if (c == '4')
- cara = 4;
- if (c == '5')
- cara = 5;
- if (c == '6')
- cara = 6;
- if (c == '7')
- cara = 7;
- if (cara == 0 || cara == 2 || cara == 4 || cara == 6)
+ if (c == '0' || c == '2' || c == '4' || c == '6')
pos_ciego[0] = 1;
else
pos_ciego[0] = 132;
- if (cara == 0)
+ if (c == '0')
num_cara = dir_dibujo3;
- else if (cara == 1)
+ else if (c == '1')
num_cara = dir_dibujo3;
- else if (cara == 2)
+ else if (c == '2')
num_cara = dir_hare_dch;
- else if (cara == 3)
+ else if (c == '3')
num_cara = dir_hare_dch;
- else if (cara == 4)
+ else if (c == '4')
num_cara = dir_hare_fondo;
- else if (cara == 5)
+ else if (c == '5')
num_cara = dir_hare_fondo;
else {
num_cara = dir_hare_frente;
@@ -1622,16 +1605,7 @@ void DrasculaEngine::talk_igorpuerta(const char *said, const char *filename) {
color_abc(WHITE);
- if (hay_sb == 1){
- sku = new Common::File;
- sku->open(filename);
- if (!sku->isOpen()) {
- error("no puedo abrir archivo de voz");
- }
- ctvd_init(2);
- ctvd_speaker(1);
- ctvd_output(sku);
- }
+ talkInit(filename);
bucless:
@@ -1731,16 +1705,7 @@ void DrasculaEngine::talk_igor_peluca(const char *said, const char *filename) {
color_abc(WHITE);
- if (hay_sb == 1){
- sku = new Common::File;
- sku->open(filename);
- if (!sku->isOpen()) {
- error("no puedo abrir archivo de voz");
- }
- ctvd_init(2);
- ctvd_speaker(1);
- ctvd_output(sku);
- }
+ talkInit(filename);
bucless: