[Scummvm-cvs-logs] CVS: scummvm/sword1 animation.cpp,1.28,1.29 control.cpp,1.42,1.43 credits.cpp,1.3,1.4 sword1.cpp,1.68,1.69

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


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

Modified Files:
	animation.cpp control.cpp credits.cpp sword1.cpp 
Log Message:
Clean up OSystem::Event

Index: animation.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/animation.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- animation.cpp	5 Dec 2004 02:52:41 -0000	1.28
+++ animation.cpp	5 Dec 2004 17:42:19 -0000	1.29
@@ -141,7 +141,7 @@
 			frameCount++;
 			OSystem::Event event;
 			while (_sys->pollEvent(event)) {
-				switch (event.event_code) {
+				switch (event.type) {
 #ifndef BACKEND_8BIT
 				case OSystem::EVENT_SCREEN_CHANGED:
 					anim->invalidateLookup(true);

Index: control.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/control.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- control.cpp	27 Nov 2004 00:26:00 -0000	1.42
+++ control.cpp	5 Dec 2004 17:42:19 -0000	1.43
@@ -993,7 +993,7 @@
 
 	do {
 		while (_system->pollEvent(event)) {
-			switch (event.event_code) {
+			switch (event.type) {
 			case OSystem::EVENT_KEYDOWN:
 
 				// Make sure backspace works right (this fixes a small issue on OS X)

Index: credits.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/credits.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- credits.cpp	5 Dec 2004 03:20:04 -0000	1.3
+++ credits.cpp	5 Dec 2004 17:42:19 -0000	1.4
@@ -273,7 +273,7 @@
 	uint32 start = _system->getMillis();
 	do {
 		while (_system->pollEvent(event)) {
-			switch (event.event_code) {
+			switch (event.type) {
 			case OSystem::EVENT_QUIT:
 				SwordEngine::_systemVars.engineQuit = true;
 				break;

Index: sword1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/sword1.cpp,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- sword1.cpp	5 Dec 2004 02:52:41 -0000	1.68
+++ sword1.cpp	5 Dec 2004 17:42:19 -0000	1.69
@@ -1292,7 +1292,7 @@
 
 	do {
 		while (_system->pollEvent(event)) {
-			switch (event.event_code) {
+			switch (event.type) {
 			case OSystem::EVENT_KEYDOWN:
 
 				// Make sure backspace works right (this fixes a small issue on OS X)





More information about the Scummvm-git-logs mailing list