From 91e6e375c2e2b8f3d77be63f99716bea72139516 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Mon, 24 Mar 2003 22:42:41 +0000
Subject: [PATCH] =?UTF-8?q?Bugfix=20D=C3=A4monenhunger,=20Projektfiles=20f?=
 =?UTF-8?q?=C3=BCr=20Visual=20Studio=20.NET?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/attributes/attributes.vcproj |   9 +-
 src/common/gamecode/gamecode.vcproj     |   9 +-
 src/common/gamecode/laws.c              |  61 ++++++++-
 src/common/gamecode/randenc.c           |  64 +--------
 src/common/items/items.vcproj           |  22 +++-
 src/common/kernel/eressea.c             |  20 +--
 src/common/kernel/eressea.h             |   3 +-
 src/common/kernel/kernel.vcproj         |  13 +-
 src/common/modules/modules.vcproj       |  12 +-
 src/common/races/races.vcproj           |  10 +-
 src/common/spells/spells.vcproj         |   8 +-
 src/common/triggers/triggers.vcproj     |  10 +-
 src/common/util/util.vcproj             |   5 +-
 src/eressea.sln                         | 166 ++++++++++--------------
 src/eressea/eressea.vcproj              |  61 +--------
 src/mapper/mapper.vcproj                |   8 +-
 16 files changed, 206 insertions(+), 275 deletions(-)

diff --git a/src/common/attributes/attributes.vcproj b/src/common/attributes/attributes.vcproj
index ad65b2157..16c9efac2 100644
--- a/src/common/attributes/attributes.vcproj
+++ b/src/common/attributes/attributes.vcproj
@@ -21,11 +21,12 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				ImproveFloatingPointConsistency="TRUE"
-				AdditionalIncludeDirectories="../util,../kernel,../..,.."
+				AdditionalIncludeDirectories="../kernel,../util,../..,.."
 				PreprocessorDefinitions="_WINDOWS,WIN32,_DEBUG"
-				RuntimeLibrary="5"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="4"
 				DisableLanguageExtensions="TRUE"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				PrecompiledHeaderThrough="stdafx.h"
 				PrecompiledHeaderFile=".\Debug/attributes.pch"
 				AssemblerListingLocation=".\Debug/"
@@ -66,7 +67,7 @@
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
 				ImproveFloatingPointConsistency="TRUE"
-				AdditionalIncludeDirectories="../util,../kernel,../..,.."
+				AdditionalIncludeDirectories="../kernel,../util,../..,.."
 				PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS"
 				StringPooling="TRUE"
 				RuntimeLibrary="4"
diff --git a/src/common/gamecode/gamecode.vcproj b/src/common/gamecode/gamecode.vcproj
index 7fb617490..6237df6b8 100644
--- a/src/common/gamecode/gamecode.vcproj
+++ b/src/common/gamecode/gamecode.vcproj
@@ -67,7 +67,7 @@
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
 				ImproveFloatingPointConsistency="TRUE"
-				AdditionalIncludeDirectories="../util,../kernel,../..,.."
+				AdditionalIncludeDirectories="../kernel,../util,../..,.."
 				PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS"
 				StringPooling="TRUE"
 				RuntimeLibrary="4"
@@ -114,10 +114,11 @@
 				Optimization="0"
 				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="../kernel,../util,../..,.."
-				PreprocessorDefinitions="_WINDOWS,WIN32,_DEBUG"
-				RuntimeLibrary="5"
+				PreprocessorDefinitions="_WINDOWS,WIN32"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="4"
 				DisableLanguageExtensions="TRUE"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				PrecompiledHeaderThrough="stdafx.h"
 				PrecompiledHeaderFile=".\Debug/gamecode.pch"
 				AssemblerListingLocation=".\Debug/"
diff --git a/src/common/gamecode/laws.c b/src/common/gamecode/laws.c
index 7d106118c..49f9c0c63 100644
--- a/src/common/gamecode/laws.c
+++ b/src/common/gamecode/laws.c
@@ -186,9 +186,8 @@ get_food(region *r)
 		if (need > 0) {
 			unit *v;
 
-			for (v = r->units; need && v; v = v->next)
-				if (v->faction != u->faction && alliedunit(v, u->faction, HELP_MONEY)
-						&& !is_monstrous(v)) {
+			for (v = r->units; need && v; v = v->next) {
+				if (v->faction != u->faction && alliedunit(v, u->faction, HELP_MONEY) && !is_monstrous(v)) {
 					int give = lifestyle(v);
 					give = max(0, get_money(v) - give);
 					give = min(need, give);
@@ -200,14 +199,66 @@ get_food(region *r)
 						add_spende(v->faction, u->faction, give, r);
 					}
 				}
+			}
 
 			/* Die Einheit hat nicht genug Geld zusammengekratzt und
 			 * nimmt Schaden: */
-
-			if (need) hunger(u, need);
+			if (need) {
+				int lspp = lifestyle(u)/u->number;
+				if (lspp > 0) {
+					int number = (need+lspp-1)/lspp;
+					if (hunger(number, u)) fset(u, FL_HUNGER);
+				}
+			}
 		}
 	}
 
