[Scummvm-cvs-logs] CVS: scummvm/queen input.cpp,1.31,1.32 journal.cpp,1.41,1.42

Max Horn fingolfin at users.sourceforge.net
Sun Dec 5 09:44:09 CET 2004


Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26853/queen

Modified Files:
	input.cpp journal.cpp 
Log Message:
Clean up OSystem::Event

Index: input.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/input.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- input.cpp	20 Nov 2004 23:49:10 -0000	1.31
+++ input.cpp	5 Dec 2004 17:42:17 -0000	1.32
@@ -97,7 +97,7 @@
 	do {
 		while (_system->pollEvent(event)) {
 			_idleTime = 0;
-			switch (event.event_code) {
+			switch (event.type) {
 			case OSystem::EVENT_KEYDOWN:
 				if (event.kbd.flags == OSystem::KBD_CTRL) {
 					if (event.kbd.keycode == 'd') {

Index: journal.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/journal.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- journal.cpp	2 Dec 2004 22:59:57 -0000	1.41
+++ journal.cpp	5 Dec 2004 17:42:17 -0000	1.42
@@ -63,7 +63,7 @@
 	while (!_quit) {
 		OSystem::Event event;
 		while (system->pollEvent(event)) {
-			switch (event.event_code) {
+			switch (event.type) {
 			case OSystem::EVENT_KEYDOWN:
 				handleKeyDown(event.kbd.ascii, event.kbd.keycode);
 				break;





More information about the Scummvm-git-logs mailing list