From 8ffd79eeca079041d36803af41b702ee858eca70 Mon Sep 17 00:00:00 2001 From: Randy Heit Date: Sun, 11 May 2008 03:02:33 +0000 Subject: [PATCH] - Fixed: FWadCollection::MergeLumps() did not initialize the flags for any marker lumps it inserted. - Fixes to placate GCC. SVN r963 (trunk) --- docs/rh-log.txt | 2 + src/s_playlist.cpp | 2 +- src/s_sound.cpp | 7 +- src/timidity/instrum_sf2.cpp | 120 +++++++++++++++++------------------ src/w_wad.cpp | 7 +- 5 files changed, 69 insertions(+), 69 deletions(-) diff --git a/docs/rh-log.txt b/docs/rh-log.txt index 10f843fc9..398295aad 100644 --- a/docs/rh-log.txt +++ b/docs/rh-log.txt @@ -1,4 +1,6 @@ May 10, 2008 +- Fixed: FWadCollection::MergeLumps() did not initialize the flags for any + marker lumps it inserted. - Fixed: Need write barriers when modifying SequenceListHead. May 9, 2008 diff --git a/src/s_playlist.cpp b/src/s_playlist.cpp index 5f68188e8..1ab294dc1 100644 --- a/src/s_playlist.cpp +++ b/src/s_playlist.cpp @@ -153,7 +153,7 @@ FString FPlayList::NextLine (FILE *file) void FPlayList::Shuffle () { unsigned int numsongs = Songs.Size(); - int i; + unsigned int i; for (i = 0; i < numsongs; ++i) { diff --git a/src/s_sound.cpp b/src/s_sound.cpp index dd3d5e2cf..6da30f509 100644 --- a/src/s_sound.cpp +++ b/src/s_sound.cpp @@ -1335,7 +1335,7 @@ bool S_ChangeMusic (const char *musicname, int order, bool looping, bool force) else { int lumpnum = -1; - int offset, length; + int offset = 0, length = 0; int device = MDEV_DEFAULT; void *handle = NULL; @@ -1398,11 +1398,6 @@ bool S_ChangeMusic (const char *musicname, int order, bool looping, bool force) } } } - else - { - offset = 0; - length = 0; - } // shutdown old music S_StopMusic (true); diff --git a/src/timidity/instrum_sf2.cpp b/src/timidity/instrum_sf2.cpp index 79a46f911..e8c8fa6c4 100644 --- a/src/timidity/instrum_sf2.cpp +++ b/src/timidity/instrum_sf2.cpp @@ -42,70 +42,70 @@ struct GenDef static const GenDef GenDefs[] = { - /* 0 */ 0, 32767, cindex(startAddrsOffset), GENF_InstrOnly, - /* 1 */ -32768, 0, cindex(endAddrsOffset), GENF_InstrOnly, - /* 2 */ -32768, 32767, cindex(startLoopAddrsOffset), GENF_InstrOnly, - /* 3 */ -32768, 32767, cindex(endLoopAddrsOffset), GENF_InstrOnly, - /* 4 */ 0, 32767, cindex(startAddrsCoarseOffset), GENF_InstrOnly, - /* 5 */ -12000, 12000, cindex(modLfoToPitch), 0, - /* 6 */ -12000, 12000, cindex(vibLfoToPitch), 0, - /* 7 */ -12000, 12000, cindex(modEnvToPitch), 0, - /* 8 */ 1500, 13500, cindex(initialFilterFc), 0, - /* 9 */ 0, 960, cindex(initialFilterQ), 0, - /* 10 */ -12000, 12000, cindex(modLfoToFilterFc), 0, - /* 11 */ -12000, 12000, cindex(modEnvToFilterFc), 0, - /* 12 */ -32768, 0, cindex(endAddrsCoarseOffset), 0, - /* 13 */ -960, 960, cindex(modLfoToVolume), 0, - /* 14 */ 0, 0, 255 /* unused1 */, 0, - /* 15 */ 0, 1000, cindex(chorusEffectsSend), 0, - /* 16 */ 0, 1000, cindex(reverbEffectsSend), 0, - /* 17 */ -500, 500, cindex(pan), 0, - /* 18 */ 0, 0, 255 /* unused2 */, 0, - /* 19 */ 0, 0, 255 /* unused3 */, 0, - /* 20 */ 0, 0, 255 /* unused4 */, 0, - /* 21 */ -12000, 5000, cindex(delayModLFO), GENF_32768_Ok, - /* 22 */ -16000, 4500, cindex(freqModLFO), 0, - /* 23 */ -12000, 5000, cindex(delayVibLFO), GENF_32768_Ok, - /* 24 */ -16000, 4500, cindex(freqVibLFO), 0, - /* 25 */ -12000, 5000, cindex(delayModEnv), GENF_32768_Ok, - /* 26 */ -12000, 8000, cindex(attackModEnv), GENF_32768_Ok, - /* 27 */ -12000, 5000, cindex(holdModEnv), GENF_32768_Ok, - /* 28 */ -12000, 8000, cindex(decayModEnv), 0, - /* 29 */ 0, 1000, cindex(sustainModEnv), 0, - /* 30 */ -12000, 8000, cindex(releaseModEnv), 0, - /* 31 */ -1200, 1200, cindex(keynumToModEnvHold), 0, - /* 32 */ -1200, 1200, cindex(keynumToModEnvDecay), 0, - /* 33 */ -12000, 5000, cindex(delayVolEnv), GENF_32768_Ok, - /* 34 */ -12000, 8000, cindex(attackVolEnv), GENF_32768_Ok, - /* 35 */ -12000, 5000, cindex(holdVolEnv), GENF_32768_Ok, - /* 36 */ -12000, 5000, cindex(decayVolEnv), 0, - /* 37 */ 0, 1440, cindex(sustainVolEnv), 0, - /* 38 */ -12000, 8000, cindex(releaseVolEnv), 0, - /* 39 */ -1200, 1200, cindex(keynumToVolEnvHold), 0, - /* 40 */ -1200, 1200, cindex(keynumToVolEnvDecay), 0, - /* 41 */ -32768, 32767, 255 /* instrument */, GENF_Index | GENF_PresetOnly, - /* 42 */ 0, 0, 255 /* reserved1 */, 0, - /* 43 */ 0, 127, 255 /* keyRange */, GENF_Range, - /* 44 */ 0, 127, 255 /* velRange */, GENF_Range, - /* 45 */ -32768, 32767, cindex(startLoopAddrsCoarseOffset), GENF_InstrOnly, - /* 46 */ 0, 127, cindex(keynum), GENF_InstrOnly, - /* 47 */ 1, 127, cindex(velocity), GENF_InstrOnly, - /* 48 */ 0, 1440, cindex(initialAttenuation), 0, - /* 49 */ 0, 0, 255 /* reserved2 */, 0, - /* 50 */ -32768, 32767, cindex(endLoopAddrsCoarseOffset), GENF_InstrOnly, - /* 51 */ -120, 120, cindex(coarseTune), 0, - /* 52 */ -99, 99, cindex(fineTune), 0, - /* 53 */ -32768, 32767, 255 /* sampleID */, GENF_Index | GENF_InstrOnly, - /* 54 */ -32768, 32767, cindex(sampleModes), GENF_InstrOnly, - /* 55 */ 0, 0, 255 /* reserved3 */, 0, - /* 56 */ 0, 1200, cindex(scaleTuning), 0, - /* 57 */ 1, 127, cindex(exclusiveClass), GENF_InstrOnly, - /* 58 */ 0, 127, cindex(overridingRootKey), GENF_InstrOnly, + /* 0 */ { 0, 32767, cindex(startAddrsOffset), GENF_InstrOnly }, + /* 1 */ { -32768, 0, cindex(endAddrsOffset), GENF_InstrOnly }, + /* 2 */ { -32768, 32767, cindex(startLoopAddrsOffset), GENF_InstrOnly }, + /* 3 */ { -32768, 32767, cindex(endLoopAddrsOffset), GENF_InstrOnly }, + /* 4 */ { 0, 32767, cindex(startAddrsCoarseOffset), GENF_InstrOnly }, + /* 5 */ { -12000, 12000, cindex(modLfoToPitch), 0 }, + /* 6 */ { -12000, 12000, cindex(vibLfoToPitch), 0 }, + /* 7 */ { -12000, 12000, cindex(modEnvToPitch), 0 }, + /* 8 */ { 1500, 13500, cindex(initialFilterFc), 0 }, + /* 9 */ { 0, 960, cindex(initialFilterQ), 0 }, + /* 10 */ { -12000, 12000, cindex(modLfoToFilterFc), 0 }, + /* 11 */ { -12000, 12000, cindex(modEnvToFilterFc), 0 }, + /* 12 */ { -32768, 0, cindex(endAddrsCoarseOffset), 0 }, + /* 13 */ { -960, 960, cindex(modLfoToVolume), 0 }, + /* 14 */ { 0, 0, 255 /* unused1 */, 0 }, + /* 15 */ { 0, 1000, cindex(chorusEffectsSend), 0 }, + /* 16 */ { 0, 1000, cindex(reverbEffectsSend), 0 }, + /* 17 */ { -500, 500, cindex(pan), 0 }, + /* 18 */ { 0, 0, 255 /* unused2 */, 0 }, + /* 19 */ { 0, 0, 255 /* unused3 */, 0 }, + /* 20 */ { 0, 0, 255 /* unused4 */, 0 }, + /* 21 */ { -12000, 5000, cindex(delayModLFO), GENF_32768_Ok }, + /* 22 */ { -16000, 4500, cindex(freqModLFO), 0 }, + /* 23 */ { -12000, 5000, cindex(delayVibLFO), GENF_32768_Ok }, + /* 24 */ { -16000, 4500, cindex(freqVibLFO), 0 }, + /* 25 */ { -12000, 5000, cindex(delayModEnv), GENF_32768_Ok }, + /* 26 */ { -12000, 8000, cindex(attackModEnv), GENF_32768_Ok }, + /* 27 */ { -12000, 5000, cindex(holdModEnv), GENF_32768_Ok }, + /* 28 */ { -12000, 8000, cindex(decayModEnv), 0 }, + /* 29 */ { 0, 1000, cindex(sustainModEnv), 0 }, + /* 30 */ { -12000, 8000, cindex(releaseModEnv), 0 }, + /* 31 */ { -1200, 1200, cindex(keynumToModEnvHold), 0 }, + /* 32 */ { -1200, 1200, cindex(keynumToModEnvDecay), 0 }, + /* 33 */ { -12000, 5000, cindex(delayVolEnv), GENF_32768_Ok }, + /* 34 */ { -12000, 8000, cindex(attackVolEnv), GENF_32768_Ok }, + /* 35 */ { -12000, 5000, cindex(holdVolEnv), GENF_32768_Ok }, + /* 36 */ { -12000, 5000, cindex(decayVolEnv), 0 }, + /* 37 */ { 0, 1440, cindex(sustainVolEnv), 0 }, + /* 38 */ { -12000, 8000, cindex(releaseVolEnv), 0 }, + /* 39 */ { -1200, 1200, cindex(keynumToVolEnvHold), 0 }, + /* 40 */ { -1200, 1200, cindex(keynumToVolEnvDecay), 0 }, + /* 41 */ { -32768, 32767, 255 /* instrument */, GENF_Index | GENF_PresetOnly }, + /* 42 */ { 0, 0, 255 /* reserved1 */, 0 }, + /* 43 */ { 0, 127, 255 /* keyRange */, GENF_Range }, + /* 44 */ { 0, 127, 255 /* velRange */, GENF_Range }, + /* 45 */ { -32768, 32767, cindex(startLoopAddrsCoarseOffset), GENF_InstrOnly }, + /* 46 */ { 0, 127, cindex(keynum), GENF_InstrOnly }, + /* 47 */ { 1, 127, cindex(velocity), GENF_InstrOnly }, + /* 48 */ { 0, 1440, cindex(initialAttenuation), 0 }, + /* 49 */ { 0, 0, 255 /* reserved2 */, 0 }, + /* 50 */ { -32768, 32767, cindex(endLoopAddrsCoarseOffset), GENF_InstrOnly }, + /* 51 */ { -120, 120, cindex(coarseTune), 0 }, + /* 52 */ { -99, 99, cindex(fineTune), 0 }, + /* 53 */ { -32768, 32767, 255 /* sampleID */, GENF_Index | GENF_InstrOnly }, + /* 54 */ { -32768, 32767, cindex(sampleModes), GENF_InstrOnly }, + /* 55 */ { 0, 0, 255 /* reserved3 */, 0 }, + /* 56 */ { 0, 1200, cindex(scaleTuning), 0 }, + /* 57 */ { 1, 127, cindex(exclusiveClass), GENF_InstrOnly }, + /* 58 */ { 0, 127, cindex(overridingRootKey), GENF_InstrOnly }, }; static const SFGenComposite DefaultGenerators = { - { 0, 127 }, // keyRange + { { 0, 127 } }, // keyRange { 0, 127 }, // velRange { 0 }, // instrument/sampleID 0, // modLfoToPitch diff --git a/src/w_wad.cpp b/src/w_wad.cpp index dabce2832..d5a6e1a9a 100644 --- a/src/w_wad.cpp +++ b/src/w_wad.cpp @@ -1426,11 +1426,12 @@ int FWadCollection::MergeLumps (const char *start, const char *end, int space) { newlumps++; strncpy (newlumpinfos[0].name, ustart, 8); - newlumpinfos[0].fullname=NULL; + newlumpinfos[0].fullname = NULL; newlumpinfos[0].wadnum = -1; newlumpinfos[0].position = newlumpinfos[0].size = 0; newlumpinfos[0].namespc = ns_global; + newlumpinfos[0].flags = 0; } newlumpinfos[newlumps++] = LumpInfo[i]; @@ -1447,11 +1448,12 @@ int FWadCollection::MergeLumps (const char *start, const char *end, int space) { newlumps++; strncpy (newlumpinfos[0].name, ustart, 8); - newlumpinfos[0].fullname=NULL; + newlumpinfos[0].fullname = NULL; newlumpinfos[0].wadnum = -1; newlumpinfos[0].position = newlumpinfos[0].size = 0; newlumpinfos[0].namespc = ns_global; + newlumpinfos[0].flags = 0; } } else @@ -1499,6 +1501,7 @@ int FWadCollection::MergeLumps (const char *start, const char *end, int space) LumpInfo[NumLumps].position = LumpInfo[NumLumps].size = 0; LumpInfo[NumLumps].namespc = ns_global; + LumpInfo[NumLumps].flags = 0; NumLumps++; }