aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/items_mr.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'engines/kyra/items_mr.cpp')
-rw-r--r--engines/kyra/items_mr.cpp16
1 files changed, 0 insertions, 16 deletions
diff --git a/engines/kyra/items_mr.cpp b/engines/kyra/items_mr.cpp
index f93ecc8d0c..8c7c25291a 100644
--- a/engines/kyra/items_mr.cpp
+++ b/engines/kyra/items_mr.cpp
@@ -29,7 +29,6 @@
namespace Kyra {
void KyraEngine_MR::removeTrashItems() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::removeTrashItems()");
for (int i = 0; _trashItemList[i] != 0xFF; ++i) {
for (int item = findItem(_trashItemList[i]); item != -1; item = findItem(_trashItemList[i])) {
if (_itemList[item].sceneId != _mainCharacter.sceneId)
@@ -41,7 +40,6 @@ void KyraEngine_MR::removeTrashItems() {
}
int KyraEngine_MR::findFreeInventorySlot() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::findFreeInventorySlot()");
for (int i = 0; i < 10; ++i) {
if (_mainCharacter.inventory[i] == 0xFFFF)
return i;
@@ -50,7 +48,6 @@ int KyraEngine_MR::findFreeInventorySlot() {
}
int KyraEngine_MR::checkItemCollision(int x, int y) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::checkItemCollision(%d, %d)", x, y);
int itemIndex = -1;
int maxItemY = -1;
@@ -80,7 +77,6 @@ int KyraEngine_MR::checkItemCollision(int x, int y) {
}
void KyraEngine_MR::setMouseCursor(uint16 item) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::setMouseCursor(%u)", item);
int shape = 0;
int hotX = 1;
int hotY = 1;
@@ -96,7 +92,6 @@ void KyraEngine_MR::setMouseCursor(uint16 item) {
}
void KyraEngine_MR::setItemMouseCursor() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::setItemMouseCursor()");
_mouseState = _itemInHand;
if (_itemInHand == -1)
_screen->setMouseCursor(0, 0, _gameShapes[0]);
@@ -105,7 +100,6 @@ void KyraEngine_MR::setItemMouseCursor() {
}
bool KyraEngine_MR::dropItem(int unk1, uint16 item, int x, int y, int unk2) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::dropItem(%d, %d, %d, %d, %d)", unk1, item, x, y, unk2);
if (_mouseState <= -1)
return false;
@@ -130,7 +124,6 @@ bool KyraEngine_MR::dropItem(int unk1, uint16 item, int x, int y, int unk2) {
}
bool KyraEngine_MR::processItemDrop(uint16 sceneId, uint16 item, int x, int y, int unk1, int unk2) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::processItemDrop(%d, %d, %d, %d, %d, %d)", sceneId, item, x, y, unk1, unk2);
int itemPos = checkItemCollision(x, y);
@@ -236,7 +229,6 @@ bool KyraEngine_MR::processItemDrop(uint16 sceneId, uint16 item, int x, int y, i
}
void KyraEngine_MR::itemDropDown(int startX, int startY, int dstX, int dstY, int itemSlot, uint16 item, int remove) {
- debugC(9, kDebugLevelMain, "KyraEngine_v2::itemDropDown(%d, %d, %d, %d, %d, %u, %d)", startX, startY, dstX, dstY, itemSlot, item, remove);
if (startX == dstX && startY == dstY) {
_itemList[itemSlot].x = dstX;
_itemList[itemSlot].y = dstY;
@@ -321,7 +313,6 @@ void KyraEngine_MR::itemDropDown(int startX, int startY, int dstX, int dstY, int
}
void KyraEngine_MR::exchangeMouseItem(int itemPos, int runScript) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::exchangeMouseItem(%d, %d)", itemPos, runScript);
if (itemListMagic(_itemInHand, itemPos))
return;
@@ -354,7 +345,6 @@ void KyraEngine_MR::exchangeMouseItem(int itemPos, int runScript) {
}
bool KyraEngine_MR::pickUpItem(int x, int y, int runScript) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::pickUpItem(%d, %d, %d)", x, y, runScript);
int itemPos = checkItemCollision(x, y);
if (itemPos <= -1)
@@ -386,7 +376,6 @@ bool KyraEngine_MR::pickUpItem(int x, int y, int runScript) {
}
bool KyraEngine_MR::isDropable(int x, int y) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::isDropable(%d, %d)", x, y);
if (y < 14 || y > 187)
return false;
@@ -401,7 +390,6 @@ bool KyraEngine_MR::isDropable(int x, int y) {
}
bool KyraEngine_MR::itemListMagic(int handItem, int itemSlot) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::itemListMagic(%d, %d)", handItem, itemSlot);
uint16 item = _itemList[itemSlot].id;
if (_currentChapter == 1 && handItem == 3 && item == 3 && queryGameFlag(0x76)) {
@@ -481,7 +469,6 @@ bool KyraEngine_MR::itemListMagic(int handItem, int itemSlot) {
}
bool KyraEngine_MR::itemInventoryMagic(int handItem, int invSlot) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::itemInventoryMagic(%d, %d)", handItem, invSlot);
uint16 item = _mainCharacter.inventory[invSlot];
if (_currentChapter == 1 && handItem == 3 && item == 3 && queryGameFlag(0x76)) {
@@ -542,21 +529,18 @@ bool KyraEngine_MR::itemInventoryMagic(int handItem, int invSlot) {
}
int KyraEngine_MR::getItemCommandStringDrop(uint16 item) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::getItemCommandStringDrop(%u)", item);
assert(item < _itemStringMapSize);
int stringId = _itemStringMap[item];
return _itemStringDrop[stringId];
}
int KyraEngine_MR::getItemCommandStringPickUp(uint16 item) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::getItemCommandStringPickUp(%u)", item);
assert(item < _itemStringMapSize);
int stringId = _itemStringMap[item];
return _itemStringPickUp[stringId];
}
int KyraEngine_MR::getItemCommandStringInv(uint16 item) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::getItemCommandStringInv(%u)", item);
assert(item < _itemStringMapSize);
int stringId = _itemStringMap[item];
return _itemStringInv[stringId];