diff options
author | Eugene Sandulenko | 2008-05-30 09:28:52 +0000 |
---|---|---|
committer | Eugene Sandulenko | 2008-05-30 09:28:52 +0000 |
commit | 4eed36f88c9e0df275ae1430dc3428b92bfd711d (patch) | |
tree | 0056d240732719534c3ba4ff4a7b77fd11885c06 /engines | |
parent | 0516f550c38e3cfc2978ae7b69ee76e028e18d28 (diff) | |
download | scummvm-rg350-4eed36f88c9e0df275ae1430dc3428b92bfd711d.tar.gz scummvm-rg350-4eed36f88c9e0df275ae1430dc3428b92bfd711d.tar.bz2 scummvm-rg350-4eed36f88c9e0df275ae1430dc3428b92bfd711d.zip |
Fix compilation
svn-id: r32386
Diffstat (limited to 'engines')
-rw-r--r-- | engines/drascula/animation.cpp | 12 | ||||
-rw-r--r-- | engines/drascula/drascula.cpp | 6 | ||||
-rw-r--r-- | engines/drascula/rooms.cpp | 40 |
3 files changed, 29 insertions, 29 deletions
diff --git a/engines/drascula/animation.cpp b/engines/drascula/animation.cpp index 80a3ab2f59..46f8daba66 100644 --- a/engines/drascula/animation.cpp +++ b/engines/drascula/animation.cpp @@ -695,7 +695,7 @@ void DrasculaEngine::animation_4_1() { loadPic("an12.alg"); decompressPic(extraSurface, 1); - talk(205; + talk(205); updateRefresh_pre(); @@ -834,7 +834,7 @@ void DrasculaEngine::animation_4_2() { flags[9] = 1; pause(12); - talk([56); + talk(56); pause(8); clearRoom(); @@ -2056,7 +2056,7 @@ void DrasculaEngine::animation_11_5() { animation_12_5(); else { flags[9] = 0; - talk(33; + talk(33); } } @@ -2225,7 +2225,7 @@ void DrasculaEngine::animation_14_5() { 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_18_2() { } void DrasculaEngine::animation_22_2() { - talk(374; + talk(374); sentido_hare=2; updateRoom(); @@ -3315,7 +3315,7 @@ void DrasculaEngine::animation_33_2() { flags[9] = 1; pause(12); - talk([56 ); + talk(56); pause(8); clearRoom(); diff --git a/engines/drascula/drascula.cpp b/engines/drascula/drascula.cpp index fe415ee183..6eee9ec8b7 100644 --- a/engines/drascula/drascula.cpp +++ b/engines/drascula/drascula.cpp @@ -2849,7 +2849,7 @@ bool DrasculaEngine::checkFlag(int fl) { 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 @@ bool DrasculaEngine::checkFlag(int fl) { 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 @@ bool DrasculaEngine::checkFlag(int fl) { 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) { diff --git a/engines/drascula/rooms.cpp b/engines/drascula/rooms.cpp index 239fed568d..374dd0968b 100644 --- a/engines/drascula/rooms.cpp +++ b/engines/drascula/rooms.cpp @@ -217,68 +217,68 @@ void DrasculaEngine::room_0() { // 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_15(int fl) { 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 @@ void DrasculaEngine::room_16(int fl) { } 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_16(int fl) { 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 @@ bool DrasculaEngine::room_21(int fl) { 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; |