# HG changeset patch # User tron # Date 1172171126 0 # Node ID e999ec323771a0b82db33dc4715b47be1f7c49c3 # Parent 8e8a6a41114db09de0f8114a542348c95994a5a9 (svn r8847) -Fix There is not much point in hiding a normal 64bit multiplication in a function, so do not do it diff --git a/src/economy.cpp b/src/economy.cpp --- a/src/economy.cpp +++ b/src/economy.cpp @@ -613,9 +613,8 @@ static void AddSingleInflation(int32 *value, uint16 *frac, int32 amt) { - int64 tmp; + int64 tmp = (int64)*value * amt; int32 low; - tmp = BIGMULS(*value, amt); *frac = (uint16)(low = (uint16)tmp + *frac); *value += (int32)(tmp >> 16) + (low >> 16); } diff --git a/src/macros.h b/src/macros.h --- a/src/macros.h +++ b/src/macros.h @@ -53,10 +53,6 @@ return (uint32)((uint64)a * (uint64)b >> shift); } -static inline int64 BIGMULS(int32 a, int32 b) -{ - return (int64)a * (int64)b; -} /* OPT: optimized into an unsigned comparison */ //#define IS_INSIDE_1D(x, base, size) ((x) >= (base) && (x) < (base) + (size))