[Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse_codecs.cpp,1.9,1.10
Max Horn
fingolfin at users.sourceforge.net
Fri Jun 24 09:16:03 CEST 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.329,1.330 resource_v2.cpp,1.56,1.57
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm imuse_player.cpp,2.54,2.55 midiparser_eup.cpp,1.16,1.17 midiparser_ro.cpp,1.8,1.9 nut_renderer.cpp,1.60,1.61 palette.cpp,2.51,2.52 palette_he.cpp,1.21,1.22 player_v1.cpp,1.25,1.26 resource_v3.cpp,1.40,1.41 room.cpp,1.18,1.19 script_v100he.cpp,2.167,2.168 script_v6.cpp,1.445,1.446 script_v6he.cpp,2.161,2.162 script_v7he.cpp,2.163,2.164 script_v80he.cpp,2.122,2.123 script_v90he.cpp,2.275,2.276 vars.cpp,1.140,1.141
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm/imuse_digi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13793
Modified Files:
dimuse_codecs.cpp
Log Message:
cleanup
Index: dimuse_codecs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_codecs.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- dimuse_codecs.cpp 24 Jun 2005 15:23:21 -0000 1.9
+++ dimuse_codecs.cpp 24 Jun 2005 16:14:28 -0000 1.10
@@ -138,15 +138,14 @@
#endif
void initializeImcTables() {
- int32 destTablePos = 0;
- int32 pos = 0;
+ int pos;
#ifdef __PALM_OS__
if (!_destImcTable) _destImcTable = (byte *)calloc(89, sizeof(byte));
if (!_destImcTable2) _destImcTable2 = (uint32 *)calloc(89 * 64, sizeof(uint32));
#endif
- do {
+ for (pos = 0; pos <= 88; ++pos) {
byte put = 1;
int32 tableValue = ((imcTable[pos] * 4) / 7) / 2;
while (tableValue != 0) {
@@ -159,16 +158,11 @@
if (put > 8) {
put = 8;
}
- put--;
- assert(pos < 89);
- _destImcTable[pos] = put;
- } while (++pos <= 88);
- _destImcTable[89] = 0;
+ _destImcTable[pos] = put - 1;
+ }
for (int n = 0; n < 64; n++) {
- pos = 0;
- destTablePos = n;
- do {
+ for (pos = 0; pos <= 88; ++pos) {
int32 count = 32;
int32 put = 0;
int32 tableValue = imcTable[pos];
@@ -179,10 +173,8 @@
count /= 2;
tableValue /= 2;
} while (count != 0);
- assert(destTablePos < 89 * 64);
- _destImcTable2[destTablePos] = put;
- destTablePos += 64;
- } while (++pos <= 88);
+ _destImcTable2[n + pos * 64] = put;
+ }
}
}
#define NextBit \
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.329,1.330 resource_v2.cpp,1.56,1.57
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm imuse_player.cpp,2.54,2.55 midiparser_eup.cpp,1.16,1.17 midiparser_ro.cpp,1.8,1.9 nut_renderer.cpp,1.60,1.61 palette.cpp,2.51,2.52 palette_he.cpp,1.21,1.22 player_v1.cpp,1.25,1.26 resource_v3.cpp,1.40,1.41 room.cpp,1.18,1.19 script_v100he.cpp,2.167,2.168 script_v6.cpp,1.445,1.446 script_v6he.cpp,2.161,2.162 script_v7he.cpp,2.163,2.164 script_v80he.cpp,2.122,2.123 script_v90he.cpp,2.275,2.276 vars.cpp,1.140,1.141
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list