diff --git a/src/common/attributes/attributes.dsp b/src/common/attributes/attributes.dsp
deleted file mode 100644
index 42afdb469..000000000
--- a/src/common/attributes/attributes.dsp
+++ /dev/null
@@ -1,273 +0,0 @@
-# Microsoft Developer Studio Project File - Name="attributes" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=attributes - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "attributes.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "attributes.mak" CFG="attributes - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "attributes - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "attributes - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "attributes - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /Za /W4 /GX /Z7 /O2 /I "../util" /I "../kernel" /I "../.." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD BASE RSC /l 0x407
-# ADD RSC /l 0x407
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF "$(CFG)" == "attributes - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /Za /W4 /Z7 /Od /I "../util" /I "../kernel" /I "../.." /I ".." /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /FD /c
-# SUBTRACT CPP /Fr /YX
-# ADD BASE RSC /l 0x407
-# ADD RSC /l 0x407
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ENDIF
-
-# Begin Target
-
-# Name "attributes - Win32 Release"
-# Name "attributes - Win32 Debug"
-# Begin Group "Header"
-
-# PROP Default_Filter "*.h"
-# Begin Source File
-
-SOURCE=.\aggressive.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\attributes.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\fleechance.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\follow.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\giveitem.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\gm.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\hate.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\iceberg.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\key.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\matmod.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\moved.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\option.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\orcification.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\otherfaction.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\overrideroads.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\racename.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\raceprefix.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\reduceproduction.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\roadsoverride.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\synonym.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\targetregion.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\ugroup.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\viewrange.h
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=.\aggressive.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\at_movement.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\attributes.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\fleechance.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\follow.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\giveitem.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\gm.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\hate.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\iceberg.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\key.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\matmod.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\moved.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\option.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\orcification.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\otherfaction.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\overrideroads.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\racename.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\raceprefix.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\reduceproduction.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\synonym.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\targetregion.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\ugroup.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\viewrange.c
-# End Source File
-# End Target
-# End Project
diff --git a/src/common/gamecode/economy.c b/src/common/gamecode/economy.c
index aff7ab058..5651adb40 100644
--- a/src/common/gamecode/economy.c
+++ b/src/common/gamecode/economy.c
@@ -655,6 +655,53 @@ give_control(unit * u, unit * u2)
fset(u2, UFL_OWNER);
}
+int
+give_control_cmd(unit * u, order * ord)
+{
+ region * r = u->region;
+ unit *u2;
+ const char * s;
+ param_t p;
+
+ init_tokens(ord);
+ skip_token();
+ u2 = getunit(r, u->faction);
+ s = getstrtoken();
+ p = findparam(s, u->faction->locale);
+
+ /* first, do all the ones that do not require HELP_GIVE or CONTACT */
+ if (p == P_CONTROL) {
+ message * msg;
+
+ if (!u2) {
+ ADDMSG(&u->faction->msgs, msg_feedback(u, ord, "feedback_unit_not_found", ""));
+ }
+ else if (!u->building && !u->ship) {
+ cmistake(u, ord, 140, MSG_EVENT);
+ }
+ else if (u->building && u2->building != u->building) {
+ cmistake(u, ord, 33, MSG_EVENT);
+ }
+ else if (u->ship && u2->ship != u->ship) {
+ cmistake(u, ord, 32, MSG_EVENT);
+ }
+ else if (!fval(u, UFL_OWNER)) {
+ cmistake(u, ord, 49, MSG_EVENT);
+ }
+ else {
+ give_control(u, u2);
+
+ msg = msg_message("givecommand", "unit recipient", u, u2);
+ add_message(&u->faction->msgs, msg);
+ if (u->faction != u2->faction) {
+ add_message(&u2->faction->msgs, msg);
+ }
+ msg_release(msg);
+ }
+ }
+ return 0;
+}
+
static void
give_cmd(unit * u, order * ord)
{
@@ -669,6 +716,14 @@ give_cmd(unit * u, order * ord)
init_tokens(ord);
skip_token();
u2 = getunit(r, u->faction);
+ s = getstrtoken();
+ p = findparam(s, u->faction->locale);
+
+ /* first, do all the ones that do not require HELP_GIVE or CONTACT */
+ if (p == P_CONTROL) {
+ /* handled in give_control_cmd */
+ return;
+ }
if (!u2 && !getunitpeasants) {
ADDMSG(&u->faction->msgs, msg_feedback(u, ord, "feedback_unit_not_found", ""));
@@ -698,45 +753,7 @@ give_cmd(unit * u, order * ord)
return;
}
- s = getstrtoken();
- p = findparam(s, u->faction->locale);
-
- /* first, do all the ones that do not require HELP_GIVE or CONTACT */
- if (p == P_CONTROL) {
- message * msg;
-
- if (!u2) {
- ADDMSG(&u->faction->msgs, msg_feedback(u, ord, "feedback_unit_not_found", ""));
- return;
- }
- if (!u->building && !u->ship) {
- cmistake(u, ord, 140, MSG_EVENT);
- return;
- }
- if (u->building && u2->building != u->building) {
- cmistake(u, ord, 33, MSG_EVENT);
- return;
- }
- if (u->ship && u2->ship != u->ship) {
- cmistake(u, ord, 32, MSG_EVENT);
- return;
- }
- if (!fval(u, UFL_OWNER)) {
- cmistake(u, ord, 49, MSG_EVENT);
- return;
- }
- give_control(u, u2);
-
- msg = msg_message("givecommand", "unit recipient", u, u2);
- add_message(&u->faction->msgs, msg);
- if (u->faction != u2->faction) {
- add_message(&u2->faction->msgs, msg);
- }
- msg_release(msg);
- return;
- }
-
- else if (u2 && u2->race == new_race[RC_SPELL]) {
+ if (u2 && u2->race == new_race[RC_SPELL]) {
ADDMSG(&u->faction->msgs, msg_feedback(u, ord, "feedback_unit_not_found", ""));
return;
}
diff --git a/src/common/gamecode/economy.h b/src/common/gamecode/economy.h
index 32e700bb0..5365d7dfd 100644
--- a/src/common/gamecode/economy.h
+++ b/src/common/gamecode/economy.h
@@ -55,6 +55,7 @@ extern void add_spende(struct faction * f1, struct faction * f2, int betrag, str
extern int make_cmd(struct unit * u, struct order * ord);
extern void split_allocations(struct region * r);
extern int recruit_archetypes(void);
+extern int give_control_cmd(struct unit * u, struct order * ord);
#ifdef __cplusplus
}
diff --git a/src/common/gamecode/gamecode.dsp b/src/common/gamecode/gamecode.dsp
deleted file mode 100644
index 049c43781..000000000
--- a/src/common/gamecode/gamecode.dsp
+++ /dev/null
@@ -1,194 +0,0 @@
-# Microsoft Developer Studio Project File - Name="gamecode" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=gamecode - Win32 Profile
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "gamecode.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "gamecode.mak" CFG="gamecode - Win32 Profile"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "gamecode - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "gamecode - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "gamecode - Win32 Profile" (based on "Win32 (x86) Static Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "gamecode - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /Za /W4 /GX /Z7 /O2 /I "../kernel" /I "../util" /I "../.." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD BASE RSC /l 0x407
-# ADD RSC /l 0x407
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF "$(CFG)" == "gamecode - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /Za /W4 /Z7 /Od /I "../kernel" /I "../util" /I "../.." /I ".." /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /FD /c
-# SUBTRACT CPP /Fr /YX
-# ADD BASE RSC /l 0x407
-# ADD RSC /l 0x407
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF "$(CFG)" == "gamecode - Win32 Profile"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "gamecode___Win32_Profile"
-# PROP BASE Intermediate_Dir "gamecode___Win32_Profile"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Profile"
-# PROP Intermediate_Dir "Profile"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /I "../util" /I "../kernel" /I "../.." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /Za /W4 /Z7 /O2 /I "../util" /I "../kernel" /I "../.." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD BASE RSC /l 0x407
-# ADD RSC /l 0x407
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ENDIF
-
-# Begin Target
-
-# Name "gamecode - Win32 Release"
-# Name "gamecode - Win32 Debug"
-# Name "gamecode - Win32 Profile"
-# Begin Group "Header"
-
-# PROP Default_Filter "*.h"
-# Begin Source File
-
-SOURCE=.\creation.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\creport.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\economy.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\laws.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\luck.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\monster.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\randenc.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\study.h
-# End Source File
-# End Group
-# Begin Group "Spells"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\spells\alp.c
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=.\creation.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\creport.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\economy.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\laws.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\luck.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\monster.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\randenc.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\report.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\spy.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\study.c
-# End Source File
-# End Target
-# End Project
diff --git a/src/common/gamecode/laws.c b/src/common/gamecode/laws.c
index 46d56f7a1..25c14c7fb 100644
--- a/src/common/gamecode/laws.c
+++ b/src/common/gamecode/laws.c
@@ -804,8 +804,11 @@ growing_trees(region * r, const int current_season, const int last_weeks_season)
if (production(r) <= 0) return;
/* Grundchance 1.0% */
- /* Jeder Elf in der Region erhöht die Chance um 0.0008%. */
- seedchance += (MIN(elves, (production(r)*MAXPEASANTS_PER_AREA)/8)) * 0.0008 * RESOURCE_QUANTITY;
+ /* Jeder Elf in der Region erhöht die Chance marginal */
+ elves = MIN(elves, (production(r)*MAXPEASANTS_PER_AREA)/8);
+ if (elves) {
+ seedchance += 1.0-pow(0.99999, elves * RESOURCE_QUANTITY);
+ }
grownup_trees = rtrees(r, 2);
seeds = 0;
@@ -4020,6 +4023,9 @@ init_processor(void)
add_proc_global(p, &gmcommands, "GM Kommandos");
}
+ p += 10; /* in case it has any effects on alliance victories */
+ add_proc_order(p, K_GIVE, &give_control_cmd, 0, "GIB KOMMANDO");
+
p += 10; /* in case it has any effects on alliance victories */
add_proc_order(p, K_LEAVE, &leave_cmd, 0, "Verlassen");
diff --git a/src/common/items/items.dsp b/src/common/items/items.dsp
deleted file mode 100644
index 78f833b2d..000000000
--- a/src/common/items/items.dsp
+++ /dev/null
@@ -1,169 +0,0 @@
-# Microsoft Developer Studio Project File - Name="items" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=items - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "items.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "items.mak" CFG="items - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "items - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "items - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "items - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /Za /W4 /GX /Z7 /O2 /I "../kernel" /I "../util" /I "../.." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD BASE RSC /l 0x407
-# ADD RSC /l 0x407
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF "$(CFG)" == "items - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /Za /W4 /Z7 /Od /I "../kernel" /I "../util" /I "../.." /I ".." /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /FD /c
-# SUBTRACT CPP /Fr /YX
-# ADD BASE RSC /l 0x407
-# ADD RSC /l 0x407
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ENDIF
-
-# Begin Target
-
-# Name "items - Win32 Release"
-# Name "items - Win32 Debug"
-# Begin Group "Header"
-
-# PROP Default_Filter "*.h"
-# Begin Source File
-
-SOURCE=.\birthday_firework.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\catapultammo.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\demonseye.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\items.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\lmsreward.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\questkeys.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\racespoils.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\seed.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\weapons.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\xerewards.h
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=.\birthday_firework.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\catapultammo.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\demonseye.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\items.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\lmsreward.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\questkeys.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\racespoils.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\seed.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\weapons.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\xerewards.c
-# End Source File
-# End Target
-# End Project
diff --git a/src/common/kernel/battle.c b/src/common/kernel/battle.c
index 308a6c995..12dbbbd9d 100644
--- a/src/common/kernel/battle.c
+++ b/src/common/kernel/battle.c
@@ -223,7 +223,7 @@ static const char *
sideabkz(side *s, boolean truename)
{
static char sideabkz_buf[8]; /* STATIC_RESULT: used for return, not across calls */
- faction * f = (s->stealthfaction && !truename)?s->stealthfaction:s->faction;
+ const faction * f = (s->stealthfaction && !truename)?s->stealthfaction:s->faction;
#undef SIDE_ABKZ
#ifdef SIDE_ABKZ
diff --git a/src/common/kernel/kernel.dsp b/src/common/kernel/kernel.dsp
deleted file mode 100644
index 38ef30984..000000000
--- a/src/common/kernel/kernel.dsp
+++ /dev/null
@@ -1,450 +0,0 @@
-# Microsoft Developer Studio Project File - Name="kernel" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=kernel - Win32 Profile
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "kernel.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "kernel.mak" CFG="kernel - Win32 Profile"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "kernel - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "kernel - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "kernel - Win32 Profile" (based on "Win32 (x86) Static Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "kernel - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /Za /W4 /GX /Z7 /O2 /I "../util" /I "../.." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD BASE RSC /l 0x407
-# ADD RSC /l 0x407
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF "$(CFG)" == "kernel - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "kernel___W"
-# PROP BASE Intermediate_Dir "kernel___W"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /Za /W4 /Z7 /Od /I "../util" /I "../.." /I ".." /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /FD /c
-# SUBTRACT CPP /Fr /YX
-# ADD BASE RSC /l 0x407
-# ADD RSC /l 0x407
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF "$(CFG)" == "kernel - Win32 Profile"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "kernel___Win32_Profile"
-# PROP BASE Intermediate_Dir "kernel___Win32_Profile"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Profile"
-# PROP Intermediate_Dir "Profile"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /I "../util" /I "../.." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /Za /W4 /Z7 /O2 /I "../util" /I "../.." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD BASE RSC /l 0x407
-# ADD RSC /l 0x407
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ENDIF
-
-# Begin Target
-
-# Name "kernel - Win32 Release"
-# Name "kernel - Win32 Debug"
-# Name "kernel - Win32 Profile"
-# Begin Group "Header"
-
-# PROP Default_Filter "*.h"
-# Begin Source File
-
-SOURCE=.\alchemy.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\alliance.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\battle.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\border.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\build.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\building.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\creation.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\curse.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\economy.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\eressea.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\faction.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\give.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\group.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\item.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\karma.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\magic.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\message.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\monster.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\movement.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\names.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\objtypes.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\order.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\orders.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\pathfinder.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\plane.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\player.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\pool.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\race.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\randenc.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\region.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\render.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\reports.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\resources.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\save.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\ship.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\skill.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\spell.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\spells.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\spy.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\study.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\teleport.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\terrain.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\ugroup.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\unit.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\xmlreader.h
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=.\alchemy.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\alliance.c
-# End Source File
-# Begin Source File
-
-SOURCE=".\battle.c"
-# End Source File
-# Begin Source File
-
-SOURCE=.\border.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\build.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\building.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\combatspells.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\curse.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\eressea.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\faction.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\give.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\group.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\item.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\karma.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\magic.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\message.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\movement.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\names.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\objtypes.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\order.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\orders.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\pathfinder.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\plane.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\player.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\pool.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\race.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\region.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\render.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\reports.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\resources.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\save.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\ship.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\skill.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\spell.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\teleport.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\terrain.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\ugroup.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\unit.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\xmlreader.c
-# End Source File
-# End Target
-# End Project
diff --git a/src/common/modules/modules.dsp b/src/common/modules/modules.dsp
deleted file mode 100644
index 387104dbe..000000000
--- a/src/common/modules/modules.dsp
+++ /dev/null
@@ -1,181 +0,0 @@
-# Microsoft Developer Studio Project File - Name="modules" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=modules - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "modules.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "modules.mak" CFG="modules - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "modules - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "modules - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "modules - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /Za /W4 /GX /Z7 /O2 /I "../kernel" /I "../util" /I "../.." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD BASE RSC /l 0x407
-# ADD RSC /l 0x407
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF "$(CFG)" == "modules - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "modules"
-# PROP BASE Intermediate_Dir "modules"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /Za /W4 /Z7 /Od /I "../kernel" /I "../util" /I "../.." /I ".." /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /FD /c
-# SUBTRACT CPP /Fr /YX
-# ADD BASE RSC /l 0x407
-# ADD RSC /l 0x407
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ENDIF
-
-# Begin Target
-
-# Name "modules - Win32 Release"
-# Name "modules - Win32 Debug"
-# Begin Group "Header"
-
-# PROP Default_Filter "*.h"
-# Begin Source File
-
-SOURCE=.\alliance.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\arena.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\dungeon.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\gmcmd.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\infocmd.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\museum.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\oceannames.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\score.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\weather.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\xecmd.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\xmas.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\xmas2000.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\xmas2001.h
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=.\arena.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\dungeon.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\gmcmd.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\infocmd.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\museum.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\oceannames.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\score.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\weather.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\xecmd.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\xmas.c
-# End Source File
-# End Target
-# End Project
diff --git a/src/common/races/races.dsp b/src/common/races/races.dsp
deleted file mode 100644
index 9ff3e9965..000000000
--- a/src/common/races/races.dsp
+++ /dev/null
@@ -1,113 +0,0 @@
-# Microsoft Developer Studio Project File - Name="races" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=races - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "races.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "races.mak" CFG="races - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "races - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "races - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "races - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /Za /W4 /GX /Z7 /O2 /I "../kernel" /I "../util" /I "../.." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD BASE RSC /l 0x407
-# ADD RSC /l 0x407
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF "$(CFG)" == "races - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "races"
-# PROP BASE Intermediate_Dir "races"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /Za /W4 /Z7 /Od /I "../kernel" /I "../util" /I "../.." /I ".." /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /FD /c
-# SUBTRACT CPP /Fr /YX
-# ADD BASE RSC /l 0x407
-# ADD RSC /l 0x407
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ENDIF
-
-# Begin Target
-
-# Name "races - Win32 Release"
-# Name "races - Win32 Debug"
-# Begin Group "Header"
-
-# PROP Default_Filter "*.h"
-# Begin Source File
-
-SOURCE=.\dragons.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\illusion.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zombies.h
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=.\dragons.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\illusion.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zombies.c
-# End Source File
-# End Target
-# End Project
diff --git a/src/common/spells/spells.dsp b/src/common/spells/spells.dsp
deleted file mode 100644
index 6994c4d65..000000000
--- a/src/common/spells/spells.dsp
+++ /dev/null
@@ -1,137 +0,0 @@
-# Microsoft Developer Studio Project File - Name="spells" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=spells - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "spells.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "spells.mak" CFG="spells - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "spells - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "spells - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "spells - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /Za /W4 /GX /Z7 /O2 /I "../kernel" /I "../util" /I "../.." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD BASE RSC /l 0x407
-# ADD RSC /l 0x407
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF "$(CFG)" == "spells - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "spells"
-# PROP BASE Intermediate_Dir "spells"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /Za /W4 /Z7 /Od /I "../kernel" /I "../util" /I "../.." /I ".." /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /FD /c
-# SUBTRACT CPP /Fr /YX
-# ADD BASE RSC /l 0x407
-# ADD RSC /l 0x407
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ENDIF
-
-# Begin Target
-
-# Name "spells - Win32 Release"
-# Name "spells - Win32 Debug"
-# Begin Group "Header"
-
-# PROP Default_Filter "*.h"
-# Begin Source File
-
-SOURCE=.\alp.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\buildingcurse.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\regioncurse.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\shipcurse.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\spells.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\unitcurse.h
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=.\alp.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\buildingcurse.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\regioncurse.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\shipcurse.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\spells.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\unitcurse.c
-# End Source File
-# End Target
-# End Project
diff --git a/src/common/triggers/triggers.dsp b/src/common/triggers/triggers.dsp
deleted file mode 100644
index 0b9c45104..000000000
--- a/src/common/triggers/triggers.dsp
+++ /dev/null
@@ -1,209 +0,0 @@
-# Microsoft Developer Studio Project File - Name="triggers" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=triggers - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "triggers.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "triggers.mak" CFG="triggers - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "triggers - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "triggers - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "triggers - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /Za /W4 /GX /Z7 /O2 /I "../kernel" /I "../util" /I "../.." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD BASE RSC /l 0x407
-# ADD RSC /l 0x407
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF "$(CFG)" == "triggers - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "triggers"
-# PROP BASE Intermediate_Dir "triggers"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /Za /W4 /Z7 /Od /I "../util" /I "../kernel" /I "../.." /I ".." /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /FD /c
-# SUBTRACT CPP /Fr /YX
-# ADD BASE RSC /l 0x407
-# ADD RSC /l 0x407
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ENDIF
-
-# Begin Target
-
-# Name "triggers - Win32 Release"
-# Name "triggers - Win32 Debug"
-# Begin Group "Header"
-
-# PROP Default_Filter "*.h"
-# Begin Source File
-
-SOURCE=..\spells\alp.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\changefaction.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\changerace.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\clonedied.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\createcurse.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\createunit.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\gate.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\giveitem.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\killunit.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\removecurse.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\shock.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\spells\spells.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\timeout.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\triggers.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\unguard.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\unitmessage.h
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=.\changefaction.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\changerace.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\clonedied.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\createcurse.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\createunit.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\gate.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\giveitem.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\killunit.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\removecurse.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\shock.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\timeout.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\triggers.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\unguard.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\unitmessage.c
-# End Source File
-# End Target
-# End Project
diff --git a/src/common/util/util.dsp b/src/common/util/util.dsp
deleted file mode 100644
index cdeb8fa8d..000000000
--- a/src/common/util/util.dsp
+++ /dev/null
@@ -1,302 +0,0 @@
-# Microsoft Developer Studio Project File - Name="util" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=util - Win32 Profile
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "util.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "util.mak" CFG="util - Win32 Profile"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "util - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "util - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "util - Win32 Profile" (based on "Win32 (x86) Static Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "util - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /Za /W4 /GX /Z7 /O2 /I "../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD BASE RSC /l 0x407
-# ADD RSC /l 0x407
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF "$(CFG)" == "util - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /Za /W4 /Z7 /Od /I "../.." /I ".." /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /FD /c
-# SUBTRACT CPP /Fr /YX
-# ADD BASE RSC /l 0x407
-# ADD RSC /l 0x407
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF "$(CFG)" == "util - Win32 Profile"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "util___Win32_Profile"
-# PROP BASE Intermediate_Dir "util___Win32_Profile"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Profile"
-# PROP Intermediate_Dir "Profile"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /I "../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /Za /W4 /Z7 /O2 /I "../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD BASE RSC /l 0x407
-# ADD RSC /l 0x407
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ENDIF
-
-# Begin Target
-
-# Name "util - Win32 Release"
-# Name "util - Win32 Debug"
-# Name "util - Win32 Profile"
-# Begin Group "Header"
-
-# PROP Default_Filter "*.h"
-# Begin Source File
-
-SOURCE=.\attrib.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\base36.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\command.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\crmessage.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\cvector.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\event.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\functions.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\goodies.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\graph.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\language.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\lists.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\log.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\message.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\nrmessage.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\rand.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\resolve.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sql.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\translation.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\umlaut.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\vmap.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\vset.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\windir.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\xml.h
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=.\attrib.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\base36.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\command.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\crmessage.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\cvector.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\dice.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\event.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\functions.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\goodies.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\graph.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\language.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\lists.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\log.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\message.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\nrmessage.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\rand.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\resolve.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\sql.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\translation.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\umlaut.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\vmap.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\vset.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\windir.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\xml.c
-# End Source File
-# End Target
-# End Project
diff --git a/src/doc/doc.dsp b/src/doc/doc.dsp
deleted file mode 100644
index 52e1ce755..000000000
--- a/src/doc/doc.dsp
+++ /dev/null
@@ -1,79 +0,0 @@
-# Microsoft Developer Studio Project File - Name="doc" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Generic Project" 0x010a
-
-CFG=doc - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "doc.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "doc.mak" CFG="doc - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "doc - Win32 Release" (based on "Win32 (x86) Generic Project")
-!MESSAGE "doc - Win32 Debug" (based on "Win32 (x86) Generic Project")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-MTL=midl.exe
-
-!IF "$(CFG)" == "doc - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-
-!ELSEIF "$(CFG)" == "doc - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-
-!ENDIF
-
-# Begin Target
-
-# Name "doc - Win32 Release"
-# Name "doc - Win32 Debug"
-# Begin Source File
-
-SOURCE=.\coding.txt
-# End Source File
-# Begin Source File
-
-SOURCE=.\commit.txt
-# End Source File
-# Begin Source File
-
-SOURCE=".\new-source.gif"
-# End Source File
-# Begin Source File
-
-SOURCE=.\triggers.txt
-# End Source File
-# End Target
-# End Project
diff --git a/src/eressea.dsw b/src/eressea.dsw
deleted file mode 100644
index aa19d853a..000000000
--- a/src/eressea.dsw
+++ /dev/null
@@ -1,200 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "attributes"=.\common\attributes\attributes.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "eressea"=.\eressea\eressea.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name kernel
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name util
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name gamecode
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name attributes
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name items
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name modules
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name races
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name spells
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name triggers
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "gamecode"=.\common\gamecode\gamecode.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "items"=.\common\items\items.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "kernel"=.\common\kernel\kernel.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "mapper"=.\mapper\mapper.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name triggers
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name util
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name kernel
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name attributes
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name items
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name modules
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name races
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name spells
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "modules"=.\common\modules\modules.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "races"=.\common\races\races.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "spells"=.\common\spells\spells.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "triggers"=.\common\triggers\triggers.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "util"=.\common\util\util.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/src/eressea.sln b/src/eressea.sln
index e9af6e9a6..32598fa52 100644
--- a/src/eressea.sln
+++ b/src/eressea.sln
@@ -8,6 +8,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "editor", "eressea\editor.vc
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eressea", "eressea.vcproj", "{AD80EB0B-7CB4-42F2-9C95-8CCEF68DB387}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "util", "common\util.vcproj", "{F70CFB27-8A2F-E447-B452-4E1C590EDA6D}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eressea-lua", "eressea\eressea-lua.vcproj", "{75501170-51C2-E641-BA8B-EDC008184192}"
+EndProject
Global
GlobalSection(SubversionScc) = preSolution
Svn-Managed = True
@@ -37,6 +41,16 @@ Global
{AD80EB0B-7CB4-42F2-9C95-8CCEF68DB387}.Profile|Win32.Build.0 = Release|Win32
{AD80EB0B-7CB4-42F2-9C95-8CCEF68DB387}.Release|Win32.ActiveCfg = Release|Win32
{AD80EB0B-7CB4-42F2-9C95-8CCEF68DB387}.Release|Win32.Build.0 = Release|Win32
+ {F70CFB27-8A2F-E447-B452-4E1C590EDA6D}.Debug|Win32.ActiveCfg = Debug|Win32
+ {F70CFB27-8A2F-E447-B452-4E1C590EDA6D}.Profile|Win32.ActiveCfg = Profile|Win32
+ {F70CFB27-8A2F-E447-B452-4E1C590EDA6D}.Profile|Win32.Build.0 = Profile|Win32
+ {F70CFB27-8A2F-E447-B452-4E1C590EDA6D}.Release|Win32.ActiveCfg = Release|Win32
+ {F70CFB27-8A2F-E447-B452-4E1C590EDA6D}.Release|Win32.Build.0 = Release|Win32
+ {75501170-51C2-E641-BA8B-EDC008184192}.Debug|Win32.ActiveCfg = Debug|Win32
+ {75501170-51C2-E641-BA8B-EDC008184192}.Profile|Win32.ActiveCfg = Profile|Win32
+ {75501170-51C2-E641-BA8B-EDC008184192}.Profile|Win32.Build.0 = Profile|Win32
+ {75501170-51C2-E641-BA8B-EDC008184192}.Release|Win32.ActiveCfg = Release|Win32
+ {75501170-51C2-E641-BA8B-EDC008184192}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/src/eressea/eressea.dsp b/src/eressea/eressea.dsp
deleted file mode 100644
index d0ad57af5..000000000
--- a/src/eressea/eressea.dsp
+++ /dev/null
@@ -1,168 +0,0 @@
-# Microsoft Developer Studio Project File - Name="eressea" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=ERESSEA - WIN32 DEBUG
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "eressea.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "eressea.mak" CFG="ERESSEA - WIN32 DEBUG"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "eressea - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "eressea - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "eressea - Win32 Profile" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "eressea - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "eressea_"
-# PROP BASE Intermediate_Dir "eressea_"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Za /W4 /GX /Zi /O2 /I "../common/kernel" /I "../common/gamecode" /I "../common/util" /I "../common" /I ".." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x407 /d "NDEBUG"
-# ADD RSC /l 0x407 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386
-
-!ELSEIF "$(CFG)" == "eressea - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "eressea0"
-# PROP BASE Intermediate_Dir "eressea0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Za /W4 /Gm /ZI /Od /I "../common/kernel" /I "../common/gamecode" /I "../common/util" /I "../common" /I ".." /D "_CONSOLE" /D "_MBCS" /D "WIN32" /D "_DEBUG" /FD /c
-# SUBTRACT CPP /Fr /YX
-# ADD BASE RSC /l 0x407 /d "_DEBUG"
-# ADD RSC /l 0x407 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo /S (*.h ../*.h ../common/kernel/eressea.h ../common/gamecode/*.h ../common/util/*.h ../common/triggers/*.h) ../common/gamecode/Debug/*.sbr ../common/kernel/Debug/*.sbr ../common/triggers/Debug/*.sbr ../common/util/Debug/*.sbr
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ELSEIF "$(CFG)" == "eressea - Win32 Profile"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "eressea___Win32_Profile"
-# PROP BASE Intermediate_Dir "eressea___Win32_Profile"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Profile"
-# PROP Intermediate_Dir "Profile"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /I ".." /I "../common" /I "../common/util" /I "../common/kernel" /I "../common/gamecode" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Za /W4 /Zi /O2 /I ".." /I "../common" /I "../common/util" /I "../common/kernel" /I "../common/gamecode" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c
-# ADD BASE RSC /l 0x407 /d "NDEBUG"
-# ADD RSC /l 0x407 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /profile /machine:I386
-
-!ENDIF
-
-# Begin Target
-
-# Name "eressea - Win32 Release"
-# Name "eressea - Win32 Debug"
-# Name "eressea - Win32 Profile"
-# Begin Group "Text Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\commit.txt
-# End Source File
-# Begin Source File
-
-SOURCE=..\header.txt
-# End Source File
-# Begin Source File
-
-SOURCE=..\todo.txt
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=.\korrektur.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\korrektur.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\main.c
-
-!IF "$(CFG)" == "eressea - Win32 Release"
-
-!ELSEIF "$(CFG)" == "eressea - Win32 Debug"
-
-# ADD CPP /D MALLOCDBG=3
-
-!ELSEIF "$(CFG)" == "eressea - Win32 Profile"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE="..\common\settings-eressea.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\common\settings-vinyambar-classic.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\common\settings-vinyambar.h"
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\settings.h
-# End Source File
-# End Target
-# End Project
diff --git a/src/eressea/tolua/bind_building.c b/src/eressea/tolua/bind_building.c
index ebe13201a..3f3666925 100644
--- a/src/eressea/tolua/bind_building.c
+++ b/src/eressea/tolua/bind_building.c
@@ -147,6 +147,16 @@ tolua_building_get_type(lua_State* L)
return 1;
}
+static int
+tolua_building_get_owner(lua_State* L)
+{
+ building* b = (building*) tolua_tousertype(L, 1, 0);
+ unit * u = b?buildingowner(b->region, b):NULL;
+ tolua_pushusertype(L, u, TOLUA_CAST "unit");
+ return 1;
+}
+
+
static int
tolua_building_create(lua_State* L)
{
@@ -195,6 +205,7 @@ tolua_building_open(lua_State* L)
tolua_function(L, TOLUA_CAST "__tostring", tolua_building_tostring);
tolua_variable(L, TOLUA_CAST "id", tolua_building_get_id, NULL);
+ tolua_variable(L, TOLUA_CAST "owner", tolua_building_get_owner, NULL);
tolua_variable(L, TOLUA_CAST "type", tolua_building_get_type, NULL);
tolua_variable(L, TOLUA_CAST "name", tolua_building_get_name, tolua_building_set_name);
tolua_variable(L, TOLUA_CAST "info", tolua_building_get_info, tolua_building_set_info);
diff --git a/src/res/e3a.xml b/src/res/e3a.xml
index 34a6a5fcd..f2fcdaf4c 100644
--- a/src/res/e3a.xml
+++ b/src/res/e3a.xml
@@ -56,7 +56,7 @@
-
+
diff --git a/src/scripts/tests.lua b/src/scripts/tests.lua
index 8a45f192a..f10cc0165 100644
--- a/src/scripts/tests.lua
+++ b/src/scripts/tests.lua
@@ -621,6 +621,37 @@ function test_mallorn()
assert(u3:get_item("mallorn")==1)
end
+local function two_units(r, f1, f2)
+ local u1, u2
+ u1 = unit.create(f1, r, 1)
+ u2 = unit.create(f2, r, 1)
+ u1:add_item("money", u1.number * 100)
+ u2:add_item("money", u2.number * 100)
+ return u1, u2
+end
+
+function two_factions()
+ local f1 = faction.create("noreply@eressea.de", "human", "de")
+ f1.id = 1
+ local f2 = faction.create("noreply@eressea.de", "orc", "de")
+ f2.id = 2
+ return f1, f2
+end
+
+function test_control()
+ free_game()
+ local u1, u2 = two_units(region.create(0, 0, "plain"), two_factions())
+ local r = u1.region
+ local b = building.create(r, "castle")
+ u1.building = b
+ u2.building = b
+ update_owners()
+ u1:clear_orders()
+ u1:add_order()
+ process_orders()
+
+end
+
function test_storage()
free_game()
local r = region.create(0, 0, "plain")
@@ -650,6 +681,7 @@ tests = {
["alliance"] = test_alliance,
["pure"] = test_pure,
["read_write"] = test_read_write,
+ ["control"] = test_control,
["faction"] = test_faction,
["region"] = test_region,
["building"] = test_building,
diff --git a/src/tools/fixes.dsp b/src/tools/fixes.dsp
deleted file mode 100644
index 9ff43646e..000000000
--- a/src/tools/fixes.dsp
+++ /dev/null
@@ -1,101 +0,0 @@
-# Microsoft Developer Studio Project File - Name="fixes" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=fixes - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "fixes.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "fixes.mak" CFG="fixes - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "fixes - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "fixes - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "fixes - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0xc09 /d "NDEBUG"
-# ADD RSC /l 0xc09 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF "$(CFG)" == "fixes - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../common/kernel" /I "../common/gamecode" /I "../common/util" /I "../common" /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /GZ /c
-# ADD BASE RSC /l 0xc09 /d "_DEBUG"
-# ADD RSC /l 0xc09 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF
-
-# Begin Target
-
-# Name "fixes - Win32 Release"
-# Name "fixes - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\fixes.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/src/tools/msg2xml.dsp b/src/tools/msg2xml.dsp
deleted file mode 100644
index 65a266e53..000000000
--- a/src/tools/msg2xml.dsp
+++ /dev/null
@@ -1,100 +0,0 @@
-# Microsoft Developer Studio Project File - Name="msg2xml" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=msg2xml - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "msg2xml.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "msg2xml.mak" CFG="msg2xml - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "msg2xml - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "msg2xml - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "msg2xml - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x407 /d "NDEBUG"
-# ADD RSC /l 0x407 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF "$(CFG)" == "msg2xml - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "msg2xml___Win32_Debug"
-# PROP BASE Intermediate_Dir "msg2xml___Win32_Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x407 /d "_DEBUG"
-# ADD RSC /l 0x407 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF
-
-# Begin Target
-
-# Name "msg2xml - Win32 Release"
-# Name "msg2xml - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\msg2xml.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/src/tools/reduce.dsp b/src/tools/reduce.dsp
deleted file mode 100644
index 91c7defcd..000000000
--- a/src/tools/reduce.dsp
+++ /dev/null
@@ -1,101 +0,0 @@
-# Microsoft Developer Studio Project File - Name="reduce" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 5.00
-# ** NICHT BEARBEITEN **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=reduce - Win32 Debug
-!MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit\
- NMAKE
-!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den\
- Befehl
-!MESSAGE
-!MESSAGE NMAKE /f "reduce-5.mak".
-!MESSAGE
-!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben
-!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:
-!MESSAGE
-!MESSAGE NMAKE /f "reduce-5.mak" CFG="reduce - Win32 Debug"
-!MESSAGE
-!MESSAGE Für die Konfiguration stehen zur Auswahl:
-!MESSAGE
-!MESSAGE "reduce - Win32 Release" (basierend auf\
- "Win32 (x86) Console Application")
-!MESSAGE "reduce - Win32 Debug" (basierend auf\
- "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "reduce - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x407 /d "NDEBUG"
-# ADD RSC /l 0x407 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF "$(CFG)" == "reduce - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /G5 /Zp1 /MDd /Za /W4 /Gm /Gi /Zi /Od /Gy /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x407 /d "_DEBUG"
-# ADD RSC /l 0x407 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF
-
-# Begin Target
-
-# Name "reduce - Win32 Release"
-# Name "reduce - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\museum.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\reduce.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\weapons.c
-# End Source File
-# End Target
-# End Project
diff --git a/src/tools/translator.dsp b/src/tools/translator.dsp
deleted file mode 100644
index 7706336a1..000000000
--- a/src/tools/translator.dsp
+++ /dev/null
@@ -1,100 +0,0 @@
-# Microsoft Developer Studio Project File - Name="translator" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=translator - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "translator.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "translator.mak" CFG="translator - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "translator - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "translator - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "translator - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x407 /d "NDEBUG"
-# ADD RSC /l 0x407 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF "$(CFG)" == "translator - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I ".." /I "../.." /I "../common/util" /D "_CONSOLE" /D "_MBCS" /D "WIN32" /D "_DEBUG" /FR /YX /FD /GZ /c
-# ADD BASE RSC /l 0x407 /d "_DEBUG"
-# ADD RSC /l 0x407 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF
-
-# Begin Target
-
-# Name "translator - Win32 Release"
-# Name "translator - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\translator.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/src/tools/xmltest.dsp b/src/tools/xmltest.dsp
deleted file mode 100644
index 33b64df9a..000000000
--- a/src/tools/xmltest.dsp
+++ /dev/null
@@ -1,100 +0,0 @@
-# Microsoft Developer Studio Project File - Name="xmltest" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=xmltest - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "xmltest.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "xmltest.mak" CFG="xmltest - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "xmltest - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "xmltest - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "xmltest - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x407 /d "NDEBUG"
-# ADD RSC /l 0x407 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF "$(CFG)" == "xmltest - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../common/util" /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /GZ /c
-# ADD BASE RSC /l 0x407 /d "_DEBUG"
-# ADD RSC /l 0x407 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF
-
-# Begin Target
-
-# Name "xmltest - Win32 Release"
-# Name "xmltest - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\xmltest.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project