From 1d625d1683450351c66311149419cd3be6e7f436 Mon Sep 17 00:00:00 2001
From: Christian Schlittchen <corwin@amber.kn-bremen.de>
Date: Sat, 9 Mar 2002 13:51:14 +0000
Subject: [PATCH] =?UTF-8?q?-=20Fix=20Tavernengr=C3=B6=C3=9Fe=2010=20-=20Fi?=
 =?UTF-8?q?x=20Skillchange-Anzeige=20-=20Compiliert=20wieder?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/kernel/battle.c   | 2 +-
 src/common/kernel/battle.h   | 1 +
 src/common/kernel/building.c | 2 +-
 src/common/kernel/reports.c  | 2 +-
 src/common/kernel/unit.c     | 3 ++-
 src/mapper/map_partei.c      | 4 ++--
 6 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/common/kernel/battle.c b/src/common/kernel/battle.c
index c64877e36..1c65835ce 100644
--- a/src/common/kernel/battle.c
+++ b/src/common/kernel/battle.c
@@ -475,7 +475,7 @@ tactics_bonus(troop at, troop dt, boolean attacking)
 }
 #endif /* NEW_TACTICS */
 
-static int
+int
 statusrow(int status)
 {
 	switch (status) {
diff --git a/src/common/kernel/battle.h b/src/common/kernel/battle.h
index e0916e99e..8d3d640e9 100644
--- a/src/common/kernel/battle.h
+++ b/src/common/kernel/battle.h
@@ -237,5 +237,6 @@ extern struct troop select_corpse(struct battle * b, struct fighter * af);
 extern fighter * make_fighter(struct battle * b, struct unit * u, boolean attack);
 void flee(const troop dt);
 void drain_exp(struct unit *u, int d);
+extern int statusrow(int status);
 
 #endif
diff --git a/src/common/kernel/building.c b/src/common/kernel/building.c
index 1c2090726..97c6935d8 100644
--- a/src/common/kernel/building.c
+++ b/src/common/kernel/building.c
@@ -648,7 +648,7 @@ static const construction inn_bld = {
 building_type bt_inn = {
 	"inn",     /* _name */
 	BFL_NONE,     /* flags */
-	1, 10, 10,    /* capac/size, maxcapac, maxsize */
+	1, 10, -1,    /* capac/size, maxcapac, maxsize */
 	inn_keep,  /* maintenance */
 	&inn_bld,  /* construction */
 	NULL          /* name() */
diff --git a/src/common/kernel/reports.c b/src/common/kernel/reports.c
index a5c6c580d..885779e34 100644
--- a/src/common/kernel/reports.c
+++ b/src/common/kernel/reports.c
@@ -643,7 +643,7 @@ spskill(const struct locale * lang, const struct unit * u, skill_t sk, int *dh,
 		diff   = effsk - oldeff; 
 
 		if(diff != 0) {
-			sbuf += sprintf(sbuf, " (%s%hd)", (diff>0)?"+":"", diff);
+			sbuf += sprintf(sbuf, " (%s%d)", (diff>0)?"+":"", diff);
 		}
 	}
 }
diff --git a/src/common/kernel/unit.c b/src/common/kernel/unit.c
index 9b3ea6d30..774e29f2f 100644
--- a/src/common/kernel/unit.c
+++ b/src/common/kernel/unit.c
@@ -854,7 +854,8 @@ add_skill(unit * u, skill_t id)
 	sv = (u->skills + u->skill_size - 1);
 	sv->level = (unsigned char)0;
 	sv->weeks = (unsigned char)1;
-	sv->id = (unsigned char)id;
+	sv->old   = (unsigned char)0;
+	sv->id    = (unsigned char)id;
 	return sv;
 }
 
diff --git a/src/mapper/map_partei.c b/src/mapper/map_partei.c
index d2e84d53f..94d5e3f4c 100644
--- a/src/mapper/map_partei.c
+++ b/src/mapper/map_partei.c
@@ -268,7 +268,7 @@ SeedPartei(void)
 	do {
 		win = openwin(SX - 10, 6, "< Neue Partei einfügen >");
 		wmove(win, y, 4);
-		for (i = 1; i < MAXRACES; i++) if(playerrace(new_race[i])) {
+		for (i = 1; i < MAXRACES; i++) if(playerrace(new_race[i]) && i != RC_ORC) {
 			sprintf(buf, "%d=%s; ", i, new_race[i]->_name[0]);
 			q += strlen(buf);
 			if (q > SX - 20) {
@@ -281,7 +281,7 @@ SeedPartei(void)
 		rc = (race_t) map_input(win, 2, 1, "Rasse", 0, MAXRACES-1, rc);
 
 		delwin(win);
-	} while(!playerrace(new_race[i]));
+	} while(!playerrace(new_race[i]) || i == RC_ORC);
 	return goodregion(rc);
 }