Mercurial > hg > openttd
changeset 8595:1a405a547734 draft
(svn r12176) -Codechange: one division less when playing sounds (patch by Dominik)
| author | smatz <smatz@openttd.org> |
|---|---|
| date | Mon, 18 Feb 2008 14:59:30 +0000 |
| parents | 2ed0f71a87ff |
| children | ae0c04ca28d2 |
| files | src/sound.cpp |
| diffstat | 1 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/sound.cpp +++ b/src/sound.cpp @@ -222,10 +222,12 @@ left < vp->virtual_left + vp->virtual_width && right > vp->virtual_left && top < vp->virtual_top + vp->virtual_height && bottom > vp->virtual_top) { int screen_x = (left + right) / 2 - vp->virtual_left; + int width = (vp->virtual_width == 0 ? 1 : vp->virtual_width); + int panning = (screen_x * PANNING_LEVELS * 2) / width - PANNING_LEVELS; StartSound( sound, - screen_x / max(1, vp->virtual_width / ((PANNING_LEVELS << 1) + 1)) - PANNING_LEVELS, + panning, (msf.effect_vol * _vol_factor_by_zoom[vp->zoom - ZOOM_LVL_BEGIN]) / 256 ); return;