From 9475e476069c494f1f32ca30233d2fedb69d42fe Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Sat, 11 Feb 2006 23:18:10 +0000
Subject: [PATCH] - bugfix capacities - a little cleanup

---
 src/common/items/weapons.c       | 43 ++++++++++++--------------------
 src/common/kernel/eressea.c      |  1 +
 src/common/kernel/movement.c     |  4 +--
 src/common/kernel/xmlreader.c    |  2 --
 src/mapper/map_partei.c          | 17 -------------
 src/scripts/eressea/xmas2004.lua |  1 -
 6 files changed, 19 insertions(+), 49 deletions(-)

diff --git a/src/common/items/weapons.c b/src/common/items/weapons.c
index 7cf6f2251..f5c857c7c 100644
--- a/src/common/items/weapons.c
+++ b/src/common/items/weapons.c
@@ -30,20 +30,9 @@
 #include <assert.h>
 #include <stdlib.h>
 
-static weapon_mod wm_spear[] = {
-	{ 1, WMF_SKILL|WMF_RIDING|WMF_AGAINST_ANYONE|WMF_OFFENSIVE },
-	{ 1, WMF_SKILL|WMF_WALKING|WMF_AGAINST_RIDING|WMF_DEFENSIVE },
-	{ 0, 0 }
-};
-
-static weapon_mod wm_lance[] = {
-	{ 1, WMF_SKILL|WMF_RIDING|WMF_AGAINST_ANYONE|WMF_OFFENSIVE },
-	{ 0, 0 }
-};
-
 enum {
-	WP_NONE,
-	WP_MAX
+  WP_NONE,
+  WP_MAX
 };
 
 /* damage types */
@@ -54,20 +43,20 @@ enum {
 #define ARMORPIERCING (1<<3)
 
 typedef struct weapondata {
-	double magres;
-	const char *damfoot;
-	const char *damhorse;
-	item_t item;
-	skill_t skill;
-	char attmod;
-	char defmod;
-	boolean rear;
-	boolean is_magic;
-	struct reload {
-		int type;
-		char time;
-	} reload;
-	char damage_type;
+  double magres;
+  const char *damfoot;
+  const char *damhorse;
+  item_t item;
+  skill_t skill;
+  char attmod;
+  char defmod;
+  boolean rear;
+  boolean is_magic;
+  struct reload {
+    int type;
+    char time;
+  } reload;
+  char damage_type;
 } weapondata;
 
 static weapondata weapontable[WP_MAX + 1] =
diff --git a/src/common/kernel/eressea.c b/src/common/kernel/eressea.c
index 04e3b8a72..01009ec1b 100644
--- a/src/common/kernel/eressea.c
+++ b/src/common/kernel/eressea.c
@@ -3107,6 +3107,7 @@ attrib_init(void)
 	at_register(&at_moveblock);
 	at_register(&at_deathcount);
 	at_register(&at_chaoscount);
+	at_register(&at_woodcount);
 
 	/* neue UNIT-Attribute */
 	at_register(&at_siege);
diff --git a/src/common/kernel/movement.c b/src/common/kernel/movement.c
index 0d2473e81..e520fd116 100644
--- a/src/common/kernel/movement.c
+++ b/src/common/kernel/movement.c
@@ -236,12 +236,12 @@ get_transporters(const item * itm, int * p_animals, int *p_acap, int * p_vehicle
     const item_type * itype = itm->type;
     if (itype->capacity>0) {
       if (itype->flags & ITF_ANIMAL) {
-        ++animals;
+        animals += itm->number;
         if (acap==0) acap = itype->capacity;
         assert(acap==itype->capacity || !"animals with different capacity not supported");
       }
       if (itype->flags & ITF_VEHICLE) {
-        ++vehicles;
+        vehicles += itm->number;
         if (vcap==0) vcap = itype->capacity;
         assert(vcap==itype->capacity || !"vehicles with different capacity not supported");
       }
diff --git a/src/common/kernel/xmlreader.c b/src/common/kernel/xmlreader.c
index 0944de0d9..76fa11ca5 100644
--- a/src/common/kernel/xmlreader.c
+++ b/src/common/kernel/xmlreader.c
@@ -1396,9 +1396,7 @@ parse_races(xmlDocPtr doc)
     rc->recruitcost = xml_ivalue(node, "recruitcost", 0);
     rc->maintenance = xml_ivalue(node, "maintenance", 0);
     rc->weight = xml_ivalue(node, "weight", 0);
-#ifdef RACE_CAPACITY
     rc->capacity = xml_ivalue(node, "capacity", 540);
-#endif
     rc->speed = (float)xml_fvalue(node, "speed", 1.0F);
     rc->hitpoints = xml_ivalue(node, "hp", 0);
     rc->armor = (char)xml_ivalue(node, "ac", 0);
diff --git a/src/mapper/map_partei.c b/src/mapper/map_partei.c
index e8fffa283..be9fefbc4 100644
--- a/src/mapper/map_partei.c
+++ b/src/mapper/map_partei.c
@@ -120,23 +120,6 @@ typedef struct island {
 	int age;
 } island;
 
-static int
-days2level(int days)
-{
-	int l = 0;
-	while (level_days(l)<=days) ++l;
-	return l-1;
-}
-
-static void
-change_level(unit * u, skill_t sk, int bylevel)
-{
-	skill * sv = get_skill(u, sk);
-	assert(bylevel>0);
-	if (sv==0) sv = add_skill(u, sk);
-	sk_set(sv, sv->level+bylevel);
-}
-
 newfaction *
 select_newfaction(const struct race * rc)
 {
diff --git a/src/scripts/eressea/xmas2004.lua b/src/scripts/eressea/xmas2004.lua
index b7a720da3..d0f29030e 100644
--- a/src/scripts/eressea/xmas2004.lua
+++ b/src/scripts/eressea/xmas2004.lua
@@ -10,7 +10,6 @@ function use_snowman(u, amount)
 end
 
 function xmas2004()
-  print(get_gamename())
   if get_gamename() == "Eressea" then
     if not get_flag("xm04") then
       print("Es weihnachtet sehr (2004)")