summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2011-02-08 20:47:48 +0000
committerrubidium <rubidium@openttd.org>2011-02-08 20:47:48 +0000
commit5286de116b56629044c93a78292ff8d0bebef32c (patch)
tree4eb0ab921b28cccf98445be19d212f1dc608a55f
parent0c873d2bc6276ff90a4358bd02e36b5d06688b8b (diff)
downloadopenttd-5286de116b56629044c93a78292ff8d0bebef32c.tar.xz
(svn r22028) -Cleanup: remove traces of a debugging "feature" that got disabled a long time ago
-rw-r--r--src/main_gui.cpp7
-rw-r--r--src/misc_cmd.cpp5
2 files changed, 2 insertions, 10 deletions
diff --git a/src/main_gui.cpp b/src/main_gui.cpp
index f6141a2cf..3f43dcdc8 100644
--- a/src/main_gui.cpp
+++ b/src/main_gui.cpp
@@ -331,11 +331,8 @@ struct MainWindow : Window
break;
case GHK_MONEY: // Gimme money
- /* Server can not cheat in advertise mode either! */
-#ifdef ENABLE_NETWORK
- if (!_networking || !_network_server || !_settings_client.network.server_advertise)
-#endif /* ENABLE_NETWORK */
- DoCommandP(0, 10000000, 0, CMD_MONEY_CHEAT);
+ /* You can only cheat for money in single player. */
+ if (!_networking) DoCommandP(0, 10000000, 0, CMD_MONEY_CHEAT);
break;
case GHK_UPDATE_COORDS: // Update the coordinates of all station signs
diff --git a/src/misc_cmd.cpp b/src/misc_cmd.cpp
index 1a8877a1b..1f6ee839a 100644
--- a/src/misc_cmd.cpp
+++ b/src/misc_cmd.cpp
@@ -190,8 +190,6 @@ CommandCost CmdPause(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2,
/**
* Change the financial flow of your company.
- * This is normally only enabled in offline mode, but if there is a debug
- * build, you can cheat (to test).
* @param tile unused
* @param flags operation to perform
* @param p1 the amount of money to receive (if negative), or spend (if positive)
@@ -201,9 +199,6 @@ CommandCost CmdPause(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2,
*/
CommandCost CmdMoneyCheat(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
{
-#ifndef _DEBUG
- if (_networking) return CMD_ERROR;
-#endif
return CommandCost(EXPENSES_OTHER, -(int32)p1);
}