dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove: ZOOM_LVL_COUNT

Browse Source 
This is the only enumeration with a COUNT and END. The logic of the COUNT
implied that BEGIN could be non-zero, but all but two uses of zoom level
assume that BEGIN is zero, making the separate count only confusing.
This commit is contained in:
rubidium42
2023-11-29 20:29:23 -04:00
committed by rubidium42
parent ddd609ce9b
commit cb8612ba79
11 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/sound.cpp
View File

@@ -195,7 +195,7 @@ static void StartSound(SoundID sound_id, float pan, uint volume)
static const byte _vol_factor_by_zoom[] = {255, 255, 255, 190, 134, 87};
static_assert(lengthof(_vol_factor_by_zoom) == ZOOM_LVL_COUNT);
static_assert(lengthof(_vol_factor_by_zoom) == ZOOM_LVL_END);
static const byte _sound_base_vol[] = {
128, 90, 128, 128, 128, 128, 128, 128,
@@ -258,7 +258,7 @@ static void SndPlayScreenCoordFx(SoundID sound, int left, int right, int top, in
StartSound(
sound,
panning,
_vol_factor_by_zoom[vp->zoom - ZOOM_LVL_BEGIN]
_vol_factor_by_zoom[vp->zoom]
);
return;
}