From fbfd96674bae933a8f9d9eeee03dacda1e6896f3 Mon Sep 17 00:00:00 2001
From: ADAM David Alan Martin <adam@recursive.engineer>
Date: Fri, 26 Apr 2024 03:39:30 -0400
Subject: [PATCH] Remove the legacy slylandro gen.

The C++ one now works fine (I think).
---
 sc2/src/uqm/gendef.c                  | 10 ++--
 sc2/src/uqm/planets/generate/Makeinfo |  2 +-
 sc2/src/uqm/planets/generate/gensly.c | 70 ---------------------------
 3 files changed, 6 insertions(+), 76 deletions(-)
 delete mode 100644 sc2/src/uqm/planets/generate/gensly.c

diff --git a/sc2/src/uqm/gendef.c b/sc2/src/uqm/gendef.c
index b4a20b266..ccc0cde28 100644
--- a/sc2/src/uqm/gendef.c
+++ b/sc2/src/uqm/gendef.c
@@ -36,7 +36,6 @@ extern GenerateFunctions generateOrzFunctions;
 extern GenerateFunctions generatePkunkFunctions;
 extern GenerateFunctions generateRainbowWorldFunctions;
 extern GenerateFunctions generateSaMatraFunctions;
-extern GenerateFunctions generateSlylandroFunctions;
 extern GenerateFunctions generateSolFunctions;
 extern GenerateFunctions generateSpathiFunctions;
 extern GenerateFunctions generateSupoxFunctions;
@@ -65,10 +64,13 @@ getGenerateFunctions (STAR_DESC *const star, void **sup )
 
 	switch (star->Index)
 	{
+		// Legacy ones are disabled...
+		case SHOFIXTI_DEFINED:
+		case SLYLANDRO_DEFINED:
+			abort();
+
 		case SOL_DEFINED:
 			return &generateSolFunctions;
-		case SHOFIXTI_DEFINED:
-			abort();
 		case START_COLONY_DEFINED:
 			return &generateColonyFunctions;
 		case SPATHI_DEFINED:
@@ -93,8 +95,6 @@ getGenerateFunctions (STAR_DESC *const star, void **sup )
 			return &generateTrapFunctions;
 		case BURVIXESE_DEFINED:
 			return &generateBurvixeseFunctions;
-		case SLYLANDRO_DEFINED:
-			return &generateSlylandroFunctions;
 		case DRUUGE_DEFINED:
 			return &generateDruugeFunctions;
 		case BOMB_DEFINED:
diff --git a/sc2/src/uqm/planets/generate/Makeinfo b/sc2/src/uqm/planets/generate/Makeinfo
index 74a3b0689..3e1c3cdaa 100644
--- a/sc2/src/uqm/planets/generate/Makeinfo
+++ b/sc2/src/uqm/planets/generate/Makeinfo
@@ -1,6 +1,6 @@
 uqm_CFILES="gendefault.c genand.c genburv.c genchmmr.c gencol.c gendru.c
 		genilw.c genmel.c genmyc.c genorz.c genpet.c genpku.c genrain.c
-		gensam.c gensly.c gensol.c genspa.c gensup.c gensyr.c
+		gensam.c gensol.c genspa.c gensup.c gensyr.c
 		genthrad.c gentrap.c genutw.c genvault.c genvux.c genwreck.c
 		genyeh.c genzfpscout.c genzoq.c"
 uqm_HFILES="genall.h gendefault.h"
diff --git a/sc2/src/uqm/planets/generate/gensly.c b/sc2/src/uqm/planets/generate/gensly.c
deleted file mode 100644
index 48ed10000..000000000
--- a/sc2/src/uqm/planets/generate/gensly.c
+++ /dev/null
@@ -1,70 +0,0 @@
-//Copyright Paul Reiche, Fred Ford. 1992-2002
-
-/*
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include "genall.h"
-#include "../planets.h"
-#include "../../comm.h"
-
-
-static bool GenerateSlylandro_generatePlanets (SOLARSYS_STATE *solarSys);
-static bool GenerateSlylandro_generateOrbital (SOLARSYS_STATE *solarSys,
-		PLANET_DESC *world);
-
-
-const GenerateFunctions generateSlylandroFunctions = {
-	/* .initNpcs         = */ GenerateDefault_initNpcs,
-	/* .reinitNpcs       = */ GenerateDefault_reinitNpcs,
-	/* .uninitNpcs       = */ GenerateDefault_uninitNpcs,
-	/* .generatePlanets  = */ GenerateSlylandro_generatePlanets,
-	/* .generateMoons    = */ GenerateDefault_generateMoons,
-	/* .generateName     = */ GenerateDefault_generateName,
-	/* .generateOrbital  = */ GenerateSlylandro_generateOrbital,
-	/* .generateMinerals = */ GenerateDefault_generateMinerals,
-	/* .generateEnergy   = */ GenerateDefault_generateEnergy,
-	/* .generateLife     = */ GenerateDefault_generateLife,
-	/* .pickupMinerals   = */ GenerateDefault_pickupMinerals,
-	/* .pickupEnergy     = */ GenerateDefault_pickupEnergy,
-	/* .pickupLife       = */ GenerateDefault_pickupLife,
-};
-
-
-static bool
-GenerateSlylandro_generatePlanets (SOLARSYS_STATE *solarSys)
-{
-	GenerateDefault_generatePlanets (solarSys);
-
-	solarSys->PlanetDesc[3].data_index = RED_GAS_GIANT;
-	solarSys->PlanetDesc[3].NumPlanets = 1;
-
-	return true;
-}
-
-static bool
-GenerateSlylandro_generateOrbital (SOLARSYS_STATE *solarSys,
-		PLANET_DESC *world)
-{
-	if (matchWorld (solarSys, world, 3, MATCH_PLANET))
-	{
-		InitCommunication (SLYLANDRO_HOME_CONVERSATION);
-		return true;
-	}
-
-	GenerateDefault_generateOrbital (solarSys, world);
-	return true;
-}
-