From 617457f3d6c80be4aca23999cf28255280811a99 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Thu, 14 Jul 2005 18:35:32 +0000
Subject: [PATCH] =?UTF-8?q?Diverse=20short/int=20Warnings=20im=20mapper=20?=
 =?UTF-8?q?ausgebaut,=20immer=20noch=20eine=20Million=20=C3=BCbrig.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mapper/map_modify.c | 4 ++--
 src/mapper/map_partei.c | 3 ++-
 src/mapper/mapper.c     | 1 -
 src/mapper/mapper.h     | 3 ++-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/mapper/map_modify.c b/src/mapper/map_modify.c
index 0f9f0282e..e8d950430 100644
--- a/src/mapper/map_modify.c
+++ b/src/mapper/map_modify.c
@@ -90,8 +90,8 @@ static int g_maxluxuries;
 void
 block_create(int x1, int y1, int size, char chaotisch, int special, char terrain)
 {
-	int local_climate;
-	int x, y, k;
+	int local_climate, k;
+	short x, y;
 	vset fringe;
 
 	vset_init(&fringe);
diff --git a/src/mapper/map_partei.c b/src/mapper/map_partei.c
index c06623449..825daf22b 100644
--- a/src/mapper/map_partei.c
+++ b/src/mapper/map_partei.c
@@ -171,7 +171,8 @@ read_dropouts(const char * filename)
 	if (F==NULL) return;
 	for (;;) {
 		char email[64], race[20];
-		int age, x, y;
+		int age;
+    short x, y;
 		if (fscanf(F, "%s %s %d %d %d", email, race, &age, &x, &y)<=0) break;
 		if (age<=2) {
 			region * r = findregion(x, y);
diff --git a/src/mapper/mapper.c b/src/mapper/mapper.c
index ddda48ccc..fcacd3d38 100644
--- a/src/mapper/mapper.c
+++ b/src/mapper/mapper.c
@@ -1154,7 +1154,6 @@ movearound(int rx, int ry) {
 				case 'I':
 					a=map_input(0,0,0,"Wieviele Regionen?",0,500,0);
 					if (a) {
-/*						block_create(rx, ry, a, 0, 0, T_GLACIER); */
 						create_island(r, a, (terrain_t)(rand()%(T_GLACIER)+1));
 						modified=1;
 					}
diff --git a/src/mapper/mapper.h b/src/mapper/mapper.h
index a54865e6c..791ffc49a 100644
--- a/src/mapper/mapper.h
+++ b/src/mapper/mapper.h
@@ -127,7 +127,8 @@ extern int numnewbies;
 typedef struct dropout {
 	struct dropout * next;
 	const struct race * race;
-	int x, y, fno;
+	short x, y;
+  int fno;
 } dropout;
 
 extern dropout * dropouts;