diff options
Diffstat (limited to 'engines/drascula/rooms.cpp')
-rw-r--r-- | engines/drascula/rooms.cpp | 714 |
1 files changed, 357 insertions, 357 deletions
diff --git a/engines/drascula/rooms.cpp b/engines/drascula/rooms.cpp index 3a4e45ca82..b5de794d42 100644 --- a/engines/drascula/rooms.cpp +++ b/engines/drascula/rooms.cpp @@ -44,149 +44,149 @@ struct RoomTalkAction { // of actions with the same number RoomTalkAction room0Actions[] = { // num action object speech - { 1, LOOK, -1, 54 }, - { 1, MOVE, -1, 19 }, - { 1, PICK, -1, 11 }, - { 1, OPEN, -1, 9 }, - { 1, CLOSE, -1, 9 }, - { 1, TALK, -1, 16 }, - { 1, DEFAULT, -1, 11 }, + { 1, kVerbLook, -1, 54 }, + { 1, kVerbMove, -1, 19 }, + { 1, kVerbPick, -1, 11 }, + { 1, kVerbOpen, -1, 9 }, + { 1, kVerbClose, -1, 9 }, + { 1, kVerbTalk, -1, 16 }, + { 1, kVerbDefault, -1, 11 }, // ------------------------------- - { 2, MOVE, -1, 19 }, - { 2, OPEN, -1, 9 }, - { 2, CLOSE, -1, 9 }, - { 2, TALK, -1, 16 }, + { 2, kVerbMove, -1, 19 }, + { 2, kVerbOpen, -1, 9 }, + { 2, kVerbClose, -1, 9 }, + { 2, kVerbTalk, -1, 16 }, // ------------------------------- - { 3, LOOK, -1, 316 }, - { 3, MOVE, -1, 317 }, - { 3, PICK, -1, 318 }, - { 3, OPEN, -1, 319 }, - { 3, CLOSE, -1, 319 }, - { 3, TALK, -1, 320 }, - { 3, DEFAULT, -1, 318 }, + { 3, kVerbLook, -1, 316 }, + { 3, kVerbMove, -1, 317 }, + { 3, kVerbPick, -1, 318 }, + { 3, kVerbOpen, -1, 319 }, + { 3, kVerbClose, -1, 319 }, + { 3, kVerbTalk, -1, 320 }, + { 3, kVerbDefault, -1, 318 }, // ------------------------------- - { 4, MOVE, -1, 19 }, - { 4, OPEN, -1, 9 }, - { 4, CLOSE, -1, 9 }, - { 4, TALK, -1, 16 }, + { 4, kVerbMove, -1, 19 }, + { 4, kVerbOpen, -1, 9 }, + { 4, kVerbClose, -1, 9 }, + { 4, kVerbTalk, -1, 16 }, // ------------------------------- - { 5, OPEN, -1, 9 }, - { 5, CLOSE, -1, 9 }, - { 5, TALK, -1, 16 }, + { 5, kVerbOpen, -1, 9 }, + { 5, kVerbClose, -1, 9 }, + { 5, kVerbTalk, -1, 16 }, // ------------------------------- - { 6, MOVE, -1, 19 }, - { 6, OPEN, -1, 9 }, - { 6, CLOSE, -1, 9 }, - { 6, TALK, -1, 16 } + { 6, kVerbMove, -1, 19 }, + { 6, kVerbOpen, -1, 9 }, + { 6, kVerbClose, -1, 9 }, + { 6, kVerbTalk, -1, 16 } }; RoomTalkAction room1Actions[] = { // num action object speech - { -1, PICK, 118, 5 }, - { -1, OPEN, 118, 3 }, - { -1, CLOSE, 118, 4 }, - { -1, TALK, 118, 6 }, + { -1, kVerbPick, 118, 5 }, + { -1, kVerbOpen, 118, 3 }, + { -1, kVerbClose, 118, 4 }, + { -1, kVerbTalk, 118, 6 }, // ------------------------------- - { -1, LOOK, 119, 8 }, - { -1, MOVE, 119, 13 }, - { -1, CLOSE, 119, 10 }, - { -1, TALK, 119, 12 }, + { -1, kVerbLook, 119, 8 }, + { -1, kVerbMove, 119, 13 }, + { -1, kVerbClose, 119, 10 }, + { -1, kVerbTalk, 119, 12 }, // ------------------------------- - { -1, MOVE, 120, 13 }, - { -1, OPEN, 120, 18 }, - { -1, TALK, 120, 15 } + { -1, kVerbMove, 120, 13 }, + { -1, kVerbOpen, 120, 18 }, + { -1, kVerbTalk, 120, 15 } }; RoomTalkAction room3Actions[] = { // num action object speech - { -1, LOOK, 129, 21 }, - { -1, PICK, 129, 5 }, - { -1, MOVE, 129, 24 }, - { -1, OPEN, 129, 22 }, - { -1, CLOSE, 129, 10 }, + { -1, kVerbLook, 129, 21 }, + { -1, kVerbPick, 129, 5 }, + { -1, kVerbMove, 129, 24 }, + { -1, kVerbOpen, 129, 22 }, + { -1, kVerbClose, 129, 10 }, // ------------------------------- - { -1, LOOK, 131, 27 }, - { -1, PICK, 131, 5 }, - { -1, MOVE, 131, 24 }, - { -1, OPEN, 131, 22 }, - { -1, CLOSE, 131, 10 }, - { -1, TALK, 131, 23 }, + { -1, kVerbLook, 131, 27 }, + { -1, kVerbPick, 131, 5 }, + { -1, kVerbMove, 131, 24 }, + { -1, kVerbOpen, 131, 22 }, + { -1, kVerbClose, 131, 10 }, + { -1, kVerbTalk, 131, 23 }, // ------------------------------- - { -1, LOOK, 132, 28 }, - { -1, PICK, 132, 5 }, - { -1, MOVE, 132, 24 }, - { -1, OPEN, 132, 22 }, - { -1, CLOSE, 132, 10 }, - { -1, TALK, 132, 23 }, + { -1, kVerbLook, 132, 28 }, + { -1, kVerbPick, 132, 5 }, + { -1, kVerbMove, 132, 24 }, + { -1, kVerbOpen, 132, 22 }, + { -1, kVerbClose, 132, 10 }, + { -1, kVerbTalk, 132, 23 }, // ------------------------------- - { -1, LOOK, 133, 321 }, - { -1, PICK, 133, 31 }, - { -1, MOVE, 133, 34 }, - { -1, OPEN, 133, 30 }, - { -1, CLOSE, 133, 10 }, + { -1, kVerbLook, 133, 321 }, + { -1, kVerbPick, 133, 31 }, + { -1, kVerbMove, 133, 34 }, + { -1, kVerbOpen, 133, 30 }, + { -1, kVerbClose, 133, 10 }, // ------------------------------- - { -1, LOOK, 166, 55 }, - { -1, PICK, 166, 7 }, + { -1, kVerbLook, 166, 55 }, + { -1, kVerbPick, 166, 7 }, // ------------------------------- - { -1, LOOK, 211, 184 } + { -1, kVerbLook, 211, 184 } }; RoomTalkAction room4Actions[] = { // num action object speech - { -1, LOOK, 189, 182 }, + { -1, kVerbLook, 189, 182 }, // ------------------------------- - { -1, LOOK, 207, 175 }, - { -1, TALK, 207, 176 }, + { -1, kVerbLook, 207, 175 }, + { -1, kVerbTalk, 207, 176 }, // ------------------------------- - { -1, LOOK, 208, 177 }, + { -1, kVerbLook, 208, 177 }, // ------------------------------- - { -1, LOOK, 209, 179 }, + { -1, kVerbLook, 209, 179 }, // ------------------------------- - { -1, LOOK, 210, 180 }, - { -1, OPEN, 210, 181 } + { -1, kVerbLook, 210, 180 }, + { -1, kVerbOpen, 210, 181 } }; RoomTalkAction room5Actions[] = { // num action object speech - { -1, MOVE, 136, 13 }, - { -1, OPEN, 136, 18 }, - { -1, TALK, 136, 15 }, + { -1, kVerbMove, 136, 13 }, + { -1, kVerbOpen, 136, 18 }, + { -1, kVerbTalk, 136, 15 }, // ------------------------------- - { -1, LOOK, 212, 187 }, - { -1, TALK, 212, 188 }, + { -1, kVerbLook, 212, 187 }, + { -1, kVerbTalk, 212, 188 }, // ------------------------------- - { -1, LOOK, 213, 189 }, - { -1, OPEN, 213, 190 } + { -1, kVerbLook, 213, 189 }, + { -1, kVerbOpen, 213, 190 } }; RoomTalkAction room6Actions[] = { // num action object speech - { -1, PICK, 144, 43 }, + { -1, kVerbPick, 144, 43 }, // ------------------------------- - { -1, LOOK, 138, 35 }, - { -1, TALK, 138, 6 }, + { -1, kVerbLook, 138, 35 }, + { -1, kVerbTalk, 138, 6 }, // ------------------------------- - { -1, LOOK, 143, 37 }, - { -1, PICK, 143, 7 }, - { -1, MOVE, 143, 7 }, - { -1, TALK, 143, 38 }, + { -1, kVerbLook, 143, 37 }, + { -1, kVerbPick, 143, 7 }, + { -1, kVerbMove, 143, 7 }, + { -1, kVerbTalk, 143, 38 }, // ------------------------------- - { -1, LOOK, 139, 36 }, + { -1, kVerbLook, 139, 36 }, // ------------------------------- - { -1, LOOK, 140, 147 } + { -1, kVerbLook, 140, 147 } }; RoomTalkAction room12Actions[] = { // num action object speech - { -1, LOOK, 154, 329 }, - { -1, TALK, 154, 330 }, + { -1, kVerbLook, 154, 329 }, + { -1, kVerbTalk, 154, 330 }, // ------------------------------- - { -1, MOVE, 155, 48 }, - { -1, TALK, 155, 331 }, + { -1, kVerbMove, 155, 48 }, + { -1, kVerbTalk, 155, 331 }, // ------------------------------- - { -1, LOOK, 156, 35 }, - { -1, MOVE, 156, 48 }, - { -1, TALK, 156, 50 }, + { -1, kVerbLook, 156, 35 }, + { -1, kVerbMove, 156, 48 }, + { -1, kVerbTalk, 156, 50 }, }; bool DrasculaEngine::roomParse(RoomTalkAction* roomActions, int fl) { @@ -195,8 +195,8 @@ bool DrasculaEngine::roomParse(RoomTalkAction* roomActions, int fl) { for (int i = 0; i < ARRAYSIZE(roomActions); i++) { if (roomActions[i].num == num_ejec || roomActions[i].num == -1) { - if (roomActions[i].action == objeto_que_lleva || - roomActions[i].action == DEFAULT) { + if (roomActions[i].action == pickedObject || + roomActions[i].action == kVerbDefault) { if (roomActions[i].objectID == fl || roomActions[i].objectID == -1) { talk(roomActions[i].speechID); @@ -216,12 +216,12 @@ void DrasculaEngine::room_0() { // non-default actions if (num_ejec == 2) { - if (objeto_que_lleva == LOOK) { + if (pickedObject == kVerbLook) { talk(_text[_lang][mirar_t[c_mirar]], mirar_v[c_mirar]); c_mirar++; if (c_mirar == 3) c_mirar = 0; - } else if (objeto_que_lleva == PICK) { + } else if (pickedObject == kVerbPick) { talk(_text[_lang][poder_t[c_poder]], poder_v[c_poder]); c_poder++; if (c_poder == 6) @@ -233,12 +233,12 @@ void DrasculaEngine::room_0() { c_poder = 0; } } else if (num_ejec == 4) { - if (objeto_que_lleva == LOOK) { + if (pickedObject == kVerbLook) { talk(_text[_lang][mirar_t[c_mirar]], mirar_v[c_mirar]); c_mirar++; if (c_mirar == 3) c_mirar = 0; - } else if (objeto_que_lleva == PICK) { + } else if (pickedObject == kVerbPick) { talk(_text[_lang][poder_t[c_poder]], poder_v[c_poder]); c_poder++; if (c_poder == 6) @@ -250,12 +250,12 @@ void DrasculaEngine::room_0() { c_poder = 0; } } else if (num_ejec == 5) { - if (objeto_que_lleva == LOOK) { + if (pickedObject == kVerbLook) { talk(_text[_lang][mirar_t[c_mirar]], mirar_v[c_mirar]); c_mirar++; if (c_mirar == 3) c_mirar = 0; - } else if (objeto_que_lleva == PICK) { + } else if (pickedObject == kVerbPick) { talk(_text[_lang][poder_t[c_poder]], poder_v[c_poder]); c_poder++; if (c_poder == 6) @@ -267,12 +267,12 @@ void DrasculaEngine::room_0() { c_poder = 0; } } else if (num_ejec == 6) { - if (objeto_que_lleva == LOOK) { + if (pickedObject == kVerbLook) { talk(_text[_lang][mirar_t[c_mirar]], mirar_v[c_mirar]); c_mirar++; if (c_mirar == 3) c_mirar = 0; - } else if (objeto_que_lleva == PICK) { + } else if (pickedObject == kVerbPick) { talk(_text[_lang][poder_t[c_poder]], poder_v[c_poder]); c_poder++; if (c_poder == 6) @@ -290,11 +290,11 @@ void DrasculaEngine::room_1(int fl) { if (roomParse(room1Actions, fl)) return; - if (objeto_que_lleva == LOOK && fl == 118) { + if (pickedObject == kVerbLook && fl == 118) { talk(1); pause(10); talk(2); - } else if (objeto_que_lleva == LOOK && fl == 120 && flags[8] == 0) + } else if (pickedObject == kVerbLook && fl == 120 && flags[8] == 0) talk(14); else hay_respuesta = 0; @@ -304,20 +304,20 @@ void DrasculaEngine::room_3(int fl) { if (roomParse(room3Actions, fl)) return; - if (objeto_que_lleva == TALK && fl == 129) { + if (pickedObject == kVerbTalk && fl == 129) { talk(23); pause(6); talk_sinc(_text[_lang][50], "50.als", "11111111111144432554433"); - } else if (objeto_que_lleva == TALK && fl == 133) { + } else if (pickedObject == kVerbTalk && fl == 133) { talk_sinc(_text[_lang][322], "322.als", "13333334125433333333"); updateRoom(); updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla); pause(25); talk(33); - } else if (objeto_que_lleva == LOOK && fl == 165) { + } else if (pickedObject == kVerbLook && fl == 165) { talk(149); talk(150); - } else if (objeto_que_lleva == PICK && fl == 165) { + } else if (pickedObject == kVerbPick && fl == 165) { copyBackground(0, 0, 0,0, 320, 200, dir_dibujo1, dir_zona_pantalla); updateRefresh_pre(); copyRect(44, 1, hare_x, hare_y, 41, 70, dir_dibujo2, dir_zona_pantalla); @@ -327,12 +327,12 @@ void DrasculaEngine::room_3(int fl) { pickObject(10); flags[3] = 1; visible[8] = 0; - } else if (objeto_que_lleva == 14 && fl == 166 && flags[37] == 0) { + } else if (pickedObject == 14 && fl == 166 && flags[37] == 0) { animation_7_2(); pickObject(8); - } else if (objeto_que_lleva == 14 && fl == 166 && flags[37] == 1) + } else if (pickedObject == 14 && fl == 166 && flags[37] == 1) talk(323); - else if (objeto_que_lleva == TALK && fl == 211) { + else if (pickedObject == kVerbTalk && fl == 211) { talk(185); talk(186); } else @@ -343,7 +343,7 @@ void DrasculaEngine::room_4(int fl) { if (roomParse(room4Actions, fl)) return; - if (objeto_que_lleva == MOVE && fl == 189 && flags[34] == 0) { + if (pickedObject == kVerbMove && fl == 189 && flags[34] == 0) { talk(327); pickObject(13); flags[34] = 1; @@ -357,9 +357,9 @@ void DrasculaEngine::room_5(int fl) { if (roomParse(room5Actions, fl)) return; - if (objeto_que_lleva == LOOK && fl == 136 && flags[8] == 0) + if (pickedObject == kVerbLook && fl == 136 && flags[8] == 0) talk(14); - else if (objeto_que_lleva == 10 && fl == 136) { + else if (pickedObject == 10 && fl == 136) { animation_5_2(); resta_objeto(10); } else @@ -370,14 +370,14 @@ void DrasculaEngine::room_6(int fl){ if (roomParse(room6Actions, fl)) return; - if (objeto_que_lleva == LOOK && fl==144) { + if (pickedObject == kVerbLook && fl==144) { talk(41); talk(42); - } else if (objeto_que_lleva == OPEN && fl == 138) + } else if (pickedObject == kVerbOpen && fl == 138) openDoor(0, 1); - else if (objeto_que_lleva == CLOSE && fl == 138) + else if (pickedObject == kVerbClose && fl == 138) closeDoor(0, 1); - else if (objeto_que_lleva == OPEN && fl == 143 && flags[2] == 0) { + else if (pickedObject == kVerbOpen && fl == 143 && flags[2] == 0) { copyBackground(0, 0, 0, 0, 320, 200, dir_dibujo1, dir_zona_pantalla); updateRefresh_pre(); copyRect(228, 102, hare_x + 5, hare_y - 1, 47, 73, dir_dibujo3, dir_zona_pantalla); @@ -388,7 +388,7 @@ void DrasculaEngine::room_6(int fl){ updateRoom(); updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla); stopSound(); - } else if (objeto_que_lleva == CLOSE && fl == 143 && flags[2] == 1) { + } else if (pickedObject == kVerbClose && fl == 143 && flags[2] == 1) { copyBackground(0, 0, 0, 0, 320, 200, dir_dibujo1, dir_zona_pantalla); flags[2] = 0; updateRefresh_pre(); @@ -399,7 +399,7 @@ void DrasculaEngine::room_6(int fl){ updateRoom(); updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla); stopSound(); - } else if (objeto_que_lleva == OPEN && fl == 139 && flags[1] == 0) { + } else if (pickedObject == kVerbOpen && fl == 139 && flags[1] == 0) { copyBackground(0, 0, 0, 0, 320, 200, dir_dibujo1, dir_zona_pantalla); updateRefresh_pre(); copyRect(267, 1, hare_x - 14, hare_y - 2, 52, 73, dir_dibujo3, dir_zona_pantalla); @@ -412,7 +412,7 @@ void DrasculaEngine::room_6(int fl){ updateRoom(); updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla); stopSound(); - } else if (objeto_que_lleva == PICK && fl == 140) { + } else if (pickedObject == kVerbPick && fl == 140) { copyBackground(0, 0, 0, 0, 320, 200, dir_dibujo1, dir_zona_pantalla); updateRefresh_pre(); copyRect(267, 1, hare_x - 14, hare_y - 2, 52, 73, dir_dibujo3, dir_zona_pantalla); @@ -421,18 +421,18 @@ void DrasculaEngine::room_6(int fl){ pickObject(9); visible[4] = 0; flags[10] = 1; - } else if (objeto_que_lleva == OPEN && fl == 140) + } else if (pickedObject == kVerbOpen && fl == 140) hay_respuesta = 1; else hay_respuesta = 0; } void DrasculaEngine::room_7(int fl){ - if (objeto_que_lleva == LOOK && fl == 169) + if (pickedObject == kVerbLook && fl == 169) talk(44); - else if (objeto_que_lleva == LOOK && fl == 164) + else if (pickedObject == kVerbLook && fl == 164) talk(35); - else if (objeto_que_lleva == PICK && fl == 190) { + else if (pickedObject == kVerbPick && fl == 190) { pickObject(17); flags[35] = 1; visible[3] = 0; @@ -443,30 +443,30 @@ void DrasculaEngine::room_7(int fl){ } void DrasculaEngine::room_8(int fl) { - if (objeto_que_lleva == LOOK && fl == 147 && flags[7] == 0) { + if (pickedObject == kVerbLook && fl == 147 && flags[7] == 0) { talk(58); pickObject(15); flags[7] = 1; if (flags[7] == 1 && flags[26] == 1 && flags[34] == 1 && flags[35] == 1 && flags[37] == 1) flags[38] = 1; - } else if (objeto_que_lleva == LOOK && fl == 147) + } else if (pickedObject == kVerbLook && fl == 147) talk(59); else hay_respuesta = 0; } void DrasculaEngine::room_9(int fl){ - if (objeto_que_lleva == LOOK && fl == 150) + if (pickedObject == kVerbLook && fl == 150) talk(35); - else if (objeto_que_lleva == TALK && fl == 150) + else if (pickedObject == kVerbTalk && fl == 150) talk(6); - else if (objeto_que_lleva == LOOK && fl == 51) + else if (pickedObject == kVerbLook && fl == 51) talk(60); - else if (objeto_que_lleva == TALK && fl == 51 && flags[4] == 0) + else if (pickedObject == kVerbTalk && fl == 51 && flags[4] == 0) animation_4_2(); - else if (objeto_que_lleva == TALK && fl == 51 && flags[4] == 1) + else if (pickedObject == kVerbTalk && fl == 51 && flags[4] == 1) animation_33_2(); - else if (objeto_que_lleva == 7 && fl == 51) { + else if (pickedObject == 7 && fl == 51) { animation_6_2(); resta_objeto(7); pickObject(14);} @@ -478,25 +478,25 @@ void DrasculaEngine::room_12(int fl){ if (roomParse(room12Actions, fl)) return; - if (objeto_que_lleva == OPEN && fl == 156) + if (pickedObject == kVerbOpen && fl == 156) openDoor(16, 4); - else if (objeto_que_lleva == CLOSE && fl == 156) + else if (pickedObject == kVerbClose && fl == 156) closeDoor(16, 4); else hay_respuesta = 0; } bool DrasculaEngine::room_13(int fl) { - if (objeto_que_lleva == LOOK && fl == 51) { + if (pickedObject == kVerbLook && fl == 51) { talk(411); sentido_hare = 3; talk(412); strcpy(objName[1], "yoda"); - } else if (objeto_que_lleva == TALK && fl == 51) + } else if (pickedObject == kVerbTalk && fl == 51) conversa("op_7.cal"); - else if (objeto_que_lleva == 19 && fl == 51) + else if (pickedObject == 19 && fl == 51) animation_1_3(); - else if (objeto_que_lleva == 9 && fl == 51) { + else if (pickedObject == 9 && fl == 51) { animation_2_3(); return true; } else @@ -505,52 +505,52 @@ bool DrasculaEngine::room_13(int fl) { } void DrasculaEngine::room_14(int fl) { - if (objeto_que_lleva == TALK && fl == 54 && flags[39] == 0) + if (pickedObject == kVerbTalk && fl == 54 && flags[39] == 0) animation_12_2(); - else if (objeto_que_lleva == TALK && fl == 54 && flags[39] == 1) + else if (pickedObject == kVerbTalk && fl == 54 && flags[39] == 1) talk(109); - else if (objeto_que_lleva == 12 && fl == 54) + else if (pickedObject == 12 && fl == 54) animation_26_2(); - else if (objeto_que_lleva == TALK && fl == 52 && flags[5] == 0) + else if (pickedObject == kVerbTalk && fl == 52 && flags[5] == 0) animation_11_2(); - else if (objeto_que_lleva == TALK && fl == 52 && flags[5] == 1) + else if (pickedObject == kVerbTalk && fl == 52 && flags[5] == 1) animation_36_2(); - else if (objeto_que_lleva == TALK && fl == 53) + else if (pickedObject == kVerbTalk && fl == 53) animation_13_2(); - else if (objeto_que_lleva == LOOK && fl == 200) + else if (pickedObject == kVerbLook && fl == 200) talk(165); - else if (objeto_que_lleva == LOOK && fl == 201) + else if (pickedObject == kVerbLook && fl == 201) talk(166); - else if (objeto_que_lleva == LOOK && fl == 202) + else if (pickedObject == kVerbLook && fl == 202) talk(167); - else if (objeto_que_lleva == LOOK && fl == 203) + else if (pickedObject == kVerbLook && fl == 203) talk(168); - else if (objeto_que_lleva == PICK && fl == 203) + else if (pickedObject == kVerbPick && fl == 203) talk(170); - else if (objeto_que_lleva == MOVE && fl == 203) + else if (pickedObject == kVerbMove && fl == 203) talk(170); - else if (objeto_que_lleva == TALK && fl == 203) + else if (pickedObject == kVerbTalk && fl == 203) talk(169); - else if (objeto_que_lleva == LOOK && fl == 204) + else if (pickedObject == kVerbLook && fl == 204) talk(171); else hay_respuesta = 0; } void DrasculaEngine::room_15(int fl) { - if (objeto_que_lleva == TALK && fl == 188) + if (pickedObject == kVerbTalk && fl == 188) talk(333); - else if (objeto_que_lleva == LOOK && fl == 188) + else if (pickedObject == kVerbLook && fl == 188) talk(334); - else if (objeto_que_lleva == 19 && fl == 188 && flags[27] == 0) + else if (pickedObject == 19 && fl == 188 && flags[27] == 0) talk(335); - else if (objeto_que_lleva == 19 && fl == 188 && flags[27] == 1) { + else if (pickedObject == 19 && fl == 188 && flags[27] == 1) { talk(336); sentido_hare = 3; talk(337); talk_sinc(_text[_lang][46], "46.als", "4442444244244"); sentido_hare = 1; - } else if (objeto_que_lleva == 18 && fl == 188 && flags[26] == 0) { + } else if (pickedObject == 18 && fl == 188 && flags[26] == 0) { copyBackground(0, 0, 0, 0, 320, 200, dir_dibujo1, dir_zona_pantalla); copyRect(133, 135, hare_x + 6, hare_y, 39, 63, dir_dibujo3, dir_zona_pantalla); updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla); @@ -560,7 +560,7 @@ void DrasculaEngine::room_15(int fl) { flags[27] = 0; pickObject(19); resta_objeto(18); - } else if (objeto_que_lleva == MOVE && fl == 188 && flags[27] == 0) { + } else if (pickedObject == kVerbMove && fl == 188 && flags[27] == 0) { animation_34_2(); talk(339); pickObject(16); @@ -568,34 +568,34 @@ void DrasculaEngine::room_15(int fl) { flags[27] = 1; if (flags[7] == 1 && flags[26] == 1 && flags[34] == 1 && flags[35] == 1 && flags[37] == 1) flags[38] = 1; - } else if (objeto_que_lleva == LOOK && fl == 205) + } else if (pickedObject == kVerbLook && fl == 205) talk(172); - else if (objeto_que_lleva == LOOK && fl == 206) + else if (pickedObject == kVerbLook && fl == 206) talk(173); - else if (objeto_que_lleva == MOVE && fl == 206) + else if (pickedObject == kVerbMove && fl == 206) talk(174); - else if (objeto_que_lleva == OPEN && fl == 206) + else if (pickedObject == kVerbOpen && fl == 206) talk(174); else hay_respuesta = 0; } void DrasculaEngine::room_16(int fl) { - if (objeto_que_lleva == TALK && fl == 163) + if (pickedObject == kVerbTalk && fl == 163) talk(_text[_lang][6], "6.als"); - else if (objeto_que_lleva == OPEN && fl == 163) + else if (pickedObject == kVerbOpen && fl == 163) openDoor(17, 0); - else if (objeto_que_lleva == CLOSE && fl == 163) + else if (pickedObject == kVerbClose && fl == 163) closeDoor(17, 0); - else if (objeto_que_lleva == LOOK && fl == 183) + else if (pickedObject == kVerbLook && fl == 183) talk(_text[_lang][340], "340.als"); - else if (objeto_que_lleva == TALK && fl == 183) { + else if (pickedObject == kVerbTalk && fl == 183) { talk(_text[_lang][341], "341.als"); pause(10); talk_sinc(_text[_lang][50], "50.als", "11111111111144432554433"); pause(3); talk_baul(_text[_lang][83], "d83.als"); - } else if (objeto_que_lleva == OPEN && fl == 183) { + } else if (pickedObject == kVerbOpen && fl == 183) { openDoor(19, NO_DOOR); if (flags[20] == 0) { flags[20] = 1; @@ -605,44 +605,44 @@ void DrasculaEngine::room_16(int fl) { talk(_text[_lang][342], "342.als"); pickObject(22); } - } else if (objeto_que_lleva == CLOSE && fl == 183) + } else if (pickedObject == kVerbClose && fl == 183) closeDoor(19, NO_DOOR); - else if (objeto_que_lleva == LOOK && fl == 185) + else if (pickedObject == kVerbLook && fl == 185) talk(_text[_lang][37], "37.als"); - else if (objeto_que_lleva == PICK && fl == 185) + else if (pickedObject == kVerbPick && fl == 185) talk(_text[_lang][7], "7.als"); - else if (objeto_que_lleva == MOVE && fl == 185) + else if (pickedObject == kVerbMove && fl == 185) talk(_text[_lang][7], "7.als"); - else if (objeto_que_lleva == TALK && fl == 185) + else if (pickedObject == kVerbTalk && fl == 185) talk(_text[_lang][38], "38.als"); - else if (objeto_que_lleva == LOOK && fl == 187) { + else if (pickedObject == kVerbLook && fl == 187) { talk(_text[_lang][343], "343.als"); sentido_hare = 3; updateRoom(); updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla); talk(_text[_lang][344], "344.als"); - } else if (objeto_que_lleva == TALK && fl == 187) + } else if (pickedObject == kVerbTalk && fl == 187) talk(_text[_lang][345], "345.als"); else hay_respuesta = 0; } void DrasculaEngine::room_17(int fl) { - if (objeto_que_lleva == LOOK && fl == 177) + if (pickedObject == kVerbLook && fl == 177) talk(_text[_lang][35], "35.als"); - else if (objeto_que_lleva == TALK && fl == 177 && flags[18] == 0) + else if (pickedObject == kVerbTalk && fl == 177 && flags[18] == 0) talk(_text[_lang][6], "6.als"); - else if (objeto_que_lleva == TALK && fl == 177 && flags[18] == 1) + else if (pickedObject == kVerbTalk && fl == 177 && flags[18] == 1) animation_18_2(); - else if (objeto_que_lleva == OPEN && fl == 177 && flags[18] == 1) + else if (pickedObject == kVerbOpen && fl == 177 && flags[18] == 1) talk(_text[_lang][346], "346.als"); - else if (objeto_que_lleva == OPEN && fl == 177 && flags[14] == 0 && flags[18] == 0) + else if (pickedObject == kVerbOpen && fl == 177 && flags[14] == 0 && flags[18] == 0) animation_22_2(); - else if (objeto_que_lleva == OPEN && fl == 177 && flags[14] == 1) + else if (pickedObject == kVerbOpen && fl == 177 && flags[14] == 1) openDoor(15, 1); - else if (objeto_que_lleva == CLOSE && fl == 177 && flags[14] == 1) + else if (pickedObject == kVerbClose && fl == 177 && flags[14] == 1) closeDoor(15, 1); - else if (objeto_que_lleva == 11 && fl == 50 && flags[22] == 0) { + else if (pickedObject == 11 && fl == 50 && flags[22] == 0) { talk(_text[_lang][347], "347.als"); flags[29] = 1; pickObject(23); @@ -652,13 +652,13 @@ void DrasculaEngine::room_17(int fl) { } void DrasculaEngine::room_18(int fl) { - if (objeto_que_lleva == TALK && fl == 55 && flags[36] == 0) + if (pickedObject == kVerbTalk && fl == 55 && flags[36] == 0) animation_24_2(); - else if (objeto_que_lleva == TALK && fl == 55 && flags[36] == 1) + else if (pickedObject == kVerbTalk && fl == 55 && flags[36] == 1) talk(_text[_lang][109], "109.als"); - else if (objeto_que_lleva == LOOK && fl == 181) + else if (pickedObject == kVerbLook && fl == 181) talk(_text[_lang][348], "348.als"); - else if (objeto_que_lleva == PICK && fl == 182) { + else if (pickedObject == kVerbPick && fl == 182) { copyBackground(0, 0, 0, 0, 320, 200, dir_dibujo1, dir_zona_pantalla); updateRefresh_pre(); copyRect(44, 1, hare_x, hare_y, 41, 70, dir_dibujo2, dir_zona_pantalla); @@ -668,29 +668,29 @@ void DrasculaEngine::room_18(int fl) { pickObject(12); visible[2] = 0; flags[28] = 1; - } else if (objeto_que_lleva == LOOK && fl == 182) + } else if (pickedObject == kVerbLook && fl == 182) talk(_text[_lang][154], "154.als"); - else if (objeto_que_lleva == 8 && fl == 55 && flags[38] == 0 && flags[33] == 1) + else if (pickedObject == 8 && fl == 55 && flags[38] == 0 && flags[33] == 1) talk(_text[_lang][349], "349.als"); - else if (objeto_que_lleva == 13 && fl == 55 && flags[38] == 0 && flags[33] == 1) + else if (pickedObject == 13 && fl == 55 && flags[38] == 0 && flags[33] == 1) talk(_text[_lang][349], "349.als"); - else if (objeto_que_lleva == 15 && fl == 55 && flags[38] == 0 && flags[33] == 1) + else if (pickedObject == 15 && fl == 55 && flags[38] == 0 && flags[33] == 1) talk(_text[_lang][349], "349.als"); - else if (objeto_que_lleva == 16 && fl == 55 && flags[38] == 0 && flags[33] == 1) + else if (pickedObject == 16 && fl == 55 && flags[38] == 0 && flags[33] == 1) talk(_text[_lang][349], "349.als"); - else if (objeto_que_lleva == 17 && fl == 55 && flags[38] == 0 && flags[33] == 1) + else if (pickedObject == 17 && fl == 55 && flags[38] == 0 && flags[33] == 1) talk(_text[_lang][349], "349.als"); - else if (objeto_que_lleva == 8 && fl == 55 && flags[38] == 1 && flags[33] == 1) + else if (pickedObject == 8 && fl == 55 && flags[38] == 1 && flags[33] == 1) animation_24_2(); - else if (objeto_que_lleva == 13 && fl == 55 && flags[38] == 1 && flags[33] == 1) + else if (pickedObject == 13 && fl == 55 && flags[38] == 1 && flags[33] == 1) animation_24_2(); - else if (objeto_que_lleva == 15 && fl == 55 && flags[38] == 1 && flags[33] == 1) + else if (pickedObject == 15 && fl == 55 && flags[38] == 1 && flags[33] == 1) animation_24_2(); - else if (objeto_que_lleva == 16 && fl == 55 && flags[38] == 1 && flags[33] == 1) + else if (pickedObject == 16 && fl == 55 && flags[38] == 1 && flags[33] == 1) animation_24_2(); - else if (objeto_que_lleva == 17 && fl == 55 && flags[38] == 1 && flags[33] == 1) + else if (pickedObject == 17 && fl == 55 && flags[38] == 1 && flags[33] == 1) animation_24_2(); - else if (objeto_que_lleva == 11 && fl == 50 && flags[22] == 0) { + else if (pickedObject == 11 && fl == 50 && flags[22] == 0) { sentido_hare = 3; updateRoom(); updateScreen(0, 0, 0, 0, 320, 200, dir_zona_pantalla); @@ -709,28 +709,28 @@ void DrasculaEngine::room_18(int fl) { } void DrasculaEngine::room_19(int fl) { - if (objeto_que_lleva == LOOK && fl == 214) + if (pickedObject == kVerbLook && fl == 214) talk(_text[_lang][191], "191.als"); else hay_respuesta = 0; } bool DrasculaEngine::room_21(int fl) { - if (objeto_que_lleva == OPEN && fl == 101 && flags[28] == 0) + if (pickedObject == kVerbOpen && fl == 101 && flags[28] == 0) talk(_text[_lang][419], "419.als"); - else if (objeto_que_lleva == OPEN && fl == 101 && flags[28] == 1) + else if (pickedObject == kVerbOpen && fl == 101 && flags[28] == 1) openDoor(0, 1); - else if (objeto_que_lleva == CLOSE && fl == 101) + else if (pickedObject == kVerbClose && fl == 101) closeDoor(0, 1); - else if(objeto_que_lleva == PICK && fl == 141) { + else if(pickedObject == kVerbPick && fl == 141) { pickObject(19); visible[2] = 0; flags[10] = 1; - } else if(objeto_que_lleva == 7 && fl == 101) { + } else if(pickedObject == 7 && fl == 101) { flags[28] = 1; openDoor(0, 1); withoutVerb(); - } else if (objeto_que_lleva == 21 && fl == 179) { + } else if (pickedObject == 21 && fl == 179) { animation_9_4(); return true; } else @@ -740,13 +740,13 @@ bool DrasculaEngine::room_21(int fl) { } void DrasculaEngine::room_22(int fl) { - if (objeto_que_lleva == PICK && fl == 140) + if (pickedObject == kVerbPick && fl == 140) talk(_text[_lang][7], "7.als"); - else if (objeto_que_lleva == 11 && fl == 140) { + else if (pickedObject == 11 && fl == 140) { pickObject(18); visible[1] = 0; flags[24] = 1; - } else if (objeto_que_lleva == 22 && fl == 52) { + } else if (pickedObject == 22 && fl == 52) { anima("up.bin",14); flags[26]=1; playSound("s1.als"); @@ -758,13 +758,13 @@ void DrasculaEngine::room_22(int fl) { sentido_hare = 3; talk(_text[_lang][499], "499.als"); talk(_text[_lang][500], "500.als"); - } else if (objeto_que_lleva == LOOK && fl == 52) + } else if (pickedObject == kVerbLook && fl == 52) talk(_text[_lang][497], "497.als"); - else if (objeto_que_lleva == TALK && fl == 52) + else if (pickedObject == kVerbTalk && fl == 52) talk(_text[_lang][498], "498.als"); - else if (objeto_que_lleva == PICK && fl == 180 && flags[26] == 0) + else if (pickedObject == kVerbPick && fl == 180 && flags[26] == 0) talk(_text[_lang][420], "420.als"); - else if (objeto_que_lleva == PICK && fl == 180 && flags[26] == 1) { + else if (pickedObject == kVerbPick && fl == 180 && flags[26] == 1) { pickObject(7); visible[3] = 0; flags[27] = 1; @@ -773,17 +773,17 @@ void DrasculaEngine::room_22(int fl) { } void DrasculaEngine::room_23(int fl) { - if (objeto_que_lleva == OPEN && fl == 103) { + if (pickedObject == kVerbOpen && fl == 103) { openDoor(0, 0); updateData(); - } else if(objeto_que_lleva == CLOSE && fl == 103) { + } else if(pickedObject == kVerbClose && fl == 103) { closeDoor(0, 0); updateData(); - } else if(objeto_que_lleva == OPEN && fl == 104) + } else if(pickedObject == kVerbOpen && fl == 104) openDoor(1, 1); - else if(objeto_que_lleva == CLOSE && fl == 104) + else if(pickedObject == kVerbClose && fl == 104) closeDoor(1, 1); - else if(objeto_que_lleva == PICK && fl == 142) { + else if(pickedObject == kVerbPick && fl == 142) { pickObject(8); visible[2] = 0; flags[11] = 1; @@ -796,36 +796,36 @@ void DrasculaEngine::room_23(int fl) { } void DrasculaEngine::room_24(int fl) { - if (objeto_que_lleva == OPEN && fl == 105) + if (pickedObject == kVerbOpen && fl == 105) openDoor(1, 0); - else if (objeto_que_lleva == CLOSE && fl == 105) + else if (pickedObject == kVerbClose && fl == 105) closeDoor(1, 0); - else if (objeto_que_lleva == OPEN && fl == 106) + else if (pickedObject == kVerbOpen && fl == 106) openDoor(2, 1); - else if (objeto_que_lleva == CLOSE && fl == 106) + else if (pickedObject == kVerbClose && fl == 106) closeDoor(2, 1); - else if (objeto_que_lleva == LOOK && fl == 151) + else if (pickedObject == kVerbLook && fl == 151) talk(_text[_lang][461], "461.als"); else hay_respuesta = 0; } void DrasculaEngine::room_26(int fl) { - if (objeto_que_lleva == OPEN && fl == 107 && flags[30] == 0) + if (pickedObject == kVerbOpen && fl == 107 && flags[30] == 0) openDoor(2, 0); - else if (objeto_que_lleva == OPEN && fl == 107 && flags[30] == 1) + else if (pickedObject == kVerbOpen && fl == 107 && flags[30] == 1) talk(_text[_lang][421], "421.als"); - else if (objeto_que_lleva == CLOSE && fl == 107) + else if (pickedObject == kVerbClose && fl == 107) closeDoor(2, 0); - else if (objeto_que_lleva == 10 && fl == 50 && flags[18] == 1 && flags[12] == 1) + else if (pickedObject == 10 && fl == 50 && flags[18] == 1 && flags[12] == 1) animation_5_4(); - else if (objeto_que_lleva == 8 && fl == 50 && flags[18] == 1 && flags[12] == 1) + else if (pickedObject == 8 && fl == 50 && flags[18] == 1 && flags[12] == 1) animation_5_4(); - else if (objeto_que_lleva == 12 && fl == 50 && flags[18] == 1 && flags[12] == 1) + else if (pickedObject == 12 && fl == 50 && flags[18] == 1 && flags[12] == 1) animation_5_4(); - else if (objeto_que_lleva == 16 && fl == 50 && flags[18] == 1 && flags[12] == 1) + else if (pickedObject == 16 && fl == 50 && flags[18] == 1 && flags[12] == 1) animation_5_4(); - else if (objeto_que_lleva == PICK && fl == 143 && flags[18] == 1) { + else if (pickedObject == kVerbPick && fl == 143 && flags[18] == 1) { lleva_al_hare(260, 180); pickObject(10); visible[1] = 0; @@ -836,49 +836,49 @@ void DrasculaEngine::room_26(int fl) { flags[30] = 1; talk_igorpuerta(_texti[_lang][28], "I28.als"); lleva_al_hare(153, 180); - } else if (objeto_que_lleva == PICK && fl == 143 && flags[18] == 0) { + } else if (pickedObject == kVerbPick && fl == 143 && flags[18] == 0) { lleva_al_hare(260, 180); copyBackground(80, 78, 199, 94, 38, 27, dir_dibujo3, dir_zona_pantalla); updateScreen(199, 94, 199, 94, 38, 27, dir_zona_pantalla); pause(3); talk_igor_peluca(_texti[_lang][25], "I25.als"); lleva_al_hare(153, 180); - } else if (objeto_que_lleva == TALK && fl == 51) + } else if (pickedObject == kVerbTalk && fl == 51) animation_1_4(); - else if (objeto_que_lleva == OPEN && fl == 167) + else if (pickedObject == kVerbOpen && fl == 167) talk(_text[_lang][467], "467.als"); - else if (objeto_que_lleva == LOOK && fl == 164) + else if (pickedObject == kVerbLook && fl == 164) talk(_text[_lang][470], "470.als"); - else if (objeto_que_lleva == OPEN && fl == 164) + else if (pickedObject == kVerbOpen && fl == 164) talk(_text[_lang][471], "471.als"); - else if (objeto_que_lleva == LOOK && fl == 163) + else if (pickedObject == kVerbLook && fl == 163) talk(_text[_lang][472], "472.als"); - else if (objeto_que_lleva == PICK && fl == 163) + else if (pickedObject == kVerbPick && fl == 163) talk(_text[_lang][473], "473.als"); - else if (objeto_que_lleva == LOOK && fl == 165) + else if (pickedObject == kVerbLook && fl == 165) talk(_text[_lang][474], "474.als"); - else if (objeto_que_lleva == LOOK && fl == 168) + else if (pickedObject == kVerbLook && fl == 168) talk(_text[_lang][476], "476.als"); - else if (objeto_que_lleva == PICK && fl == 168) + else if (pickedObject == kVerbPick && fl == 168) talk(_text[_lang][477], "477.als"); else hay_respuesta = 0; } void DrasculaEngine::room_27(int fl) { - if (objeto_que_lleva == OPEN && fl == 110) + if (pickedObject == kVerbOpen && fl == 110) openDoor(6, 1); - else if (objeto_que_lleva == CLOSE && fl == 110) + else if (pickedObject == kVerbClose && fl == 110) closeDoor(6, 1); - else if (objeto_que_lleva == OPEN && fl == 116 && flags[23] == 0) + else if (pickedObject == kVerbOpen && fl == 116 && flags[23] == 0) talk(_text[_lang][419], "419.als"); - else if (objeto_que_lleva == OPEN && fl == 116 && flags[23] == 1) + else if (pickedObject == kVerbOpen && fl == 116 && flags[23] == 1) openDoor(5, 3); - else if (objeto_que_lleva == 17 && fl == 116) { + else if (pickedObject == 17 && fl == 116) { flags[23] = 1; openDoor(5,3); withoutVerb(); - } else if (objeto_que_lleva == LOOK && fl == 175) + } else if (pickedObject == kVerbLook && fl == 175) talk(_text[_lang][429], "429.als"); else if (fl == 150) talk(_text[_lang][460], "460.als"); @@ -887,34 +887,34 @@ void DrasculaEngine::room_27(int fl) { } void DrasculaEngine::room_29(int fl) { - if (objeto_que_lleva == OPEN && fl == 114) + if (pickedObject == kVerbOpen && fl == 114) openDoor(4, 1); - else if (objeto_que_lleva == CLOSE && fl == 114) + else if (pickedObject == kVerbClose && fl == 114) closeDoor(4, 1); - else if (objeto_que_lleva == LOOK && fl == 152) + else if (pickedObject == kVerbLook && fl == 152) talk(_text[_lang][463], "463.als"); - else if (objeto_que_lleva == OPEN && fl == 152) + else if (pickedObject == kVerbOpen && fl == 152) talk(_text[_lang][464], "464.als"); - else if (objeto_que_lleva == LOOK && fl == 153) + else if (pickedObject == kVerbLook && fl == 153) talk(_text[_lang][465], "465.als"); - else if (objeto_que_lleva == PICK && fl == 154) + else if (pickedObject == kVerbPick && fl == 154) talk(_text[_lang][466], "466.als"); - else if (objeto_que_lleva == OPEN && fl == 156) + else if (pickedObject == kVerbOpen && fl == 156) talk(_text[_lang][467], "467.als"); else hay_respuesta = 0; } void DrasculaEngine::room_30(int fl) { - if (objeto_que_lleva == OPEN && fl == 115) + if (pickedObject == kVerbOpen && fl == 115) openDoor(4, 0); - else if (objeto_que_lleva == CLOSE && fl == 115) + else if (pickedObject == kVerbClose && fl == 115) closeDoor(4, 0); - else if (objeto_que_lleva == OPEN && fl == 144 && flags[19] == 0) + else if (pickedObject == kVerbOpen && fl == 144 && flags[19] == 0) talk(_text[_lang][422], "422.als"); - else if (objeto_que_lleva == OPEN && fl == 144 && flags[19] == 1 && flags[22] == 1) + else if (pickedObject == kVerbOpen && fl == 144 && flags[19] == 1 && flags[22] == 1) openDoor(16, 1); - else if (objeto_que_lleva == OPEN && fl == 144 && flags[19] == 1 && flags[22] == 0) { + else if (pickedObject == kVerbOpen && fl == 144 && flags[19] == 1 && flags[22] == 0) { openDoor(16, 1); talk(_text[_lang][423], "423.als"); flags[22] = 1; @@ -923,59 +923,59 @@ void DrasculaEngine::room_30(int fl) { flags[18] = 1; if (flags[18] == 1) animation_6_4(); - } else if (objeto_que_lleva == CLOSE && fl == 144) + } else if (pickedObject == kVerbClose && fl == 144) closeDoor(16, 1); - else if (objeto_que_lleva == 13 && fl == 144) { + else if (pickedObject == 13 && fl == 144) { talk(_text[_lang][424], "424.als"); flags[19] = 1; - } else if (objeto_que_lleva == OPEN && fl == 157) + } else if (pickedObject == kVerbOpen && fl == 157) talk(_text[_lang][468], "468.als"); - else if (objeto_que_lleva == LOOK && fl == 158) + else if (pickedObject == kVerbLook && fl == 158) talk(_text[_lang][469], "469.als"); else hay_respuesta = 0; } void DrasculaEngine::room_31(int fl) { - if (objeto_que_lleva == PICK && fl == 145) { + if (pickedObject == kVerbPick && fl == 145) { pickObject(11); visible[1] = 0; flags[13] = 1; - } else if (objeto_que_lleva == OPEN && fl == 117) + } else if (pickedObject == kVerbOpen && fl == 117) openDoor(5, 0); - else if (objeto_que_lleva == CLOSE && fl == 117) + else if (pickedObject == kVerbClose && fl == 117) closeDoor(5, 0); - else if (objeto_que_lleva == LOOK && fl == 161) + else if (pickedObject == kVerbLook && fl == 161) talk(_text[_lang][470], "470.als"); - else if (objeto_que_lleva == OPEN && fl == 161) + else if (pickedObject == kVerbOpen && fl == 161) talk(_text[_lang][471], "471.als"); else hay_respuesta = 0; } void DrasculaEngine::room_34(int fl) { - if (objeto_que_lleva == MOVE && fl == 146) + if (pickedObject == kVerbMove && fl == 146) animation_8_4(); - else if (objeto_que_lleva == LOOK && fl == 146) + else if (pickedObject == kVerbLook && fl == 146) talk(_text[_lang][458], "458.als"); - else if (objeto_que_lleva == PICK && fl == 146) + else if (pickedObject == kVerbPick && fl == 146) talk(_text[_lang][459], "459.als"); - else if (objeto_que_lleva == OPEN && fl == 120 && flags[25] == 1) + else if (pickedObject == kVerbOpen && fl == 120 && flags[25] == 1) openDoor(8, 2); - else if (objeto_que_lleva == OPEN && fl == 120 && flags[25] == 0) { + else if (pickedObject == kVerbOpen && fl == 120 && flags[25] == 0) { openDoor(8, 2); sentido_hare = 3; talk(_text[_lang][425], "425.als"); pickObject(14); flags[25] = 1; - } else if (objeto_que_lleva == CLOSE && fl == 120) + } else if (pickedObject == kVerbClose && fl == 120) closeDoor(8, 2); else hay_respuesta=0; } void DrasculaEngine::room_35(int fl) { - if (objeto_que_lleva == PICK && fl == 148) { + if (pickedObject == kVerbPick && fl == 148) { pickObject(16); visible[2] = 0; flags[14] = 1; @@ -983,14 +983,14 @@ void DrasculaEngine::room_35(int fl) { flags[18] = 1; if (flags[18] == 1) animation_6_4(); - } else if (objeto_que_lleva == PICK && fl == 147) { + } else if (pickedObject == kVerbPick && fl == 147) { talk(_text[_lang][426], "426.als"); pickObject(15); visible[1] = 0; flags[15] = 1; flags[17] = 1; updateData(); - } else if (objeto_que_lleva == PICK && fl == 149) { + } else if (pickedObject == kVerbPick && fl == 149) { pickObject(13); visible[3] = 0; flags[17] = 0; @@ -999,54 +999,54 @@ void DrasculaEngine::room_35(int fl) { } void DrasculaEngine::room_44(int fl) { - if (objeto_que_lleva == LOOK && fl == 172) + if (pickedObject == kVerbLook && fl == 172) talk(_text[_lang][428], "428.als"); else hay_respuesta = 0; } void DrasculaEngine::room_49(int fl){ - if (objeto_que_lleva == TALK && fl ==51) + if (pickedObject == kVerbTalk && fl ==51) conversa("op_9.cal"); - else if (objeto_que_lleva == LOOK && fl == 51) + else if (pickedObject == kVerbLook && fl == 51) talk(_text[_lang][132], "132.als"); - else if ((objeto_que_lleva == 8 && fl == 51) || (objeto_que_lleva == 8 && fl == 203)) + else if ((pickedObject == 8 && fl == 51) || (pickedObject == 8 && fl == 203)) animation_5_5(); - else if (objeto_que_lleva == LOOK && fl == 200) + else if (pickedObject == kVerbLook && fl == 200) talk(_text[_lang][133], "133.als"); - else if (objeto_que_lleva == TALK && fl == 200) + else if (pickedObject == kVerbTalk && fl == 200) talk(_text[_lang][134], "134.als"); - else if (objeto_que_lleva == LOOK && fl == 201) + else if (pickedObject == kVerbLook && fl == 201) talk(_text[_lang][135], "135.als"); - else if (objeto_que_lleva == LOOK && fl == 203) + else if (pickedObject == kVerbLook && fl == 203) talk(_text[_lang][137], "137.als"); else hay_respuesta = 0; } void DrasculaEngine::room_53(int fl) { - if (objeto_que_lleva == PICK && fl == 120) { + if (pickedObject == kVerbPick && fl == 120) { pickObject(16); visible[3] = 0; - } else if (objeto_que_lleva == LOOK && fl == 121) + } else if (pickedObject == kVerbLook && fl == 121) talk(_text[_lang][128], "128.als"); - else if (objeto_que_lleva == LOOK && fl == 209) + else if (pickedObject == kVerbLook && fl == 209) talk(_text[_lang][129], "129.als"); - else if (objeto_que_lleva == MOVE && fl == 123) + else if (pickedObject == kVerbMove && fl == 123) animation_11_5(); - else if (objeto_que_lleva == LOOK && fl == 52) + else if (pickedObject == kVerbLook && fl == 52) talk(_text[_lang][447], "447.als"); - else if (objeto_que_lleva == TALK && fl == 52) + else if (pickedObject == kVerbTalk && fl == 52) talk(_text[_lang][131], "131.als"); - else if (objeto_que_lleva == 12 && fl == 52) + else if (pickedObject == 12 && fl == 52) animation_10_5(); - else if (objeto_que_lleva == 15 && fl == 52) + else if (pickedObject == 15 && fl == 52) animation_9_5(); - else if (objeto_que_lleva == 16 && fl == 121) { + else if (pickedObject == 16 && fl == 121) { flags[2] = 1; withoutVerb(); updateData(); - } else if (objeto_que_lleva == 16) { + } else if (pickedObject == 16) { talk(_text[_lang][439], "439.als"); withoutVerb(); visible[3] = 1; @@ -1055,13 +1055,13 @@ void DrasculaEngine::room_53(int fl) { } void DrasculaEngine::room_54(int fl) { - if ((objeto_que_lleva == TALK && fl == 118) || (objeto_que_lleva == LOOK && fl == 118 && flags[0] == 0)) + if ((pickedObject == kVerbTalk && fl == 118) || (pickedObject == kVerbLook && fl == 118 && flags[0] == 0)) animation_1_5(); - else if (objeto_que_lleva == LOOK && fl == 118 && flags[0]==1) + else if (pickedObject == kVerbLook && fl == 118 && flags[0]==1) talk(_text[_lang][124], "124.als"); - else if (objeto_que_lleva == LOOK && fl == 53) + else if (pickedObject == kVerbLook && fl == 53) talk(_text[_lang][127], "127.als"); - else if (objeto_que_lleva == TALK && fl == 53 && flags[14] == 0) { + else if (pickedObject == kVerbTalk && fl == 53 && flags[14] == 0) { talk(_text[_lang][288], "288.als"); flags[12] = 1; pause(10); @@ -1072,18 +1072,18 @@ void DrasculaEngine::room_54(int fl) { conversa("op_10.cal"); flags[12] = 0; flags[14] = 1; - } else if (objeto_que_lleva == TALK && fl == 53 && flags[14] == 1) + } else if (pickedObject == kVerbTalk && fl == 53 && flags[14] == 1) talk(_text[_lang][109], "109.als"); - else if (objeto_que_lleva == PICK && fl == 9999 && flags[13] == 0) { + else if (pickedObject == kVerbPick && fl == 9999 && flags[13] == 0) { pickObject(8); flags[13] = 1; talk_mus(_texte[_lang][10], "e10.als"); updateData(); - } else if (objeto_que_lleva == OPEN && fl == 119) + } else if (pickedObject == kVerbOpen && fl == 119) talk(_text[_lang][125], "125.als"); - else if (objeto_que_lleva == LOOK && fl == 119) + else if (pickedObject == kVerbLook && fl == 119) talk(_text[_lang][126], "126.als"); - else if (objeto_que_lleva == 10 && fl == 119) { + else if (pickedObject == 10 && fl == 119) { pause(4); talk(_text[_lang][436], "436.als"); withoutVerb(); @@ -1093,15 +1093,15 @@ void DrasculaEngine::room_54(int fl) { } void DrasculaEngine::room_55(int fl) { - if (objeto_que_lleva == PICK && fl == 122) { + if (pickedObject == kVerbPick && fl == 122) { pickObject(12); flags[8] = 1; updateData(); - } else if (objeto_que_lleva == LOOK && fl == 122) + } else if (pickedObject == kVerbLook && fl == 122) talk(_text[_lang][138], "138.als"); - else if (objeto_que_lleva == LOOK && fl == 204) + else if (pickedObject == kVerbLook && fl == 204) talk(_text[_lang][139], "139.als"); - else if (objeto_que_lleva == LOOK && fl == 205) + else if (pickedObject == kVerbLook && fl == 205) talk(_text[_lang][140], "140.als"); else if (fl == 206) { playSound("s11.als"); @@ -1113,14 +1113,14 @@ void DrasculaEngine::room_55(int fl) { } bool DrasculaEngine::room_56(int fl) { - if (objeto_que_lleva == OPEN && fl == 124) { + if (pickedObject == kVerbOpen && fl == 124) { animation_14_5(); return true; - } else if (objeto_que_lleva == LOOK && fl == 124) + } else if (pickedObject == kVerbLook && fl == 124) talk(_text[_lang][450], "450.als"); - else if (objeto_que_lleva == OPEN && fl == 207) + else if (pickedObject == kVerbOpen && fl == 207) talk(_text[_lang][141], "141.als"); - else if (objeto_que_lleva == LOOK && fl == 208) + else if (pickedObject == kVerbLook && fl == 208) talk(_text[_lang][142], "142.als"); else hay_respuesta = 0; @@ -1129,16 +1129,16 @@ bool DrasculaEngine::room_56(int fl) { } void DrasculaEngine::room_58(int fl) { - if (objeto_que_lleva == MOVE && fl == 103) + if (pickedObject == kVerbMove && fl == 103) animation_7_6(); - else if (objeto_que_lleva == LOOK && fl == 104) + else if (pickedObject == kVerbLook && fl == 104) talk(_text[_lang][454], "454.als"); else hay_respuesta = 0; } void DrasculaEngine::room_59(int fl) { - if ((objeto_que_lleva == TALK && fl == 51) || (objeto_que_lleva == LOOK && fl == 51)) { + if ((pickedObject == kVerbTalk && fl == 51) || (pickedObject == kVerbLook && fl == 51)) { flags[9] = 1; talk(_text[_lang][259], "259.als"); talk_bj_cama(_textbj[_lang][13], "bj13.als"); @@ -1212,36 +1212,36 @@ void DrasculaEngine::room_59(int fl) { } bool DrasculaEngine::room_60(int fl) { - if (objeto_que_lleva == MOVE && fl == 112) + if (pickedObject == kVerbMove && fl == 112) animation_10_6(); - else if (objeto_que_lleva == LOOK && fl == 112) + else if (pickedObject == kVerbLook && fl == 112) talk(_text[_lang][440], "440.als"); - else if (objeto_que_lleva == TALK && fl == 52) { + else if (pickedObject == kVerbTalk && fl == 52) { talk(_text[_lang][266], "266.als"); talk_taber2(_textt[_lang][1], "t1.als"); conversa("op_12.cal"); withoutVerb(); - objeto_que_lleva = 0; - } else if (objeto_que_lleva == TALK && fl == 115) + pickedObject = 0; + } else if (pickedObject == kVerbTalk && fl == 115) talk(_text[_lang][455], "455.als"); - else if (objeto_que_lleva == TALK && fl == 56) + else if (pickedObject == kVerbTalk && fl == 56) talk(_text[_lang][455], "455.als"); - else if (objeto_que_lleva == LOOK && fl == 114) + else if (pickedObject == kVerbLook && fl == 114) talk(_text[_lang][167], "167.als"); - else if (objeto_que_lleva == LOOK && fl == 113) + else if (pickedObject == kVerbLook && fl == 113) talk(_text[_lang][168], "168.als"); - else if (objeto_que_lleva == PICK && fl == 113) + else if (pickedObject == kVerbPick && fl == 113) talk(_text[_lang][170], "170.als"); - else if (objeto_que_lleva == MOVE && fl == 113) + else if (pickedObject == kVerbMove && fl == 113) talk(_text[_lang][170], "170.als"); - else if (objeto_que_lleva == TALK && fl == 113) + else if (pickedObject == kVerbTalk && fl == 113) talk(_text[_lang][169], "169.als"); - else if (objeto_que_lleva == 21 && fl == 56) + else if (pickedObject == 21 && fl == 56) animation_18_6(); - else if (objeto_que_lleva == 9 && fl == 56 && flags[6] == 1) { + else if (pickedObject == 9 && fl == 56 && flags[6] == 1) { animation_9_6(); return true; - } else if (objeto_que_lleva == 9 && fl == 56 && flags[6] == 0) { + } else if (pickedObject == 9 && fl == 56 && flags[6] == 0) { anima("cnf.bin", 14); talk(_text[_lang][455], "455.als"); } else @@ -1251,67 +1251,67 @@ bool DrasculaEngine::room_60(int fl) { } void DrasculaEngine::room_61(int fl) { - if (objeto_que_lleva == LOOK && fl == 116) + if (pickedObject == kVerbLook && fl == 116) talk(_text[_lang][172], "172.als"); - else if (objeto_que_lleva == LOOK && fl == 117) + else if (pickedObject == kVerbLook && fl == 117) talk(_text[_lang][173], "173.als"); - else if (objeto_que_lleva == MOVE && fl == 117) + else if (pickedObject == kVerbMove && fl == 117) talk(_text[_lang][174], "174.als"); - else if (objeto_que_lleva == OPEN && fl == 117) + else if (pickedObject == kVerbOpen && fl == 117) talk(_text[_lang][174], "174.als"); else hay_respuesta = 0; } void DrasculaEngine::room_62(int fl) { - if (objeto_que_lleva == TALK && fl == 53) + if (pickedObject == kVerbTalk && fl == 53) conversa("op_13.cal"); - else if (objeto_que_lleva == TALK && fl == 52 && flags[0] == 0) + else if (pickedObject == kVerbTalk && fl == 52 && flags[0] == 0) animation_3_1(); - else if (objeto_que_lleva == TALK && fl == 52 && flags[0] == 1) + else if (pickedObject == kVerbTalk && fl == 52 && flags[0] == 1) talk(_text[_lang][109], "109.als"); - else if (objeto_que_lleva == TALK && fl == 54) + else if (pickedObject == kVerbTalk && fl == 54) animation_4_1(); - else if (objeto_que_lleva == LOOK && fl == 100) + else if (pickedObject == kVerbLook && fl == 100) talk(_text[_lang][168], "168.als"); - else if (objeto_que_lleva == TALK && fl == 100) + else if (pickedObject == kVerbTalk && fl == 100) talk(_text[_lang][169], "169.als"); - else if (objeto_que_lleva == PICK && fl == 100) + else if (pickedObject == kVerbPick && fl == 100) talk(_text[_lang][170], "170.als"); - else if (objeto_que_lleva == LOOK && fl == 101) + else if (pickedObject == kVerbLook && fl == 101) talk(_text[_lang][171], "171.als"); - else if (objeto_que_lleva == LOOK && fl == 102) + else if (pickedObject == kVerbLook && fl == 102) talk(_text[_lang][167], "167.als"); - else if (objeto_que_lleva == LOOK && fl == 103) + else if (pickedObject == kVerbLook && fl == 103) talk(_text[_lang][166], "166.als"); else hay_respuesta = 0; } void DrasculaEngine::room_63(int fl) { - if (objeto_que_lleva == LOOK && fl == 110) + if (pickedObject == kVerbLook && fl == 110) talk(_text[_lang][172], "172.als"); - else if (objeto_que_lleva == LOOK && fl == 109) + else if (pickedObject == kVerbLook && fl == 109) talk(_text[_lang][173], "173.als"); - else if (objeto_que_lleva == MOVE && fl == 109) + else if (pickedObject == kVerbMove && fl == 109) talk(_text[_lang][174], "174.als"); - else if (objeto_que_lleva == LOOK && fl == 108) + else if (pickedObject == kVerbLook && fl == 108) talk(_text[_lang][334], "334.als"); - else if (objeto_que_lleva == TALK && fl == 108) + else if (pickedObject == kVerbTalk && fl == 108) talk(_text[_lang][333], "333.als"); else hay_respuesta = 0; } void DrasculaEngine::room_pendulo(int fl) { - if (objeto_que_lleva == LOOK && fl == 100) + if (pickedObject == kVerbLook && fl == 100) talk(_text[_lang][452], "452.als"); - else if (objeto_que_lleva == LOOK && fl == 101) + else if (pickedObject == kVerbLook && fl == 101) talk (_text[_lang][123], "123.als"); - else if (objeto_que_lleva == PICK && fl == 101) + else if (pickedObject == kVerbPick && fl == 101) pickObject(20); - else if (objeto_que_lleva == 20 && fl == 100) + else if (pickedObject == 20 && fl == 100) animation_6_6(); - else if (objeto_que_lleva == PICK || objeto_que_lleva == OPEN) + else if (pickedObject == kVerbPick || pickedObject == kVerbOpen) talk(_text[_lang][453], "453.als"); else hay_respuesta = 0; |