[Scummvm-cvs-logs] scummvm master -> 2a064a97254f1374da256d0a0c8ca4f46e96d599

[fuzzie]

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:
2a064a9725 MOHAWK: Rename variable to fix WinCE build.


Commit: 2a064a97254f1374da256d0a0c8ca4f46e96d599
    https://github.com/scummvm/scummvm/commit/2a064a97254f1374da256d0a0c8ca4f46e96d599
Author: Alyssa Milburn (fuzzie at fuzzie.org)
Date: 2011-03-08T06:45:52-08:00

Commit Message:
MOHAWK: Rename variable to fix WinCE build.

Thanks to LordHoto for working out why this was failing.

Changed paths:
    engines/mohawk/cstime_game.cpp



diff --git a/engines/mohawk/cstime_game.cpp b/engines/mohawk/cstime_game.cpp
index 5dfc9c4..14e5d99 100644
--- a/engines/mohawk/cstime_game.cpp
+++ b/engines/mohawk/cstime_game.cpp
@@ -470,8 +470,8 @@ void CSTimeConversation::end(bool useLastClicked, bool runEvents) {
 			_vm->getCase()->getCurrScene()->getChar(_sourceChar)->setupAmbientAnims(true);
 	}
 
-	CSTimeInterface *interface = _vm->getInterface();
-	CSTimeInventoryDisplay *invDisplay = interface->getInventoryDisplay();
+	CSTimeInterface *iface = _vm->getInterface();
+	CSTimeInventoryDisplay *invDisplay = iface->getInventoryDisplay();
 	if (invDisplay->getState() == 4) {
 		invDisplay->hide();
 		invDisplay->setState(0);
@@ -480,8 +480,8 @@ void CSTimeConversation::end(bool useLastClicked, bool runEvents) {
 	setState((uint)~0);
 	_currHover = 0xffff;
 
-	interface->clearTextLine();
-	interface->clearDialogArea();
+	iface->clearTextLine();
+	iface->clearDialogArea();
 	invDisplay->show();
 
 	// TODO: stupid case 20 stuff