DM: Some more work on GCC warnings

1 files changed, 44 insertions, 38 deletions

diff --git a/engines/dm/sounds.cpp b/engines/dm/sounds.cpp
index c041715fd3..fe53f110ef 100644
--- a/engines/dm/sounds.cpp
+++ b/engines/dm/sounds.cpp
@@ -47,50 +47,56 @@ SoundMan* SoundMan::getSoundMan(DMEngine* vm, const DMADGameDescription* gameVer
 	}
 }
 
-SoundMan::SoundMan(DMEngine* vm) : _vm(vm) {}
+void SoundMan::initConstants() {
+	Sound sounds[k34_D13_soundCount] = {
+		Sound(533, 112,  11, 3, 6), /* k00_soundMETALLIC_THUD 0 */
+		Sound(534, 112,  15, 0, 3), /* k01_soundSWITCH 1 */
+		Sound(535, 112,  72, 3, 6), /* k02_soundDOOR_RATTLE 2 */
+		Sound(550, 112,  60, 3, 5), /* k03_soundATTACK_PAIN_RAT_HELLHOUND_RED_DRAGON 3 */
+		Sound(536, 112,  10, 3, 6), /* k04_soundWOODEN_THUD_ATTACK_TROLIN_ANTMAN_STONE_GOLEM 4 */
+		Sound(537, 112,  99, 3, 7), /* k05_soundSTRONG_EXPLOSION 5 */
+		Sound(539, 112, 110, 3, 6), /* k06_soundSCREAM 6 */
+		Sound(551, 112,  55, 3, 5), /* k07_soundATTACK_MUMMY_GHOST_RIVE 7 */
+		Sound(540, 112,   2, 3, 6), /* k08_soundSWALLOW 8 */
+		Sound(541, 112,  80, 3, 6), /* k09_soundCHAMPION_0_DAMAGED 9 */
+		Sound(542, 112,  82, 3, 6), /* k10_soundCHAMPION_1_DAMAGED 10 */
+		Sound(543, 112,  84, 3, 6), /* k11_soundCHAMPION_2_DAMAGED 11 */
+		Sound(544, 112,  86, 3, 6), /* k12_soundCHAMPION_3_DAMAGED 12 */
+		Sound(545, 112,  95, 3, 6), /* k13_soundSPELL 13 */
+		Sound(552, 112,  57, 3, 5), /* k14_soundATTACK_SCREAMER_OITU 14 */
+		Sound(553, 112,  52, 3, 5), /* k15_soundATTACK_GIANT_SCORPION_SCORPION 15 */
+		Sound(546, 112,  40, 2, 4), /* k16_soundCOMBAT_ATTACK_SKELETON_ANIMATED_ARMOUR_DETH_KNIGHT 16 */
+		Sound(547, 112,  70, 1, 4), /* k17_soundBUZZ 17 */
+		Sound(549, 138,  75, 3, 6), /* k18_soundPARTY_DAMAGED 18 */
+		Sound(554, 112,  50, 3, 5), /* k19_soundATTACK_MAGENTA_WORM_WORM 19 */
+		Sound(537, 112,  98, 0, 4), /* k20_soundWEAK_EXPLOSION 20 */
+		Sound(555, 112,  96, 2, 4), /* k21_soundATTACK_GIGGLER 21 */
+		Sound(563, 138,  24, 0, 4), /* k22_soundMOVE_ANIMATED_ARMOUR_DETH_KNIGHT 22 Atari ST: not present */
+		Sound(564, 138,  21, 0, 4), /* k23_soundMOVE_COUATL_GIANT_WASP_MUNCHER 23 Atari ST: not present */
+		Sound(565, 138,  23, 0, 4), /* k24_soundMOVE_MUMMY_TROLIN_ANTMAN_STONE_GOLEM_GIGGLER_VEXIRK_DEMON 24 Atari ST: not present */
+		Sound(566, 138, 105, 0, 4), /* k25_soundBLOW_HORN 25 Atari ST: not present */
+		Sound(567, 138,  27, 0, 4), /* k26_soundMOVE_SCREAMER_ROCK_ROCKPILE_MAGENTA_WORM_WORM_PAIN_RAT_HELLHOUND_RUSTER_GIANT_SCORPION_SCORPION_OITU 26 Atari ST: not present */
+		Sound(568, 138,  28, 0, 4), /* k27_soundMOVE_SWAMP_SLIME_SLIME_DEVIL_WATER_ELEMENTAL 27 Atari ST: not present */
+		Sound(569, 138, 106, 0, 4), /* k28_soundWAR_CRY 28 Atari ST: not present */
+		Sound(570, 138,  56, 0, 4), /* k29_soundATTACK_ROCK_ROCKPILE 29 Atari ST: not present */
+		Sound(571, 138,  58, 0, 4), /* k30_soundATTACK_WATER_ELEMENTAL 30 Atari ST: not present */
+		Sound(572, 112,  53, 0, 4), /* k31_soundATTACK_COUATL 31 Atari ST: not present */
+		Sound(573, 138,  29, 0, 4), /* k32_soundMOVE_RED_DRAGON 32 Atari ST: not present */
+		Sound(574, 150,  22, 0, 4)  /* k33_soundMOVE_SKELETON 33 Atari ST: not present */
+	};
+	for (int i = 0; i < k34_D13_soundCount; i++)
+		g60_sounds[i] = sounds[i];
+}
+
+SoundMan::SoundMan(DMEngine* vm) : _vm(vm) {
+	initConstants();
+}
 
 SoundMan::~SoundMan() {
 	for (uint16 i = 0; i < k34_D13_soundCount; ++i)
 		delete[] _gK24_soundData[i]._firstSample;
 }
 
