From 1898dbe13aebe7f0ccf3d33c74c5dddc8c04ae50 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Sun, 27 Feb 2011 00:37:08 -0800
Subject: [PATCH] We have put the spoils code into the open source parts of the
 code.

---
 eressea.sln       | 10 ++++++++--
 src/races/races.c | 19 -------------------
 2 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/eressea.sln b/eressea.sln
index f7bd7af39..06627cd40 100644
--- a/eressea.sln
+++ b/eressea.sln
@@ -10,9 +10,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua-bindings", "..\shared\s
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "external", "..\external\external.vcxproj", "{F9AE4586-8F65-486B-9666-744839E40A54}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "amalgamation-eressea", "src\eressea.vcxproj", "{AD80EB0B-7CB4-42F2-9C95-8CCEF68DB387}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eressea", "src\eressea.vcxproj", "{AD80EB0B-7CB4-42F2-9C95-8CCEF68DB387}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "amalgamation-example", "..\example\src\example.vcxproj", "{4A17DAEE-2261-4E2C-96F6-BA4132A09551}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example", "..\example\src\example.vcxproj", "{4A17DAEE-2261-4E2C-96F6-BA4132A09551}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "atlantis", "..\meropis\src\meropis.vcxproj", "{52764450-41CA-11E0-B2EC-3136E0D72085}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -42,6 +44,10 @@ Global
 		{4A17DAEE-2261-4E2C-96F6-BA4132A09551}.Debug|Win32.Build.0 = Debug|Win32
 		{4A17DAEE-2261-4E2C-96F6-BA4132A09551}.Release|Win32.ActiveCfg = Release|Win32
 		{4A17DAEE-2261-4E2C-96F6-BA4132A09551}.Release|Win32.Build.0 = Release|Win32
+		{52764450-41CA-11E0-B2EC-3136E0D72085}.Debug|Win32.ActiveCfg = Debug|Win32
+		{52764450-41CA-11E0-B2EC-3136E0D72085}.Debug|Win32.Build.0 = Debug|Win32
+		{52764450-41CA-11E0-B2EC-3136E0D72085}.Release|Win32.ActiveCfg = Release|Win32
+		{52764450-41CA-11E0-B2EC-3136E0D72085}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/src/races/races.c b/src/races/races.c
index abf9f5a4b..1756986c4 100644
--- a/src/races/races.c
+++ b/src/races/races.c
@@ -94,24 +94,6 @@ equip_newunits(const struct equipment * eq, struct unit *u)
   }
 }
 
-static item *
-default_spoil(const struct race * rc, int size)
-{
-  item * itm = NULL;
-
-  if (rng_int()%100 < RACESPOILCHANCE) {
-    char spoilname[32];
-    const item_type * itype;
-
-    sprintf(spoilname,  "%sspoil", rc->_name[0]);
-    itype = it_find(spoilname);
-    if (itype!=NULL) {
-      i_add(&itm, i_new(itype, size));
-    }
-  }
-  return itm;
-}
-
 /* Die Funktionen werden über den hier registrierten Namen in races.xml
  * in die jeweilige Rassendefiniton eingebunden */
 void
@@ -138,6 +120,5 @@ register_races(void)
   /* function itemdrop
   * to generate battle spoils
   * race->itemdrop() */
-  register_function((pf_generic)default_spoil, "defaultdrops");
   register_function((pf_generic)equip_newunits, "equip_newunits");
 }