From fba338b2567316983d90152b33f28217af1d633e Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Tue, 16 Dec 2003 01:05:16 +0000
Subject: [PATCH] server.cpp statt main.cpp, um namen von .o files unique zu
 halten

---
 src/eressea/Jamfile                  | 2 +-
 src/eressea/korrektur.c              | 8 +++-----
 src/eressea/main.c                   | 4 ++--
 src/eressea/{main.cpp => server.cpp} | 0
 4 files changed, 6 insertions(+), 8 deletions(-)
 rename src/eressea/{main.cpp => server.cpp} (100%)

diff --git a/src/eressea/Jamfile b/src/eressea/Jamfile
index 6f8b427ca..c94a77f3f 100644
--- a/src/eressea/Jamfile
+++ b/src/eressea/Jamfile
@@ -24,7 +24,7 @@ if $(HAVE_LUA) {
   <lua>region.cpp
   <lua>ship.cpp
   <lua>unit.cpp
-  main.cpp
+  server.cpp
   ;
 
  LINKLIBS on $(BINARY) += -llua50 -llualib50 ;
diff --git a/src/eressea/korrektur.c b/src/eressea/korrektur.c
index 289eb5e2c..4161b2c76 100644
--- a/src/eressea/korrektur.c
+++ b/src/eressea/korrektur.c
@@ -2813,14 +2813,14 @@ give_cammo(void)
 
 #ifdef WDW_PHOENIX
 static region *
-random_region(void)
+random_land_region(void)
 {
 	region *r;
 	int c = 0;
 
 	/* count the available regions */
 	for(r=regions; r; r=r->next) {
-		if(rplane(r) == NULL && landregion(r)) c++;
+		if (r->land && rplane(r)==NULL) ++c;
 	}
 
 	/* choose one */
@@ -2828,9 +2828,7 @@ random_region(void)
 
 	/* this is a bit obfuscated, but should be correct */
 	for(r=regions; c > 0; r=r->next) {
-		if(rplane(r) == NULL && landregion(r)) {
-			--c;
-		}
+		if (r->land && rplane(r)==NULL) --c;
 	}
 
 	return(r);
diff --git a/src/eressea/main.c b/src/eressea/main.c
index a7dd1579c..47fd41ef0 100644
--- a/src/eressea/main.c
+++ b/src/eressea/main.c
@@ -706,8 +706,8 @@ main(int argc, char *argv[])
 	return 0;
 #endif
 
-
-	if ((i=readgame(false))!=0) return i;
+  sprintf(buf, "%d", turn);
+  if ((i=readgame(buf, false))!=0) return i;
 
 #ifdef NEW_STARTEQUIPMENT
   add_equipment(it_find("conquesttoken"), 1);
diff --git a/src/eressea/main.cpp b/src/eressea/server.cpp
similarity index 100%
rename from src/eressea/main.cpp
rename to src/eressea/server.cpp