[Scummvm-cvs-logs] SF.net SVN: scummvm: [32556] scummvm/trunk/engines/drascula
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Thu Jun 5 17:03:48 CEST 2008
Revision: 32556
http://scummvm.svn.sourceforge.net/scummvm/?rev=32556&view=rev
Author: thebluegr
Date: 2008-06-05 08:03:48 -0700 (Thu, 05 Jun 2008)
Log Message:
-----------
Added enums for all items up to chapter 3 and some of chapter 4
Modified Paths:
--------------
scummvm/trunk/engines/drascula/animation.cpp
scummvm/trunk/engines/drascula/drascula.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-06-05 14:02:49 UTC (rev 32555)
+++ scummvm/trunk/engines/drascula/animation.cpp 2008-06-05 15:03:48 UTC (rev 32556)
@@ -1089,11 +1089,11 @@
talk_vb(19);
if (flags[25] == 0) {
talk_vb(20);
- if (removeObject(7) == 0)
+ if (removeObject(kItemMoney) == 0)
flags[30] = 1;
- if (removeObject(18) == 0)
+ if (removeObject(kItemTwoCoins) == 0)
flags[31] = 1;
- if (removeObject(19) == 0)
+ if (removeObject(kItemOneCoin) == 0)
flags[32] = 1;
}
talk_vb(21);
@@ -1185,17 +1185,17 @@
flags[22] = 1;
withoutVerb();
- removeObject(23);
- addObject(11);
+ removeObject(kItemEarWithEarPlug);
+ addObject(kItemEarplugs);
talk_vb(23);
talk_vb(24);
if (flags[30] == 1)
- addObject(7);
+ addObject(kItemMoney);
if (flags[31] == 1)
- addObject(18);
+ addObject(kItemTwoCoins);
if (flags[32] == 1)
- addObject(19);
+ addObject(kItemOneCoin);
talk_vb(25);
talk_vb(26);
}
@@ -1280,12 +1280,12 @@
flags[38] = 0;
flags[36] = 1;
withoutVerb();
- removeObject(8);
- removeObject(13);
- removeObject(15);
- removeObject(16);
- removeObject(17);
- addObject(20);
+ removeObject(kItemLeaves);
+ removeObject(kItemBubbleGum);
+ removeObject(kItemTissues);
+ removeObject(kItemCigarettes);
+ removeObject(kItemCandle);
+ addObject(kItemReefer);
}
void DrasculaEngine::animation_35_2() {
@@ -2234,7 +2234,7 @@
updateAnim(121, 225, 113, 50, 59, 6, extraSurface);
pickObject(11);
- removeObject(12);
+ removeObject(kItemBook);
if (_lang == kSpanish)
textSurface = extraSurface;
Modified: scummvm/trunk/engines/drascula/drascula.cpp
===================================================================
--- scummvm/trunk/engines/drascula/drascula.cpp 2008-06-05 14:02:49 UTC (rev 32555)
+++ scummvm/trunk/engines/drascula/drascula.cpp 2008-06-05 15:03:48 UTC (rev 32556)
@@ -453,7 +453,7 @@
gotoObject(65, 145);
}
} else if (currentChapter == 2) {
- addObject(28);
+ addObject(kItemPhone);
trackProtagonist = 3;
objExit = 162;
if (hay_que_load == 0)
@@ -464,13 +464,13 @@
}
}
} else if (currentChapter == 3) {
- addObject(28);
- addObject(11);
- addObject(14);
- addObject(22);
- addObject(9);
- addObject(20);
- addObject(19);
+ addObject(kItemPhone);
+ addObject(kItemEarplugs);
+ addObject(kItemSickle);
+ addObject(kItemHandbag);
+ addObject(kItemCross);
+ addObject(kItemReefer);
+ addObject(kItemOneCoin);
flags[1] = 1;
trackProtagonist = 1;
objExit = 99;
@@ -481,11 +481,12 @@
return true;
}
}
+ // From here onwards the items have different IDs
} else if (currentChapter == 4) {
- addObject(28);
- addObject(9);
- addObject(20);
- addObject(22);
+ addObject(kItemPhone2);
+ addObject(kItemCross2);
+ addObject(kItemReefer2);
+ addObject(kItemOneCoin2);
objExit = 100;
if (hay_que_load == 0) {
enterRoom(21);
@@ -718,11 +719,11 @@
pickedObject = objeto;
}
-int DrasculaEngine::removeObject(int osj) {
+int DrasculaEngine::removeObject(int obj) {
int result = 1;
for (int h = 1; h < 43; h++) {
- if (inventoryObjects[h] == osj) {
+ if (inventoryObjects[h] == obj) {
inventoryObjects[h] = 0;
result = 0;
break;
@@ -2345,10 +2346,10 @@
void DrasculaEngine::showMenu() {
int h, n, x;
- char texto_icono[13];
+ char textIcon[13];
x = whichObject();
- strcpy(texto_icono, iconName[x]);
+ strcpy(textIcon, iconName[x]);
for (n = 1; n < 43; n++) {
h = inventoryObjects[n];
@@ -2366,18 +2367,18 @@
}
if (x < 7)
- print_abc(texto_icono, itemLocations[x].x - 2, itemLocations[x].y - 7);
+ print_abc(textIcon, itemLocations[x].x - 2, itemLocations[x].y - 7);
}
void DrasculaEngine::clearMenu() {
- int n, sobre_verbo = 1;
+ int n, verbActivated = 1;
for (n = 0; n < 7; n++) {
if (mouseX > verbBarX[n] && mouseX < verbBarX[n + 1])
- sobre_verbo = 0;
- copyRect(OBJWIDTH * n, OBJHEIGHT * sobre_verbo, verbBarX[n], 2,
+ verbActivated = 0;
+ copyRect(OBJWIDTH * n, OBJHEIGHT * verbActivated, verbBarX[n], 2,
OBJWIDTH, OBJHEIGHT, backSurface, screenSurface);
- sobre_verbo = 1;
+ verbActivated = 1;
}
}
@@ -2454,8 +2455,8 @@
}
if (objectNum[l] == 176 && flags[29] == 1) {
flags[29] = 0;
- removeObject(23);
- addObject(11);
+ removeObject(kItemEarWithEarPlug);
+ addObject(kItemEarplugs);
}
clearRoom();
sscanf(_targetSurface[l], "%d", &roomNum);
@@ -3302,18 +3303,18 @@
}
}
-void DrasculaEngine::addObject(int osj) {
+void DrasculaEngine::addObject(int obj) {
int h, position = 0;
for (h = 1; h < 43; h++) {
- if (inventoryObjects[h] == osj)
+ if (inventoryObjects[h] == obj)
position = 1;
}
if (position == 0) {
for (h = 1; h < 43; h++) {
if (inventoryObjects[h] == 0) {
- inventoryObjects[h] = osj;
+ inventoryObjects[h] = obj;
position = 1;
break;
}
Modified: scummvm/trunk/engines/drascula/drascula.h
===================================================================
--- scummvm/trunk/engines/drascula/drascula.h 2008-06-05 14:02:49 UTC (rev 32555)
+++ scummvm/trunk/engines/drascula/drascula.h 2008-06-05 15:03:48 UTC (rev 32556)
@@ -68,6 +68,38 @@
kVerbMove = 6
};
+// Items up to chapter 3
+enum InventoryItems {
+ kItemMoney = 7,
+ kItemLeaves = 8,
+ kItemCross = 9,
+ kItemSpike = 10,
+ kItemEarplugs = 11,
+ kItemBook = 12,
+ kItemBubbleGum = 13,
+ kItemSickle = 14,
+ kItemTissues = 15,
+ kItemCigarettes = 16,
+ kItemCandle = 17,
+ kItemTwoCoins = 18,
+ kItemOneCoin = 19,
+ kItemReefer = 20,
+ kItemKey = 21,
+ kItemHandbag = 22,
+ kItemEarWithEarPlug = 23,
+ kItemPhone = 28
+};
+
+// Items from chapter 4 onwards
+enum InventoryItems2 {
+ kItemKey2 = 7,
+ kItemCross2 = 9,
+ kItemRope2 = 19,
+ kItemReefer2 = 20,
+ kItemOneCoin2 = 22,
+ kItemPhone2 = 28
+};
+
enum Colors {
kColorBrown = 1,
kColorDarkBlue = 2,
Modified: scummvm/trunk/engines/drascula/rooms.cpp
===================================================================
--- scummvm/trunk/engines/drascula/rooms.cpp 2008-06-05 14:02:49 UTC (rev 32555)
+++ scummvm/trunk/engines/drascula/rooms.cpp 2008-06-05 15:03:48 UTC (rev 32556)
@@ -269,7 +269,7 @@
talk(14);
else if (pickedObject == 10 && fl == 136) {
animation_5_2();
- removeObject(10);
+ removeObject(kItemSpike);
} else
hasAnswer = 0;
}
@@ -374,7 +374,7 @@
animation_33_2();
else if (pickedObject == 7 && fl == 51) {
animation_6_2();
- removeObject(7);
+ removeObject(kItemMoney);
pickObject(14);}
else
hasAnswer = 0;
@@ -451,7 +451,7 @@
talk(338);
flags[27] = 0;
pickObject(19);
- removeObject(18);
+ removeObject(kItemTwoCoins);
} else if (pickedObject == kVerbMove && fl == 188 && flags[27] == 0) {
animation_34_2();
talk(339);
@@ -519,7 +519,7 @@
talk(347);
flags[29] = 1;
pickObject(23);
- removeObject(11);
+ removeObject(kItemEarplugs);
} else
hasAnswer = 0;
}
@@ -564,7 +564,7 @@
talk(347);
flags[29] = 1;
pickObject(23);
- removeObject(11);
+ removeObject(kItemEarplugs);
} else
hasAnswer = 0;
}
@@ -1728,8 +1728,8 @@
talk(164);
flags[23] = 1;
withoutVerb();
- addObject(7);
- addObject(18);
+ addObject(kItemMoney);
+ addObject(kItemTwoCoins);
} else if (pickedObject == kVerbLook && fl == 22 && flags[23] == 1)
talk(307);
else if (pickedObject == kVerbLook && fl == 28)
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