From f5024f8c91899fe227483ef329b5998969b6bb23 Mon Sep 17 00:00:00 2001
From: truelight <truelight@openttd.org>
Date: Wed, 7 Nov 2007 14:33:52 +0000
Subject: [PATCH] (svn r11388) -Fix: postfix ++ returned new value, should
 (ofcourse) be old value (SmatZ) -Fix: prefix ++ didn't exist, added it

---
 src/helpers.hpp | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/helpers.hpp b/src/helpers.hpp
index f185eecec6..4163be4aca 100644
--- a/src/helpers.hpp
+++ b/src/helpers.hpp
@@ -136,7 +136,15 @@ template <typename Tenum_t> struct TinyEnumT
 	}
 
 	/** postfix ++ operator on tiny type */
-	FORCEINLINE TinyEnumT& operator ++ (int)
+	FORCEINLINE TinyEnumT operator ++ (int)
+	{
+		TinyEnumT org = *this;
+		if (++m_val >= end) m_val -= (storage_type)(end - begin);
+		return org;
+	}
+
+	/** prefix ++ operator on tiny type */
+	FORCEINLINE TinyEnumT& operator ++ ()
 	{
 		if (++m_val >= end) m_val -= (storage_type)(end - begin);
 		return *this;
@@ -208,8 +216,10 @@ public:
 	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 ++ (int) { return *this += 1; }
-	FORCEINLINE OverflowSafeInt& operator -- (int) { return *this += -1; }
+	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.