aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/pet_control/pet_inventory_glyphs.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'engines/titanic/pet_control/pet_inventory_glyphs.cpp')
-rw-r--r--engines/titanic/pet_control/pet_inventory_glyphs.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/engines/titanic/pet_control/pet_inventory_glyphs.cpp b/engines/titanic/pet_control/pet_inventory_glyphs.cpp
index 783a8a9717..38974547f5 100644
--- a/engines/titanic/pet_control/pet_inventory_glyphs.cpp
+++ b/engines/titanic/pet_control/pet_inventory_glyphs.cpp
@@ -198,17 +198,17 @@ bool CPetInventoryGlyph::doAction(CGlyphAction *action) {
return true;
}
-void CPetInventoryGlyph::setItem(CGameObject *item, int val) {
+void CPetInventoryGlyph::setItem(CGameObject *item, bool isLoading) {
_item = item;
if (_owner && item) {
- int v1 = populateItem(item, val);
+ int v1 = populateItem(item, isLoading);
_background = dynamic_cast<CPetInventoryGlyphs *>(_owner)->getBackground(v1);
_image = dynamic_cast<CPetInventory *>(getPetSection())->getImage(v1);
}
}
-int CPetInventoryGlyph::populateItem(CGameObject *item, int val) {
+int CPetInventoryGlyph::populateItem(CGameObject *item, bool isLoading) {
// Scan the master item names list
CString itemName = item->getName();
int itemIndex = -1;
@@ -221,7 +221,7 @@ int CPetInventoryGlyph::populateItem(CGameObject *item, int val) {
switch (ITEM_MODES[itemIndex]) {
case 0:
- switch (subMode(item, val)) {
+ switch (subMode(item, isLoading)) {
case 0:
case 1:
return 0;
@@ -233,7 +233,7 @@ int CPetInventoryGlyph::populateItem(CGameObject *item, int val) {
}
case 2:
- switch (subMode(item, val)) {
+ switch (subMode(item, isLoading)) {
case 0:
return 2;
default:
@@ -242,7 +242,7 @@ int CPetInventoryGlyph::populateItem(CGameObject *item, int val) {
break;
case 15:
- switch (subMode(item, val)) {
+ switch (subMode(item, isLoading)) {
case 0:
case 1:
return 14;
@@ -260,7 +260,7 @@ int CPetInventoryGlyph::populateItem(CGameObject *item, int val) {
break;
case 26:
- switch (subMode(item, val)) {
+ switch (subMode(item, isLoading)) {
case 0:
return 26;
case 1:
@@ -281,11 +281,11 @@ int CPetInventoryGlyph::populateItem(CGameObject *item, int val) {
return ITEM_MODES[itemIndex];
}
-int CPetInventoryGlyph::subMode(CGameObject *item, int val) {
+int CPetInventoryGlyph::subMode(CGameObject *item, bool isLoading) {
int frameNum = item->getFrameNumber();
int movieFrame = item->getMovieFrame();
- if (val && frameNum != -1 && frameNum != movieFrame)
+ if (isLoading && frameNum != -1 && frameNum != movieFrame)
item->loadFrame(frameNum);
return frameNum;