From f35612bd21374ee0aa77c0a79b6546922d43add0 Mon Sep 17 00:00:00 2001 From: smatz Date: Mon, 7 Apr 2008 20:02:36 +0000 Subject: (svn r12616) -Codechange: r12591 didn't work as expected for NDS, move one function back to cpp --- src/command.cpp | 11 +++++++++++ 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. -- cgit v1.2.3-70-g09d2