diff options
| author | Strangerke | 2016-09-19 07:05:37 +0200 |
|---|---|---|
| committer | Strangerke | 2016-09-19 07:06:55 +0200 |
| commit | 1670cb035ffef58af7dff4c87f5408736e10f8ff (patch) | |
| tree | 6d6924e9463e339fa0e4d9e35d6295fe3b1b31a7 /engines/dm/projexpl.h | |
| parent | 1cf5c7f7c91559962ddd8c43af7bf4ce05deebc3 (diff) | |
| download | scummvm-rg350-1670cb035ffef58af7dff4c87f5408736e10f8ff.tar.gz scummvm-rg350-1670cb035ffef58af7dff4c87f5408736e10f8ff.tar.bz2 scummvm-rg350-1670cb035ffef58af7dff4c87f5408736e10f8ff.zip | |
DM: Change the definition of setMapAndTime, move SoundIndex enum to SoundMan
Diffstat (limited to 'engines/dm/projexpl.h')
| -rw-r--r-- | engines/dm/projexpl.h | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/engines/dm/projexpl.h b/engines/dm/projexpl.h index 9ed636aff5..ad39609a16 100644 --- a/engines/dm/projexpl.h +++ b/engines/dm/projexpl.h @@ -37,45 +37,6 @@ enum KillOutcome { kDMKillOutcomeAllCreaturesInGroup = 2 // @ C2_OUTCOME_KILLED_ALL_CREATURES_IN_GROUP }; -enum SoundIndex { - kDMSoundIndexMetallicThud = 0, // @ C00_SOUND_METALLIC_THUD - kDMSoundIndexSwitch = 1, // @ C01_SOUND_SWITCH - kDMSoundIndexDoorRattle = 2, // @ C02_SOUND_DOOR_RATTLE - kDMSoundIndexAttackPainRatHellHoundRedDragon = 3, // @ C03_SOUND_ATTACK_PAIN_RAT_HELLHOUND_RED_DRAGON - kDMSoundIndexWoodenThudAttackTrolinAntmanStoneGolem = 4, // @ C04_SOUND_WOODEN_THUD_ATTACK_TROLIN_ANTMAN_STONE_GOLEM - kDMSoundIndexStrongExplosion = 5, // @ C05_SOUND_STRONG_EXPLOSION - kDMSoundIndexScream = 6, // @ C06_SOUND_SCREAM - kDMSoundIndexAttackMummyGhostRive = 7, // @ C07_SOUND_ATTACK_MUMMY_GHOST_RIVE - kDMSoundIndexSwallow = 8, // @ C08_SOUND_SWALLOW - kDMSoundIndexChampion0Damaged = 9, // @ C09_SOUND_CHAMPION_0_DAMAGED - kDMSoundIndexChampion1Damaged = 10, // @ C10_SOUND_CHAMPION_1_DAMAGED - kDMSoundIndexChampion2Damaged = 11, // @ C11_SOUND_CHAMPION_2_DAMAGED - kDMSoundIndexChampion3Damaged = 12, // @ C12_SOUND_CHAMPION_3_DAMAGED - kDMSoundIndexSpell = 13, // @ C13_SOUND_SPELL - kDMSoundIndexAttackScreamerOitu = 14, // @ C14_SOUND_ATTACK_SCREAMER_OITU - kDMSoundIndexAttackGiantScorpion = 15, // @ C15_SOUND_ATTACK_GIANT_SCORPION_SCORPION - kDMSoundIndexAttackSkelettonAnimatedArmorDethKnight = 16, // @ C16_SOUND_COMBAT_ATTACK_SKELETON_ANIMATED_ARMOUR_DETH_KNIGHT - kDMSoundIndexBuzz = 17, // @ C17_SOUND_BUZZ - kDMSoundIndexPartyDamaged = 18, // @ C18_SOUND_PARTY_DAMAGED - kDMSoundIndexAttackMagentaWorm = 19, // @ C19_SOUND_ATTACK_MAGENTA_WORM_WORM - kDMSoundIndexWeakExplosion = 20, // @ C20_SOUND_WEAK_EXPLOSION - kDMSoundIndexAttackGiggler = 21, // @ C21_SOUND_ATTACK_GIGGLER - kDMSoundIndexMoveAnimatedArmorDethKnight = 22, // @ C22_SOUND_MOVE_ANIMATED_ARMOUR_DETH_KNIGHT - kDMSoundIndexMoveCouatlGiantWaspMuncher = 23, // @ C23_SOUND_MOVE_COUATL_GIANT_WASP_MUNCHER - kDMSoundIndexMoveMummyTrolinAntmanStoneGolemGiggleVexirkDemon = 24, // @ C24_SOUND_MOVE_MUMMY_TROLIN_ANTMAN_STONE_GOLEM_GIGGLER_VEXIRK_DEMON - kDMSoundIndexBlowHorn = 25, // @ C25_SOUND_BLOW_HORN - kDMSoundIndexMoveScreamerRocksWormPainRatHellHoundRusterScorpionsOitu = 26, // @ C26_SOUND_MOVE_SCREAMER_ROCK_ROCKPILE_MAGENTA_WORM_WORM_PAIN_RAT_HELLHOUND_RUSTER_GIANT_SCORPION_SCORPION_OITU - kDMSoundIndexMoveSlimesDevilWaterElemental = 27, // @ C27_SOUND_MOVE_SWAMP_SLIME_SLIME_DEVIL_WATER_ELEMENTAL - kDMSoundIndexWarCry = 28, // @ C28_SOUND_WAR_CRY - kDMSoundIndexAttackRocks = 29, // @ C29_SOUND_ATTACK_ROCK_ROCKPILE - kDMSoundIndexAttackWaterElemental = 30, // @ C30_SOUND_ATTACK_WATER_ELEMENTAL - kDMSoundIndexAttackCouatl = 31, // @ C31_SOUND_ATTACK_COUATL - kDMSoundIndexMoveRedDragon = 32, // @ C32_SOUND_MOVE_RED_DRAGON - kDMSoundIndexMoveSkeletton = 33 // @ C33_SOUND_MOVE_SKELETON -}; - -#define M31_setMap(map_time, map) ((map_time) = (((map_time) & 0x00FFFFFF) | (((int32)(map)) << 24))) - class TimelineEvent; class Projectile; |