Mercurial > hg > openttd
changeset 6845:29cfcc6c2198 draft
(svn r10085) -Fix [FS#839]: message that you had given money appeared even when an error occured.
| author | rubidium <rubidium@openttd.org> |
|---|---|
| date | Sun, 10 Jun 2007 20:49:11 +0000 |
| parents | 70d60b0104c1 |
| children | a5bd2c7b1159 |
| files | src/main_gui.cpp |
| diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/main_gui.cpp +++ b/src/main_gui.cpp @@ -80,7 +80,8 @@ money = clamp(money, 0, 20000000); // Clamp between 20 million and 0 /* Give 'id' the money, and substract it from ourself */ - if (!DoCommandP(0, money, id, NULL, CMD_GIVE_MONEY | CMD_MSG(STR_INSUFFICIENT_FUNDS))) break; + int32 ret = DoCommandP(0, money, id, NULL, CMD_GIVE_MONEY | CMD_MSG(STR_INSUFFICIENT_FUNDS)); + if (CmdFailed(ret) || ret == 0) break; // We either did something wrong, or we don't have any money anymore /* Inform the player of this action */ snprintf(msg, sizeof(msg), "%d", money);