# HG changeset patch
# User truelight
# Date 1104225842 0
# Node ID 640a517dc129bda1a12715196aed697580a6c51c
# Parent  65ecc321b3dbed77b51d79e8cc09a653eaee56f4
(svn r1284) -Fix: Fixed 'money-cheat' (read: bug which could give people a lot of money)

diff -r 65ecc321b3db -r 640a517dc129 main_gui.c
--- a/main_gui.c	Mon Dec 27 18:18:44 2004 +0000
+++ b/main_gui.c	Tue Dec 28 09:24:02 2004 +0000
@@ -87,6 +87,9 @@
 		// Give money
 		int32 money = atoi(e->edittext.str) / GetCurrentCurrencyRate();
 		char msg[100];
+
+		money = clamp(money, 0, 0xFFFFFFFF); // Clamp between 4 billion and 0
+
 		// Give 'id' the money, and substract it from ourself
 		if (!DoCommandP(0, money, id, NULL, CMD_GIVE_MONEY)) break;
 
diff -r 65ecc321b3db -r 640a517dc129 misc_cmd.c
--- a/misc_cmd.c	Mon Dec 27 18:18:44 2004 +0000
+++ b/misc_cmd.c	Tue Dec 28 09:24:02 2004 +0000
@@ -285,6 +285,11 @@
 {
 	SET_EXPENSES_TYPE(EXPENSES_OTHER);
 
+	p1 = clamp(p1, 0, 0xFFFFFFFF); // Clamp between 4 billion and 0
+
+	if (p1 == 0)
+		return CMD_ERROR;
+
 	if (flags & DC_EXEC) {
 		// Add money to player
 		byte old_cp = _current_player;