petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r12616) -Codechange: r12591 didn't work as expected for NDS, move one function back to cpp

Browse Source
This commit is contained in:
smatz
2008-04-07 20:02:36 +00:00
parent f1cd7ef5ee
commit 42a66ef990
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/command.cpp
View File

@@ -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;
}

10
src/command_type.h
View File

@@ -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.