Skip to content

enable water salvage #74

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pWn3d1337 merged 1 commit into from
Feb 1, 2026
Merged

enable water salvage #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions GeneralsMD/Code/GameEngine/Include/GameLogic/CrateSystem.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ class CrateTemplate : public Overridable
ScienceType m_killerScience; ///< Must be killed by something posessing this science
crateCreationEntryList m_possibleCrates; ///< CreationChance is for this CrateData to succeed, this list controls one-of-n crates created on success
Bool m_isOwnedByMaker; ///< Design needs crates to be owned sometimes.
Bool m_allowWater; ///< Crate can spawn on water

private:

Expand Down
25 changes: 23 additions & 2 deletions GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Die/CreateCrateDie.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,14 @@ Object *CreateCrateDie::createCrate( CrateTemplate const *currentCrateData )
fpOptions.minRadius = 0.0f;
fpOptions.maxRadius = 5.0f;
fpOptions.relationshipObject = getObject();
fpOptions.flags = FPF_IGNORE_ALLY_OR_NEUTRAL_UNITS; // So the dead guy won't block, nor will his dead hulk.

if (currentCrateData->m_allowWater) {
fpOptions.flags = static_cast<FindPositionFlags>(FPF_IGNORE_ALLY_OR_NEUTRAL_UNITS | FPF_IGNORE_WATER);
}
else {
fpOptions.flags = FPF_IGNORE_ALLY_OR_NEUTRAL_UNITS; // So the dead guy won't block, nor will his dead hulk.
}

if (layer != LAYER_GROUND) {
creationPoint = centerPoint;
spotFound = true;
Expand All @@ -223,7 +230,13 @@ Object *CreateCrateDie::createCrate( CrateTemplate const *currentCrateData )
fpOptions.minRadius = 0.0f;
fpOptions.maxRadius = 125.0f;
fpOptions.relationshipObject = NULL;
fpOptions.flags = FPF_NONE;

if (currentCrateData->m_allowWater) {
fpOptions.flags = FPF_IGNORE_WATER;
}
else {
fpOptions.flags = FPF_NONE;
}
if( ThePartitionManager->findPositionAround( &centerPoint, &fpOptions, &creationPoint ) )
{
spotFound = TRUE;
Expand All @@ -232,6 +245,14 @@ Object *CreateCrateDie::createCrate( CrateTemplate const *currentCrateData )

if( spotFound )
{
//Move up to water surface if unterwater
if (currentCrateData->m_allowWater && getObject()->isOverWater()) {
Real waterZ{ 0 };
if (TheTerrainLogic->isUnderwater(creationPoint.x, creationPoint.y, &waterZ)) {
creationPoint.z = std::max(creationPoint.z, waterZ);
}
}

Object *newCrate = TheThingFactory->newObject( crateType, NULL );
newCrate->setPosition( &creationPoint );
newCrate->setOrientation( GameLogicRandomValueReal( 0, 2*PI ) );
Expand Down
2 changes: 2 additions & 0 deletions GeneralsMD/Code/GameEngine/Source/GameLogic/System/CrateSystem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@ const FieldParse CrateTemplate::TheCrateTemplateFieldParseTable[] =
{ "CrateObject", CrateTemplate::parseCrateCreationEntry, NULL, NULL },
{ "KillerScience", INI::parseScience, NULL, offsetof( CrateTemplate, m_killerScience) },
{ "OwnedByMaker", INI::parseBool, NULL, offsetof( CrateTemplate, m_isOwnedByMaker) },
{ "AllowWater", INI::parseBool, NULL, offsetof( CrateTemplate, m_allowWater) },
{ NULL, NULL, NULL, NULL },
};

Expand All @@ -196,6 +197,7 @@ CrateTemplate::CrateTemplate()
m_killerScience = SCIENCE_INVALID;
m_possibleCrates.clear();
m_isOwnedByMaker = FALSE;
m_allowWater = false;
}

CrateTemplate::~CrateTemplate()
Expand Down