[Scummvm-cvs-logs] SF.net SVN: scummvm: [29916] scummvm/trunk/engines/agi

[fingolfin at users.sourceforge.net]

Revision: 29916
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29916&view=rev
Author:   fingolfin
Date:     2007-12-20 06:26:03 -0800 (Thu, 20 Dec 2007)

Log Message:
-----------
get rid of unused globals

Modified Paths:
--------------
    scummvm/trunk/engines/agi/agi.cpp
    scummvm/trunk/engines/agi/agi.h
    scummvm/trunk/engines/agi/preagi.cpp

Modified: scummvm/trunk/engines/agi/agi.cpp
===================================================================
--- scummvm/trunk/engines/agi/agi.cpp	2007-12-20 13:29:52 UTC (rev 29915)
+++ scummvm/trunk/engines/agi/agi.cpp	2007-12-20 14:26:03 UTC (rev 29916)
@@ -114,20 +114,11 @@
 			g_mouse.y = event.mouse.y;
 			break;
 		case Common::EVENT_KEYDOWN:
-			_keyControl = 0;
-			_keyAlt = 0;
-
 			if (event.kbd.flags == Common::KBD_CTRL && event.kbd.keycode == Common::KEYCODE_d) {
 				_console->attach();
 				break;
 			}
 
-			if (event.kbd.flags & Common::KBD_CTRL)
-				_keyControl = 1;
-
-			if (event.kbd.flags & Common::KBD_ALT)
-				_keyAlt = 1;
-
 			switch (key = event.kbd.keycode) {
 			case Common::KEYCODE_LEFT:
 			case Common::KEYCODE_KP4:
@@ -232,9 +223,9 @@
 					key = event.kbd.ascii;
 					break;
 				}
-				if (_keyControl)
+				if (event.kbd.flags & Common::KBD_CTRL)
 					key = (key & ~0x20) - 0x40;
-				else if (_keyAlt)
+				else if (event.kbd.flags & Common::KBD_ALT)
 					key = scancodeTable[(key & ~0x20) - 0x41] << 8;
 				else if (event.kbd.flags & Common::KBD_SHIFT)
 					key = event.kbd.ascii;
@@ -634,9 +625,6 @@
 	_keyQueueStart = 0;
 	_keyQueueEnd = 0;
 
-	_keyControl = 0;
-	_keyAlt = 0;
-
 	_allowSynthetic = false;
 
 	g_tickTimer = 0;

Modified: scummvm/trunk/engines/agi/agi.h
===================================================================
--- scummvm/trunk/engines/agi/agi.h	2007-12-20 13:29:52 UTC (rev 29915)
+++ scummvm/trunk/engines/agi/agi.h	2007-12-20 14:26:03 UTC (rev 29916)
@@ -755,9 +755,6 @@
 		int16 p4, int16 p5, int16 p6, int16 p7);
 	void releaseImageStack();
 
-	int _keyControl;
-	int _keyAlt;
-
 	Console *_console;
 
 	int agiInit();

Modified: scummvm/trunk/engines/agi/preagi.cpp
===================================================================
--- scummvm/trunk/engines/agi/preagi.cpp	2007-12-20 13:29:52 UTC (rev 29915)
+++ scummvm/trunk/engines/agi/preagi.cpp	2007-12-20 14:26:03 UTC (rev 29916)
@@ -94,9 +94,6 @@
 	_keyQueueStart = 0;
 	_keyQueueEnd = 0;
 
-	_keyControl = 0;
-	_keyAlt = 0;
-
 	_allowSynthetic = false;
 
 	g_tickTimer = 0;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.