Files
@ r17167:68f47a8db1b5
Branch filter:
Location: cpp/openttd-patchpack/source/src/sound_type.h - annotation
r17167:68f47a8db1b5
3.1 KiB
text/x-c
(svn r21916) -Fix [FS#4442]: the minimum speed needed for (realistic) acceleration to work properly can sometimes be more than the (temporary) maximum speed causing Clamp to "fail". Make sure that the minimum speed always overrules the maximum speed
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 | r8157:cf41aa22cd09 r8157:cf41aa22cd09 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r11936:9ec1ad99161c r8157:cf41aa22cd09 r9390:aab57f0a7820 r9390:aab57f0a7820 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r8157:cf41aa22cd09 r11929:58368e8855b4 r11929:58368e8855b4 r11929:58368e8855b4 r11932:f2bc1b879057 r11932:f2bc1b879057 r8157:cf41aa22cd09 | /* $Id$ */
/*
* This file is part of OpenTTD.
* OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
* OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
*/
/** @file sound_type.h Types related to sounds. */
#ifndef SOUND_TYPE_H
#define SOUND_TYPE_H
struct MusicFileSettings {
byte playlist;
byte music_vol;
byte effect_vol;
byte custom_1[33];
byte custom_2[33];
bool playing;
bool shuffle;
};
struct SoundEntry {
uint8 file_slot;
size_t file_offset;
size_t file_size;
uint16 rate;
uint8 bits_per_sample;
uint8 channels;
uint8 volume;
uint8 priority;
};
enum SoundFx {
SND_BEGIN = 0,
SND_02_SPLAT = 0, // 0 == 0x00 !
SND_03_FACTORY_WHISTLE,
SND_04_TRAIN,
SND_05_TRAIN_THROUGH_TUNNEL,
SND_06_SHIP_HORN,
SND_07_FERRY_HORN,
SND_08_PLANE_TAKE_OFF,
SND_09_JET,
SND_0A_TRAIN_HORN,
SND_0B_MINING_MACHINERY,
SND_0C_ELECTRIC_SPARK,
SND_0D_STEAM,
SND_0E_LEVEL_CROSSING,
SND_0F_VEHICLE_BREAKDOWN,
SND_10_TRAIN_BREAKDOWN,
SND_11_CRASH,
SND_12_EXPLOSION, // 16 == 0x10
SND_13_BIG_CRASH,
SND_14_CASHTILL,
SND_15_BEEP, // 19 == 0x13
SND_16_MORSE, // 20 == 0x14
SND_17_SKID_PLANE,
SND_18_HELICOPTER,
SND_19_BUS_START_PULL_AWAY,
SND_1A_BUS_START_PULL_AWAY_WITH_HORN,
SND_1B_TRUCK_START,
SND_1C_TRUCK_START_2,
SND_1D_APPLAUSE,
SND_1E_OOOOH,
SND_1F_SPLAT, // 29 == 0x1D
SND_20_SPLAT_2, // 30 == 0x1E
SND_21_JACKHAMMER,
SND_22_CAR_HORN,
SND_23_CAR_HORN_2,
SND_24_SHEEP,
SND_25_COW,
SND_26_HORSE,
SND_27_BLACKSMITH_ANVIL,
SND_28_SAWMILL, // 38 == 0x26 !
SND_00_GOOD_YEAR, // 39 == 0x27 !
SND_01_BAD_YEAR, // 40 == 0x28 !
SND_29_RIP, // 41 == 0x29 !
SND_2A_EXTRACT_AND_POP,
SND_2B_COMEDY_HIT,
SND_2C_MACHINERY,
SND_2D_RIP_2,
SND_2E_EXTRACT_AND_POP,
SND_2F_POP,
SND_30_CARTOON_SOUND,
SND_31_EXTRACT,
SND_32_POP_2,
SND_33_PLASTIC_MINE,
SND_34_WIND,
SND_35_COMEDY_BREAKDOWN,
SND_36_CARTOON_CRASH,
SND_37_BALLOON_SQUEAK,
SND_38_CHAINSAW,
SND_39_HEAVY_WIND,
SND_3A_COMEDY_BREAKDOWN_2,
SND_3B_JET_OVERHEAD,
SND_3C_COMEDY_CAR,
SND_3D_ANOTHER_JET_OVERHEAD,
SND_3E_COMEDY_CAR_2,
SND_3F_COMEDY_CAR_3,
SND_40_COMEDY_CAR_START_AND_PULL_AWAY,
SND_41_MAGLEV,
SND_42_LOON_BIRD,
SND_43_LION,
SND_44_MONKEYS,
SND_45_PLANE_CRASHING,
SND_46_PLANE_ENGINE_SPUTTERING,
SND_47_MAGLEV_2,
SND_48_DISTANT_BIRD, // 72 == 0x48
SND_END
};
/** The number of sounds in the original sample.cat */
static const uint ORIGINAL_SAMPLE_COUNT = 73;
typedef uint16 SoundID;
#endif /* SOUND_TYPE_H */
|