+	for (r = regions; r; r = r->next) {
+		int peasantfood = rpeasants(r)*10;
+		int bauernblut = 0;
+		boolean bfind = false;
+		for (u = r->units; u; u = u->next) {
+			if (u->race == new_race[RC_DAEMON]) {
+				/* Alles Bauernblut der Region zählen.
+				* warnung: bauernblut einer partei hilft im moment der anderen
+				* so selten wie das benutzt wird, ist das erstmal wursht,
+				* aber ein TODO fürs BUGS File.
+				* Es ist auch deshalb fast egal, weil es ja im Grunde nicht dem Dämon,
+				* sondern der Region zu gute kommt - und da ist der anwender schnuppe
+				*/
+				if (!bfind) {
+					unit * ud = u;
+					while (ud) {
+						attrib * a = a_find(ud->attribs, &at_bauernblut);
+						if (a) bauernblut += a->data.i;
+						do { ud=ud->next; } while (ud && ud->race!=new_race[RC_DAEMON]);
+					}
+					bfind = true;
+				}
+				if (r->planep == NULL || !fval(r->planep, PFL_NOFEED)) {
+					int demons = u->number;
+					if (bauernblut>=demons) {
+						bauernblut -= demons;
+						demons = 0;
+					} else if (bauernblut) {
+						demons-=bauernblut;
+					}
+					if (peasantfood>=demons) {
+						peasantfood -= demons;
+						demons = 0;
+					} else {
+						demons -= peasantfood;
+						peasantfood = 0;
+					}
+					if (demons > 0) {
+						hunger(demons, u); /* nicht gefütterte dämonen hungern */
+					}
+				}
+			}
+		}
+		rsetpeasants(r, peasantfood/10);
+	}
+
 	/* 3. Von den überlebenden das Geld abziehen: */
 	for (u = r->units; u; u = u->next) {
 		int need = min(get_money(u), lifestyle(u));
diff --git a/src/common/gamecode/randenc.c b/src/common/gamecode/randenc.c
index b37e3db48..8253e815d 100644
--- a/src/common/gamecode/randenc.c
+++ b/src/common/gamecode/randenc.c
@@ -1135,66 +1135,12 @@ randomevents(void)
 	}
 #endif
 
-	/* Talente von Dämonen verschieben sich und Dämonen fressen Bauern */
+	/* Talente von Dämonen verschieben sich */
 
 	for (r = regions; r; r = r->next) {
-		int peasantfood = rpeasants(r)*10;
-		int bauernblut = 0;
-		boolean bfind = false;
 		for (u = r->units; u; u = u->next) {
 			if (u->race == new_race[RC_DAEMON]) {
-				/* Alles Bauernblut der Region zählen.
-				 * warnung: bauernblut einer partei hilft im moment der anderen
-				 * so selten wie das benutzt wird, ist das erstmal wursht,
-				 * aber ein TODO fürs BUGS File.
-				 * Es ist auch deshalb fast egal, weil es ja im Grunde nicht dem Dämon,
-				 * sondern der Region zu gute kommt - und da ist der anwender schnuppe
-				 */
-				skill * sv;
-				if (!bfind) {
-					unit * ud = u;
-					while (ud) {
-						attrib * a = a_find(ud->attribs, &at_bauernblut);
-						if (a) bauernblut += a->data.i;
-						do { ud=ud->next; } while (ud && ud->race!=new_race[RC_DAEMON]);
-					}
-					bfind = true;
-				}
-				if (r->planep == NULL || !fval(r->planep, PFL_NOFEED)) {
-					int demons = u->number;
-					if (bauernblut>=demons) {
-						bauernblut -= demons;
-						demons = 0;
-					} else if (bauernblut) {
-						demons-=bauernblut;
-					}
-					if (peasantfood>=demons) {
-						peasantfood -= demons;
-						demons = 0;
-					} else {
-						demons -= peasantfood;
-						peasantfood = 0;
-					}
-					if (demons > 0) {
-#ifdef DAEMON_HUNGER
-						hunger(u, demons); /* nicht gefütterte dämonen hungern */
-#else
-						c = 0;
-						for (n = 0; n != demons; n++) {
-							if (rand() % 100 < 10) {
-								c++;
-							}
-						}
-						if (c) {
-							scale_number(u, u->number - c);
-							sprintf(buf, "%d Dämonen von %s sind hungrig in "
-								"ihre Sphäre zurückgekehrt.", c, unitname(u));
-							addmessage(0, u->faction, buf, MSG_EVENT, ML_IMPORTANT);
-						}
-#endif
-					}
-				}
-				sv = u->skills;
+				skill * sv = u->skills;
 				while (sv!=u->skills+u->skill_size) {
 					if (sv->level>0 && rand() % 100 < 25) {
 						int weeks = 1+rand()%3;
@@ -1203,12 +1149,16 @@ randomevents(void)
 						} else {
 							while (weeks--) learn_skill(u, sv->id, 1.0);
 						}
+						if (sv->old>sv->level) {
+							log_printf("%s dropped from %u to %u:%u in %s\n",
+									   unitname(u), sv->old, sv->level,
+									   sv->weeks, skillname(sv->id, NULL));
+						}
 					}
 					++sv;
 				}
 			}
 		}
