[Scummvm-cvs-logs] CVS: scummvm/simon midi.cpp,1.10,1.11

Travis Howell kirben at users.sourceforge.net
Tue Nov 12 20:53:02 CET 2002


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

Modified Files:
	midi.cpp 
Log Message:

Change last ugly hack to make it a little better


Index: midi.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/midi.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- midi.cpp	13 Nov 2002 04:34:45 -0000	1.10
+++ midi.cpp	13 Nov 2002 04:52:35 -0000	1.11
@@ -90,79 +90,11 @@
 		} else {
 			//FIXME We currently don't know how to find out music track size for GMF midi format
 			// So we use music files sizes minues header for now to allow looping
-			if (music == 0)
-				t->data_size = 8900;
-			if (music == 1)
-				t->data_size = 12166;
-			if (music == 2)
-				t->data_size = 2848;
-			if (music == 3)
-				t->data_size = 3442;
-			if (music == 4) 
-				t->data_size = 4034;
-			if (music == 5)
-				t->data_size = 4508;
-			if (music == 6)
-				t->data_size = 7064;
-			if (music == 7)
-				t->data_size = 9730;
-			if (music == 8)
-				t->data_size = 6014;
-			if (music == 9)
-				t->data_size = 4742;
-			if (music == 10) 
-				t->data_size = 3138;
-			if (music == 11) 
-				t->data_size = 6570;
-			if (music == 12) 
-				t->data_size = 5384;
-			if (music == 13) 
-				t->data_size = 8909;
-			if (music == 14) 
-				t->data_size = 6457;
-			if (music == 15) 
-				t->data_size = 16321;
-			if (music == 16) 
-				t->data_size = 2742;
-			if (music == 17) 
-				t->data_size = 8968;
-			if (music == 18) 
-				t->data_size = 4804;
-			if (music == 19) 
-				t->data_size = 8442;
-			if (music == 20) 
-				t->data_size = 7717;
-			if (music == 21)
-				t->data_size =  9444;
-			if (music == 22)
-				t->data_size = 5800;
-			if (music == 23)
-				t->data_size = 1381;
-			if (music == 24)
-				t->data_size = 5660;
-			if (music == 25)
-				t->data_size = 6684;
-			if (music == 26)
-				t->data_size = 2456;
-			if (music == 27)
-				t->data_size = 4744;
-			if (music == 28)
-				t->data_size = 2455;
-			if (music == 29)
-				t->data_size = 1177;
-			if (music == 30)
-				t->data_size = 1232;
-			if (music == 31)
-				t->data_size = 17256;
-			if (music == 32)
-				t->data_size = 5103;
-			if (music == 33)
-				t->data_size = 8794;
-			if (music == 34)
-				t->data_size = 4884;
-			if (music == 35)
-				t->data_size = 16;
-			t->data_size = t->data_size - 8;
+			int music_data_size[] = {8900, 12166, 2848, 3442, 4034, 4508, 7064, 9730, 6014, 4742, 3138,
+						6570, 5384, 8909, 6457, 16321, 2742, 8968, 4804, 8442, 7717,
+						9444, 5800, 1381, 5660, 6684, 2456, 4744, 2455, 1177, 1232,
+						17256, 5103, 8794, 4884, 16};
+			t->data_size = music_data_size[music] - 8;
 		}
 
 		t->data_ptr = (byte *)calloc(t->data_size, 1);





More information about the Scummvm-git-logs mailing list