diff options
| author | rubidium <rubidium@openttd.org> | 2009-05-17 17:17:48 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-05-17 17:17:48 +0000 |
| commit | 9c24e2bb8fdc29620ea8d73ecec9c93e8e3b3e53 (patch) | |
| tree | 1b503e6d6551d4e0b93ceeaa187e88e3797ea7af /src/sound_type.h | |
| parent | e3bd95e7b6694a68a73bbb2649d6f96092e2e313 (diff) | |
| download | openttd-9c24e2bb8fdc29620ea8d73ecec9c93e8e3b3e53.tar.xz | |
(svn r16340) -Codechange: introduce SoundID (uint16) and use that instead of SoundFX, which was used as a byte and uint16 at different places, when the uint16 sound ID is meant.
Diffstat (limited to 'src/sound_type.h')
| -rw-r--r-- | src/sound_type.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/sound_type.h b/src/sound_type.h index 0879ff717..63e9986fc 100644 --- a/src/sound_type.h +++ b/src/sound_type.h @@ -5,8 +5,6 @@ #ifndef SOUND_TYPE_H #define SOUND_TYPE_H -#include "core/enum_type.hpp" - struct MusicFileSettings { byte playlist; byte music_vol; @@ -106,11 +104,9 @@ enum SoundFx { SND_END }; -/** Define basic enum properties */ -template <> struct EnumPropsT<SoundFx> : MakeEnumPropsT<SoundFx, byte, SND_BEGIN, SND_END, SND_END> {}; -typedef TinyEnumT<SoundFx> SoundFxByte; - /** The number of sounds in the original sample.cat */ static const uint ORIGINAL_SAMPLE_COUNT = 73; +typedef uint16 SoundID; + #endif /* SOUND_TYPE_H */ |