-		rsetpeasants(r, peasantfood/10);
 	}
 
 	for (r = regions; r; r = r->next) {
diff --git a/src/common/items/items.vcproj b/src/common/items/items.vcproj
index 985c346e2..e61001082 100644
--- a/src/common/items/items.vcproj
+++ b/src/common/items/items.vcproj
@@ -34,8 +34,7 @@
 				ProgramDataBaseFileName=".\Release/"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="1"
-				CompileAs="0"/>
+				DebugInformationFormat="1"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -68,10 +67,11 @@
 				Optimization="0"
 				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="../kernel,../util,../..,.."
-				PreprocessorDefinitions="_WINDOWS,WIN32,_DEBUG"
-				RuntimeLibrary="5"
+				PreprocessorDefinitions="_WINDOWS,WIN32"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="4"
 				DisableLanguageExtensions="TRUE"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				PrecompiledHeaderThrough="stdafx.h"
 				PrecompiledHeaderFile=".\Debug/items.pch"
 				AssemblerListingLocation=".\Debug/"
@@ -109,12 +109,18 @@
 			<File
 				RelativePath=".\birthday_firework.h">
 			</File>
+			<File
+				RelativePath=".\catapultammo.h">
+			</File>
 			<File
 				RelativePath=".\demonseye.h">
 			</File>
 			<File
 				RelativePath=".\items.h">
 			</File>
+			<File
+				RelativePath=".\lmsreward.h">
+			</File>
 			<File
 				RelativePath=".\questkeys.h">
 			</File>
@@ -134,12 +140,18 @@
 		<File
 			RelativePath=".\birthday_firework.c">
 		</File>
+		<File
+			RelativePath=".\catapultammo.c">
+		</File>
 		<File
 			RelativePath=".\demonseye.c">
 		</File>
 		<File
 			RelativePath=".\items.c">
 		</File>
+		<File
+			RelativePath=".\lmsreward.c">
+		</File>
 		<File
 			RelativePath=".\questkeys.c">
 		</File>
diff --git a/src/common/kernel/eressea.c b/src/common/kernel/eressea.c
index 709b9bf14..ae328b90e 100644
--- a/src/common/kernel/eressea.c
+++ b/src/common/kernel/eressea.c
@@ -2594,24 +2594,20 @@ lifestyle(const unit * u)
 	return need;
 }
 
-void
-hunger(unit * u, int need)
+boolean
+hunger(int number, unit * u)
 {
 	region * r = u->region;
 	int dead = 0, hpsub = 0;
 	int hp = u->hp / u->number;
-	int lspp = lifestyle(u)/u->number;
 
-	if(lspp <= 0) return;
-
-	while(need > 0) {
+	while (number--) {
 		int dam = old_race(u->race)==RC_HALFLING?15+rand()%14:(13+rand()%12);
-		if(dam >= hp) {
+		if (dam >= hp) {
 			++dead;
 		} else {
 			hpsub += dam;
 		}
-		need -= lspp;
 	}
 
 	if (dead) {
@@ -2622,8 +2618,8 @@ hunger(unit * u, int need)
 
 		scale_number(u, u->number - dead);
 		deathcounts(r, dead);
-	}
-	if(hpsub > 0) {
+ 	}
+	if (hpsub > 0) {
 		/* Jetzt die Schäden der nicht gestorbenen abziehen. */
 		u->hp -= hpsub;
 		/* Meldung nur, wenn noch keine für Tote generiert. */
@@ -2633,9 +2629,7 @@ hunger(unit * u, int need)
 				"malnourish%u:unit%r:region", u, r));
 		}
 	}
-	if(dead || hpsub) {
-		fset(u, FL_HUNGER);
-	}
+	return (dead || hpsub);
 }
 
 void
diff --git a/src/common/kernel/eressea.h b/src/common/kernel/eressea.h
index dda40b01d..901bf4bc8 100644
--- a/src/common/kernel/eressea.h
+++ b/src/common/kernel/eressea.h
@@ -98,7 +98,6 @@ struct xml_stack;
 #define NEW_DRIVE     /* Neuer Algorithmus Transportiere/Fahre */
 #define PARTIAL_STUDY /* Wenn nicht genug Silber vorhanden, wird ein Talent anteilig gelernt */
 #define HUNGER_REDUCES_SKILL /* Hunger reduziert den Talentwert auf die Hälfte */
-#define DAEMON_HUNGER /* Dämonen hungern, statt mit 10% in ihre sphäre zurückzukehren */
 #define NEW_RECEIPIES /* Vereinfachte, besser verteilte Kräuterzutaten für Tränke */
 #define NEW_TAVERN
 #define GOBLINKILL
@@ -1170,7 +1169,7 @@ typedef struct local_names {
 } local_names;
 
 extern int maxworkingpeasants(const struct region * r);
-extern void hunger(struct unit * u, int moneyneeded);
+extern boolean hunger(int number, struct unit * u);
 extern int lifestyle(const struct unit*);
 extern int besieged(const struct unit * u);
 
diff --git a/src/common/kernel/kernel.vcproj b/src/common/kernel/kernel.vcproj
index 3265e8e4c..2d5402e19 100644
--- a/src/common/kernel/kernel.vcproj
+++ b/src/common/kernel/kernel.vcproj
@@ -68,10 +68,11 @@
 				Optimization="0"
 				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="../util,../..,.."
-				PreprocessorDefinitions="_WINDOWS,WIN32,_DEBUG"
-				RuntimeLibrary="5"
+				PreprocessorDefinitions="_WINDOWS,WIN32"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="4"
 				DisableLanguageExtensions="TRUE"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				PrecompiledHeaderThrough="stdafx.h"
 				PrecompiledHeaderFile=".\Debug/kernel.pch"
 				AssemblerListingLocation=".\Debug/"