-
-Sound g60_sounds[k34_D13_soundCount] = {
-Sound(533, 112,  11, 3, 6), /* k00_soundMETALLIC_THUD 0 */
-Sound(534, 112,  15, 0, 3), /* k01_soundSWITCH 1 */
-Sound(535, 112,  72, 3, 6), /* k02_soundDOOR_RATTLE 2 */
-Sound(550, 112,  60, 3, 5), /* k03_soundATTACK_PAIN_RAT_HELLHOUND_RED_DRAGON 3 */
-Sound(536, 112,  10, 3, 6), /* k04_soundWOODEN_THUD_ATTACK_TROLIN_ANTMAN_STONE_GOLEM 4 */
-Sound(537, 112,  99, 3, 7), /* k05_soundSTRONG_EXPLOSION 5 */
-Sound(539, 112, 110, 3, 6), /* k06_soundSCREAM 6 */
-Sound(551, 112,  55, 3, 5), /* k07_soundATTACK_MUMMY_GHOST_RIVE 7 */
-Sound(540, 112,   2, 3, 6), /* k08_soundSWALLOW 8 */
-Sound(541, 112,  80, 3, 6), /* k09_soundCHAMPION_0_DAMAGED 9 */
-Sound(542, 112,  82, 3, 6), /* k10_soundCHAMPION_1_DAMAGED 10 */
-Sound(543, 112,  84, 3, 6), /* k11_soundCHAMPION_2_DAMAGED 11 */
-Sound(544, 112,  86, 3, 6), /* k12_soundCHAMPION_3_DAMAGED 12 */
-Sound(545, 112,  95, 3, 6), /* k13_soundSPELL 13 */
-Sound(552, 112,  57, 3, 5), /* k14_soundATTACK_SCREAMER_OITU 14 */
-Sound(553, 112,  52, 3, 5), /* k15_soundATTACK_GIANT_SCORPION_SCORPION 15 */
-Sound(546, 112,  40, 2, 4), /* k16_soundCOMBAT_ATTACK_SKELETON_ANIMATED_ARMOUR_DETH_KNIGHT 16 */
-Sound(547, 112,  70, 1, 4), /* k17_soundBUZZ 17 */
-Sound(549, 138,  75, 3, 6), /* k18_soundPARTY_DAMAGED 18 */
-Sound(554, 112,  50, 3, 5), /* k19_soundATTACK_MAGENTA_WORM_WORM 19 */
-Sound(537, 112,  98, 0, 4), /* k20_soundWEAK_EXPLOSION 20 */
-Sound(555, 112,  96, 2, 4), /* k21_soundATTACK_GIGGLER 21 */
-Sound(563, 138,  24, 0, 4), /* k22_soundMOVE_ANIMATED_ARMOUR_DETH_KNIGHT 22 Atari ST: not present */
-Sound(564, 138,  21, 0, 4), /* k23_soundMOVE_COUATL_GIANT_WASP_MUNCHER 23 Atari ST: not present */
-Sound(565, 138,  23, 0, 4), /* k24_soundMOVE_MUMMY_TROLIN_ANTMAN_STONE_GOLEM_GIGGLER_VEXIRK_DEMON 24 Atari ST: not present */
-Sound(566, 138, 105, 0, 4), /* k25_soundBLOW_HORN 25 Atari ST: not present */
-Sound(567, 138,  27, 0, 4), /* k26_soundMOVE_SCREAMER_ROCK_ROCKPILE_MAGENTA_WORM_WORM_PAIN_RAT_HELLHOUND_RUSTER_GIANT_SCORPION_SCORPION_OITU 26 Atari ST: not present */
-Sound(568, 138,  28, 0, 4), /* k27_soundMOVE_SWAMP_SLIME_SLIME_DEVIL_WATER_ELEMENTAL 27 Atari ST: not present */
-Sound(569, 138, 106, 0, 4), /* k28_soundWAR_CRY 28 Atari ST: not present */
-Sound(570, 138,  56, 0, 4), /* k29_soundATTACK_ROCK_ROCKPILE 29 Atari ST: not present */
-Sound(571, 138,  58, 0, 4), /* k30_soundATTACK_WATER_ELEMENTAL 30 Atari ST: not present */
-Sound(572, 112,  53, 0, 4), /* k31_soundATTACK_COUATL 31 Atari ST: not present */
-Sound(573, 138,  29, 0, 4), /* k32_soundMOVE_RED_DRAGON 32 Atari ST: not present */
-Sound(574, 150,  22, 0, 4)}; /* k33_soundMOVE_SKELETON 33 Atari ST: not present */
-
 void SoundMan::f503_loadSounds() {
 	for (uint16 soundIndex = 0; soundIndex < k34_D13_soundCount; ++soundIndex) {
 		SoundData *soundData = _gK24_soundData + soundIndex;