[Scummvm-cvs-logs] scummvm master -> 8ccf02dcaf7ed057d6debfd4c246626155a90a0f

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
8ccf02dcaf LASTEXPRESS: Redo d71b48 and use variable instead of commenting it


Commit: 8ccf02dcaf7ed057d6debfd4c246626155a90a0f
    https://github.com/scummvm/scummvm/commit/8ccf02dcaf7ed057d6debfd4c246626155a90a0f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-10-11T23:16:58-07:00

Commit Message:
LASTEXPRESS: Redo d71b48 and use variable instead of commenting it

Changed paths:
    engines/lastexpress/game/inventory.cpp
    engines/lastexpress/game/inventory.h



diff --git a/engines/lastexpress/game/inventory.cpp b/engines/lastexpress/game/inventory.cpp
index 8edef90..2f1b0a8 100644
--- a/engines/lastexpress/game/inventory.cpp
+++ b/engines/lastexpress/game/inventory.cpp
@@ -44,7 +44,7 @@
 namespace LastExpress {
 
 Inventory::Inventory(LastExpressEngine *engine) : _engine(engine), _selectedItem(kItemNone), _highlightedItemIndex(0), _itemsShown(0),
-	/*_showingHourGlass(false), */ _blinkingDirection(1), _blinkingBrightness(0),
+	_showingHourGlass(false), _blinkingDirection(1), _blinkingBrightness(0),
 	_useMagnifier(false), _portraitHighlighted(false), _isOpened(false), _eggHightlighted(false), _itemScene(NULL) {
 
 	//_inventoryRect = Common::Rect(0, 0, 32, 32);
@@ -52,6 +52,8 @@ Inventory::Inventory(LastExpressEngine *engine) : _engine(engine), _selectedItem
 	_selectedItemRect = Common::Rect(44, 0, 76, 32);
 
 	init();
+
+	debug(9, "_showingHourGlass: %d", _showingHourGlass);
 }
 
 Inventory::~Inventory() {
diff --git a/engines/lastexpress/game/inventory.h b/engines/lastexpress/game/inventory.h
index 9b82ef0..b1019a4 100644
--- a/engines/lastexpress/game/inventory.h
+++ b/engines/lastexpress/game/inventory.h
@@ -140,7 +140,7 @@ private:
 
 	uint32 _itemsShown;
 
-	//bool _showingHourGlass;
+	bool _showingHourGlass;
 	int16  _blinkingDirection;
 	uint16 _blinkingBrightness;