Files
@ r12269:f94731e7dc53
Branch filter:
Location: cpp/openttd-patchpack/source/src/zoom_func.h - annotation
r12269:f94731e7dc53
1.9 KiB
text/x-c
(svn r16694) -Fix [FS#2995] (rgradual loading, rnewindustries): only pay for whatever has been actually unloaded and perform the payment when unloading has finished. This fixes, amongst others:
* cheating by starting to unload and after getting paid rushing to the depot to get sold (or unloading, loading and getting paid again for the remainder)
* cargo being dropped onto a station at the moment a stockpiling industry doesn't accept it anymore
* industries getting cargo that has not been unloaded yet and subsequently dumping it back on the station in one go
Note: you will now get paid after the unloading has finished, so you'll have to wait a bit longer for 'your' money.
* cheating by starting to unload and after getting paid rushing to the depot to get sold (or unloading, loading and getting paid again for the remainder)
* cargo being dropped onto a station at the moment a stockpiling industry doesn't accept it anymore
* industries getting cargo that has not been unloaded yet and subsequently dumping it back on the station in one go
Note: you will now get paid after the unloading has finished, so you'll have to wait a bit longer for 'your' money.
r8123:dde0a9a84019 r8123:dde0a9a84019 r9111:983de9c5a848 r8123:dde0a9a84019 r8123:dde0a9a84019 r8123:dde0a9a84019 r8123:dde0a9a84019 r8123:dde0a9a84019 r8123:dde0a9a84019 r8123:dde0a9a84019 r8123:dde0a9a84019 r8123:dde0a9a84019 r8123:dde0a9a84019 r8123:dde0a9a84019 r8123:dde0a9a84019 r8123:dde0a9a84019 r8123:dde0a9a84019 r8123:dde0a9a84019 r8123:dde0a9a84019 r8123:dde0a9a84019 r8123:dde0a9a84019 r8123:dde0a9a84019 r8123:dde0a9a84019 r8123:dde0a9a84019 r8123:dde0a9a84019 r8123:dde0a9a84019 r8123:dde0a9a84019 r8123:dde0a9a84019 r8123:dde0a9a84019 r8123:dde0a9a84019 r8123:dde0a9a84019 r8123:dde0a9a84019 r8123:dde0a9a84019 r8123:dde0a9a84019 r8123:dde0a9a84019 r8123:dde0a9a84019 r8123:dde0a9a84019 r8123:dde0a9a84019 r8123:dde0a9a84019 r8123:dde0a9a84019 r8123:dde0a9a84019 r8123:dde0a9a84019 r8123:dde0a9a84019 r8123:dde0a9a84019 r8123:dde0a9a84019 r8123:dde0a9a84019 r8123:dde0a9a84019 r8123:dde0a9a84019 r8123:dde0a9a84019 r8123:dde0a9a84019 r8123:dde0a9a84019 r8123:dde0a9a84019 r8123:dde0a9a84019 r8123:dde0a9a84019 r8123:dde0a9a84019 r8123:dde0a9a84019 r8123:dde0a9a84019 r8123:dde0a9a84019 r8123:dde0a9a84019 r8123:dde0a9a84019 r8123:dde0a9a84019 r8123:dde0a9a84019 r8123:dde0a9a84019 r8123:dde0a9a84019 r8123:dde0a9a84019 r8123:dde0a9a84019 | /* $Id$ */
/** @file zoom_func.h Functions related to zooming. */
#ifndef ZOOM_FUNC_H
#define ZOOM_FUNC_H
#include "zoom_type.h"
extern ZoomLevel _saved_scrollpos_zoom;
/**
* Scale by zoom level, usually shift left (when zoom > ZOOM_LVL_NORMAL)
* When shifting right, value is rounded up
* @param value value to shift
* @param zoom zoom level to shift to
* @return shifted value
*/
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;
}
/**
* Scale by zoom level, usually shift right (when zoom > ZOOM_LVL_NORMAL)
* When shifting right, value is rounded up
* @param value value to shift
* @param zoom zoom level to shift to
* @return shifted 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;
}
/**
* Scale by zoom level, usually shift left (when zoom > ZOOM_LVL_NORMAL)
* @param value value to shift
* @param zoom zoom level to shift to
* @return shifted value
*/
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;
}
/**
* Scale by zoom level, usually shift right (when zoom > ZOOM_LVL_NORMAL)
* @param value value to shift
* @param zoom zoom level to shift to
* @return shifted value
*/
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;
}
#endif /* ZOOM_FUNC_H */
|