mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r10070) -Fix: fix the rounding problem of zoom-levels in zoom.hpp, so it is global for every call

release/0.6
truelight 2007-06-08 18:45:14 +00:00
parent d3a7fb8d73
commit 98c3056aa6
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gfx.cpp
View File

@ -856,7 +856,7 @@ static inline void GfxBlitTileZoom(BlitterParams *bp)
if (num <= 0) continue; if (num <= 0) continue;
} }
num = UnScaleByZoom(num + ScaleByZoom(1, Tzoom) - 1, Tzoom); num = UnScaleByZoom(num, Tzoom);
switch (Tmode) { switch (Tmode) {
case BM_COLOUR_REMAP: case BM_COLOUR_REMAP:

4
src/zoom.hpp
View File

@ -37,14 +37,14 @@ static inline int ScaleByZoom(int value, ZoomLevel zoom)
{ {
if (zoom == ZOOM_LVL_NORMAL) return value; if (zoom == ZOOM_LVL_NORMAL) return value;
int izoom = (int)zoom - (int)ZOOM_LVL_NORMAL; int izoom = (int)zoom - (int)ZOOM_LVL_NORMAL;
return (zoom > ZOOM_LVL_NORMAL) ? value << izoom : value >> -izoom; return (zoom > ZOOM_LVL_NORMAL) ? value << izoom : (value + (1 << -izoom)) >> -izoom;
} }
static inline int UnScaleByZoom(int value, ZoomLevel zoom) static inline int UnScaleByZoom(int value, ZoomLevel zoom)
{ {
if (zoom == ZOOM_LVL_NORMAL) return value; if (zoom == ZOOM_LVL_NORMAL) return value;
int izoom = (int)zoom - (int)ZOOM_LVL_NORMAL; int izoom = (int)zoom - (int)ZOOM_LVL_NORMAL;
return (zoom > ZOOM_LVL_NORMAL) ? value >> izoom : value << -izoom; return (zoom > ZOOM_LVL_NORMAL) ? (value + (1 << izoom) - 1) >> izoom : value << -izoom;
} }
#endif /* ZOOM_HPP */ #endif /* ZOOM_HPP */