Skip to content

add water check to HeightDieUpdate #77

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 17, 2026
Merged

add water check to HeightDieUpdate #77

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
2 changes: 1 addition & 1 deletion GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HeightDieUpdate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class HeightDieUpdateModuleData: public UpdateModuleData
Real m_destroyAttachedParticlesAtHeight; ///< HACK, destroy any attached particle system of object when below this height
Bool m_snapToGroundOnDeath; ///< snap to the ground when killed
UnsignedInt m_initialDelay; ///< Don't explode before this time

Bool m_targetHeightIncludesWater; ///< target height considers water height instead of terrain
};

//-------------------------------------------------------------------------------------------------
Expand Down
16 changes: 12 additions & 4 deletions GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/HeightDieUpdate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ HeightDieUpdateModuleData::HeightDieUpdateModuleData( void )
m_destroyAttachedParticlesAtHeight = -1.0f;
m_snapToGroundOnDeath = FALSE;
m_initialDelay = 0;

m_targetHeightIncludesWater = false;
}

//-------------------------------------------------------------------------------------------------
Expand All @@ -76,6 +76,7 @@ void HeightDieUpdateModuleData::buildFieldParse(MultiIniFieldParse& p)
{ "DestroyAttachedParticlesAtHeight", INI::parseReal, nullptr, offsetof( HeightDieUpdateModuleData, m_destroyAttachedParticlesAtHeight ) },
{ "SnapToGroundOnDeath", INI::parseBool, nullptr, offsetof( HeightDieUpdateModuleData, m_snapToGroundOnDeath ) },
{ "InitialDelay", INI::parseDurationUnsignedInt, nullptr, offsetof( HeightDieUpdateModuleData, m_initialDelay ) },
{ "TargetHeightIncludesWater", INI::parseBool, nullptr, offsetof(HeightDieUpdateModuleData, m_targetHeightIncludesWater) },
{ nullptr, nullptr, nullptr, 0 }

};
Expand Down Expand Up @@ -161,7 +162,14 @@ UpdateSleepTime HeightDieUpdate::update( void )
}

// get the terrain height
Real terrainHeightAtPos = TheTerrainLogic->getGroundHeight( pos->x, pos->y );
Real terrainHeightAtPosNoWater = TheTerrainLogic->getGroundHeight(pos->x, pos->y);
Real terrainHeightAtPos{ terrainHeightAtPosNoWater };
if (modData->m_targetHeightIncludesWater) {
Real waterz{ 0 };
if (TheTerrainLogic->isUnderwater(pos->x, pos->y, &waterz)) {
terrainHeightAtPos = waterz;
}
}

// if including structures, check for bridges
if (modData->m_targetHeightIncludesStructures)
Expand Down Expand Up @@ -240,13 +248,13 @@ UpdateSleepTime HeightDieUpdate::update( void )

// if we're supposed to snap us to the ground on death do so
// AND: even if we're not snapping to ground, be sure we don't go BELOW ground
if( modData->m_snapToGroundOnDeath || pos->z < terrainHeightAtPos )
if( modData->m_snapToGroundOnDeath || pos->z < terrainHeightAtPosNoWater )
{
Coord3D ground;

ground.x = pos->x;
ground.y = pos->y;
ground.z = terrainHeightAtPos;
ground.z = terrainHeightAtPosNoWater;
getObject()->setPosition( &ground );

}
Expand Down