From 9c24e2bb8fdc29620ea8d73ecec9c93e8e3b3e53 Mon Sep 17 00:00:00 2001
From: rubidium <rubidium@openttd.org>
Date: Sun, 17 May 2009 17:17:48 +0000
Subject: (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.

---
 src/sound_type.h | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'src/sound_type.h')

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 */
-- 
cgit v1.2.3-54-g00ecf