From 4b5882b450ecf1368d9c72ab92b8754b4ea32236 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Sat, 30 May 2009 14:28:48 +0000
Subject: [PATCH] just fixes

---
 src/common/gamecode/market.c |  6 +++---
 src/common/kernel/battle.c   |  2 +-
 src/common/kernel/region.h   | 12 +++++++-----
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/common/gamecode/market.c b/src/common/gamecode/market.c
index ed021ccea..99a6bc22c 100644
--- a/src/common/gamecode/market.c
+++ b/src/common/gamecode/market.c
@@ -61,9 +61,9 @@ free_market(attrib * a)
 
 const item_type * r_luxury(region * r)
 {
-  const luxury_type * ltype;
-  for (ltype = luxurytypes;ltype;ltype=ltype->next) {
-    if (r_demand(r, ltype)<0) return ltype->itype;
+  struct demand * dmd;
+  for (dmd=r->land->demands;dmd;dmd=dmd->next) {
+    if (dmd->value==0) return dmd->type->itype;
   }
   return NULL;
 }
diff --git a/src/common/kernel/battle.c b/src/common/kernel/battle.c
index 67ee541a7..c54548b57 100644
--- a/src/common/kernel/battle.c
+++ b/src/common/kernel/battle.c
@@ -1899,7 +1899,7 @@ hits(troop at, troop dt, weapon * awp)
   skdiff = skilldiff(at, dt, dist);
   /* Verteidiger bekommt eine Rüstung */
   armor = select_armor(dt, true);
-  if (weapon->type->flags & WTF_USESHIELD) {
+  if (dwp->type->flags & WTF_USESHIELD) {
     shield = select_armor(dt, false);
   }
   if (contest(skdiff, dt, armor, shield)) {
diff --git a/src/common/kernel/region.h b/src/common/kernel/region.h
index 3cf61d525..dcefd7ae3 100644
--- a/src/common/kernel/region.h
+++ b/src/common/kernel/region.h
@@ -71,14 +71,16 @@ typedef struct region_owner {
   int since_turn;
 } region_owner;
 
+typedef struct demand {
+  struct demand * next;
+  const struct luxury_type * type;
+  int value;
+} demand;
+
 typedef struct land_region {
   char *name;
   /* TODO: demand kann nach Konvertierung entfernt werden. */
-  struct demand {
-    struct demand * next;
-    const struct luxury_type * type;
-    int value;
-  } * demands;
+  demand * demands;
   const struct item_type * herbtype;
   short herbs;
   short morale;