Mercurial > hg > openttd
changeset 8854:855ce528445f draft
(svn r12616) -Codechange: r12591 didn't work as expected for NDS, move one function back to cpp
author | smatz <smatz@openttd.org> |
---|---|
date | Mon, 07 Apr 2008 20:02:36 +0000 |
parents | 02787d6f3834 |
children | 2acce887e7ec |
files | src/command.cpp src/command_type.h |
diffstat | 2 files changed, 12 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/command.cpp +++ b/src/command.cpp @@ -668,3 +668,14 @@ 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; +}
--- a/src/command_type.h +++ b/src/command_type.h @@ -49,15 +49,7 @@ * @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.