diff options
| author | truebrain <truebrain@openttd.org> | 2011-12-20 17:57:56 +0000 |
|---|---|---|
| committer | truebrain <truebrain@openttd.org> | 2011-12-20 17:57:56 +0000 |
| commit | 1c9bec19993417b1f3b240f2bdb0745aa26c0cb3 (patch) | |
| tree | d09407cc962ee87ac1bbbbc60951cad74c6b1db7 /src/command_type.h | |
| parent | 7a38642a1c83531a65907ae784bc03a82d35132a (diff) | |
| download | openttd-1c9bec19993417b1f3b240f2bdb0745aa26c0cb3.tar.xz | |
(svn r23640) -Fix: stop using FORCEINLINE (1/3rd of the instances were, the others were still regular inline), but make sure inline is always a 'forced' inline (I am looking at you MSVC)
Diffstat (limited to 'src/command_type.h')
| -rw-r--r-- | src/command_type.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/command_type.h b/src/command_type.h index 2e50c5eae..152f66618 100644 --- a/src/command_type.h +++ b/src/command_type.h @@ -58,7 +58,7 @@ public: * Adds the given cost to the cost of the command. * @param cost the cost to add */ - FORCEINLINE void AddCost(const Money &cost) + inline void AddCost(const Money &cost) { this->cost += cost; } @@ -69,7 +69,7 @@ public: * Multiplies the cost of the command by the given factor. * @param factor factor to multiply the costs with */ - FORCEINLINE void MultiplyCost(int factor) + inline void MultiplyCost(int factor) { this->cost *= factor; } @@ -78,7 +78,7 @@ public: * The costs as made up to this moment * @return the costs */ - FORCEINLINE Money GetCost() const + inline Money GetCost() const { return this->cost; } @@ -87,7 +87,7 @@ public: * The expense type of the cost * @return the expense type */ - FORCEINLINE ExpensesType GetExpensesType() const + inline ExpensesType GetExpensesType() const { return this->expense_type; } @@ -137,7 +137,7 @@ public: * Did this command succeed? * @return true if and only if it succeeded */ - FORCEINLINE bool Succeeded() const + inline bool Succeeded() const { return this->success; } @@ -146,7 +146,7 @@ public: * Did this command fail? * @return true if and only if it failed */ - FORCEINLINE bool Failed() const + inline bool Failed() const { return !this->success; } |