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

C++ Generate base -- fix compiling.

Browse Source
This commit is contained in:
ADAM David Alan Martin
2024-04-25 01:48:24 -04:00
parent 990db1d15a
commit 7c02232e46
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/uqm/planets/Makeinfo
+1 -1
View File
@@ -5,4 +5,4 @@ uqm_CFILES="calc.c cargo.c devices.c gentopo.c lander.c orbits.c
uqm_HFILES="elemdata.h generate.h lander.h lifeform.h plandata.h planets.h uqm_HFILES="elemdata.h generate.h lander.h lifeform.h plandata.h planets.h
scan.h solarsys.h sundata.h" scan.h solarsys.h sundata.h"
uqm_CXXFILES="pstarmap-modern.cpp" uqm_CXXFILES="pstarmap-modern.cpp generate-base.cpp"
sc2/src/uqm/planets/generate-base.cpp
+13 -8
View File
@@ -16,6 +16,10 @@
#include "uqm/planets/generate.h" #include "uqm/planets/generate.h"
#include <tuple>
#include "uqm/planets/generate/gendefault.h"
/* /*
* XXX: Note that the way that defaults get called via C++ is a bit * XXX: Note that the way that defaults get called via C++ is a bit
* indirect and wonky. The genFunc C table calls into the C++ * indirect and wonky. The genFunc C table calls into the C++
@@ -48,7 +52,7 @@
* an example of that kind of glue. * an example of that kind of glue.
*/ */
namespace Planets ::detail:: Generate namespace Planets ::detail:: Generate_m
{ {
Generator::~Generator()= default; Generator::~Generator()= default;
@@ -112,31 +116,32 @@ namespace Planets ::detail:: Generate
} }
bool bool
DefaultGenerator::generateName( SolarSystem *const solarSys, PLANET_DESC *const world ) DefaultGenerator::generateName( const SolarSystem *const solarSys,
const PLANET_DESC *const world )
{ {
return GenerateDefault_generateName( solarSys, world ); return GenerateDefault_generateName( solarSys, world );
} }
COUNT COUNT
DefaultGenerator::generateMinerals( SolarSystem *const solarSys, PLANET_DESC *const world, DefaultGenerator::generateMinerals( const SolarSystem *const solarSys,
const COUNT whichNode, NODE_INFO *const info ) const PLANET_DESC *const world, const COUNT whichNode, NODE_INFO *const info )
{ {
return GenerateDefault_generateMinerals( solarSys, world, whichNode, info ); return GenerateDefault_generateMinerals( solarSys, world, whichNode, info );
} }
COUNT COUNT
DefaultGenerator::generateEnergy( SolarSystem *const solarSys, PLANET_DESC *const world, DefaultGenerator::generateEnergy( const SolarSystem *const solarSys,
const COUNT whichNode, NODE_INFO *const info ) const PLANET_DESC *const world, const COUNT whichNode, NODE_INFO *const info )
{ {
return GenerateDefault_generateEnergy( solarSys, world, whichNode, info ); return GenerateDefault_generateEnergy( solarSys, world, whichNode, info );
} }
COUNT COUNT
DefaultGenerator::generateLife( SolarSystem *const solarSys, PLANET_DESC *const world, DefaultGenerator::generateLife( const SolarSystem *const solarSys,
const COUNT whichNode, NODE_INFO *const info ) const PLANET_DESC *const world, const COUNT whichNode, NODE_INFO *const info )
{ {
return GenerateDefault_generateLife( solarSys, world, whichNode, info ); return GenerateDefault_generateLife( solarSys, world, whichNode, info );
} }