From ba2e0fef8cbc10e9ad2625704d3d5426c6c86c03 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Sat, 26 Nov 2005 01:24:28 +0000
Subject: [PATCH] more code that fails when there are no luxuries

---
 src/common/gamecode/economy.c | 5 +++--
 src/common/kernel/region.c    | 3 +++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/common/gamecode/economy.c b/src/common/gamecode/economy.c
index 62eb398ea..c729ab8fa 100644
--- a/src/common/gamecode/economy.c
+++ b/src/common/gamecode/economy.c
@@ -2067,8 +2067,9 @@ expandselling(region * r, request * sellorders, int limit)
 
 			if (++counter[i] > max_products) {
 				int d = r_demand(r, ltype);
-				if (d > 1)
-					r_setdemand(r, ltype, d-1);
+        if (d > 1) {
+          r_setdemand(r, ltype, d-1);
+        }
 				counter[i] = 0;
 			}
 		}
diff --git a/src/common/kernel/region.c b/src/common/kernel/region.c
index c8738c0bb..e03757cec 100644
--- a/src/common/kernel/region.c
+++ b/src/common/kernel/region.c
@@ -670,6 +670,9 @@ void
 r_setdemand(region * r, const luxury_type * ltype, int value)
 {
 	struct demand * d, ** dp = &r->land->demands;
+
+  if (ltype==NULL) return;
+
 	while (*dp && (*dp)->type != ltype) dp = &(*dp)->next;
 	d = *dp;
 	if (!d) {