cpp/openttd-patchpack/source Changeset - r21117:d60ca97bcd9e

Changeset - r21117:d60ca97bcd9e

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

rubidium - 10 years ago 2014-01-02 11:05:42
rubidium@openttd.org

(svn r26202) -Cleanup: since ZOOM_LEVEL_NORMAL 0 and there aren't any negative zoom levels, there is no reason to account for negative zoom levels in the zoom functions (based on patch by MJP)

1 file changed with 8 insertions and 12 deletions:

src/zoom_func.h

0 comments (0 inline, 0 general)

src/zoom_func.h

➞

Show inline comments

@@ @@ -23,9 +23,8 @@ @@
  */
 static inline int ScaleByZoom(int value, ZoomLevel zoom)
+{
 	if (zoom == ZOOM_LVL_NORMAL) return value;
 	int izoom = zoom - ZOOM_LVL_NORMAL;
 	return (zoom > ZOOM_LVL_NORMAL) ? value << izoom : (value + (1 << -izoom) - 1) >> -izoom;
 	assert(zoom >= 0);
 	return value << zoom;
+}
 /**
@@ @@ -37,9 +36,8 @@ static inline int ScaleByZoom(int value, @@
  */
 static inline int UnScaleByZoom(int value, ZoomLevel zoom)
+{
 	if (zoom == ZOOM_LVL_NORMAL) return value;
 	int izoom = zoom - ZOOM_LVL_NORMAL;
 	return (zoom > ZOOM_LVL_NORMAL) ? (value + (1 << izoom) - 1) >> izoom : value << -izoom;
 	assert(zoom >= 0);
 	return (value + (1 << zoom) - 1) >> zoom;
+}
 /**
@@ @@ -50,9 +48,8 @@ static inline int UnScaleByZoom(int valu @@
  */
 static inline int ScaleByZoomLower(int value, ZoomLevel zoom)
+{
 	if (zoom == ZOOM_LVL_NORMAL) return value;
 	int izoom = zoom - ZOOM_LVL_NORMAL;
 	return (zoom > ZOOM_LVL_NORMAL) ? value << izoom : value >> -izoom;
 	assert(zoom >= 0);
 	return value << zoom;
+}
 /**
@@ @@ -63,9 +60,8 @@ static inline int ScaleByZoomLower(int v @@
  */
 static inline int UnScaleByZoomLower(int value, ZoomLevel zoom)
+{
 	if (zoom == ZOOM_LVL_NORMAL) return value;
 	int izoom = zoom - ZOOM_LVL_NORMAL;
 	return (zoom > ZOOM_LVL_NORMAL) ? value >> izoom : value << -izoom;
 	assert(zoom >= 0);
 	return value >> zoom;
+}
 #endif /* ZOOM_FUNC_H */

0 comments (0 inline, 0 general)