diff options
| -rw-r--r-- | src/core/overflowsafe_type.hpp | 147 | ||||
| -rw-r--r-- | src/driver.h | 2 | ||||
| -rw-r--r-- | src/helpers.hpp | 141 | ||||
| -rw-r--r-- | src/openttd.h | 3 | ||||
| -rw-r--r-- | src/zoom.hpp | 2 |
5 files changed, 151 insertions, 144 deletions
diff --git a/src/core/overflowsafe_type.hpp b/src/core/overflowsafe_type.hpp new file mode 100644 index 000000000..632e261a6 --- /dev/null +++ b/src/core/overflowsafe_type.hpp @@ -0,0 +1,147 @@ +/* $Id$ */ + +/** @file overflowsafe_type.hpp An overflow safe integer-like type. */ + +#ifndef OVERFLOWSAFE_TYPE_HPP +#define OVERFLOWSAFE_TYPE_HPP + +/** + * Overflow safe template for integers, i.e. integers that will never overflow + * you multiply the maximum value with 2, or add 2, or substract somethng from + * the minimum value, etc. + * @param T the type these integers are stored with. + * @param T_MAX the maximum value for the integers. + * @param T_MIN the minimum value for the integers. + */ +template <class T, T T_MAX, T T_MIN> +class OverflowSafeInt +{ +private: + /** The non-overflow safe backend to store the value in. */ + T m_value; +public: + OverflowSafeInt() : m_value(0) { } + + OverflowSafeInt(const OverflowSafeInt& other) { this->m_value = other.m_value; } + OverflowSafeInt(const int64 int_) { this->m_value = int_; } + + FORCEINLINE OverflowSafeInt& operator = (const OverflowSafeInt& other) { this->m_value = other.m_value; return *this; } + + FORCEINLINE OverflowSafeInt operator - () const { return OverflowSafeInt(-this->m_value); } + + /** + * Safe implementation of addition. + * @param other the amount to add + * @note when the addition would yield more than T_MAX (or less than T_MIN), + * it will be T_MAX (respectively T_MIN). + */ + FORCEINLINE OverflowSafeInt& operator += (const OverflowSafeInt& other) + { + if ((T_MAX - abs(other.m_value)) < abs(this->m_value) && + (this->m_value < 0) == (other.m_value < 0)) { + this->m_value = (this->m_value < 0) ? T_MIN : T_MAX ; + } else { + this->m_value += other.m_value; + } + return *this; + } + + /* Operators for addition and substraction */ + FORCEINLINE OverflowSafeInt operator + (const OverflowSafeInt& other) const { OverflowSafeInt result = *this; result += other; return result; } + FORCEINLINE OverflowSafeInt operator + (const int other) const { OverflowSafeInt result = *this; result += (int64)other; return result; } + FORCEINLINE OverflowSafeInt operator + (const uint other) const { OverflowSafeInt result = *this; result += (int64)other; return result; } + FORCEINLINE OverflowSafeInt& operator -= (const OverflowSafeInt& other) { return *this += (-other); } + FORCEINLINE OverflowSafeInt operator - (const OverflowSafeInt& other) const { OverflowSafeInt result = *this; result -= other; return result; } + FORCEINLINE OverflowSafeInt operator - (const int other) const { OverflowSafeInt result = *this; result -= (int64)other; return result; } + FORCEINLINE OverflowSafeInt operator - (const uint other) const { OverflowSafeInt result = *this; result -= (int64)other; return result; } + + FORCEINLINE OverflowSafeInt& operator ++ () { return *this += 1; } + FORCEINLINE OverflowSafeInt& operator -- () { return *this += -1; } + FORCEINLINE OverflowSafeInt operator ++ (int) { OverflowSafeInt org = *this; *this += 1; return org; } + FORCEINLINE OverflowSafeInt operator -- (int) { OverflowSafeInt org = *this; *this += -1; return org; } + + /** + * Safe implementation of multiplication. + * @param factor the factor to multiply this with. + * @note when the multiplication would yield more than T_MAX (or less than T_MIN), + * it will be T_MAX (respectively T_MIN). + */ + FORCEINLINE OverflowSafeInt& operator *= (const int factor) + { + if (factor != 0 && (T_MAX / abs(factor)) < abs(this->m_value)) { + this->m_value = ((this->m_value < 0) == (factor < 0)) ? T_MAX : T_MIN ; + } else { + this->m_value *= factor ; + } + return *this; + } + + /* Operators for multiplication */ + FORCEINLINE OverflowSafeInt operator * (const int64 factor) const { OverflowSafeInt result = *this; result *= factor; return result; } + FORCEINLINE OverflowSafeInt operator * (const int factor) const { OverflowSafeInt result = *this; result *= (int64)factor; return result; } + FORCEINLINE OverflowSafeInt operator * (const uint factor) const { OverflowSafeInt result = *this; result *= (int64)factor; return result; } + FORCEINLINE OverflowSafeInt operator * (const uint16 factor) const { OverflowSafeInt result = *this; result *= (int64)factor; return result; } + FORCEINLINE OverflowSafeInt operator * (const byte factor) const { OverflowSafeInt result = *this; result *= (int64)factor; return result; } + + /* Operators for division */ + FORCEINLINE OverflowSafeInt& operator /= (const int divisor) { this->m_value /= divisor; return *this; } + FORCEINLINE OverflowSafeInt operator / (const OverflowSafeInt& divisor) const { OverflowSafeInt result = *this; result /= divisor.m_value; return result; } + FORCEINLINE OverflowSafeInt operator / (const int divisor) const { OverflowSafeInt result = *this; result /= divisor; return result; } + FORCEINLINE OverflowSafeInt operator / (const uint divisor) const { OverflowSafeInt result = *this; result /= (int)divisor; return result; } + + /* Operators for modulo */ + FORCEINLINE OverflowSafeInt& operator %= (const int divisor) { this->m_value %= divisor; return *this; } + FORCEINLINE OverflowSafeInt operator % (const int divisor) const { OverflowSafeInt result = *this; result %= divisor; return result; } + + /* Operators for shifting */ + FORCEINLINE OverflowSafeInt& operator <<= (const int shift) { this->m_value <<= shift; return *this; } + FORCEINLINE OverflowSafeInt operator << (const int shift) const { OverflowSafeInt result = *this; result <<= shift; return result; } + FORCEINLINE OverflowSafeInt& operator >>= (const int shift) { this->m_value >>= shift; return *this; } + FORCEINLINE OverflowSafeInt operator >> (const int shift) const { OverflowSafeInt result = *this; result >>= shift; return result; } + + /* Operators for (in)equality when comparing overflow safe ints */ + FORCEINLINE bool operator == (const OverflowSafeInt& other) const { return this->m_value == other.m_value; } + FORCEINLINE bool operator != (const OverflowSafeInt& other) const { return !(*this == other); } + FORCEINLINE bool operator > (const OverflowSafeInt& other) const { return this->m_value > other.m_value; } + FORCEINLINE bool operator >= (const OverflowSafeInt& other) const { return this->m_value >= other.m_value; } + FORCEINLINE bool operator < (const OverflowSafeInt& other) const { return !(*this >= other); } + FORCEINLINE bool operator <= (const OverflowSafeInt& other) const { return !(*this > other); } + + /* Operators for (in)equality when comparing non-overflow safe ints */ + FORCEINLINE bool operator == (const int other) const { return this->m_value == other; } + FORCEINLINE bool operator != (const int other) const { return !(*this == other); } + FORCEINLINE bool operator > (const int other) const { return this->m_value > other; } + FORCEINLINE bool operator >= (const int other) const { return this->m_value >= other; } + FORCEINLINE bool operator < (const int other) const { return !(*this >= other); } + FORCEINLINE bool operator <= (const int other) const { return !(*this > other); } + + FORCEINLINE operator int64 () const { return this->m_value; } +}; + +/* Sometimes we got int64 operator OverflowSafeInt instead of vice versa. Handle that properly */ +template <class T, int64 T_MAX, int64 T_MIN> FORCEINLINE OverflowSafeInt<T, T_MAX, T_MIN> operator + (int64 a, OverflowSafeInt<T, T_MAX, T_MIN> b) { return b + a; } +template <class T, int64 T_MAX, int64 T_MIN> FORCEINLINE OverflowSafeInt<T, T_MAX, T_MIN> operator - (int64 a, OverflowSafeInt<T, T_MAX, T_MIN> b) { return -b + a; } +template <class T, int64 T_MAX, int64 T_MIN> FORCEINLINE OverflowSafeInt<T, T_MAX, T_MIN> operator * (int64 a, OverflowSafeInt<T, T_MAX, T_MIN> b) { return b * a; } +template <class T, int64 T_MAX, int64 T_MIN> FORCEINLINE OverflowSafeInt<T, T_MAX, T_MIN> operator / (int64 a, OverflowSafeInt<T, T_MAX, T_MIN> b) { return (OverflowSafeInt<T, T_MAX, T_MIN>)a / (int)b; } + +/* Sometimes we got int operator OverflowSafeInt instead of vice versa. Handle that properly */ +template <class T, int64 T_MAX, int64 T_MIN> FORCEINLINE OverflowSafeInt<T, T_MAX, T_MIN> operator + (int a, OverflowSafeInt<T, T_MAX, T_MIN> b) { return b + a; } +template <class T, int64 T_MAX, int64 T_MIN> FORCEINLINE OverflowSafeInt<T, T_MAX, T_MIN> operator - (int a, OverflowSafeInt<T, T_MAX, T_MIN> b) { return -b + a; } +template <class T, int64 T_MAX, int64 T_MIN> FORCEINLINE OverflowSafeInt<T, T_MAX, T_MIN> operator * (int a, OverflowSafeInt<T, T_MAX, T_MIN> b) { return b * a; } +template <class T, int64 T_MAX, int64 T_MIN> FORCEINLINE OverflowSafeInt<T, T_MAX, T_MIN> operator / (int a, OverflowSafeInt<T, T_MAX, T_MIN> b) { return (OverflowSafeInt<T, T_MAX, T_MIN>)a / (int)b; } + +/* Sometimes we got uint operator OverflowSafeInt instead of vice versa. Handle that properly */ +template <class T, int64 T_MAX, int64 T_MIN> FORCEINLINE OverflowSafeInt<T, T_MAX, T_MIN> operator + (uint a, OverflowSafeInt<T, T_MAX, T_MIN> b) { return b + a; } +template <class T, int64 T_MAX, int64 T_MIN> FORCEINLINE OverflowSafeInt<T, T_MAX, T_MIN> operator - (uint a, OverflowSafeInt<T, T_MAX, T_MIN> b) { return -b + a; } +template <class T, int64 T_MAX, int64 T_MIN> FORCEINLINE OverflowSafeInt<T, T_MAX, T_MIN> operator * (uint a, OverflowSafeInt<T, T_MAX, T_MIN> b) { return b * a; } +template <class T, int64 T_MAX, int64 T_MIN> FORCEINLINE OverflowSafeInt<T, T_MAX, T_MIN> operator / (uint a, OverflowSafeInt<T, T_MAX, T_MIN> b) { return (OverflowSafeInt<T, T_MAX, T_MIN>)a / (int)b; } + +/* Sometimes we got byte operator OverflowSafeInt instead of vice versa. Handle that properly */ +template <class T, int64 T_MAX, int64 T_MIN> FORCEINLINE OverflowSafeInt<T, T_MAX, T_MIN> operator + (byte a, OverflowSafeInt<T, T_MAX, T_MIN> b) { return b + a; } +template <class T, int64 T_MAX, int64 T_MIN> FORCEINLINE OverflowSafeInt<T, T_MAX, T_MIN> operator - (byte a, OverflowSafeInt<T, T_MAX, T_MIN> b) { return -b + a; } +template <class T, int64 T_MAX, int64 T_MIN> FORCEINLINE OverflowSafeInt<T, T_MAX, T_MIN> operator * (byte a, OverflowSafeInt<T, T_MAX, T_MIN> b) { return b * a; } +template <class T, int64 T_MAX, int64 T_MIN> FORCEINLINE OverflowSafeInt<T, T_MAX, T_MIN> operator / (byte a, OverflowSafeInt<T, T_MAX, T_MIN> b) { return (OverflowSafeInt<T, T_MAX, T_MIN>)a / (int)b; } + +typedef OverflowSafeInt<int64, INT64_MAX, INT64_MIN> OverflowSafeInt64; + +#endif /* OVERFLOWSAFE_TYPE_HPP */ diff --git a/src/driver.h b/src/driver.h index 640fc9c21..676671c6b 100644 --- a/src/driver.h +++ b/src/driver.h @@ -6,7 +6,7 @@ #define DRIVER_H #include "debug.h" -#include "helpers.hpp" +#include "core/enum_type.hpp" #include "string.h" #include <string> #include <map> diff --git a/src/helpers.hpp b/src/helpers.hpp index d7bedae55..aaa38acb5 100644 --- a/src/helpers.hpp +++ b/src/helpers.hpp @@ -5,9 +5,6 @@ #ifndef HELPERS_HPP #define HELPERS_HPP -#include "macros.h" -#include "core/enum_type.hpp" - /** When allocating using malloc/calloc in C++ it is usually needed to cast the return value * from void* to the proper pointer type. Another alternative would be MallocT<> as follows */ template <typename T> FORCEINLINE T* MallocT(size_t num_elements) @@ -42,142 +39,4 @@ template<typename T> void Swap(T& a, T& b) b = t; } - -/** - * Overflow safe template for integers, i.e. integers that will never overflow - * you multiply the maximum value with 2, or add 2, or substract somethng from - * the minimum value, etc. - * @param T the type these integers are stored with. - * @param T_MAX the maximum value for the integers. - * @param T_MIN the minimum value for the integers. - */ -template <class T, T T_MAX, T T_MIN> -class OverflowSafeInt -{ -private: - /** The non-overflow safe backend to store the value in. */ - T m_value; -public: - OverflowSafeInt() : m_value(0) { } - - OverflowSafeInt(const OverflowSafeInt& other) { this->m_value = other.m_value; } - OverflowSafeInt(const int64 int_) { this->m_value = int_; } - - FORCEINLINE OverflowSafeInt& operator = (const OverflowSafeInt& other) { this->m_value = other.m_value; return *this; } - - FORCEINLINE OverflowSafeInt operator - () const { return OverflowSafeInt(-this->m_value); } - - /** - * Safe implementation of addition. - * @param other the amount to add - * @note when the addition would yield more than T_MAX (or less than T_MIN), - * it will be T_MAX (respectively T_MIN). - */ - FORCEINLINE OverflowSafeInt& operator += (const OverflowSafeInt& other) - { - if ((T_MAX - abs(other.m_value)) < abs(this->m_value) && - (this->m_value < 0) == (other.m_value < 0)) { - this->m_value = (this->m_value < 0) ? T_MIN : T_MAX ; - } else { - this->m_value += other.m_value; - } - return *this; - } - - /* Operators for addition and substraction */ - FORCEINLINE OverflowSafeInt operator + (const OverflowSafeInt& other) const { OverflowSafeInt result = *this; result += other; return result; } - FORCEINLINE OverflowSafeInt operator + (const int other) const { OverflowSafeInt result = *this; result += (int64)other; return result; } - FORCEINLINE OverflowSafeInt operator + (const uint other) const { OverflowSafeInt result = *this; result += (int64)other; return result; } - FORCEINLINE OverflowSafeInt& operator -= (const OverflowSafeInt& other) { return *this += (-other); } - FORCEINLINE OverflowSafeInt operator - (const OverflowSafeInt& other) const { OverflowSafeInt result = *this; result -= other; return result; } - FORCEINLINE OverflowSafeInt operator - (const int other) const { OverflowSafeInt result = *this; result -= (int64)other; return result; } - FORCEINLINE OverflowSafeInt operator - (const uint other) const { OverflowSafeInt result = *this; result -= (int64)other; return result; } - - FORCEINLINE OverflowSafeInt& operator ++ () { return *this += 1; } - FORCEINLINE OverflowSafeInt& operator -- () { return *this += -1; } - FORCEINLINE OverflowSafeInt operator ++ (int) { OverflowSafeInt org = *this; *this += 1; return org; } - FORCEINLINE OverflowSafeInt operator -- (int) { OverflowSafeInt org = *this; *this += -1; return org; } - - /** - * Safe implementation of multiplication. - * @param factor the factor to multiply this with. - * @note when the multiplication would yield more than T_MAX (or less than T_MIN), - * it will be T_MAX (respectively T_MIN). - */ - FORCEINLINE OverflowSafeInt& operator *= (const int factor) - { - if (factor != 0 && (T_MAX / abs(factor)) < abs(this->m_value)) { - this->m_value = ((this->m_value < 0) == (factor < 0)) ? T_MAX : T_MIN ; - } else { - this->m_value *= factor ; - } - return *this; - } - - /* Operators for multiplication */ - FORCEINLINE OverflowSafeInt operator * (const int64 factor) const { OverflowSafeInt result = *this; result *= factor; return result; } - FORCEINLINE OverflowSafeInt operator * (const int factor) const { OverflowSafeInt result = *this; result *= (int64)factor; return result; } - FORCEINLINE OverflowSafeInt operator * (const uint factor) const { OverflowSafeInt result = *this; result *= (int64)factor; return result; } - FORCEINLINE OverflowSafeInt operator * (const uint16 factor) const { OverflowSafeInt result = *this; result *= (int64)factor; return result; } - FORCEINLINE OverflowSafeInt operator * (const byte factor) const { OverflowSafeInt result = *this; result *= (int64)factor; return result; } - - /* Operators for division */ - FORCEINLINE OverflowSafeInt& operator /= (const int divisor) { this->m_value /= divisor; return *this; } - FORCEINLINE OverflowSafeInt operator / (const OverflowSafeInt& divisor) const { OverflowSafeInt result = *this; result /= divisor.m_value; return result; } - FORCEINLINE OverflowSafeInt operator / (const int divisor) const { OverflowSafeInt result = *this; result /= divisor; return result; } - FORCEINLINE OverflowSafeInt operator / (const uint divisor) const { OverflowSafeInt result = *this; result /= (int)divisor; return result; } - - /* Operators for modulo */ - FORCEINLINE OverflowSafeInt& operator %= (const int divisor) { this->m_value %= divisor; return *this; } - FORCEINLINE OverflowSafeInt operator % (const int divisor) const { OverflowSafeInt result = *this; result %= divisor; return result; } - - /* Operators for shifting */ - FORCEINLINE OverflowSafeInt& operator <<= (const int shift) { this->m_value <<= shift; return *this; } - FORCEINLINE OverflowSafeInt operator << (const int shift) const { OverflowSafeInt result = *this; result <<= shift; return result; } - FORCEINLINE OverflowSafeInt& operator >>= (const int shift) { this->m_value >>= shift; return *this; } - FORCEINLINE OverflowSafeInt operator >> (const int shift) const { OverflowSafeInt result = *this; result >>= shift; return result; } - - /* Operators for (in)equality when comparing overflow safe ints */ - FORCEINLINE bool operator == (const OverflowSafeInt& other) const { return this->m_value == other.m_value; } - FORCEINLINE bool operator != (const OverflowSafeInt& other) const { return !(*this == other); } - FORCEINLINE bool operator > (const OverflowSafeInt& other) const { return this->m_value > other.m_value; } - FORCEINLINE bool operator >= (const OverflowSafeInt& other) const { return this->m_value >= other.m_value; } - FORCEINLINE bool operator < (const OverflowSafeInt& other) const { return !(*this >= other); } - FORCEINLINE bool operator <= (const OverflowSafeInt& other) const { return !(*this > other); } - - /* Operators for (in)equality when comparing non-overflow safe ints */ - FORCEINLINE bool operator == (const int other) const { return this->m_value == other; } - FORCEINLINE bool operator != (const int other) const { return !(*this == other); } - FORCEINLINE bool operator > (const int other) const { return this->m_value > other; } - FORCEINLINE bool operator >= (const int other) const { return this->m_value >= other; } - FORCEINLINE bool operator < (const int other) const { return !(*this >= other); } - FORCEINLINE bool operator <= (const int other) const { return !(*this > other); } - - FORCEINLINE operator int64 () const { return this->m_value; } -}; - -/* Sometimes we got int64 operator OverflowSafeInt instead of vice versa. Handle that properly */ -template <class T, int64 T_MAX, int64 T_MIN> FORCEINLINE OverflowSafeInt<T, T_MAX, T_MIN> operator + (int64 a, OverflowSafeInt<T, T_MAX, T_MIN> b) { return b + a; } -template <class T, int64 T_MAX, int64 T_MIN> FORCEINLINE OverflowSafeInt<T, T_MAX, T_MIN> operator - (int64 a, OverflowSafeInt<T, T_MAX, T_MIN> b) { return -b + a; } -template <class T, int64 T_MAX, int64 T_MIN> FORCEINLINE OverflowSafeInt<T, T_MAX, T_MIN> operator * (int64 a, OverflowSafeInt<T, T_MAX, T_MIN> b) { return b * a; } -template <class T, int64 T_MAX, int64 T_MIN> FORCEINLINE OverflowSafeInt<T, T_MAX, T_MIN> operator / (int64 a, OverflowSafeInt<T, T_MAX, T_MIN> b) { return (OverflowSafeInt<T, T_MAX, T_MIN>)a / (int)b; } - -/* Sometimes we got int operator OverflowSafeInt instead of vice versa. Handle that properly */ -template <class T, int64 T_MAX, int64 T_MIN> FORCEINLINE OverflowSafeInt<T, T_MAX, T_MIN> operator + (int a, OverflowSafeInt<T, T_MAX, T_MIN> b) { return b + a; } -template <class T, int64 T_MAX, int64 T_MIN> FORCEINLINE OverflowSafeInt<T, T_MAX, T_MIN> operator - (int a, OverflowSafeInt<T, T_MAX, T_MIN> b) { return -b + a; } -template <class T, int64 T_MAX, int64 T_MIN> FORCEINLINE OverflowSafeInt<T, T_MAX, T_MIN> operator * (int a, OverflowSafeInt<T, T_MAX, T_MIN> b) { return b * a; } -template <class T, int64 T_MAX, int64 T_MIN> FORCEINLINE OverflowSafeInt<T, T_MAX, T_MIN> operator / (int a, OverflowSafeInt<T, T_MAX, T_MIN> b) { return (OverflowSafeInt<T, T_MAX, T_MIN>)a / (int)b; } - -/* Sometimes we got uint operator OverflowSafeInt instead of vice versa. Handle that properly */ -template <class T, int64 T_MAX, int64 T_MIN> FORCEINLINE OverflowSafeInt<T, T_MAX, T_MIN> operator + (uint a, OverflowSafeInt<T, T_MAX, T_MIN> b) { return b + a; } -template <class T, int64 T_MAX, int64 T_MIN> FORCEINLINE OverflowSafeInt<T, T_MAX, T_MIN> operator - (uint a, OverflowSafeInt<T, T_MAX, T_MIN> b) { return -b + a; } -template <class T, int64 T_MAX, int64 T_MIN> FORCEINLINE OverflowSafeInt<T, T_MAX, T_MIN> operator * (uint a, OverflowSafeInt<T, T_MAX, T_MIN> b) { return b * a; } -template <class T, int64 T_MAX, int64 T_MIN> FORCEINLINE OverflowSafeInt<T, T_MAX, T_MIN> operator / (uint a, OverflowSafeInt<T, T_MAX, T_MIN> b) { return (OverflowSafeInt<T, T_MAX, T_MIN>)a / (int)b; } - -/* Sometimes we got byte operator OverflowSafeInt instead of vice versa. Handle that properly */ -template <class T, int64 T_MAX, int64 T_MIN> FORCEINLINE OverflowSafeInt<T, T_MAX, T_MIN> operator + (byte a, OverflowSafeInt<T, T_MAX, T_MIN> b) { return b + a; } -template <class T, int64 T_MAX, int64 T_MIN> FORCEINLINE OverflowSafeInt<T, T_MAX, T_MIN> operator - (byte a, OverflowSafeInt<T, T_MAX, T_MIN> b) { return -b + a; } -template <class T, int64 T_MAX, int64 T_MIN> FORCEINLINE OverflowSafeInt<T, T_MAX, T_MIN> operator * (byte a, OverflowSafeInt<T, T_MAX, T_MIN> b) { return b * a; } -template <class T, int64 T_MAX, int64 T_MIN> FORCEINLINE OverflowSafeInt<T, T_MAX, T_MIN> operator / (byte a, OverflowSafeInt<T, T_MAX, T_MIN> b) { return (OverflowSafeInt<T, T_MAX, T_MIN>)a / (int)b; } - #endif /* HELPERS_HPP */ diff --git a/src/openttd.h b/src/openttd.h index 7fd02174b..11db9139e 100644 --- a/src/openttd.h +++ b/src/openttd.h @@ -8,6 +8,7 @@ #define VARDEF extern #endif +#include "macros.h" #include "helpers.hpp" struct Oblong { @@ -68,7 +69,7 @@ typedef uint16 GroupID; typedef uint16 EngineRenewID; typedef uint16 DestinationID; -typedef OverflowSafeInt<int64, INT64_MAX, INT64_MIN> OverflowSafeInt64; +#include "core/overflowsafe_type.hpp" typedef OverflowSafeInt64 Money; /* DestinationID must be at least as large as every these below, because it can diff --git a/src/zoom.hpp b/src/zoom.hpp index dea064196..56e3c6099 100644 --- a/src/zoom.hpp +++ b/src/zoom.hpp @@ -5,7 +5,7 @@ #ifndef ZOOM_HPP #define ZOOM_HPP -#include "helpers.hpp" +#include "core/enum_type.hpp" enum ZoomLevel { /* Our possible zoom-levels */ |