[Scummvm-cvs-logs] SF.net SVN: scummvm:[40476] scummvm/trunk/engines/drascula
sev at users.sourceforge.net
sev at users.sourceforge.net
Tue May 12 12:02:18 CEST 2009
Revision: 40476
http://scummvm.svn.sourceforge.net/scummvm/?rev=40476&view=rev
Author: sev
Date: 2009-05-12 10:02:18 +0000 (Tue, 12 May 2009)
Log Message:
-----------
Replace verb numbers with constants in selectVerb() call
Modified Paths:
--------------
scummvm/trunk/engines/drascula/animation.cpp
scummvm/trunk/engines/drascula/converse.cpp
scummvm/trunk/engines/drascula/drascula.cpp
scummvm/trunk/engines/drascula/drascula.h
scummvm/trunk/engines/drascula/interface.cpp
scummvm/trunk/engines/drascula/objects.cpp
scummvm/trunk/engines/drascula/rooms.cpp
scummvm/trunk/engines/drascula/saveload.cpp
scummvm/trunk/engines/drascula/sound.cpp
Modified: scummvm/trunk/engines/drascula/animation.cpp
===================================================================
--- scummvm/trunk/engines/drascula/animation.cpp 2009-05-12 08:27:06 UTC (rev 40475)
+++ scummvm/trunk/engines/drascula/animation.cpp 2009-05-12 10:02:18 UTC (rev 40476)
@@ -697,7 +697,7 @@
loadPic(96, frontSurface);
loadPic(97, extraSurface);
loadPic(99, backSurface);
- selectVerb(0);
+ selectVerb(kVerbNone);
flags[9] = 0;
flags[4] = 1;
@@ -969,7 +969,7 @@
void DrasculaEngine::animation_27_2() {
flags[22] = 1;
- selectVerb(0);
+ selectVerb(kVerbNone);
removeObject(kItemEarWithEarPlug);
addObject(kItemEarplugs);
@@ -1010,7 +1010,7 @@
playTalkSequence(31); // sequence 31, chapter 2
- selectVerb(0);
+ selectVerb(kVerbNone);
removeObject(kItemLeaves);
removeObject(kItemBubbleGum);
removeObject(kItemTissues);
@@ -1231,7 +1231,7 @@
int flyX[] = {1, 63, 125, 187, 249};
int pixelX = curX - 53, pixelY = curY - 9;
- selectVerb(0);
+ selectVerb(kVerbNone);
removeObject(8);
gotoObject(curX - 19, curY + curHeight);
@@ -1410,7 +1410,7 @@
characterMoved = 0;
curX = -1;
objExit = 104;
- selectVerb(0);
+ selectVerb(kVerbNone);
enterRoom(57);
}
@@ -1562,7 +1562,7 @@
void DrasculaEngine::animation_6_6() {
animate("rct.bin", 11);
clearRoom();
- selectVerb(0);
+ selectVerb(kVerbNone);
removeObject(20);
loadPic(96, frontSurface);
loadPic(97, frontSurface);
@@ -1571,7 +1571,7 @@
doBreak = 1;
objExit = 104;
curX = -1;
- selectVerb(0);
+ selectVerb(kVerbNone);
enterRoom(58);
hare_se_ve = 1;
trackProtagonist = 1;
@@ -1960,7 +1960,7 @@
flags[8] = 1;
curX = curX - 4;
talk_sync(_text[46], "46.als", "4442444244244");
- selectVerb(0);
+ selectVerb(kVerbNone);
}
void DrasculaEngine::animation_6_2() {
@@ -1999,7 +1999,7 @@
loadPic(96, frontSurface);
loadPic(97, extraSurface);
loadPic(99, backSurface);
- selectVerb(0);
+ selectVerb(kVerbNone);
flags[9] = 0;
}
@@ -2045,7 +2045,7 @@
loadPic(96, frontSurface);
loadPic(97, extraSurface);
loadPic(99, backSurface);
- selectVerb(0);
+ selectVerb(kVerbNone);
flags[33] = 1;
flags[9] = 0;
@@ -2156,7 +2156,7 @@
loadPic(96, frontSurface);
loadPic(roomDisk, drawSurface3);
loadPic(roomNumber, bgSurface, HALF_PAL);
- selectVerb(0);
+ selectVerb(kVerbNone);
updateRoom();
}
Modified: scummvm/trunk/engines/drascula/converse.cpp
===================================================================
--- scummvm/trunk/engines/drascula/converse.cpp 2009-05-12 08:27:06 UTC (rev 40475)
+++ scummvm/trunk/engines/drascula/converse.cpp 2009-05-12 10:02:18 UTC (rev 40476)
@@ -148,7 +148,7 @@
breakOut = 0;
- selectVerb(0);
+ selectVerb(kVerbNone);
getStringFromLine(buffer, size, phrase1);
getStringFromLine(buffer, size, phrase2);
Modified: scummvm/trunk/engines/drascula/drascula.cpp
===================================================================
--- scummvm/trunk/engines/drascula/drascula.cpp 2009-05-12 08:27:06 UTC (rev 40475)
+++ scummvm/trunk/engines/drascula/drascula.cpp 2009-05-12 10:02:18 UTC (rev 40476)
@@ -318,7 +318,7 @@
if (loadedDifferentChapter == 0)
animation_1_1();
- selectVerb(0);
+ selectVerb(kVerbNone);
loadPic("2aux62.alg", drawSurface2);
trackProtagonist = 1;
objExit = 104;
@@ -517,7 +517,7 @@
#ifndef _WIN32_WCE
updateEvents();
#endif
- selectVerb(0);
+ selectVerb(kVerbNone);
}
if (leftMouseButton == 1 && menuBar == 1) {
@@ -536,24 +536,24 @@
Common::KeyCode key = getScan();
if (key == Common::KEYCODE_F1 && menuScreen == 0) {
- selectVerb(1);
+ selectVerb(kVerbLook);
} else if (key == Common::KEYCODE_F2 && menuScreen == 0) {
- selectVerb(2);
+ selectVerb(kVerbPick);
} else if (key == Common::KEYCODE_F3 && menuScreen == 0) {
- selectVerb(3);
+ selectVerb(kVerbOpen);
} else if (key == Common::KEYCODE_F4 && menuScreen == 0) {
- selectVerb(4);
+ selectVerb(kVerbClose);
} else if (key == Common::KEYCODE_F5 && menuScreen == 0) {
- selectVerb(5);
+ selectVerb(kVerbTalk);
} else if (key == Common::KEYCODE_F6 && menuScreen == 0) {
- selectVerb(6);
+ selectVerb(kVerbMove);
} else if (key == Common::KEYCODE_F9) {
volumeControls();
} else if (key == Common::KEYCODE_F10) {
if (!saveLoadScreen())
return true;
} else if (key == Common::KEYCODE_F8) {
- selectVerb(0);
+ selectVerb(kVerbNone);
} else if (key == Common::KEYCODE_v) {
_subtitlesDisabled = true;
ConfMan.setBool("subtitles", !_subtitlesDisabled);
Modified: scummvm/trunk/engines/drascula/drascula.h
===================================================================
--- scummvm/trunk/engines/drascula/drascula.h 2009-05-12 08:27:06 UTC (rev 40475)
+++ scummvm/trunk/engines/drascula/drascula.h 2009-05-12 10:02:18 UTC (rev 40476)
@@ -60,6 +60,7 @@
enum Verbs {
kVerbDefault = -1,
+ kVerbNone = 0,
kVerbLook = 1,
kVerbPick = 2,
kVerbOpen = 3,
Modified: scummvm/trunk/engines/drascula/interface.cpp
===================================================================
--- scummvm/trunk/engines/drascula/interface.cpp 2009-05-12 08:27:06 UTC (rev 40475)
+++ scummvm/trunk/engines/drascula/interface.cpp 2009-05-12 10:02:18 UTC (rev 40476)
@@ -61,7 +61,7 @@
}
// no verb selected
- selectVerb(0);
+ selectVerb(kVerbNone);
}
void DrasculaEngine::selectVerb(int verb) {
Modified: scummvm/trunk/engines/drascula/objects.cpp
===================================================================
--- scummvm/trunk/engines/drascula/objects.cpp 2009-05-12 08:27:06 UTC (rev 40475)
+++ scummvm/trunk/engines/drascula/objects.cpp 2009-05-12 10:02:18 UTC (rev 40476)
@@ -178,7 +178,7 @@
}
updateEvents();
if (takeObject == 0)
- selectVerb(0);
+ selectVerb(kVerbNone);
return false;
}
Modified: scummvm/trunk/engines/drascula/rooms.cpp
===================================================================
--- scummvm/trunk/engines/drascula/rooms.cpp 2009-05-12 08:27:06 UTC (rev 40475)
+++ scummvm/trunk/engines/drascula/rooms.cpp 2009-05-12 10:02:18 UTC (rev 40476)
@@ -572,7 +572,7 @@
} else if (pickedObject == 7 && fl == 101) {
flags[28] = 1;
toggleDoor(0, 1, kOpenDoor);
- selectVerb(0);
+ selectVerb(kVerbNone);
} else if (pickedObject == 21 && fl == 179) {
animate("st.bin", 14);
fadeToBlack(1);
@@ -594,7 +594,7 @@
playSound(1);
hiccup(14);
finishSound();
- selectVerb(0);
+ selectVerb(kVerbNone);
removeObject(22);
updateVisible();
trackProtagonist = 3;
@@ -705,7 +705,7 @@
else if (pickedObject == 17 && fl == 116) {
flags[23] = 1;
toggleDoor(5, 3, kOpenDoor);
- selectVerb(0);
+ selectVerb(kVerbNone);
} else if (fl == 150)
talk(460);
else
@@ -834,16 +834,16 @@
} else if (pickedObject == 12 && fl == 52) {
flags[3] = 1;
talk(401);
- selectVerb(0);
+ selectVerb(kVerbNone);
removeObject(12);
} else if (pickedObject == 15 && fl == 52) {
flags[4] = 1;
talk(401);
- selectVerb(0);
+ selectVerb(kVerbNone);
removeObject(15);
} else if (pickedObject == 16 && fl == 121) {
flags[2] = 1;
- selectVerb(0);
+ selectVerb(kVerbNone);
updateVisible();
pickedObject = kVerbMove;
} else if (pickedObject == 16) {
@@ -882,7 +882,7 @@
} else if (pickedObject == 10 && fl == 119) {
pause(4);
talk(436);
- selectVerb(0);
+ selectVerb(kVerbNone);
removeObject(10);
} else
hasAnswer = 0;
@@ -986,7 +986,7 @@
loadPic(59, bgSurface, HALF_PAL);
trackProtagonist = 3;
talk(245);
- selectVerb(0);
+ selectVerb(kVerbNone);
flags[11] = 1;
}
} else
@@ -1009,11 +1009,11 @@
talk(266);
talk_bartender(1, 1);
converse(12);
- selectVerb(0);
+ selectVerb(kVerbNone);
pickedObject = 0;
} else if (pickedObject == 21 && fl == 56) {
flags[6] = 1;
- selectVerb(0);
+ selectVerb(kVerbNone);
removeObject(21);
animate("beb.bin", 10);
} else if (pickedObject == 9 && fl == 56 && flags[6] == 1) {
@@ -1514,7 +1514,7 @@
|| (pickedObject == kVerbOpen && fl == 22 && flags[23] == 0)) {
talk(164);
flags[23] = 1;
- selectVerb(0);
+ selectVerb(kVerbNone);
addObject(kItemMoney);
addObject(kItemTwoCoins);
} else if (pickedObject == kVerbLook && fl == 22 && flags[23] == 1)
@@ -1525,7 +1525,7 @@
hasAnswer = 0;
} else if (currentChapter == 4) {
if ((pickedObject == 18 && fl == 19) || (pickedObject == 19 && fl == 18)) {
- selectVerb(0);
+ selectVerb(kVerbNone);
chooseObject(21);
removeObject(18);
removeObject(19);
@@ -2004,7 +2004,7 @@
updateRoom();
updateScreen();
finishSound();
- selectVerb(0);
+ selectVerb(kVerbNone);
}
}
Modified: scummvm/trunk/engines/drascula/saveload.cpp
===================================================================
--- scummvm/trunk/engines/drascula/saveload.cpp 2009-05-12 08:27:06 UTC (rev 40475)
+++ scummvm/trunk/engines/drascula/saveload.cpp 2009-05-12 10:02:18 UTC (rev 40476)
@@ -174,7 +174,7 @@
delay(5);
}
- selectVerb(0);
+ selectVerb(kVerbNone);
clearRoom();
loadPic(roomNumber, bgSurface, HALF_PAL);
@@ -223,7 +223,7 @@
loadedDifferentChapter = 0;
sscanf(currentData, "%d.ald", &roomNum);
enterRoom(roomNum);
- selectVerb(0);
+ selectVerb(kVerbNone);
return true;
}
Modified: scummvm/trunk/engines/drascula/sound.cpp
===================================================================
--- scummvm/trunk/engines/drascula/sound.cpp 2009-05-12 08:27:06 UTC (rev 40475)
+++ scummvm/trunk/engines/drascula/sound.cpp 2009-05-12 10:02:18 UTC (rev 40476)
@@ -100,7 +100,7 @@
if (_lang == kSpanish)
loadPic(974, tableSurface);
- selectVerb(0);
+ selectVerb(kVerbNone);
updateEvents();
}
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