From b1703d27d46af8f56fa60ddb3d1582af79c8ad69 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Tue, 26 Jul 2005 21:03:08 +0000
Subject: [PATCH] local linux fixes

---
 src/common/gamecode/creport.c | 13 -------------
 src/common/modules/museum.c   |  1 +
 src/mapper/map_partei.c       |  2 +-
 src/mapper/mapper.c           |  2 +-
 4 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/src/common/gamecode/creport.c b/src/common/gamecode/creport.c
index b400233a4..51ff7aa78 100644
--- a/src/common/gamecode/creport.c
+++ b/src/common/gamecode/creport.c
@@ -158,19 +158,6 @@ reset_translations(void)
 	}
 }
 
-/* implementation */
-static void
-cr_output_str_list(FILE * F, const char *title, const strlist * S, const faction * f)
-{
-	if (!S) return;
-
-	fprintf(F, "%s\n", title);
-	while (S) {
-		fprintf(F, "\"%s\"\n", S->s);
-		S = S->next;
-	}
-}
-
 #include "objtypes.h"
 
 static void
diff --git a/src/common/modules/museum.c b/src/common/modules/museum.c
index c536ca4c0..aff5bd0ae 100644
--- a/src/common/modules/museum.c
+++ b/src/common/modules/museum.c
@@ -26,6 +26,7 @@
 
 /* kernel includes */
 #include <kernel/building.h>
+#include <kernel/faction.h>
 #include <kernel/item.h>
 #include <kernel/movement.h>
 #include <kernel/message.h>
diff --git a/src/mapper/map_partei.c b/src/mapper/map_partei.c
index 825daf22b..940beca7d 100644
--- a/src/mapper/map_partei.c
+++ b/src/mapper/map_partei.c
@@ -173,7 +173,7 @@ read_dropouts(const char * filename)
 		char email[64], race[20];
 		int age;
     short x, y;
-		if (fscanf(F, "%s %s %d %d %d", email, race, &age, &x, &y)<=0) break;
+		if (fscanf(F, "%s %s %d %hd %hd", email, race, &age, &x, &y)<=0) break;
 		if (age<=2) {
 			region * r = findregion(x, y);
 			if (r) {
diff --git a/src/mapper/mapper.c b/src/mapper/mapper.c
index f68bf0da4..9330527a7 100644
--- a/src/mapper/mapper.c
+++ b/src/mapper/mapper.c
@@ -812,7 +812,7 @@ SetHighlight(void)
 }
 
 void
-recalc_everything(int *x, int *y, int *rx, int *ry)
+recalc_everything(short *x, short *y, short *rx, short *ry)
 {
 	int eingerueckt;