diff options
author | smatz <smatz@openttd.org> | 2008-04-07 20:02:36 +0000 |
---|---|---|
committer | smatz <smatz@openttd.org> | 2008-04-07 20:02:36 +0000 |
commit | 42a66ef9903d12cf748ddc6b3c4dcfaaef1c5efd (patch) | |
tree | c2115574a47116b76a0611096c82fda037e9a4b4 /src | |
parent | f1cd7ef5ee9d0862622d53a4c348d6f9debd500e (diff) | |
download | openttd-42a66ef9903d12cf748ddc6b3c4dcfaaef1c5efd.tar.xz |
(svn r12616) -Codechange: r12591 didn't work as expected for NDS, move one function back to cpp
Diffstat (limited to 'src')
-rw-r--r-- | src/command.cpp | 11 | ||||
-rw-r--r-- | src/command_type.h | 10 |
2 files changed, 12 insertions, 9 deletions
diff --git a/src/command.cpp b/src/command.cpp index 4b6335744..7bf1b8cba 100644 --- a/src/command.cpp +++ b/src/command.cpp @@ -668,3 +668,14 @@ callb_err: ClearStorageChanges(false); return false; } + + +CommandCost CommandCost::AddCost(CommandCost ret) +{ + this->AddCost(ret.cost); + if (this->success && !ret.success) { + this->message = ret.message; + this->success = false; + } + return *this; +} diff --git a/src/command_type.h b/src/command_type.h index 2f3fe2947..da310fe4e 100644 --- a/src/command_type.h +++ b/src/command_type.h @@ -49,15 +49,7 @@ public: * @param ret the command to add the cost of. * @return this class. */ - CommandCost AddCost(CommandCost ret) - { - this->AddCost(ret.cost); - if (this->success && !ret.success) { - this->message = ret.message; - this->success = false; - } - return *this; - } + CommandCost AddCost(CommandCost ret); /** * Adds the given cost to the cost of the command. |