@@ -263,9 +264,6 @@
 			<File
 				RelativePath=".\study.h">
 			</File>
-			<File
-				RelativePath=".\technology.h">
-			</File>
 			<File
 				RelativePath=".\teleport.h">
 			</File>
@@ -372,9 +370,6 @@
 		<File
 			RelativePath=".\spell.c">
 		</File>
-		<File
-			RelativePath=".\technology.c">
-		</File>
 		<File
 			RelativePath=".\teleport.c">
 		</File>
diff --git a/src/common/modules/modules.vcproj b/src/common/modules/modules.vcproj
index 7d1be44b1..46d2e618d 100644
--- a/src/common/modules/modules.vcproj
+++ b/src/common/modules/modules.vcproj
@@ -22,17 +22,18 @@
 				Optimization="0"
 				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="../kernel,../util,../..,.."
-				PreprocessorDefinitions="_WINDOWS,WIN32,_DEBUG"
-				RuntimeLibrary="5"
+				PreprocessorDefinitions="_WINDOWS,WIN32"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="4"
 				DisableLanguageExtensions="TRUE"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				PrecompiledHeaderThrough="stdafx.h"
 				PrecompiledHeaderFile=".\Debug/modules.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
 				ProgramDataBaseFileName=".\Debug/"
 				WarningLevel="4"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="FALSE"
 				DebugInformationFormat="1"
 				CompileAs="0"/>
 			<Tool
@@ -79,8 +80,7 @@
 				ProgramDataBaseFileName=".\Release/"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="1"
-				CompileAs="0"/>
+				DebugInformationFormat="1"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
diff --git a/src/common/races/races.vcproj b/src/common/races/races.vcproj
index 033bb09bd..dbc7b17aa 100644
--- a/src/common/races/races.vcproj
+++ b/src/common/races/races.vcproj
@@ -22,10 +22,11 @@
 				Optimization="0"
 				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="../kernel,../util,../..,.."
-				PreprocessorDefinitions="_WINDOWS,WIN32,_DEBUG"
-				RuntimeLibrary="5"
+				PreprocessorDefinitions="_WINDOWS,WIN32"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="4"
 				DisableLanguageExtensions="TRUE"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				PrecompiledHeaderThrough="stdafx.h"
 				PrecompiledHeaderFile=".\Debug/races.pch"
 				AssemblerListingLocation=".\Debug/"
@@ -79,8 +80,7 @@
 				ProgramDataBaseFileName=".\Release/"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="1"
-				CompileAs="0"/>
+				DebugInformationFormat="1"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
diff --git a/src/common/spells/spells.vcproj b/src/common/spells/spells.vcproj
index eb1a5dbaa..bf3829682 100644
--- a/src/common/spells/spells.vcproj
+++ b/src/common/spells/spells.vcproj
@@ -34,8 +34,7 @@
 				ProgramDataBaseFileName=".\Release/"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="1"
-				CompileAs="0"/>
+				DebugInformationFormat="1"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -69,9 +68,10 @@
 				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="../kernel,../util,../..,.."
 				PreprocessorDefinitions="_WINDOWS,WIN32,_DEBUG"
-				RuntimeLibrary="5"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="4"
 				DisableLanguageExtensions="TRUE"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				PrecompiledHeaderThrough="stdafx.h"
 				PrecompiledHeaderFile=".\Debug/spells.pch"
 				AssemblerListingLocation=".\Debug/"
diff --git a/src/common/triggers/triggers.vcproj b/src/common/triggers/triggers.vcproj
index 5b658099a..e49ac889f 100644
--- a/src/common/triggers/triggers.vcproj
+++ b/src/common/triggers/triggers.vcproj
@@ -23,9 +23,10 @@
 				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="../util,../kernel,../..,.."
 				PreprocessorDefinitions="_WINDOWS,WIN32,_DEBUG"
-				RuntimeLibrary="5"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="4"
 				DisableLanguageExtensions="TRUE"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				PrecompiledHeaderThrough="stdafx.h"
 				PrecompiledHeaderFile=".\Debug/triggers.pch"
 				AssemblerListingLocation=".\Debug/"
@@ -66,7 +67,7 @@
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
 				ImproveFloatingPointConsistency="TRUE"
-				AdditionalIncludeDirectories="../kernel,../util,../..,.."
+				AdditionalIncludeDirectories="../util,../kernel,../..,.."
 				PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS"
 				StringPooling="TRUE"
 				RuntimeLibrary="4"
@@ -79,8 +80,7 @@
 				ProgramDataBaseFileName=".\Release/"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="1"
-				CompileAs="0"/>
+				DebugInformationFormat="1"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
diff --git a/src/common/util/util.vcproj b/src/common/util/util.vcproj
index 02ff72e57..8e3f3acff 100644
--- a/src/common/util/util.vcproj
+++ b/src/common/util/util.vcproj
@@ -115,9 +115,10 @@
 				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="../..,.."
 				PreprocessorDefinitions="_WINDOWS,WIN32,_DEBUG"
