aboutsummaryrefslogtreecommitdiff
path: root/engines/mads/inventory.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2014-03-27 21:04:27 -0400
committerPaul Gilbert2014-03-27 21:04:27 -0400
commit377cbbe77d5c7f16aba086e4fb1707de843ddc1a (patch)
tree3a4d2e0e2df86cc4eef9f1373b27c17363984c81 /engines/mads/inventory.cpp
parent103e87b4049f05a5f7901110c9a685a435f60c2b (diff)
downloadscummvm-rg350-377cbbe77d5c7f16aba086e4fb1707de843ddc1a.tar.gz
scummvm-rg350-377cbbe77d5c7f16aba086e4fb1707de843ddc1a.tar.bz2
scummvm-rg350-377cbbe77d5c7f16aba086e4fb1707de843ddc1a.zip
MADS: Cleanup of game and player fields used during initialization
Diffstat (limited to 'engines/mads/inventory.cpp')
-rw-r--r--engines/mads/inventory.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/mads/inventory.cpp b/engines/mads/inventory.cpp
index 3237d55b77..a8e50e6ae1 100644
--- a/engines/mads/inventory.cpp
+++ b/engines/mads/inventory.cpp
@@ -116,7 +116,7 @@ void InventoryObjects::addToInventory(int objectId) {
(*this)[objectId]._roomNumber = PLAYER_INVENTORY;
- if (_vm->_game->_v1 == 5 && !_vm->_game->_screenObjects._v832EC) {
+ if (_vm->_game->_kernelMode == KERNEL_ACTIVE_CODE && !_vm->_game->_screenObjects._v832EC) {
userInterface.categoryChanged();
userInterface.selectObject(userInterface._selectedInvIndex);
}
@@ -137,7 +137,7 @@ void InventoryObjects::removeFromInventory(int objectId, int newScene) {
int selectedIndex = userInterface._selectedInvIndex;
bool noSelection = selectedIndex < 0;
- if (_vm->_game->_v1 == 5 && !_vm->_game->_screenObjects._v832EC)
+ if (_vm->_game->_kernelMode == KERNEL_ACTIVE_CODE && !_vm->_game->_screenObjects._v832EC)
userInterface.selectObject(-1);
// Remove the item from the inventory list
@@ -158,7 +158,7 @@ void InventoryObjects::removeFromInventory(int objectId, int newScene) {
newIndex = 0;
}
- if (_vm->_game->_v1 == 5 && !_vm->_game->_screenObjects._v832EC) {
+ if (_vm->_game->_kernelMode == KERNEL_ACTIVE_CODE && !_vm->_game->_screenObjects._v832EC) {
userInterface.categoryChanged();
userInterface.selectObject(newIndex);
}