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

(svn r9936) -Fix: (Un)ScaleByZoom missed a minus sign in some cases

release/0.6
truelight 2007-05-26 15:20:13 +00:00
parent 9ca9d73eea
commit a856c160ef
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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 >> -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 >> izoom : value << -izoom;
} }
#endif /* ZOOM_HPP */ #endif /* ZOOM_HPP */