From 41d31a48708fe4a6fbc40937ae87d18314e3c27f Mon Sep 17 00:00:00 2001 From: ADAM David Alan Martin Date: Tue, 23 Apr 2024 23:41:45 -0400 Subject: [PATCH] Turn off all slave shields. Unfortunately... Earth has no texture/resource/asset for the zoomed-in landing. Just the mini-map and the globe. What's interesting here is that this indicates that those two assets are distinct! I always thought they were the same. I'll have to dig into how they're related. --- sc2/src/uqm/planets/generate/genchmmr.c | 4 ++-- sc2/src/uqm/planets/generate/gencol.c | 2 +- sc2/src/uqm/planets/generate/gensol.c | 2 +- sc2/src/uqm/planets/generate/gensyr.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sc2/src/uqm/planets/generate/genchmmr.c b/sc2/src/uqm/planets/generate/genchmmr.c index 672d977b9..d60f3cf3b 100644 --- a/sc2/src/uqm/planets/generate/genchmmr.c +++ b/sc2/src/uqm/planets/generate/genchmmr.c @@ -58,8 +58,8 @@ GenerateChmmr_generatePlanets (SOLARSYS_STATE *solarSys) GenerateDefault_generatePlanets (solarSys); solarSys->PlanetDesc[1].data_index = SAPPHIRE_WORLD; - if (!GET_GAME_STATE (CHMMR_UNLEASHED)) - solarSys->PlanetDesc[1].data_index |= PLANET_SHIELDED; + if( false ){ if (!GET_GAME_STATE (CHMMR_UNLEASHED)) + solarSys->PlanetDesc[1].data_index |= PLANET_SHIELDED; } solarSys->PlanetDesc[1].NumPlanets = 1; return true; diff --git a/sc2/src/uqm/planets/generate/gencol.c b/sc2/src/uqm/planets/generate/gencol.c index 27e4d5b20..92ae78f33 100644 --- a/sc2/src/uqm/planets/generate/gencol.c +++ b/sc2/src/uqm/planets/generate/gencol.c @@ -96,7 +96,7 @@ GenerateColony_generatePlanets (SOLARSYS_STATE *solarSys) angle = ARCTAN (pMinPlanet->location.x, pMinPlanet->location.y); pMinPlanet->location.x = COSINE (angle, pMinPlanet->radius); pMinPlanet->location.y = SINE (angle, pMinPlanet->radius); - pMinPlanet->data_index = WATER_WORLD | PLANET_SHIELDED; + pMinPlanet->data_index = WATER_WORLD ; //| PLANET_SHIELDED; return true; } diff --git a/sc2/src/uqm/planets/generate/gensol.c b/sc2/src/uqm/planets/generate/gensol.c index d6041f363..57da6bd8f 100644 --- a/sc2/src/uqm/planets/generate/gensol.c +++ b/sc2/src/uqm/planets/generate/gensol.c @@ -137,7 +137,7 @@ GenerateSol_generatePlanets (SOLARSYS_STATE *solarSys) angle = NORMALIZE_ANGLE (FULL_CIRCLE - angle); break; case 2: /* EARTH */ - pCurDesc->data_index = WATER_WORLD | PLANET_SHIELDED; + pCurDesc->data_index = WATER_WORLD ; //| PLANET_SHIELDED; pCurDesc->radius = EARTH_RADIUS; pCurDesc->NumPlanets = 2; break; diff --git a/sc2/src/uqm/planets/generate/gensyr.c b/sc2/src/uqm/planets/generate/gensyr.c index ebf3be4b0..112387949 100644 --- a/sc2/src/uqm/planets/generate/gensyr.c +++ b/sc2/src/uqm/planets/generate/gensyr.c @@ -49,7 +49,7 @@ GenerateSyreen_generatePlanets (SOLARSYS_STATE *solarSys) { GenerateDefault_generatePlanets (solarSys); - solarSys->PlanetDesc[0].data_index = WATER_WORLD | PLANET_SHIELDED; + solarSys->PlanetDesc[0].data_index = WATER_WORLD ;//| PLANET_SHIELDED; solarSys->PlanetDesc[0].NumPlanets = 1; return true;