-				RuntimeLibrary="5"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="4"
 				DisableLanguageExtensions="TRUE"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				PrecompiledHeaderThrough="stdafx.h"
 				PrecompiledHeaderFile=".\Debug/util.pch"
 				AssemblerListingLocation=".\Debug/"
diff --git a/src/eressea.sln b/src/eressea.sln
index dc6336064..864fb6772 100644
--- a/src/eressea.sln
+++ b/src/eressea.sln
@@ -1,117 +1,93 @@
 Microsoft Visual Studio Solution File, Format Version 7.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "attributes", "common\attributes\attributes.vcproj", "{D5C518FE-0CDE-456F-94B8-E5898334C282}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "attributes", "common\attributes\attributes.vcproj", "{330712B5-8B27-4B17-B3CF-7A02CC0F93C3}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eressea", "eressea\eressea.vcproj", "{5CC7ED12-F35B-462E-ADD8-199A069B26BF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eressea", "eressea\eressea.vcproj", "{B859D542-781E-4647-BCAB-3FE5ED077366}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gamecode", "common\gamecode\gamecode.vcproj", "{3653BF42-41B1-47F9-B39E-57FF0ED436D0}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gamecode", "common\gamecode\gamecode.vcproj", "{79659D44-EC28-42B9-9475-6C0D62D0AAE0}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "items", "common\items\items.vcproj", "{F7FD2D27-F01A-4321-89CA-0833AEB496A2}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "items", "common\items\items.vcproj", "{C14E3D2B-8189-4570-A4E3-9010C873E4FD}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kernel", "common\kernel\kernel.vcproj", "{34F6F559-D823-4FB5-8A27-6B501D08266E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kernel", "common\kernel\kernel.vcproj", "{EDB0DE67-8215-4AF7-ACA1-F23CB11FF211}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mapper", "mapper\mapper.vcproj", "{5ACC858D-1C75-47C6-9D32-5FFA86EFDE1C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mapper", "mapper\mapper.vcproj", "{17F83AAB-352D-4F68-ADA6-09F36D86826F}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "modules", "common\modules\modules.vcproj", "{36ED8F09-B031-4518-8EE9-AD0DEE7CDA8C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "modules", "common\modules\modules.vcproj", "{601CF164-F483-4DE7-8014-64BDD30680B5}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "races", "common\races\races.vcproj", "{DB06B030-3D63-47B7-8A76-D2B87B73D97C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "races", "common\races\races.vcproj", "{4C837BEC-A428-4287-84B3-8F8F9DE7FA00}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spells", "common\spells\spells.vcproj", "{EB295D94-78C0-48DB-AD68-4D0D7275399A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spells", "common\spells\spells.vcproj", "{0EE778AB-8445-40DB-8F65-6BE378A91B97}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "triggers", "common\triggers\triggers.vcproj", "{6CDDC02C-599F-42F2-A377-CFDAB17BD638}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "triggers", "common\triggers\triggers.vcproj", "{EF495253-2EEC-4F83-B6C0-D651F88B2198}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "util", "common\util\util.vcproj", "{9B8FDC41-3B77-4452-A4C3-9D35EFDF25B7}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "util", "common\util\util.vcproj", "{1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}"
 EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
 		ConfigName.0 = Debug
-		ConfigName.1 = Profile
-		ConfigName.2 = Release
+		ConfigName.1 = Release
 	EndGlobalSection
 	GlobalSection(ProjectDependencies) = postSolution
-		{5CC7ED12-F35B-462E-ADD8-199A069B26BF}.0 = {34F6F559-D823-4FB5-8A27-6B501D08266E}
-		{5CC7ED12-F35B-462E-ADD8-199A069B26BF}.1 = {9B8FDC41-3B77-4452-A4C3-9D35EFDF25B7}
-		{5CC7ED12-F35B-462E-ADD8-199A069B26BF}.2 = {3653BF42-41B1-47F9-B39E-57FF0ED436D0}
-		{5CC7ED12-F35B-462E-ADD8-199A069B26BF}.3 = {D5C518FE-0CDE-456F-94B8-E5898334C282}
-		{5CC7ED12-F35B-462E-ADD8-199A069B26BF}.4 = {F7FD2D27-F01A-4321-89CA-0833AEB496A2}
-		{5CC7ED12-F35B-462E-ADD8-199A069B26BF}.5 = {36ED8F09-B031-4518-8EE9-AD0DEE7CDA8C}
-		{5CC7ED12-F35B-462E-ADD8-199A069B26BF}.6 = {DB06B030-3D63-47B7-8A76-D2B87B73D97C}
-		{5CC7ED12-F35B-462E-ADD8-199A069B26BF}.7 = {EB295D94-78C0-48DB-AD68-4D0D7275399A}
-		{5CC7ED12-F35B-462E-ADD8-199A069B26BF}.8 = {6CDDC02C-599F-42F2-A377-CFDAB17BD638}
-		{5ACC858D-1C75-47C6-9D32-5FFA86EFDE1C}.0 = {6CDDC02C-599F-42F2-A377-CFDAB17BD638}
-		{5ACC858D-1C75-47C6-9D32-5FFA86EFDE1C}.1 = {9B8FDC41-3B77-4452-A4C3-9D35EFDF25B7}
-		{5ACC858D-1C75-47C6-9D32-5FFA86EFDE1C}.2 = {34F6F559-D823-4FB5-8A27-6B501D08266E}
-		{5ACC858D-1C75-47C6-9D32-5FFA86EFDE1C}.3 = {D5C518FE-0CDE-456F-94B8-E5898334C282}
-		{5ACC858D-1C75-47C6-9D32-5FFA86EFDE1C}.4 = {F7FD2D27-F01A-4321-89CA-0833AEB496A2}
-		{5ACC858D-1C75-47C6-9D32-5FFA86EFDE1C}.5 = {36ED8F09-B031-4518-8EE9-AD0DEE7CDA8C}
-		{5ACC858D-1C75-47C6-9D32-5FFA86EFDE1C}.6 = {DB06B030-3D63-47B7-8A76-D2B87B73D97C}
-		{5ACC858D-1C75-47C6-9D32-5FFA86EFDE1C}.7 = {EB295D94-78C0-48DB-AD68-4D0D7275399A}
+		{B859D542-781E-4647-BCAB-3FE5ED077366}.0 = {EF495253-2EEC-4F83-B6C0-D651F88B2198}
+		{B859D542-781E-4647-BCAB-3FE5ED077366}.1 = {0EE778AB-8445-40DB-8F65-6BE378A91B97}
+		{B859D542-781E-4647-BCAB-3FE5ED077366}.2 = {4C837BEC-A428-4287-84B3-8F8F9DE7FA00}
+		{B859D542-781E-4647-BCAB-3FE5ED077366}.3 = {601CF164-F483-4DE7-8014-64BDD30680B5}
+		{B859D542-781E-4647-BCAB-3FE5ED077366}.4 = {C14E3D2B-8189-4570-A4E3-9010C873E4FD}
+		{B859D542-781E-4647-BCAB-3FE5ED077366}.5 = {330712B5-8B27-4B17-B3CF-7A02CC0F93C3}
+		{B859D542-781E-4647-BCAB-3FE5ED077366}.6 = {79659D44-EC28-42B9-9475-6C0D62D0AAE0}
+		{B859D542-781E-4647-BCAB-3FE5ED077366}.7 = {1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}
+		{B859D542-781E-4647-BCAB-3FE5ED077366}.8 = {EDB0DE67-8215-4AF7-ACA1-F23CB11FF211}
+		{17F83AAB-352D-4F68-ADA6-09F36D86826F}.0 = {0EE778AB-8445-40DB-8F65-6BE378A91B97}
+		{17F83AAB-352D-4F68-ADA6-09F36D86826F}.1 = {4C837BEC-A428-4287-84B3-8F8F9DE7FA00}
+		{17F83AAB-352D-4F68-ADA6-09F36D86826F}.2 = {601CF164-F483-4DE7-8014-64BDD30680B5}
+		{17F83AAB-352D-4F68-ADA6-09F36D86826F}.3 = {C14E3D2B-8189-4570-A4E3-9010C873E4FD}
+		{17F83AAB-352D-4F68-ADA6-09F36D86826F}.4 = {330712B5-8B27-4B17-B3CF-7A02CC0F93C3}
+		{17F83AAB-352D-4F68-ADA6-09F36D86826F}.5 = {EDB0DE67-8215-4AF7-ACA1-F23CB11FF211}
+		{17F83AAB-352D-4F68-ADA6-09F36D86826F}.6 = {1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}
+		{17F83AAB-352D-4F68-ADA6-09F36D86826F}.7 = {EF495253-2EEC-4F83-B6C0-D651F88B2198}
 	EndGlobalSection
 	GlobalSection(ProjectConfiguration) = postSolution
-		{D5C518FE-0CDE-456F-94B8-E5898334C282}.Debug.ActiveCfg = Debug|Win32
-		{D5C518FE-0CDE-456F-94B8-E5898334C282}.Debug.Build.0 = Debug|Win32
-		{D5C518FE-0CDE-456F-94B8-E5898334C282}.Profile.ActiveCfg = Release|Win32
-		{D5C518FE-0CDE-456F-94B8-E5898334C282}.Profile.Build.0 = Release|Win32
-		{D5C518FE-0CDE-456F-94B8-E5898334C282}.Release.ActiveCfg = Release|Win32
-		{D5C518FE-0CDE-456F-94B8-E5898334C282}.Release.Build.0 = Release|Win32
-		{5CC7ED12-F35B-462E-ADD8-199A069B26BF}.Debug.ActiveCfg = Debug|Win32
-		{5CC7ED12-F35B-462E-ADD8-199A069B26BF}.Debug.Build.0 = Debug|Win32
-		{5CC7ED12-F35B-462E-ADD8-199A069B26BF}.Profile.ActiveCfg = Profile|Win32
-		{5CC7ED12-F35B-462E-ADD8-199A069B26BF}.Profile.Build.0 = Profile|Win32
-		{5CC7ED12-F35B-462E-ADD8-199A069B26BF}.Release.ActiveCfg = Release|Win32
-		{5CC7ED12-F35B-462E-ADD8-199A069B26BF}.Release.Build.0 = Release|Win32
-		{3653BF42-41B1-47F9-B39E-57FF0ED436D0}.Debug.ActiveCfg = Debug|Win32
-		{3653BF42-41B1-47F9-B39E-57FF0ED436D0}.Debug.Build.0 = Debug|Win32
-		{3653BF42-41B1-47F9-B39E-57FF0ED436D0}.Profile.ActiveCfg = Profile|Win32
-		{3653BF42-41B1-47F9-B39E-57FF0ED436D0}.Profile.Build.0 = Profile|Win32
-		{3653BF42-41B1-47F9-B39E-57FF0ED436D0}.Release.ActiveCfg = Release|Win32
-		{3653BF42-41B1-47F9-B39E-57FF0ED436D0}.Release.Build.0 = Release|Win32
-		{F7FD2D27-F01A-4321-89CA-0833AEB496A2}.Debug.ActiveCfg = Debug|Win32
-		{F7FD2D27-F01A-4321-89CA-0833AEB496A2}.Debug.Build.0 = Debug|Win32
-		{F7FD2D27-F01A-4321-89CA-0833AEB496A2}.Profile.ActiveCfg = Debug|Win32
-		{F7FD2D27-F01A-4321-89CA-0833AEB496A2}.Profile.Build.0 = Debug|Win32
-		{F7FD2D27-F01A-4321-89CA-0833AEB496A2}.Release.ActiveCfg = Release|Win32
-		{F7FD2D27-F01A-4321-89CA-0833AEB496A2}.Release.Build.0 = Release|Win32
-		{34F6F559-D823-4FB5-8A27-6B501D08266E}.Debug.ActiveCfg = Debug|Win32
-		{34F6F559-D823-4FB5-8A27-6B501D08266E}.Debug.Build.0 = Debug|Win32
-		{34F6F559-D823-4FB5-8A27-6B501D08266E}.Profile.ActiveCfg = Profile|Win32
-		{34F6F559-D823-4FB5-8A27-6B501D08266E}.Profile.Build.0 = Profile|Win32
-		{34F6F559-D823-4FB5-8A27-6B501D08266E}.Release.ActiveCfg = Release|Win32
-		{34F6F559-D823-4FB5-8A27-6B501D08266E}.Release.Build.0 = Release|Win32
-		{5ACC858D-1C75-47C6-9D32-5FFA86EFDE1C}.Debug.ActiveCfg = Debug|Win32
-		{5ACC858D-1C75-47C6-9D32-5FFA86EFDE1C}.Profile.ActiveCfg = Debug|Win32
-		{5ACC858D-1C75-47C6-9D32-5FFA86EFDE1C}.Profile.Build.0 = Debug|Win32
-		{5ACC858D-1C75-47C6-9D32-5FFA86EFDE1C}.Release.ActiveCfg = Release|Win32
-		{5ACC858D-1C75-47C6-9D32-5FFA86EFDE1C}.Release.Build.0 = Release|Win32
-		{36ED8F09-B031-4518-8EE9-AD0DEE7CDA8C}.Debug.ActiveCfg = Debug|Win32
-		{36ED8F09-B031-4518-8EE9-AD0DEE7CDA8C}.Debug.Build.0 = Debug|Win32
-		{36ED8F09-B031-4518-8EE9-AD0DEE7CDA8C}.Profile.ActiveCfg = Release|Win32
-		{36ED8F09-B031-4518-8EE9-AD0DEE7CDA8C}.Profile.Build.0 = Release|Win32
-		{36ED8F09-B031-4518-8EE9-AD0DEE7CDA8C}.Release.ActiveCfg = Release|Win32
-		{36ED8F09-B031-4518-8EE9-AD0DEE7CDA8C}.Release.Build.0 = Release|Win32
-		{DB06B030-3D63-47B7-8A76-D2B87B73D97C}.Debug.ActiveCfg = Debug|Win32
-		{DB06B030-3D63-47B7-8A76-D2B87B73D97C}.Debug.Build.0 = Debug|Win32
-		{DB06B030-3D63-47B7-8A76-D2B87B73D97C}.Profile.ActiveCfg = Release|Win32
-		{DB06B030-3D63-47B7-8A76-D2B87B73D97C}.Profile.Build.0 = Release|Win32
-		{DB06B030-3D63-47B7-8A76-D2B87B73D97C}.Release.ActiveCfg = Release|Win32
-		{DB06B030-3D63-47B7-8A76-D2B87B73D97C}.Release.Build.0 = Release|Win32
-		{EB295D94-78C0-48DB-AD68-4D0D7275399A}.Debug.ActiveCfg = Debug|Win32
-		{EB295D94-78C0-48DB-AD68-4D0D7275399A}.Debug.Build.0 = Debug|Win32
-		{EB295D94-78C0-48DB-AD68-4D0D7275399A}.Profile.ActiveCfg = Debug|Win32
-		{EB295D94-78C0-48DB-AD68-4D0D7275399A}.Profile.Build.0 = Debug|Win32
-		{EB295D94-78C0-48DB-AD68-4D0D7275399A}.Release.ActiveCfg = Release|Win32
-		{EB295D94-78C0-48DB-AD68-4D0D7275399A}.Release.Build.0 = Release|Win32
-		{6CDDC02C-599F-42F2-A377-CFDAB17BD638}.Debug.ActiveCfg = Debug|Win32
-		{6CDDC02C-599F-42F2-A377-CFDAB17BD638}.Debug.Build.0 = Debug|Win32
-		{6CDDC02C-599F-42F2-A377-CFDAB17BD638}.Profile.ActiveCfg = Release|Win32
-		{6CDDC02C-599F-42F2-A377-CFDAB17BD638}.Profile.Build.0 = Release|Win32
-		{6CDDC02C-599F-42F2-A377-CFDAB17BD638}.Release.ActiveCfg = Release|Win32
-		{6CDDC02C-599F-42F2-A377-CFDAB17BD638}.Release.Build.0 = Release|Win32
-		{9B8FDC41-3B77-4452-A4C3-9D35EFDF25B7}.Debug.ActiveCfg = Debug|Win32
-		{9B8FDC41-3B77-4452-A4C3-9D35EFDF25B7}.Debug.Build.0 = Debug|Win32
-		{9B8FDC41-3B77-4452-A4C3-9D35EFDF25B7}.Profile.ActiveCfg = Profile|Win32
-		{9B8FDC41-3B77-4452-A4C3-9D35EFDF25B7}.Profile.Build.0 = Profile|Win32
-		{9B8FDC41-3B77-4452-A4C3-9D35EFDF25B7}.Release.ActiveCfg = Release|Win32
-		{9B8FDC41-3B77-4452-A4C3-9D35EFDF25B7}.Release.Build.0 = Release|Win32
+		{330712B5-8B27-4B17-B3CF-7A02CC0F93C3}.Debug.ActiveCfg = Debug|Win32
+		{330712B5-8B27-4B17-B3CF-7A02CC0F93C3}.Debug.Build.0 = Debug|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}.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}.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}.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}.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}.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}.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}.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}.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}.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}.Release.ActiveCfg = Release|Win32
+		{1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}.Release.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection
diff --git a/src/eressea/eressea.vcproj b/src/eressea/eressea.vcproj
index 11d417ec3..a4e86c872 100644
--- a/src/eressea/eressea.vcproj
+++ b/src/eressea/eressea.vcproj
@@ -78,7 +78,7 @@
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
 				ImproveFloatingPointConsistency="TRUE"
