[Scummvm-cvs-logs] SF.net SVN: scummvm:[49963] scummvm/trunk/engines/sci

[fingolfin at users.sourceforge.net]

Revision: 49963
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49963&view=rev
Author:   fingolfin
Date:     2010-06-17 23:12:17 +0000 (Thu, 17 Jun 2010)

Log Message:
-----------
SCI: Turn _modifierStates into member of class EventManager

Modified Paths:
--------------
    scummvm/trunk/engines/sci/event.cpp
    scummvm/trunk/engines/sci/event.h

Modified: scummvm/trunk/engines/sci/event.cpp
===================================================================
--- scummvm/trunk/engines/sci/event.cpp	2010-06-17 23:11:56 UTC (rev 49962)
+++ scummvm/trunk/engines/sci/event.cpp	2010-06-17 23:12:17 UTC (rev 49963)
@@ -36,7 +36,7 @@
 
 #define SCANCODE_ROWS_NR 3
 
-EventManager::EventManager(bool fontIsExtended) : _fontIsExtended(fontIsExtended) {
+EventManager::EventManager(bool fontIsExtended) : _fontIsExtended(fontIsExtended), _modifierStates(0) {
 }
 
 EventManager::~EventManager() {
@@ -115,7 +115,6 @@
 };
 
 SciEvent EventManager::getScummVMEvent() {
-	static int _modifierStates = 0;	// FIXME: Avoid non-const global vars
 	SciEvent input = { SCI_EVENT_NONE, 0, 0, 0 };
 
 	Common::EventManager *em = g_system->getEventManager();

Modified: scummvm/trunk/engines/sci/event.h
===================================================================
--- scummvm/trunk/engines/sci/event.h	2010-06-17 23:11:56 UTC (rev 49962)
+++ scummvm/trunk/engines/sci/event.h	2010-06-17 23:12:17 UTC (rev 49963)
@@ -120,6 +120,7 @@
 	SciEvent getScummVMEvent();
 
 	const bool _fontIsExtended;
+	int _modifierStates;
 	Common::List<SciEvent> _events;
 };
 


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