[Scummvm-cvs-logs] SF.net SVN: scummvm: [32386] scummvm/trunk/engines/drascula
sev at users.sourceforge.net
sev at users.sourceforge.net
Fri May 30 11:28:52 CEST 2008
Revision: 32386
http://scummvm.svn.sourceforge.net/scummvm/?rev=32386&view=rev
Author: sev
Date: 2008-05-30 02:28:52 -0700 (Fri, 30 May 2008)
Log Message:
-----------
Fix compilation
Modified Paths:
--------------
scummvm/trunk/engines/drascula/animation.cpp
scummvm/trunk/engines/drascula/drascula.cpp
scummvm/trunk/engines/drascula/rooms.cpp
Modified: scummvm/trunk/engines/drascula/animation.cpp
===================================================================
--- scummvm/trunk/engines/drascula/animation.cpp 2008-05-30 08:56:07 UTC (rev 32385)
+++ scummvm/trunk/engines/drascula/animation.cpp 2008-05-30 09:28:52 UTC (rev 32386)
@@ -695,7 +695,7 @@
loadPic("an12.alg");
decompressPic(extraSurface, 1);
- talk(205;
+ talk(205);
updateRefresh_pre();
@@ -834,7 +834,7 @@
flags[9] = 1;
pause(12);
- talk([56);
+ talk(56);
pause(8);
clearRoom();
@@ -2056,7 +2056,7 @@
animation_12_5();
else {
flags[9] = 0;
- talk(33;
+ talk(33);
}
}
@@ -2225,7 +2225,7 @@
stopSound();
pause(17);
sentido_hare = 3;
- talk(246;
+ talk(246);
lleva_al_hare(89, 160);
flags[10] = 1;
playSound("s7.als");
@@ -2721,7 +2721,7 @@
}
void DrasculaEngine::animation_22_2() {
- talk(374;
+ talk(374);
sentido_hare=2;
updateRoom();
@@ -3315,7 +3315,7 @@
flags[9] = 1;
pause(12);
- talk([56 );
+ talk(56);
pause(8);
clearRoom();
Modified: scummvm/trunk/engines/drascula/drascula.cpp
===================================================================
--- scummvm/trunk/engines/drascula/drascula.cpp 2008-05-30 08:56:07 UTC (rev 32385)
+++ scummvm/trunk/engines/drascula/drascula.cpp 2008-05-30 09:28:52 UTC (rev 32386)
@@ -2849,7 +2849,7 @@
else if (pickedObject == kVerbLook && fl == 14)
talk(157);
else if (pickedObject == kVerbLook && fl == 15)
- talk(58;
+ talk(58);
else if (pickedObject == kVerbLook && fl == 16)
talk(158);
else if (pickedObject == kVerbLook && fl == 17)
@@ -2894,7 +2894,7 @@
else if (pickedObject == kVerbLook && fl == 14)
talk(157);
else if (pickedObject == kVerbLook && fl == 15)
- talk(58;
+ talk(58);
else if (pickedObject == kVerbLook && fl == 16)
talk(158);
else if (pickedObject == kVerbLook && fl == 17)
@@ -2963,7 +2963,7 @@
if (pickedObject == kVerbLook && fl == 28)
talk(328);
else if (pickedObject == kVerbLook && fl == 7)
- talk(478;
+ talk(478);
else if (pickedObject == kVerbLook && fl == 8)
talk(120);
else if (pickedObject == kVerbLook && fl == 9) {
Modified: scummvm/trunk/engines/drascula/rooms.cpp
===================================================================
--- scummvm/trunk/engines/drascula/rooms.cpp 2008-05-30 08:56:07 UTC (rev 32385)
+++ scummvm/trunk/engines/drascula/rooms.cpp 2008-05-30 09:28:52 UTC (rev 32386)
@@ -217,68 +217,68 @@
// non-default actions
if (num_ejec == 2) {
if (pickedObject == kVerbLook) {
- talk(mirar_t[c_mirarc_mirar]);
+ talk(_text[_lang][mirar_t[c_mirar]], mirar_v[c_mirar]);
c_mirar++;
if (c_mirar == 3)
c_mirar = 0;
} else if (pickedObject == kVerbPick) {
- talk(poder_t[c_poderc_poder]);
+ talk(_text[_lang][poder_t[c_poder]], poder_v[c_poder]);
c_poder++;
if (c_poder == 6)
c_poder = 0;
} else {
- talk(poder_t[c_poderc_poder]);
+ talk(_text[_lang][poder_t[c_poder]], poder_v[c_poder]);
c_poder++;
if (c_poder == 6)
c_poder = 0;
}
} else if (num_ejec == 4) {
if (pickedObject == kVerbLook) {
- talk(mirar_t[c_mirarc_mirar]);
+ talk(_text[_lang][mirar_t[c_mirar]], mirar_v[c_mirar]);
c_mirar++;
if (c_mirar == 3)
c_mirar = 0;
} else if (pickedObject == kVerbPick) {
- talk(poder_t[c_poderc_poder]);
+ talk(_text[_lang][poder_t[c_poder]], poder_v[c_poder]);
c_poder++;
if (c_poder == 6)
c_poder = 0;
} else {
- talk(poder_t[c_poderc_poder]);
+ talk(_text[_lang][poder_t[c_poder]], poder_v[c_poder]);
c_poder++;
if (c_poder == 6)
c_poder = 0;
}
} else if (num_ejec == 5) {
if (pickedObject == kVerbLook) {
- talk(mirar_t[c_mirarc_mirar]);
+ talk(_text[_lang][mirar_t[c_mirar]], mirar_v[c_mirar]);
c_mirar++;
if (c_mirar == 3)
c_mirar = 0;
} else if (pickedObject == kVerbPick) {
- talk(poder_t[c_poderc_poder]);
+ talk(_text[_lang][poder_t[c_poder]], poder_v[c_poder]);
c_poder++;
if (c_poder == 6)
c_poder = 0;
} else {
- talk(poder_t[c_poderc_poder]);
+ talk(_text[_lang][poder_t[c_poder]], poder_v[c_poder]);
c_poder++;
if (c_poder == 6)
c_poder = 0;
}
} else if (num_ejec == 6) {
if (pickedObject == kVerbLook) {
- talk(mirar_t[c_mirarc_mirar]);
+ talk(_text[_lang][mirar_t[c_mirar]], mirar_v[c_mirar]);
c_mirar++;
if (c_mirar == 3)
c_mirar = 0;
} else if (pickedObject == kVerbPick) {
- talk(poder_t[c_poderc_poder]);
+ talk(_text[_lang][poder_t[c_poder]], poder_v[c_poder]);
c_poder++;
if (c_poder == 6)
c_poder = 0;
} else {
- talk(poder_t[c_poderc_poder]);
+ talk(_text[_lang][poder_t[c_poder]], poder_v[c_poder]);
c_poder++;
if (c_poder == 6)
c_poder = 0;
@@ -582,7 +582,7 @@
void DrasculaEngine::room_16(int fl) {
if (pickedObject == kVerbTalk && fl == 163)
- talk(6
+ talk(6);
else if (pickedObject == kVerbOpen && fl == 163)
openDoor(17, 0);
else if (pickedObject == kVerbClose && fl == 163)
@@ -608,13 +608,13 @@
} else if (pickedObject == kVerbClose && fl == 183)
closeDoor(19, NO_DOOR);
else if (pickedObject == kVerbLook && fl == 185)
- talk(37;
+ talk(37);
else if (pickedObject == kVerbPick && fl == 185)
- talk(7
+ talk(7);
else if (pickedObject == kVerbMove && fl == 185)
- talk(7
+ talk(7);
else if (pickedObject == kVerbTalk && fl == 185)
- talk(38;
+ talk(38);
else if (pickedObject == kVerbLook && fl == 187) {
talk(343);
sentido_hare = 3;
@@ -629,9 +629,9 @@
void DrasculaEngine::room_17(int fl) {
if (pickedObject == kVerbLook && fl == 177)
- talk(35;
+ talk(35);
else if (pickedObject == kVerbTalk && fl == 177 && flags[18] == 0)
- talk(6
+ talk(6);
else if (pickedObject == kVerbTalk && fl == 177 && flags[18] == 1)
animation_18_2();
else if (pickedObject == kVerbOpen && fl == 177 && flags[18] == 1)
@@ -741,7 +741,7 @@
void DrasculaEngine::room_22(int fl) {
if (pickedObject == kVerbPick && fl == 140)
- talk(7
+ talk(7);
else if (pickedObject == 11 && fl == 140) {
pickObject(18);
visible[1] = 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