-				AdditionalIncludeDirectories="..,../common,../common/util,../common/kernel,../common/gamecode"
+				AdditionalIncludeDirectories="../common/kernel,../common/gamecode,../common/util,../common,.."
 				PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
 				StringPooling="TRUE"
 				RuntimeLibrary="4"
@@ -134,10 +134,11 @@
 				Optimization="0"
 				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="../common/kernel,../common/gamecode,../common/util,../common,.."
-				PreprocessorDefinitions="_CONSOLE,WIN32,_DEBUG"
-				RuntimeLibrary="5"
+				PreprocessorDefinitions="_CONSOLE,WIN32"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="4"
 				DisableLanguageExtensions="TRUE"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				PrecompiledHeaderThrough="stdafx.h"
 				PrecompiledHeaderFile=".\Debug/eressea.pch"
 				AssemblerListingLocation=".\Debug/"
@@ -191,58 +192,6 @@
 				RelativePath="..\todo.txt">
 			</File>
 		</Filter>
-		<Filter
-			Name="xml data"
-			Filter="">
-			<File
-				RelativePath="..\res\buildings.xml">
-			</File>
-			<File
-				RelativePath="..\res\buildings.xsd">
-			</File>
-			<File
-				RelativePath="..\res\eressea.xml">
-			</File>
-			<File
-				RelativePath="..\res\races.xml">
-			</File>
-			<File
-				RelativePath="..\res\races.xsd">
-			</File>
-			<File
-				RelativePath="..\res\resources.xml">
-			</File>
-			<File
-				RelativePath="..\res\resources.xsd">
-			</File>
-			<File
-				RelativePath="..\res\ships.xml">
-			</File>
-			<File
-				RelativePath="..\res\ships.xsd">
-			</File>
-			<File
-				RelativePath="..\res\skills.xml">
-			</File>
-			<File
-				RelativePath="..\res\skills.xsd">
-			</File>
-			<File
-				RelativePath="..\res\terrains.xml">
-			</File>
-			<File
-				RelativePath="..\res\terrains.xsd">
-			</File>
-			<File
-				RelativePath="..\res\tutorial.xml">
-			</File>
-			<File
-				RelativePath="..\res\vinyambar-classic.xml">
-			</File>
-			<File
-				RelativePath="..\res\vinyambar.xml">
-			</File>
-		</Filter>
 		<File
 			RelativePath=".\korrektur.c">
 		</File>
diff --git a/src/mapper/mapper.vcproj b/src/mapper/mapper.vcproj
index 6f1efa567..46684c5c0 100644
--- a/src/mapper/mapper.vcproj
+++ b/src/mapper/mapper.vcproj
@@ -22,6 +22,7 @@
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
 				ImproveFloatingPointConsistency="TRUE"
+				AdditionalIncludeDirectories="../common/kernel,../common/gamecode,../common/util,../common,.."
 				PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
 				StringPooling="TRUE"
 				RuntimeLibrary="4"
@@ -77,10 +78,11 @@
 				Optimization="0"
 				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="../common/kernel,../common/gamecode,../common/util,../common,.."
-				PreprocessorDefinitions="_CONSOLE,WIN32,_DEBUG"
-				RuntimeLibrary="5"
+				PreprocessorDefinitions="_CONSOLE,WIN32"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="4"
 				DisableLanguageExtensions="TRUE"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				PrecompiledHeaderThrough="stdafx.h"
 				PrecompiledHeaderFile=".\Debug/mapper.pch"
 				AssemblerListingLocation=".\Debug/"