[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.48,1.49

Travis Howell kirben at users.sourceforge.net
Mon Nov 4 18:18:05 CET 2002


Update of /cvsroot/scummvm/scummvm/simon
In directory usw-pr-cvs1:/tmp/cvs-serv1348/simon

Modified Files:
	simon.cpp 
Log Message:

Fix broken simon games


Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- simon.cpp	4 Nov 2002 23:26:08 -0000	1.48
+++ simon.cpp	5 Nov 2002 02:17:38 -0000	1.49
@@ -4711,11 +4711,13 @@
 
 		if (_voice_type != FORMAT_NONE) {
 #ifdef USE_MAD
-			if (_voice_type == FORMAT_MP3)
+			if (_voice_type == FORMAT_MP3) {
 				_voice_offsets = (uint32 *)malloc((gss->NUM_VOICE_RESOURCES + 1) * sizeof(uint32));
-			else
-#else
+			 } else {
+#endif
 				_voice_offsets = (uint32 *)malloc(gss->NUM_VOICE_RESOURCES * sizeof(uint32));
+#ifdef USE_MAD
+			}
 #endif
 			if (_voice_offsets == NULL)
 				error("Out of memory for voice offsets");
@@ -4754,11 +4756,13 @@
 		if (_effects_file->isOpen() == true)
 		{
 #ifdef USE_MAD
-			if (_effects_type == FORMAT_MP3)
+			if (_effects_type == FORMAT_MP3) {
 				_effects_offsets = (uint32 *)malloc((gss->NUM_EFFECTS_RESOURCES + 1) * sizeof(uint32));
-			else
-#else
+			} else {
+#endif
 				_effects_offsets = (uint32 *)malloc(gss->NUM_EFFECTS_RESOURCES * sizeof(uint32));
+#ifdef USE_MAD
+			}
 #endif
 			if (_effects_offsets == NULL)
 				error("Out of memory for effects offsets");





More information about the Scummvm-git-logs mailing list