[Scummvm-cvs-logs] SF.net SVN: scummvm: [32485] scummvm/trunk/engines/drascula
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Mon Jun 2 07:00:12 CEST 2008
Revision: 32485
http://scummvm.svn.sourceforge.net/scummvm/?rev=32485&view=rev
Author: thebluegr
Date: 2008-06-01 22:00:11 -0700 (Sun, 01 Jun 2008)
Log Message:
-----------
Simplified talk_blind()
Modified Paths:
--------------
scummvm/trunk/engines/drascula/animation.cpp
scummvm/trunk/engines/drascula/drascula.h
scummvm/trunk/engines/drascula/talk.cpp
Modified: scummvm/trunk/engines/drascula/animation.cpp
===================================================================
--- scummvm/trunk/engines/drascula/animation.cpp 2008-06-02 04:42:19 UTC (rev 32484)
+++ scummvm/trunk/engines/drascula/animation.cpp 2008-06-02 05:00:11 UTC (rev 32485)
@@ -736,30 +736,30 @@
pause(10);
- talk_blind(_textd[_lang][68], "d68.als", _textd1[_lang][68 - TEXTD_START]);
+ talk_blind(1);
pause(5);
talk_hacker(_textd[_lang][57], "d57.als");
pause(6);
- talk_blind(_textd[_lang][69],"d69.als", _textd1[_lang][69 - TEXTD_START]);
+ talk_blind(2);
pause(4);
talk_hacker(_textd[_lang][58],"d58.als");
- talk_blind(_textd[_lang][70],"d70.als", _textd1[_lang][70 - TEXTD_START]);
+ talk_blind(3);
delay(14);
talk_hacker(_textd[_lang][59],"d59.als");
- talk_blind(_textd[_lang][71],"d71.als", _textd1[_lang][71 - TEXTD_START]);
+ talk_blind(4);
talk_hacker(_textd[_lang][60],"d60.als");
- talk_blind(_textd[_lang][72],"d72.als", _textd1[_lang][72 - TEXTD_START]);
+ talk_blind(5);
talk_hacker(_textd[_lang][61],"d61.als");
- talk_blind(_textd[_lang][73],"d73.als", _textd1[_lang][73 - TEXTD_START]);
+ talk_blind(6);
talk_hacker(_textd[_lang][62],"d62.als");
- talk_blind(_textd[_lang][74],"d74.als", _textd1[_lang][74 - TEXTD_START]);
+ talk_blind(7);
talk_hacker(_textd[_lang][63],"d63.als");
- talk_blind(_textd[_lang][75],"d75.als", _textd1[_lang][75 - TEXTD_START]);
+ talk_blind(8);
copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
updateScreen();
_system->delayMillis(1000);
talk_hacker(_textd[_lang][64], "d64.als");
- talk_blind(_textd[_lang][76], "d76.als", _textd1[_lang][76 - TEXTD_START]);
+ talk_blind(9);
copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
updateScreen();
@@ -2529,7 +2529,7 @@
if (flags[4] == 1)
talk_hacker(_textd[_lang][66], "d66.als");
pause(6);
- talk_blind(_textd[_lang][78], "d78.als", _textd1[_lang][78 - TEXTD_START]);
+ talk_blind(11);
pause(4);
talk_hacker(_textd[_lang][67], "d67.als");
@@ -2577,12 +2577,12 @@
pause(10);
- talk_blind(_textd[_lang][68], "d68.als", _textd1[_lang][68 - TEXTD_START]);
+ talk_blind(1);
pause(5);
talk_hacker(_textd[_lang][57], "d57.als");
pause(6);
_system->delayMillis(1000);
- talk_blind(_textd[_lang][77], "d77.als", _textd1[_lang][77 - TEXTD_START]);
+ talk_blind(10);
talk_hacker(_textd[_lang][65], "d65.als");
copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
Modified: scummvm/trunk/engines/drascula/drascula.h
===================================================================
--- scummvm/trunk/engines/drascula/drascula.h 2008-06-02 04:42:19 UTC (rev 32484)
+++ scummvm/trunk/engines/drascula/drascula.h 2008-06-02 05:00:11 UTC (rev 32485)
@@ -463,7 +463,7 @@
void talk_vb(const char *, const char *);
void talk_vbpuerta(int);
void talk_vbpuerta(const char *said, const char *filename);
- void talk_blind(const char *, const char *, const char *);
+ void talk_blind(int);
void talk_hacker(const char *, const char *);
void hiccup(int);
Modified: scummvm/trunk/engines/drascula/talk.cpp
===================================================================
--- scummvm/trunk/engines/drascula/talk.cpp 2008-06-02 04:42:19 UTC (rev 32484)
+++ scummvm/trunk/engines/drascula/talk.cpp 2008-06-02 05:00:11 UTC (rev 32485)
@@ -637,7 +637,15 @@
playMusic(roomMusic);
}
-void DrasculaEngine::talk_blind(const char *said, const char *filename, const char *sincronia) {
+void DrasculaEngine::talk_blind(int index) {
+ // Special case: a second array is used for sync here
+ // Also, the blind man's texts in the first array and his
+ // voice files start from 58, not 1
+ char filename[20];
+ sprintf(filename, "d%i.als", index + TEXTD_START - 1);
+ const char *said = _textd[_lang][index + TEXTD_START - 1];
+ const char *sincronia = _textd1[_lang][index - 1];
+
byte *num_cara;
int p = 0;
int pos_blind[6];
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