adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Dynamic Chmmr, Druuge, Supox, and Mycon Gambit.

Browse Source 
Now there's still more to do...  But I think I can retire the
old funcptr based stuff soon.
This commit is contained in:
ADAM David Alan Martin
2024-04-26 21:45:17 -04:00
parent a9d0e3ce7c
commit 4f1b12d4c5
7 changed files with 138 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/uqm/gendef.c
+5 -12
View File
@@ -24,8 +24,6 @@
extern GenerateFunctions generateDefaultFunctions; extern GenerateFunctions generateDefaultFunctions;
extern GenerateFunctions generateChmmrFunctions;
extern GenerateFunctions generateDruugeFunctions;
extern GenerateFunctions generateIlwrathFunctions; extern GenerateFunctions generateIlwrathFunctions;
extern GenerateFunctions generateMelnormeFunctions; extern GenerateFunctions generateMelnormeFunctions;
extern GenerateFunctions generateMyconFunctions; extern GenerateFunctions generateMyconFunctions;
@@ -35,10 +33,8 @@ extern GenerateFunctions generateRainbowWorldFunctions;
extern GenerateFunctions generateSaMatraFunctions; extern GenerateFunctions generateSaMatraFunctions;
extern GenerateFunctions generateSolFunctions; extern GenerateFunctions generateSolFunctions;
extern GenerateFunctions generateSpathiFunctions; extern GenerateFunctions generateSpathiFunctions;
extern GenerateFunctions generateSupoxFunctions;
extern GenerateFunctions generateTalkingPetFunctions; extern GenerateFunctions generateTalkingPetFunctions;
extern GenerateFunctions generateThraddashFunctions; extern GenerateFunctions generateThraddashFunctions;
extern GenerateFunctions generateTrapFunctions;
extern GenerateFunctions generateUtwigFunctions; extern GenerateFunctions generateUtwigFunctions;
extern GenerateFunctions generateVuxFunctions; extern GenerateFunctions generateVuxFunctions;
extern GenerateFunctions generateYehatFunctions; extern GenerateFunctions generateYehatFunctions;
@@ -51,6 +47,11 @@ getGenerateFunctions (STAR_DESC *const star)
switch (star->Index) switch (star->Index)
{ {
// Legacy ones are disabled... // Legacy ones are disabled...
case CHMMR_DEFINED:
case DRUUGE_DEFINED:
case MYCON_TRAP_DEFINED:
case SUPOX_DEFINED:
case SHIP_VAULT_DEFINED: case SHIP_VAULT_DEFINED:
case ANDROSYNTH_DEFINED: case ANDROSYNTH_DEFINED:
case BURVIXESE_DEFINED: case BURVIXESE_DEFINED:
@@ -80,12 +81,6 @@ getGenerateFunctions (STAR_DESC *const star)
return &generateMelnormeFunctions; return &generateMelnormeFunctions;
case TALKING_PET_DEFINED: case TALKING_PET_DEFINED:
return &generateTalkingPetFunctions; return &generateTalkingPetFunctions;
case CHMMR_DEFINED:
return &generateChmmrFunctions;
case MYCON_TRAP_DEFINED:
return &generateTrapFunctions;
case DRUUGE_DEFINED:
return &generateDruugeFunctions;
case BOMB_DEFINED: case BOMB_DEFINED:
case UTWIG_DEFINED: case UTWIG_DEFINED:
return &generateUtwigFunctions; return &generateUtwigFunctions;
@@ -113,8 +108,6 @@ getGenerateFunctions (STAR_DESC *const star)
return &generateYehatFunctions; return &generateYehatFunctions;
case PKUNK_DEFINED: case PKUNK_DEFINED:
return &generatePkunkFunctions; return &generatePkunkFunctions;
case SUPOX_DEFINED:
return &generateSupoxFunctions;
case RAINBOW_DEFINED: case RAINBOW_DEFINED:
return &generateRainbowWorldFunctions; return &generateRainbowWorldFunctions;
case ILWRATH_DEFINED: case ILWRATH_DEFINED:
sc2/src/uqm/plandata.c
+7
View File
@@ -538,6 +538,7 @@ STAR_DESC starmap_array[] =
#endif #endif
//{{2908, 269}, MAKE_STAR (DWARF_STAR, BLUE_BODY, -1), SHOFIXTI_DEFINED, 4, 82}, //{{2908, 269}, MAKE_STAR (DWARF_STAR, BLUE_BODY, -1), SHOFIXTI_DEFINED, 4, 82},
{{6858, 577}, MAKE_STAR (DWARF_STAR, GREEN_BODY, -1), 0, 0, 123, "Mycon Trap"},
{{1004, 1083}, MAKE_STAR (DWARF_STAR, GREEN_BODY, -1), 0, 2, 27, "Slylandro"}, {{1004, 1083}, MAKE_STAR (DWARF_STAR, GREEN_BODY, -1), 0, 2, 27, "Slylandro"},
{{1776, 1395}, MAKE_STAR (DWARF_STAR, YELLOW_BODY, -1), 0, 0, 98, "Colony"}, {{1776, 1395}, MAKE_STAR (DWARF_STAR, YELLOW_BODY, -1), 0, 0, 98, "Colony"},
@@ -555,11 +556,17 @@ STAR_DESC starmap_array[] =
{{1707, 1501}, MAKE_STAR (DWARF_STAR, GREEN_BODY, -1), 0, 0, 52}, {{1707, 1501}, MAKE_STAR (DWARF_STAR, GREEN_BODY, -1), 0, 0, 52},
{{2104, 2083}, MAKE_STAR (DWARF_STAR, ORANGE_BODY, -1), 0, 0, 118, "Zoq-Fot-Pik Scout"}, {{2104, 2083}, MAKE_STAR (DWARF_STAR, ORANGE_BODY, -1), 0, 0, 118, "Zoq-Fot-Pik Scout"},
{{ 742, 2268}, MAKE_STAR (DWARF_STAR, ORANGE_BODY, -1), 0, 0, 117, "Chmmr"},
{{3587, 2566}, MAKE_STAR (DWARF_STAR, GREEN_BODY, -1), 0, 7, 86, "Androsynth"}, {{3587, 2566}, MAKE_STAR (DWARF_STAR, GREEN_BODY, -1), 0, 7, 86, "Androsynth"},
{{9469, 2806}, MAKE_STAR (DWARF_STAR, ORANGE_BODY, -1), 0, 6, 61, "Druuge"},
{{4125, 3770}, MAKE_STAR (DWARF_STAR, BLUE_BODY, -1), 0, 0, 114, "Syreen Gaia"}, {{4125, 3770}, MAKE_STAR (DWARF_STAR, BLUE_BODY, -1), 0, 0, 114, "Syreen Gaia"},
{{5937, 3937}, MAKE_STAR (DWARF_STAR, ORANGE_BODY, -1), 0, 5, 10, "Syreen Vault"}, {{5937, 3937}, MAKE_STAR (DWARF_STAR, ORANGE_BODY, -1), 0, 5, 10, "Syreen Vault"},
{{9645, 5791}, MAKE_STAR (DWARF_STAR, ORANGE_BODY, -1), 0, 0, 130, "Burvixese"}, {{9645, 5791}, MAKE_STAR (DWARF_STAR, ORANGE_BODY, -1), 0, 0, 130, "Burvixese"},
{{7414, 9124}, MAKE_STAR (DWARF_STAR, GREEN_BODY, -1), 0, 2, 47, "Supox"},
{{MAX_X_UNIVERSE << 1, MAX_Y_UNIVERSE << 1}, 0, 0, 0, 0}, {{MAX_X_UNIVERSE << 1, MAX_Y_UNIVERSE << 1}, 0, 0, 0, 0},
sc2/src/uqm/planets/generate/Makeinfo
+5 -4
View File
@@ -1,10 +1,11 @@
uqm_CFILES="gendefault.c genchmmr.c gendru.c uqm_CFILES="gendefault.c
genilw.c genmel.c genmyc.c genorz.c genpet.c genpku.c genrain.c genilw.c genmel.c genmyc.c genorz.c genpet.c genpku.c genrain.c
gensam.c gensol.c genspa.c gensup.c gensam.c gensol.c genspa.c
genthrad.c gentrap.c genutw.c genvux.c genthrad.c genutw.c genvux.c
genyeh.c genzoq.c" genyeh.c genzoq.c"
uqm_HFILES="genall.h gendefault.h" uqm_HFILES="genall.h gendefault.h"
uqm_CXXFILES="cxx-generator.cpp gensly-modern.cpp genshof-modern.cpp uqm_CXXFILES="cxx-generator.cpp gensly-modern.cpp genshof-modern.cpp
gencol-modern.cpp genwreck-modern.cpp genzfpscout-modern.cpp gencol-modern.cpp genwreck-modern.cpp genzfpscout-modern.cpp
genand-modern.cpp genburv-modern.cpp gensyr-modern.cpp genand-modern.cpp genburv-modern.cpp gensyr-modern.cpp
genvault-modern.cpp" genvault-modern.cpp genchmmr-modern.cpp gendru-modern.cpp
gentrap-modern.cpp gensup-modern.cpp"
sc2/src/uqm/planets/generate/genchmmr.c → sc2/src/uqm/planets/generate/genchmmr-modern.cpp
+28 -30
View File
@@ -30,34 +30,32 @@
#include "../../starbase.h" #include "../../starbase.h"
static bool GenerateChmmr_generatePlanets (SOLARSYS_STATE *solarSys); namespace
static bool GenerateChmmr_generateMoons (SOLARSYS_STATE *solarSys, {
PLANET_DESC *planet); using namespace Planets::exports;
static bool GenerateChmmr_generateOrbital (SOLARSYS_STATE *solarSys,
PLANET_DESC *world);
class GenerateChmmr
const GenerateFunctions generateChmmrFunctions = { : public DefaultGenerator
/* .initNpcs = */ GenerateDefault_initNpcs, {
/* .reinitNpcs = */ GenerateDefault_reinitNpcs, bool generatePlanets( SolarSystem *solarSys ) override;
/* .uninitNpcs = */ GenerateDefault_uninitNpcs, bool generateMoons( SolarSystem *solarSys,
/* .generatePlanets = */ GenerateChmmr_generatePlanets, PLANET_DESC *planet ) override;
/* .generateMoons = */ GenerateChmmr_generateMoons, bool generateOrbital( SolarSystem *solarSys,
/* .generateName = */ GenerateDefault_generateName, PLANET_DESC *world ) override;
/* .generateOrbital = */ GenerateChmmr_generateOrbital,
/* .generateMinerals = */ GenerateDefault_generateMinerals,
/* .generateEnergy = */ GenerateDefault_generateEnergy,
/* .generateLife = */ GenerateDefault_generateLife,
/* .pickupMinerals = */ GenerateDefault_pickupMinerals,
/* .pickupEnergy = */ GenerateDefault_pickupEnergy,
/* .pickupLife = */ GenerateDefault_pickupLife,
}; };
auto init= []
static bool
GenerateChmmr_generatePlanets (SOLARSYS_STATE *solarSys)
{ {
GenerateDefault_generatePlanets (solarSys); Generator::add( "Chmmr", std::make_unique< GenerateChmmr >() );
return 0xDEADBEEF;
}();
}
bool
GenerateChmmr::generatePlanets( SolarSystem *const solarSys )
{
DefaultGenerator::generatePlanets (solarSys);
solarSys->PlanetDesc[1].data_index = SAPPHIRE_WORLD; solarSys->PlanetDesc[1].data_index = SAPPHIRE_WORLD;
if( false ){ if (!GET_GAME_STATE (CHMMR_UNLEASHED)) if( false ){ if (!GET_GAME_STATE (CHMMR_UNLEASHED))
@@ -67,10 +65,10 @@ GenerateChmmr_generatePlanets (SOLARSYS_STATE *solarSys)
return true; return true;
} }
static bool bool
GenerateChmmr_generateMoons (SOLARSYS_STATE *solarSys, PLANET_DESC *planet) GenerateChmmr::generateMoons( SolarSystem *const solarSys, PLANET_DESC *const planet )
{ {
GenerateDefault_generateMoons (solarSys, planet); DefaultGenerator::generateMoons (solarSys, planet);
if (matchWorld (solarSys, planet, 1, MATCH_PLANET)) if (matchWorld (solarSys, planet, 1, MATCH_PLANET))
{ {
@@ -90,8 +88,8 @@ GenerateChmmr_generateMoons (SOLARSYS_STATE *solarSys, PLANET_DESC *planet)
return true; return true;
} }
static bool bool
GenerateChmmr_generateOrbital (SOLARSYS_STATE *solarSys, PLANET_DESC *world) GenerateChmmr::generateOrbital( SolarSystem *const solarSys, PLANET_DESC *const world )
{ {
if (matchWorld (solarSys, world, 1, MATCH_PLANET)) if (matchWorld (solarSys, world, 1, MATCH_PLANET))
{ {
@@ -150,7 +148,7 @@ GenerateChmmr_generateOrbital (SOLARSYS_STATE *solarSys, PLANET_DESC *world)
return PrepareToVisitStarBase(); return PrepareToVisitStarBase();
} }
GenerateDefault_generateOrbital (solarSys, world); DefaultGenerator::generateOrbital (solarSys, world);
return true; return true;
} }
sc2/src/uqm/planets/generate/gendru.c → sc2/src/uqm/planets/generate/gendru-modern.cpp
+33 -35
View File
@@ -29,39 +29,37 @@
#include <string.h> #include <string.h>
namespace
{
using namespace Planets::exports;
static bool GenerateDruuge_generatePlanets (SOLARSYS_STATE *solarSys); class GenerateDruuge
static bool GenerateDruuge_generateOrbital (SOLARSYS_STATE *solarSys, : public DefaultGenerator
PLANET_DESC *world); {
static COUNT GenerateDruuge_generateEnergy (const SOLARSYS_STATE *, bool generatePlanets( SolarSystem *solarSys ) override;
const PLANET_DESC *world, COUNT whichNode, NODE_INFO *); bool generateOrbital( SolarSystem *solarSys,
static bool GenerateDruuge_pickupEnergy (SOLARSYS_STATE *solarSys, PLANET_DESC *world ) override;
PLANET_DESC *world, COUNT whichNode); COUNT generateEnergy( const SolarSystem *,
const PLANET_DESC *world, COUNT whichNode, NODE_INFO * ) override;
bool pickupEnergy( SolarSystem *solarSys,
const GenerateFunctions generateDruugeFunctions = { PLANET_DESC *world, COUNT whichNode ) override;
/* .initNpcs = */ GenerateDefault_initNpcs,
/* .reinitNpcs = */ GenerateDefault_reinitNpcs,
/* .uninitNpcs = */ GenerateDefault_uninitNpcs,
/* .generatePlanets = */ GenerateDruuge_generatePlanets,
/* .generateMoons = */ GenerateDefault_generateMoons,
/* .generateName = */ GenerateDefault_generateName,
/* .generateOrbital = */ GenerateDruuge_generateOrbital,
/* .generateMinerals = */ GenerateDefault_generateMinerals,
/* .generateEnergy = */ GenerateDruuge_generateEnergy,
/* .generateLife = */ GenerateDefault_generateLife,
/* .pickupMinerals = */ GenerateDefault_pickupMinerals,
/* .pickupEnergy = */ GenerateDruuge_pickupEnergy,
/* .pickupLife = */ GenerateDefault_pickupLife,
}; };
auto init= []
{
Generator::add( "Druuge", std::make_unique< GenerateDruuge >() );
static bool return 0xDEADBEEF;
GenerateDruuge_generatePlanets (SOLARSYS_STATE *solarSys) }();
}
bool
GenerateDruuge::generatePlanets( SolarSystem *const solarSys )
{ {
COUNT angle; COUNT angle;
GenerateDefault_generatePlanets (solarSys); DefaultGenerator::generatePlanets (solarSys);
memmove (&solarSys->PlanetDesc[1], &solarSys->PlanetDesc[0], memmove (&solarSys->PlanetDesc[1], &solarSys->PlanetDesc[0],
sizeof (solarSys->PlanetDesc[0]) sizeof (solarSys->PlanetDesc[0])
@@ -83,8 +81,8 @@ GenerateDruuge_generatePlanets (SOLARSYS_STATE *solarSys)
return true; return true;
} }
static bool bool
GenerateDruuge_generateOrbital (SOLARSYS_STATE *solarSys, PLANET_DESC *world) GenerateDruuge::generateOrbital( SolarSystem *const solarSys, PLANET_DESC *const world )
{ {
if (matchWorld (solarSys, world, 0, MATCH_PLANET)) if (matchWorld (solarSys, world, 0, MATCH_PLANET))
{ {
@@ -126,14 +124,14 @@ GenerateDruuge_generateOrbital (SOLARSYS_STATE *solarSys, PLANET_DESC *world)
} }
} }
GenerateDefault_generateOrbital (solarSys, world); DefaultGenerator::generateOrbital (solarSys, world);
return true; return true;
} }
static bool bool
GenerateDruuge_pickupEnergy (SOLARSYS_STATE *solarSys, PLANET_DESC *world, GenerateDruuge::pickupEnergy( SolarSystem *const solarSys, PLANET_DESC *const world,
COUNT whichNode) const COUNT whichNode )
{ {
if (matchWorld (solarSys, world, 0, MATCH_PLANET)) if (matchWorld (solarSys, world, 0, MATCH_PLANET))
{ {
@@ -155,9 +153,9 @@ GenerateDruuge_pickupEnergy (SOLARSYS_STATE *solarSys, PLANET_DESC *world,
return false; return false;
} }
static COUNT COUNT
GenerateDruuge_generateEnergy (const SOLARSYS_STATE *solarSys, GenerateDruuge::generateEnergy( const SolarSystem *const solarSys,
const PLANET_DESC *world, COUNT whichNode, NODE_INFO *info) const PLANET_DESC *const world, const COUNT whichNode, NODE_INFO *const info )
{ {
if (matchWorld (solarSys, world, 0, MATCH_PLANET)) if (matchWorld (solarSys, world, 0, MATCH_PLANET))
{ {
sc2/src/uqm/planets/generate/gensup.c → sc2/src/uqm/planets/generate/gensup-modern.cpp
+32 -35
View File
@@ -27,39 +27,36 @@
#include "../../state.h" #include "../../state.h"
#include "libs/mathlib.h" #include "libs/mathlib.h"
namespace
{
using namespace Planets::exports;
static bool GenerateSupox_generatePlanets (SOLARSYS_STATE *solarSys); class GenerateSupox
static bool GenerateSupox_generateOrbital (SOLARSYS_STATE *solarSys, : public DefaultGenerator
PLANET_DESC *world); {
static COUNT GenerateSupox_generateEnergy (const SOLARSYS_STATE *, bool generatePlanets( SolarSystem *solarSys ) override;
const PLANET_DESC *world, COUNT whichNode, NODE_INFO *); bool generateOrbital( SolarSystem *solarSys,
static bool GenerateSupox_pickupEnergy (SOLARSYS_STATE *solarSys, PLANET_DESC *world ) override;
PLANET_DESC *world, COUNT whichNode); COUNT generateEnergy( const SolarSystem *,
const PLANET_DESC *world, COUNT whichNode, NODE_INFO * ) override;
bool pickupEnergy( SolarSystem *solarSys,
const GenerateFunctions generateSupoxFunctions = { PLANET_DESC *world, COUNT whichNode ) override;
/* .initNpcs = */ GenerateDefault_initNpcs,
/* .reinitNpcs = */ GenerateDefault_reinitNpcs,
/* .uninitNpcs = */ GenerateDefault_uninitNpcs,
/* .generatePlanets = */ GenerateSupox_generatePlanets,
/* .generateMoons = */ GenerateDefault_generateMoons,
/* .generateName = */ GenerateDefault_generateName,
/* .generateOrbital = */ GenerateSupox_generateOrbital,
/* .generateMinerals = */ GenerateDefault_generateMinerals,
/* .generateEnergy = */ GenerateSupox_generateEnergy,
/* .generateLife = */ GenerateDefault_generateLife,
/* .pickupMinerals = */ GenerateDefault_pickupMinerals,
/* .pickupEnergy = */ GenerateSupox_pickupEnergy,
/* .pickupLife = */ GenerateDefault_pickupLife,
}; };
auto init= []
{
Generator::add( "Supox", std::make_unique< GenerateSupox >() );
static bool return 0xDEADBEEF;
GenerateSupox_generatePlanets (SOLARSYS_STATE *solarSys) }();
}
bool
GenerateSupox::generatePlanets( SolarSystem *const solarSys )
{ {
COUNT angle; COUNT angle;
GenerateDefault_generatePlanets (solarSys); DefaultGenerator::generatePlanets (solarSys);
solarSys->PlanetDesc[0].data_index = WATER_WORLD; solarSys->PlanetDesc[0].data_index = WATER_WORLD;
solarSys->PlanetDesc[0].NumPlanets = 2; solarSys->PlanetDesc[0].NumPlanets = 2;
@@ -74,8 +71,8 @@ GenerateSupox_generatePlanets (SOLARSYS_STATE *solarSys)
return true; return true;
} }
static bool bool
GenerateSupox_generateOrbital (SOLARSYS_STATE *solarSys, PLANET_DESC *world) GenerateSupox::generateOrbital( SolarSystem *const solarSys, PLANET_DESC *const world )
{ {
if (matchWorld (solarSys, world, 0, MATCH_PLANET)) if (matchWorld (solarSys, world, 0, MATCH_PLANET))
{ {
@@ -117,14 +114,14 @@ GenerateSupox_generateOrbital (SOLARSYS_STATE *solarSys, PLANET_DESC *world)
} }
} }
GenerateDefault_generateOrbital (solarSys, world); DefaultGenerator::generateOrbital (solarSys, world);
return true; return true;
} }
static bool bool
GenerateSupox_pickupEnergy (SOLARSYS_STATE *solarSys, PLANET_DESC *world, GenerateSupox::pickupEnergy( SolarSystem *const solarSys, PLANET_DESC *const world,
COUNT whichNode) const COUNT whichNode )
{ {
if (matchWorld (solarSys, world, 0, MATCH_PLANET)) if (matchWorld (solarSys, world, 0, MATCH_PLANET))
{ {
@@ -145,9 +142,9 @@ GenerateSupox_pickupEnergy (SOLARSYS_STATE *solarSys, PLANET_DESC *world,
return false; return false;
} }
static COUNT COUNT
GenerateSupox_generateEnergy (const SOLARSYS_STATE *solarSys, GenerateSupox::generateEnergy( const SolarSystem *const solarSys,
const PLANET_DESC *world, COUNT whichNode, NODE_INFO *info) const PLANET_DESC *const world, const COUNT whichNode, NODE_INFO *const info)
{ {
if (matchWorld (solarSys, world, 0, MATCH_PLANET)) if (matchWorld (solarSys, world, 0, MATCH_PLANET))
{ {
sc2/src/uqm/planets/generate/gentrap.c → sc2/src/uqm/planets/generate/gentrap-modern.cpp
+23 -25
View File
@@ -19,35 +19,33 @@
#include "genall.h" #include "genall.h"
#include "../planets.h" #include "../planets.h"
namespace
{
using namespace Planets::exports;
static bool GenerateTrap_generatePlanets (SOLARSYS_STATE *solarSys); class GenerateTrap
static bool GenerateTrap_generateOrbital (SOLARSYS_STATE *solarSys, : public DefaultGenerator
PLANET_DESC *world); {
bool generatePlanets( SolarSystem *solarSys ) override;
bool generateOrbital( SolarSystem *solarSys,
const GenerateFunctions generateTrapFunctions = { PLANET_DESC *world ) override;
/* .initNpcs = */ GenerateDefault_initNpcs,
/* .reinitNpcs = */ GenerateDefault_reinitNpcs,
/* .uninitNpcs = */ GenerateDefault_uninitNpcs,
/* .generatePlanets = */ GenerateTrap_generatePlanets,
/* .generateMoons = */ GenerateDefault_generateMoons,
/* .generateName = */ GenerateDefault_generateName,
/* .generateOrbital = */ GenerateTrap_generateOrbital,
/* .generateMinerals = */ GenerateDefault_generateMinerals,
/* .generateEnergy = */ GenerateDefault_generateEnergy,
/* .generateLife = */ GenerateDefault_generateLife,
/* .pickupMinerals = */ GenerateDefault_pickupMinerals,
/* .pickupEnergy = */ GenerateDefault_pickupEnergy,
/* .pickupLife = */ GenerateDefault_pickupLife,
}; };
auto init= []
{
Generator::add( "Mycon Trap", std::make_unique< GenerateTrap >() );
static bool return 0xDEADBEEF;
GenerateTrap_generatePlanets (SOLARSYS_STATE *solarSys) }();
}
bool
GenerateTrap::generatePlanets( SolarSystem *const solarSys )
{ {
COUNT angle; COUNT angle;
GenerateDefault_generatePlanets (solarSys); DefaultGenerator::generatePlanets (solarSys);
solarSys->PlanetDesc[0].data_index = TELLURIC_WORLD; solarSys->PlanetDesc[0].data_index = TELLURIC_WORLD;
solarSys->PlanetDesc[0].NumPlanets = 1; solarSys->PlanetDesc[0].NumPlanets = 1;
@@ -62,10 +60,10 @@ GenerateTrap_generatePlanets (SOLARSYS_STATE *solarSys)
return true; return true;
} }
static bool bool
GenerateTrap_generateOrbital (SOLARSYS_STATE *solarSys, PLANET_DESC *world) GenerateTrap::generateOrbital( SolarSystem *const solarSys, PLANET_DESC *const world )
{ {
GenerateDefault_generateOrbital (solarSys, world); DefaultGenerator::generateOrbital (solarSys, world);
if (matchWorld (solarSys, world, 0, MATCH_PLANET)) if (matchWorld (solarSys, world, 0, MATCH_PLANET))
{ {