[Scummvm-cvs-logs] SF.net SVN: scummvm: [32290] scummvm/trunk/engines/drascula
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Mon May 26 16:08:54 CEST 2008
Revision: 32290
http://scummvm.svn.sourceforge.net/scummvm/?rev=32290&view=rev
Author: thebluegr
Date: 2008-05-26 07:08:53 -0700 (Mon, 26 May 2008)
Log Message:
-----------
Slight cleanup
Modified Paths:
--------------
scummvm/trunk/engines/drascula/animation.cpp
scummvm/trunk/engines/drascula/drascula.cpp
scummvm/trunk/engines/drascula/drascula.h
Modified: scummvm/trunk/engines/drascula/animation.cpp
===================================================================
--- scummvm/trunk/engines/drascula/animation.cpp 2008-05-26 12:43:01 UTC (rev 32289)
+++ scummvm/trunk/engines/drascula/animation.cpp 2008-05-26 14:08:53 UTC (rev 32290)
@@ -84,12 +84,10 @@
comienza_sound("s5.als");
if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
break;
- anima("scr2.bin", 17);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if (anima("scr2.bin", 17))
break;
fin_sound_corte();
- anima("scr3.bin", 17);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if (anima("scr3.bin", 17))
break;
loadPic("cielo2.alg");
decompressPic(dir_zona_pantalla, 256);
@@ -198,11 +196,9 @@
talk_dr_izq(_textd[_lang][3], "d3.als");
if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
break;
- anima("lib.bin", 16);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if (anima("lib.bin", 16))
break;
- anima("lib2.bin", 16);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if (anima("lib2.bin", 16))
break;
clearRoom();
color_solo = RED;
@@ -219,8 +215,7 @@
talk_solo(_textd[_lang][5], "d5.als");
if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
break;
- anima("lib2.bin", 16);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if (anima("lib2.bin", 16))
break;
clearRoom();
loadPic("plan2.alg");
@@ -230,8 +225,7 @@
talk_solo(_textd[_lang][6], "d6.als");
if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
break;
- anima("lib2.bin", 16);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if (anima("lib2.bin", 16))
break;
clearRoom();
loadPic("plan3.alg");
@@ -269,21 +263,16 @@
talk_dr_izq(_textd[_lang][10], "d10.als");
if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
break;
- anima("rayo1.bin", 16);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if (anima("rayo1.bin", 16))
break;
comienza_sound("s5.als");
- anima("rayo2.bin", 15);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if (anima("rayo2.bin", 15))
break;
- anima("frel2.bin", 16);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if (anima("frel2.bin", 16))
break;
- anima("frel.bin", 16);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if (anima("frel.bin", 16))
break;
- anima("frel.bin", 16);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if (anima("frel.bin", 16))
break;
fin_sound_corte();
clearRoom();
@@ -462,8 +451,7 @@
if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
break;
- anima("ag.bin", 14);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if (anima("ag.bin", 14))
break;
if (_lang == kSpanish)
@@ -551,8 +539,7 @@
if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
break;
- anima("lev.bin", 15);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if (anima("lev.bin", 15))
break;
lleva_al_hare(100 + ancho_hare / 2, 99 + alto_hare);
@@ -579,11 +566,11 @@
talk(_text[_lang][221], "221.als");
talk_bj(_textbj[_lang][10], "BJ10.als");
talk(_text[_lang][222], "222.als");
- anima("gaf.bin", 15);
- anima("bjb.bin", 14);
- playMusic(9);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if (anima("gaf.bin", 15))
break;
+ if (anima("bjb.bin", 14))
+ break;
+ playMusic(9);
loadPic("97.alg");
if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
break;
@@ -629,10 +616,10 @@
lleva_al_hare(157, 98 + alto_hare);
if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
break;
- anima("bes.bin", 16);
+ if (anima("bes.bin", 16))
+ break;
playMusic(11);
- anima("rap.bin", 16);
- if ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE))
+ if (anima("rap.bin", 16))
break;
sentido_hare = 3;
strcpy(num_room, "no_bj.alg");
Modified: scummvm/trunk/engines/drascula/drascula.cpp
===================================================================
--- scummvm/trunk/engines/drascula/drascula.cpp 2008-05-26 12:43:01 UTC (rev 32289)
+++ scummvm/trunk/engines/drascula/drascula.cpp 2008-05-26 14:08:53 UTC (rev 32290)
@@ -2033,7 +2033,7 @@
ctvd_output(sku);
}
-void DrasculaEngine::anima(const char *animation, int FPS) {
+bool DrasculaEngine::anima(const char *animation, int FPS) {
Common::File FileIn;
unsigned j;
int NFrames = 1;
@@ -2084,6 +2084,8 @@
free(AuxBuffLast);
free(AuxBuffDes);
FileIn.close();
+
+ return ((term_int == 1) || (getscan() == Common::KEYCODE_ESCAPE));
}
void DrasculaEngine::animafin_sound_corte() {
Modified: scummvm/trunk/engines/drascula/drascula.h
===================================================================
--- scummvm/trunk/engines/drascula/drascula.h 2008-05-26 12:43:01 UTC (rev 32289)
+++ scummvm/trunk/engines/drascula/drascula.h 2008-05-26 14:08:53 UTC (rev 32290)
@@ -602,7 +602,7 @@
void color_abc(int cl);
void centra_texto(const char *,int,int);
void comienza_sound(const char *);
- void anima(const char *animation, int FPS);
+ bool anima(const char *animation, int FPS);
void fin_sound_corte();
void FundeAlNegro(int VelocidadDeFundido);
void pause(int);
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