[Scummvm-cvs-logs] SF.net SVN: scummvm: [32384] scummvm/trunk/engines/drascula
sev at users.sourceforge.net
sev at users.sourceforge.net
Fri May 30 10:55:47 CEST 2008
Revision: 32384
http://scummvm.svn.sourceforge.net/scummvm/?rev=32384&view=rev
Author: sev
Date: 2008-05-30 01:55:47 -0700 (Fri, 30 May 2008)
Log Message:
-----------
Wrap up talk_taber2()
Modified Paths:
--------------
scummvm/trunk/engines/drascula/animation.cpp
scummvm/trunk/engines/drascula/drascula.h
scummvm/trunk/engines/drascula/rooms.cpp
Modified: scummvm/trunk/engines/drascula/animation.cpp
===================================================================
--- scummvm/trunk/engines/drascula/animation.cpp 2008-05-30 08:48:01 UTC (rev 32383)
+++ scummvm/trunk/engines/drascula/animation.cpp 2008-05-30 08:55:47 UTC (rev 32384)
@@ -2497,36 +2497,36 @@
copyBackground(164, 85, 155, 48, 113, 114, drawSurface3, screenSurface);
updateScreen(0, 0, 0, 0, 320, 200, screenSurface);
stopSound();
- talk_taber2(_textt[_lang][23], "t23.als");
+ talk_taber2(23);
flags[7] = 1;
}
void DrasculaEngine::animation_11_6() {
- talk_taber2(_textt[_lang][10], "t10.als");
+ talk_taber2(10);
talk(268);
- talk_taber2(_textt[_lang][11], "t11.als");
+ talk_taber2(11);
}
void DrasculaEngine::animation_12_6() {
- talk_taber2(_textt[_lang][12], "t12.als");
+ talk_taber2(12);
talk(270);
- talk_taber2(_textt[_lang][13], "t13.als");
- talk_taber2(_textt[_lang][14], "t14.als");
+ talk_taber2(13);
+ talk_taber2(14);
}
void DrasculaEngine::animation_13_6() {
- talk_taber2(_textt[_lang][15], "t15.als");
+ talk_taber2(15);
}
void DrasculaEngine::animation_14_6() {
- talk_taber2(_textt[_lang][24], "t24.als");
+ talk_taber2(24);
addObject(21);
flags[10] = 1;
rompo_y_salgo = 1;
}
void DrasculaEngine::animation_15_6() {
- talk_taber2(_textt[_lang][16], "t16.als");
+ talk_taber2(16);
}
void DrasculaEngine::animation_18_6() {
Modified: scummvm/trunk/engines/drascula/drascula.h
===================================================================
--- scummvm/trunk/engines/drascula/drascula.h 2008-05-30 08:48:01 UTC (rev 32383)
+++ scummvm/trunk/engines/drascula/drascula.h 2008-05-30 08:55:47 UTC (rev 32384)
@@ -484,6 +484,7 @@
void placeIgor();
void placeBJ();
void placeDrascula();
+
void talkInit(const char *filename);
void talk_igor_dch(int);
void talk_igor_dch(const char *said, const char *filename);
@@ -497,14 +498,27 @@
void talk_tabernero(const char *said, const char *filename);
void talk_igorpuerta(const char *said, const char *filename);
void talk_igor_peluca(const char *said, const char *filename);
- void hiccup(int);
- void stopSound();
+ void talk_pen(const char *, const char *);
+ void talk_pen2(const char *, const char *);
+ void talk_taber2(int);
+ void talk_taber2(const char *, const char *);
+ void talk_bj_bed(int);
+ void talk_bj_bed(const char *said, const char * filename);
+ void talk_htel(const char *said, const char *filename);
void talk_bj(int);
void talk_bj(const char *, const char *);
void talk_baul(const char *said, const char *filename);
void talk(int);
void talk(const char *, const char *);
void talk_sinc(const char *, const char *, const char *);
+ void talk_drunk(const char *said, const char *filename);
+ void talk_pianista(const char *said, const char *filename);
+ void talk_igor_seated(const char *, const char *);
+ void talk_wolf(const char *said, const char *filename);
+ void talk_mus(const char *said, const char *filename);
+
+ void hiccup(int);
+ void stopSound();
void closeDoor(int nflag, int doorNum);
void playMusic(int p);
void stopMusic();
@@ -612,8 +626,6 @@
void converse(const char *);
void print_abc_opc(const char *, int, int, int);
void response(int);
- void talk_drunk(const char *said, const char *filename);
- void talk_pianista(const char *said, const char *filename);
void MusicFadeout();
void ctvd_end();
@@ -670,9 +682,6 @@
void update_56_pre();
void update_50();
void update_57();
- void talk_igor_seated(const char *, const char *);
- void talk_wolf(const char *said, const char *filename);
- void talk_mus(const char *said, const char *filename);
void room_58(int);
void room_59(int);
bool room_60(int);
@@ -702,12 +711,6 @@
void animation_18_6();
void animation_19_6();
void activatePendulum();
- void talk_pen(const char *, const char *);
- void talk_pen2(const char *, const char *);
- void talk_taber2(const char *, const char *);
- void talk_bj_bed(int);
- void talk_bj_bed(const char *said, const char * filename);
- void talk_htel(const char *said, const char *filename);
private:
int _lang;
Modified: scummvm/trunk/engines/drascula/rooms.cpp
===================================================================
--- scummvm/trunk/engines/drascula/rooms.cpp 2008-05-30 08:48:01 UTC (rev 32383)
+++ scummvm/trunk/engines/drascula/rooms.cpp 2008-05-30 08:55:47 UTC (rev 32384)
@@ -1218,7 +1218,7 @@
talk(440);
else if (pickedObject == kVerbTalk && fl == 52) {
talk(266);
- talk_taber2(_textt[_lang][1], "t1.als");
+ talk_taber2(1);
converse("op_12.cal");
withoutVerb();
pickedObject = 0;
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