Neuer Inselgenerator im Server.

Einheitliche Runtime-Library für VC.net Targets.

src/common/attributes/attributes.vcproj

@@ -114,6 +114,58 @@
 			<Tool
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
+		<Configuration
+			Name="Profile|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="../kernel,../util,../..,.."
+				PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS"
+				StringPooling="TRUE"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="TRUE"
+				DisableLanguageExtensions="TRUE"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderFile=".\Release/attributes.pch"
+				AssemblerListingLocation=".\Release/"
+				ObjectFile=".\Release/"
+				ProgramDataBaseFileName=".\Release/"
+				WarningLevel="4"
+				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="1"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile=".\Release\attributes.lib"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				Culture="1031"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
 	</Configurations>
 	<References>
 	</References>

src/common/gamecode/economy.c

@@ -1771,7 +1771,13 @@ buy(unit * u, request ** buyorders, struct order * ord)
 		}
 	} else {
 		/* ...oder in der Region muß es eine Burg geben. */
-		if (!rbuildings(r)) {
+    building * b;
+    static const struct building_type * bt_castle;
+    if (!bt_castle) bt_castle = bt_find("castle");
+    for (b=r->buildings;b;b=b->next) {
+      if (b->type==bt_castle && b->size>2) break;
+    }
+		if (b==NULL) {
 			cmistake(u, ord, 119, MSG_COMMERCE);
 			return;
 		}
@@ -2568,6 +2574,11 @@ steal_cmd(unit * u, struct order * ord, request ** stealorders)
   region * r = u->region;
 	faction * f = NULL;
 
+  if (rterrain(r) == T_OCEAN && u->race != new_race[RC_AQUARIAN]) {
+    cmistake(u, ord, 242, MSG_INCOME);
+    return;
+  }
+
 	if (r->planep && fval(r->planep, PFL_NOATTACK)) {
 		cmistake(u, ord, 270, MSG_INCOME);
 		return;

src/common/gamecode/gamecode.vcproj

@@ -72,12 +72,12 @@
 			ATLMinimizesCRunTimeLibraryUsage="FALSE">
 			<Tool
 				Name="VCCLCompilerTool"
+				Optimization="0"
 				InlineFunctionExpansion="1"
-				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="../kernel,../util,../..,.."
 				PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS"
 				StringPooling="TRUE"
-				RuntimeLibrary="4"
+				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
 				DisableLanguageExtensions="TRUE"
 				UsePrecompiledHeader="2"

src/common/items/items.vcproj

@@ -113,6 +113,57 @@
 			<Tool
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
+		<Configuration
+			Name="Profile|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="../kernel,../util,../..,.."
+				PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS"
+				StringPooling="TRUE"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="TRUE"
+				DisableLanguageExtensions="TRUE"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderFile=".\Release/items.pch"
+				AssemblerListingLocation=".\Release/"
+				ObjectFile=".\Release/"
+				ProgramDataBaseFileName=".\Release/"
+				WarningLevel="4"
+				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="1"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile=".\Release\items.lib"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				Culture="1031"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
 	</Configurations>
 	<References>
 	</References>

src/common/kernel/eressea.c

@@ -1862,6 +1862,7 @@ createunitid(unit *u, int id)
 unit *
 createunit(region * r, faction * f, int number, const struct race * rc)
 {
+  assert(rc);
 	return create_unit(r, f, number, rc, 0, NULL, NULL);
 }
 
@@ -1870,6 +1871,7 @@ create_unit(region * r, faction * f, int number, const struct race *urace, int i
 {
 	unit * u = calloc(1, sizeof(unit));
 
+  assert(urace);
 	assert(f->alive);
 	u_setfaction(u, f);
 	set_order(&u->thisorder, NULL);

src/common/kernel/faction.c

@@ -96,7 +96,7 @@ addfaction(const char *email, const char * password,
   int i;
   faction * f = calloc(sizeof(faction), 1);
 
-  assert(frace != new_race[RC_ORC]);
+  assert(frace && frace != new_race[RC_ORC]);
 
   if (set_email(&f->email, email)!=0) {
     log_error(("Invalid email address for faction %s: %s\n", itoa36(f->no), email));

src/common/kernel/kernel.vcproj

@@ -19,12 +19,12 @@
 			ATLMinimizesCRunTimeLibraryUsage="FALSE">
 			<Tool
 				Name="VCCLCompilerTool"
+				Optimization="0"
 				InlineFunctionExpansion="1"
-				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="../util,../..,.."
 				PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS"
 				StringPooling="TRUE"
-				RuntimeLibrary="4"
+				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
 				DisableLanguageExtensions="TRUE"
 				UsePrecompiledHeader="2"

src/common/kernel/movement.c

@@ -944,7 +944,7 @@ init_transportation(void)
     * K_DRIVE. This is time consuming for an error check, but there
     * doesn't seem to be an easy way to speed this up. */
     for (u=r->units; u; u=u->next) {
-      if (get_keyword(u->thisorder) == K_DRIVE && !fval(u, UFL_LONGACTION) && !LongHunger(u)) {
+      if (get_keyword(u->thisorder) == K_DRIVE && can_move(u) && !fval(u, UFL_LONGACTION) && !LongHunger(u)) {
         unit * ut;
 
         init_tokens(u->thisorder);
@@ -980,7 +980,7 @@ init_transportation(void)
           ut = getunit(r, u->faction);
           if (ut==NULL) continue;
 
-          if (get_keyword(ut->thisorder) == K_DRIVE && !fval(ut, UFL_LONGACTION) && !LongHunger(ut)) {
+          if (get_keyword(ut->thisorder) == K_DRIVE && can_move(u) && !fval(ut, UFL_LONGACTION) && !LongHunger(ut)) {
             init_tokens(ut->thisorder);
             skip_token();
             if (getunit(r, ut->faction) == u) {
@@ -1800,7 +1800,7 @@ travel_i(unit * u, region_list * route_begin, region_list * route_end, order * o
     ut = getunit(r, u->faction);
     if (ut!=NULL) {
       boolean found = false;
-      if (get_keyword(ut->thisorder) == K_DRIVE) {
+      if (get_keyword(ut->thisorder) == K_DRIVE && can_move(ut)) {
         if (!fval(ut, UFL_LONGACTION) && !LongHunger(ut)) {
           init_tokens(ut->thisorder);
           skip_token();

src/common/kernel/spell.c

@@ -9717,7 +9717,7 @@ static spell spelldaten[] =
     SPL_ENTERASTRAL, "Astraler Weg",
     "Alte arkane Formeln ermöglichen es dem Magier, sich und andere in die "
     "astrale Ebene zu bringen. Der Magier kann (Stufe-3)*15 GE durch das "
-    "kurzzeitig entstehende Tor bringen. Ist der Magier erfahren genug, "
+    "kurzzeitig entstehende Tor schicken. Ist der Magier erfahren genug, "
     "den Zauber auf Stufen von 11 oder mehr zu zaubern, kann er andere "
     "Einheiten auch gegen ihren Willen auf die andere Ebene zwingen.", NULL,
     "u+",

src/common/modules/autoseed.c

@@ -228,79 +228,177 @@ preferred_terrain(const struct race * rc)
 }
 
 #define REGIONS_PER_FACTION 2
+#define PLAYERS_PER_ISLAND 20
+#define TURNS_PER_ISLAND 3
 #define MINFACTIONS 1
 #define MAXAGEDIFF 5
 #define VOLCANO_CHANCE 100
 
+static boolean
+virgin_region(const region * r)
+{
+  direction_t d;
+  if (r==NULL) return true;
+  if (r->age>MAXAGEDIFF) return false;
+  if (r->units) return false;
+  for (d=0;d!=MAXDIRECTIONS;++d) {
+    const region * rn = rconnect(r, d);
+    if (rn) {
+      if (rn->age>MAXAGEDIFF) return false;
+      if (rn->units) return false;
+    }
+  }
+  return true;
+}
+
+void
+get_island(region * root, region_list ** rlist)
+{
+  region_list ** rnext = rlist;
+  while (*rnext) rnext=&(*rnext)->next;
+
+  fset(root, FL_MARK);
+  add_regionlist(rnext, root);
+
+  while (*rnext) {
+    direction_t dir;
+
+    region * rcurrent = (*rnext)->data;
+    rnext = &(*rnext)->next;
+
+    for (dir=0;dir!=MAXDIRECTIONS;++dir) {
+      region * r = rconnect(rcurrent, dir);
+      if (r!=NULL && r->land && !fval(r, FL_MARK)) {
+        fset(r, FL_MARK);
+        add_regionlist(rnext, r);
+      }
+    }
+  }
+  rnext=rlist;
+  while (*rnext) {
+    region_list * rptr = *rnext;
+    freset(rptr->data, FL_MARK);
+    rnext = &rptr->next;
+  }
+}
+
+/** create new island with up to nsize players
+ * returns the number of players placed on the new island.
+ */
 int
 autoseed(newfaction ** players, int nsize)
 {
 	int x = 0, y = 0;
-	region * r;
+	region * r = NULL;
 	region_list * rlist = NULL;
-	int rsize, isize=0;
+	int rsize, tsize = 0;
-	region * rmin = NULL;
+  int isize = REGIONS_PER_FACTION; /* target size for the island */
-	direction_t d;
+  int psize = 0; /* players on this island */
-	int dist;
-
-	for (r=regions;r;r=r->next) {
-		struct plane * p = rplane(r);
-		if (r->terrain==T_OCEAN && p==NULL && (rmin==NULL || r->age<=MAXAGEDIFF)) {
-			direction_t d;
-			for (d=0;d!=MAXDIRECTIONS;++d) {
-				if (rconnect(r, d)==NULL) break;
-			}
-			if (d!=MAXDIRECTIONS) rmin=r;
-		}
-	}
-	r = NULL;
-	for (dist=1;r!=rmin;++dist) {
-		for (d=0;r!=rmin && d!=MAXDIRECTIONS;++d) {
-			int i;
-			region * rn = rmin;
-			for (i=0;i!=dist;++i) rn=rconnect(rn, d);
-			if (rn==NULL) {
-				r = rmin;
-				x = rmin->x + delta_x[d] * dist;
-				y = rmin->y + delta_y[d] * dist;
-			}
-		}
-	}
 
   if (listlen(*players)<MINFACTIONS) return 0;
-	r = new_region(x, y);
+
-	terraform(r, T_OCEAN);
+  if (turn % TURNS_PER_ISLAND) {
-	add_regionlist(&rlist, r);
+    region * rmin = NULL;
-	rsize = 1;
+    /* find a spot that's adjacent to the previous island, but virgin.
-	while (nsize && rsize) {
+     * like the last land virgin ocean region adjacent to land.
+     */
+    for (r=regions;r;r=r->next) {
+      struct plane * p = rplane(r);
+      if (r->terrain==T_OCEAN && p==NULL && virgin_region(r)) {
+        direction_t d;
+        for (d=0;d!=MAXDIRECTIONS;++d) {
+          region * rn = rconnect(r, d);
+          if (rn && rn->land) break;
+        }
+        if (d!=MAXDIRECTIONS) rmin = r;
+      }
+    }
+    if (rmin!=NULL) {
+      region_list * rlist = NULL, * rptr;
+      faction * f;
+      get_island(rmin, &rlist);
+      for (rptr=rlist;rptr;rptr=rptr->next) {
+        region * r = rlist->data;
+        unit * u;
+        for (u=r->units;u;u->next) {
+          f = u->faction;
+          if (!fval(f, FL_MARK)) {
+            ++psize;
+            fset(f, FL_MARK);
+          }
+        }
+      }
+      free_regionlist(rlist);
+      if (psize>0) for (f=factions;f;f=f->next) freset(f, FL_MARK);
+      if (psize<PLAYERS_PER_ISLAND) {
+        r = rmin;
+      }
+    }
+  }
+  if (r==NULL) {
+    region * rmin = NULL;
+    direction_t dmin = MAXDIRECTIONS;
+    /* find an empty spot.
+     * rmin = the youngest ocean region that has a missing neighbour 
+     * dmin = direction in which it's empty
+     */
+    for (r=regions;r;r=r->next) {
+      struct plane * p = rplane(r);
+      if (r->terrain==T_OCEAN && p==NULL && (rmin==NULL || r->age<=MAXAGEDIFF)) {
+        direction_t d;
+        for (d=0;d!=MAXDIRECTIONS;++d) {
+          if (rconnect(r, d)==NULL) break;
+        }
+        if (d!=MAXDIRECTIONS) {
+          rmin=r;
+          dmin=d;
+        }
+      }
+    }
+
+    /* create a new region where we found the empty spot, and make it the first 
+    * in our island. island regions are kept in rlist, so only new regions can 
+    * get populated, and old regions are not overwritten */
+    if (rmin!=NULL) {
+      assert(virgin_region(rconnect(rmin, dmin)));
+      x = rmin->x + delta_x[dmin];
+      y = rmin->y + delta_y[dmin];
+    }
+    r = new_region(x, y);
+    terraform(r, T_OCEAN); /* we change the terrain later */
+  }
+
+  add_regionlist(&rlist, r);
+  rsize = 1;
+
+  while (rsize && (nsize || isize>=REGIONS_PER_FACTION)) {
 		int i = rand() % rsize;
 		region_list ** rnext = &rlist;
 		direction_t d;
 		while (i--) rnext=&(*rnext)->next;
 		r = (*rnext)->data;
 		*rnext = (*rnext)->next;
-		if (rsize==0) {
-			log_error(("Could not place all factions on the same island as requested\n"));
-			break;
-		}
 		--rsize;
-		assert(r->terrain==T_OCEAN);
 		for (d=0;d!=MAXDIRECTIONS;++d) {
 			region * rn = rconnect(r, d);
-			if (rn==NULL) {
+			if (virgin_region(rn)) {
-				rn = new_region(r->x + delta_x[d], r->y + delta_y[d]);
+        if (rn==NULL) {
-				terraform(rn, T_OCEAN);
+          rn = new_region(r->x + delta_x[d], r->y + delta_y[d]);
+          terraform(rn, T_OCEAN);
+        }
 				add_regionlist(&rlist, rn);
 				++rsize;
 			}
 		}
     if (rand() % VOLCANO_CHANCE == 0) {
       terraform(r, T_VOLCANO);
-    } else if (rand() % REGIONS_PER_FACTION == 0 || rsize==0) {
+    } else if (nsize && (rand() % isize == 0 || rsize==0)) {
 			newfaction ** nfp, * nextf = *players;
 			unit * u;
+
+      isize += REGIONS_PER_FACTION;
 			terraform(r, preferred_terrain(nextf->race));
-			++isize;
+			++tsize;
 			u = addplayer(r, addfaction(nextf->email, nextf->password, nextf->race, nextf->lang,
 				nextf->subscription));
 			u->faction->alliance = nextf->allies;
@@ -315,13 +413,22 @@ autoseed(newfaction ** players, int nsize)
 				}
 				else nfp = &nf->next;
 			}
+      ++psize;
 			--nsize;
-		}
+      --isize;
-		else {
+      if (psize>=PLAYERS_PER_ISLAND) break;
+		} else {
 			terraform(r, (terrain_t)((rand() % T_GLACIER)+1));
+      --isize;
 		}
 	}
-	if (rlist) {
+
+  if (nsize!=0) {
+    log_error(("Could not place all factions on the same island as requested\n"));
+  }
+
+  
+  if (rlist) {
 #define MINOCEANDIST 3
 #define MAXFILLDIST 10
 #define SPECIALCHANCE 80
@@ -378,5 +485,5 @@ autoseed(newfaction ** players, int nsize)
 			}
 		}
 	}
-	return isize;
+	return tsize;
 }

src/common/modules/autoseed.h

@@ -34,6 +34,7 @@ typedef struct newfaction {
 
 extern int autoseed(newfaction ** players, int nsize);
 extern newfaction * read_newfactions(const char * filename);
+extern void get_island(struct region * root, struct region_list ** rlist);
 
 #ifdef __cplusplus
 }

src/common/modules/modules.vcproj

@@ -113,6 +113,57 @@
 			<Tool
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
+		<Configuration
+			Name="Profile|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="../kernel,../util,../..,.."
+				PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS"
+				StringPooling="TRUE"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="TRUE"
+				DisableLanguageExtensions="TRUE"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderFile=".\Release/modules.pch"
+				AssemblerListingLocation=".\Release/"
+				ObjectFile=".\Release/"
+				ProgramDataBaseFileName=".\Release/"
+				WarningLevel="4"
+				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="1"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile=".\Release\modules.lib"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				Culture="1031"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
 	</Configurations>
 	<References>
 	</References>

src/common/races/races.vcproj

@@ -113,6 +113,57 @@
 			<Tool
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
+		<Configuration
+			Name="Profile|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="../kernel,../util,../..,.."
+				PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS"
+				StringPooling="TRUE"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="TRUE"
+				DisableLanguageExtensions="TRUE"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderFile=".\Release/races.pch"
+				AssemblerListingLocation=".\Release/"
+				ObjectFile=".\Release/"
+				ProgramDataBaseFileName=".\Release/"
+				WarningLevel="4"
+				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="1"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile=".\Release\races.lib"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				Culture="1031"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
 	</Configurations>
 	<References>
 	</References>

src/common/spells/spells.vcproj

@@ -113,6 +113,57 @@
 			<Tool
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
+		<Configuration
+			Name="Profile|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="../kernel,../util,../..,.."
+				PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS"
+				StringPooling="TRUE"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="TRUE"
+				DisableLanguageExtensions="TRUE"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderFile=".\Release/spells.pch"
+				AssemblerListingLocation=".\Release/"
+				ObjectFile=".\Release/"
+				ProgramDataBaseFileName=".\Release/"
+				WarningLevel="4"
+				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="1"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile=".\Release\spells.lib"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				Culture="1031"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
 	</Configurations>
 	<References>
 	</References>

src/common/triggers/triggers.vcproj

@@ -113,6 +113,57 @@
 			<Tool
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
+		<Configuration
+			Name="Profile|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="../util,../kernel,../..,.."
+				PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS"
+				StringPooling="TRUE"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="TRUE"
+				DisableLanguageExtensions="TRUE"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderFile=".\Release/triggers.pch"
+				AssemblerListingLocation=".\Release/"
+				ObjectFile=".\Release/"
+				ProgramDataBaseFileName=".\Release/"
+				WarningLevel="4"
+				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="1"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile=".\Release\triggers.lib"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				Culture="1031"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
 	</Configurations>
 	<References>
 	</References>

src/common/util/util.vcproj

@@ -71,12 +71,12 @@
 			ATLMinimizesCRunTimeLibraryUsage="FALSE">
 			<Tool
 				Name="VCCLCompilerTool"
+				Optimization="0"
 				InlineFunctionExpansion="1"
-				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="../.."
 				PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS"
 				StringPooling="TRUE"
-				RuntimeLibrary="4"
+				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
 				DisableLanguageExtensions="TRUE"
 				UsePrecompiledHeader="2"

src/eressea.sln

@@ -76,54 +76,78 @@ EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
 		Debug = Debug
+		Profile = Profile
 		Release = Release
 	EndGlobalSection
 	GlobalSection(ProjectConfiguration) = postSolution
 		{330712B5-8B27-4B17-B3CF-7A02CC0F93C3}.Debug.ActiveCfg = Debug|Win32
 		{330712B5-8B27-4B17-B3CF-7A02CC0F93C3}.Debug.Build.0 = Debug|Win32
+		{330712B5-8B27-4B17-B3CF-7A02CC0F93C3}.Profile.ActiveCfg = Profile|Win32
+		{330712B5-8B27-4B17-B3CF-7A02CC0F93C3}.Profile.Build.0 = Profile|Win32
 		{330712B5-8B27-4B17-B3CF-7A02CC0F93C3}.Release.ActiveCfg = Release|Win32
 		{330712B5-8B27-4B17-B3CF-7A02CC0F93C3}.Release.Build.0 = Release|Win32
 		{B859D542-781E-4647-BCAB-3FE5ED077366}.Debug.ActiveCfg = Debug|Win32
 		{B859D542-781E-4647-BCAB-3FE5ED077366}.Debug.Build.0 = Debug|Win32
+		{B859D542-781E-4647-BCAB-3FE5ED077366}.Profile.ActiveCfg = Profile|Win32
+		{B859D542-781E-4647-BCAB-3FE5ED077366}.Profile.Build.0 = Profile|Win32
 		{B859D542-781E-4647-BCAB-3FE5ED077366}.Release.ActiveCfg = Release|Win32
 		{B859D542-781E-4647-BCAB-3FE5ED077366}.Release.Build.0 = Release|Win32
 		{79659D44-EC28-42B9-9475-6C0D62D0AAE0}.Debug.ActiveCfg = Debug|Win32
 		{79659D44-EC28-42B9-9475-6C0D62D0AAE0}.Debug.Build.0 = Debug|Win32
+		{79659D44-EC28-42B9-9475-6C0D62D0AAE0}.Profile.ActiveCfg = Profile|Win32
+		{79659D44-EC28-42B9-9475-6C0D62D0AAE0}.Profile.Build.0 = Profile|Win32
 		{79659D44-EC28-42B9-9475-6C0D62D0AAE0}.Release.ActiveCfg = Release|Win32
 		{79659D44-EC28-42B9-9475-6C0D62D0AAE0}.Release.Build.0 = Release|Win32
 		{C14E3D2B-8189-4570-A4E3-9010C873E4FD}.Debug.ActiveCfg = Debug|Win32
 		{C14E3D2B-8189-4570-A4E3-9010C873E4FD}.Debug.Build.0 = Debug|Win32
+		{C14E3D2B-8189-4570-A4E3-9010C873E4FD}.Profile.ActiveCfg = Profile|Win32
+		{C14E3D2B-8189-4570-A4E3-9010C873E4FD}.Profile.Build.0 = Profile|Win32
 		{C14E3D2B-8189-4570-A4E3-9010C873E4FD}.Release.ActiveCfg = Release|Win32
 		{C14E3D2B-8189-4570-A4E3-9010C873E4FD}.Release.Build.0 = Release|Win32
 		{EDB0DE67-8215-4AF7-ACA1-F23CB11FF211}.Debug.ActiveCfg = Debug|Win32
 		{EDB0DE67-8215-4AF7-ACA1-F23CB11FF211}.Debug.Build.0 = Debug|Win32
+		{EDB0DE67-8215-4AF7-ACA1-F23CB11FF211}.Profile.ActiveCfg = Profile|Win32
+		{EDB0DE67-8215-4AF7-ACA1-F23CB11FF211}.Profile.Build.0 = Profile|Win32
 		{EDB0DE67-8215-4AF7-ACA1-F23CB11FF211}.Release.ActiveCfg = Release|Win32
 		{EDB0DE67-8215-4AF7-ACA1-F23CB11FF211}.Release.Build.0 = Release|Win32
 		{17F83AAB-352D-4F68-ADA6-09F36D86826F}.Debug.ActiveCfg = Debug|Win32
 		{17F83AAB-352D-4F68-ADA6-09F36D86826F}.Debug.Build.0 = Debug|Win32
+		{17F83AAB-352D-4F68-ADA6-09F36D86826F}.Profile.ActiveCfg = Profile|Win32
 		{17F83AAB-352D-4F68-ADA6-09F36D86826F}.Release.ActiveCfg = Release|Win32
 		{601CF164-F483-4DE7-8014-64BDD30680B5}.Debug.ActiveCfg = Debug|Win32
 		{601CF164-F483-4DE7-8014-64BDD30680B5}.Debug.Build.0 = Debug|Win32
+		{601CF164-F483-4DE7-8014-64BDD30680B5}.Profile.ActiveCfg = Profile|Win32
+		{601CF164-F483-4DE7-8014-64BDD30680B5}.Profile.Build.0 = Profile|Win32
 		{601CF164-F483-4DE7-8014-64BDD30680B5}.Release.ActiveCfg = Release|Win32
 		{601CF164-F483-4DE7-8014-64BDD30680B5}.Release.Build.0 = Release|Win32
 		{4C837BEC-A428-4287-84B3-8F8F9DE7FA00}.Debug.ActiveCfg = Debug|Win32
 		{4C837BEC-A428-4287-84B3-8F8F9DE7FA00}.Debug.Build.0 = Debug|Win32
+		{4C837BEC-A428-4287-84B3-8F8F9DE7FA00}.Profile.ActiveCfg = Profile|Win32
+		{4C837BEC-A428-4287-84B3-8F8F9DE7FA00}.Profile.Build.0 = Profile|Win32
 		{4C837BEC-A428-4287-84B3-8F8F9DE7FA00}.Release.ActiveCfg = Release|Win32
 		{4C837BEC-A428-4287-84B3-8F8F9DE7FA00}.Release.Build.0 = Release|Win32
 		{0EE778AB-8445-40DB-8F65-6BE378A91B97}.Debug.ActiveCfg = Debug|Win32
 		{0EE778AB-8445-40DB-8F65-6BE378A91B97}.Debug.Build.0 = Debug|Win32
+		{0EE778AB-8445-40DB-8F65-6BE378A91B97}.Profile.ActiveCfg = Profile|Win32
+		{0EE778AB-8445-40DB-8F65-6BE378A91B97}.Profile.Build.0 = Profile|Win32
 		{0EE778AB-8445-40DB-8F65-6BE378A91B97}.Release.ActiveCfg = Release|Win32
 		{0EE778AB-8445-40DB-8F65-6BE378A91B97}.Release.Build.0 = Release|Win32
 		{EF495253-2EEC-4F83-B6C0-D651F88B2198}.Debug.ActiveCfg = Debug|Win32
 		{EF495253-2EEC-4F83-B6C0-D651F88B2198}.Debug.Build.0 = Debug|Win32
+		{EF495253-2EEC-4F83-B6C0-D651F88B2198}.Profile.ActiveCfg = Profile|Win32
+		{EF495253-2EEC-4F83-B6C0-D651F88B2198}.Profile.Build.0 = Profile|Win32
 		{EF495253-2EEC-4F83-B6C0-D651F88B2198}.Release.ActiveCfg = Release|Win32
 		{EF495253-2EEC-4F83-B6C0-D651F88B2198}.Release.Build.0 = Release|Win32
 		{1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}.Debug.ActiveCfg = Debug|Win32
 		{1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}.Debug.Build.0 = Debug|Win32
+		{1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}.Profile.ActiveCfg = Profile|Win32
+		{1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}.Profile.Build.0 = Profile|Win32
 		{1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}.Release.ActiveCfg = Release|Win32
 		{1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}.Release.Build.0 = Release|Win32
 		{749A2F7C-B9C3-4CEB-B1B2-1D4587E68719}.Debug.ActiveCfg = Debug|Win32
 		{749A2F7C-B9C3-4CEB-B1B2-1D4587E68719}.Debug.Build.0 = Debug|Win32
+		{749A2F7C-B9C3-4CEB-B1B2-1D4587E68719}.Profile.ActiveCfg = Profile|Win32
+		{749A2F7C-B9C3-4CEB-B1B2-1D4587E68719}.Profile.Build.0 = Profile|Win32
 		{749A2F7C-B9C3-4CEB-B1B2-1D4587E68719}.Release.ActiveCfg = Release|Win32
 		{749A2F7C-B9C3-4CEB-B1B2-1D4587E68719}.Release.Build.0 = Release|Win32
 	EndGlobalSection

src/eressea/eressea-lua.vcproj

@@ -28,7 +28,7 @@
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="TRUE"
+				DisableLanguageExtensions="FALSE"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderFile=".\Release/eressea-lua.pch"
 				AssemblerListingLocation=".\Release/"
@@ -84,14 +84,14 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
+				Optimization="0"
 				InlineFunctionExpansion="1"
-				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="../common/kernel,../common/gamecode,../common/util,../common,.."
 				PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
 				StringPooling="TRUE"
-				RuntimeLibrary="4"
+				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="TRUE"
+				DisableLanguageExtensions="FALSE"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderFile=".\Profile/eressea-lua.pch"
 				AssemblerListingLocation=".\Profile/"
@@ -107,9 +107,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="luabind.lib lua50.lib lualib50.lib libxml2.lib iconv.lib"
 				OutputFile=".\Profile/eressea-lua.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
+				GenerateDebugInformation="TRUE"
 				SubSystem="1"/>
 			<Tool
 				Name="VCMIDLTool"

src/eressea/eressea.vcproj

@@ -43,7 +43,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="luabind.lib lua50.lib lualib50.lib libxml2.lib iconv.lib"
+				AdditionalDependencies="libxml2.lib iconv.lib"
 				OutputFile=".\Release/eressea.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -84,12 +84,12 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
+				Optimization="0"
 				InlineFunctionExpansion="1"
-				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="../common/kernel,../common/gamecode,../common/util,../common,.."
 				PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
 				StringPooling="TRUE"
-				RuntimeLibrary="4"
+				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
 				DisableLanguageExtensions="TRUE"
 				UsePrecompiledHeader="2"
@@ -107,9 +107,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="libxml2.lib iconv.lib"
 				OutputFile=".\Profile/eressea.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
+				GenerateDebugInformation="TRUE"
 				SubSystem="1"/>
 			<Tool
 				Name="VCMIDLTool"
@@ -167,7 +169,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="luabindd.lib lua50d.lib lualib50d.lib libxml2.lib iconv.lib"
+				AdditionalDependencies="libxml2.lib iconv.lib"
 				OutputFile=".\Debug/eressea.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"

src/mapper/mapper.vcproj

@@ -41,6 +41,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="curses.lib libxml2.lib iconv.lib"
 				OutputFile=".\Release/mapper.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -135,6 +136,68 @@
 			<Tool
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
+		<Configuration
+			Name="Profile|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="../common/kernel,../common/gamecode,../common/util,../common,.."
+				PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
+				StringPooling="TRUE"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="TRUE"
+				DisableLanguageExtensions="TRUE"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderFile=".\Release/mapper.pch"
+				AssemblerListingLocation=".\Release/"
+				ObjectFile=".\Release/"
+				ProgramDataBaseFileName=".\Release/"
+				WarningLevel="4"
+				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="1"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="curses.lib libxml2.lib iconv.lib"
+				OutputFile=".\Release/mapper.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile=".\Release/mapper.pdb"
+				SubSystem="1"/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Release/mapper.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1031"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
 	</Configurations>
 	<References>
 	</References>

src/res/messages.xml

@@ -4301,9 +4301,9 @@
       <arg name="region" type="region"/>
       <arg name="command" type="order"/>
     </type>
-    <text locale="de">"$unit($unit) in $region($region): '$order($command)' - Ohne eine Burg gibt es keinen Markt."</text>
+    <text locale="de">"$unit($unit) in $region($region): '$order($command)' - Ohne einen Handelsposten gibt es keinen Markt."</text>
-    <text locale="fr">"$unit($unit) in $region($region): '$order($command)' - There is no market place without a castle."</text>
+    <text locale="fr">"$unit($unit) in $region($region): '$order($command)' - There is no marketplace without at least a tradepost."</text>
-    <text locale="en">"$unit($unit) in $region($region): '$order($command)' - There is no market place without a castle."</text>
+    <text locale="en">"$unit($unit) in $region($region): '$order($command)' - There is no marketplace without at least a tradepost."</text>
   </message>
   <message name="error118" section="errors">
     <type>

src/scripts/eressea.lua

@@ -65,11 +65,13 @@ function process(orders)
       f = get_faction(atoi36(name))
       if f ~= nil then
         f.locale = loc
-  			print("LOCALECHANGE ", f, loc)
+        print("LOCALECHANGE ", f, loc)
-			end
+      end
     end
   end
   
+  autoseed(basepath .. "/newfactions")
+
   write_passwords()
   write_reports()