Skip to content

Sir skurpsalot player patch 1 #1750

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
Azaezel merged 2 commits into from
May 24, 2026
Merged

Sir skurpsalot player patch 1 #1750

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
40f22dc
Update player.cpp
Sir-Skurpsalot May 23, 2026
66a6c3d
Update player.cpp
Sir-Skurpsalot May 23, 2026
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
14 changes: 7 additions & 7 deletions Engine/source/T3D/player.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1015,19 +1015,19 @@ void PlayerData::initPersistFields()
"Used when computing the damage location.\n"
"@see Player::getDamageLocation" );
addFieldV( "boxTorsoLeftPercentage", TypeRangedF32, Offset(boxTorsoLeftPercentage, PlayerData), &CommonValidators::NormalizedFloat,
"@brief Percentage of the player's bounding box width that represents the left side of the torso.\n\n"
"@brief Percentage of the player's bounding box width from center that represents the left side of the torso.\n\n"
"Used when computing the damage location.\n"
"@see Player::getDamageLocation" );
addFieldV( "boxTorsoRightPercentage", TypeRangedF32, Offset(boxTorsoRightPercentage, PlayerData), &CommonValidators::NormalizedFloat,
"@brief Percentage of the player's bounding box width that represents the right side of the torso.\n\n"
"@brief Percentage of the player's bounding box width from center that represents the right side of the torso.\n\n"
"Used when computing the damage location.\n"
"@see Player::getDamageLocation" );
addFieldV( "boxTorsoBackPercentage", TypeRangedF32, Offset(boxTorsoBackPercentage, PlayerData), &CommonValidators::NormalizedFloat,
"@brief Percentage of the player's bounding box depth that represents the back side of the torso.\n\n"
"@brief Percentage of the player's bounding box depth from center that represents the back side of the torso.\n\n"
"Used when computing the damage location.\n"
"@see Player::getDamageLocation" );
addFieldV( "boxTorsoFrontPercentage", TypeRangedF32, Offset(boxTorsoFrontPercentage, PlayerData), &CommonValidators::NormalizedFloat,
"@brief Percentage of the player's bounding box depth that represents the front side of the torso.\n\n"
"@brief Percentage of the player's bounding box depth from center that represents the front side of the torso.\n\n"
"Used when computing the damage location.\n"
"@see Player::getDamageLocation" );

Expand Down Expand Up @@ -2395,10 +2395,10 @@ void Player::getDamageLocation(const Point3F& in_rPos, const char *&out_rpVert,
{
F32 xWidth = boxSize.x;

//boxTorsoBackPercentage and boxTorsoLeftPercentage should both be negative floats
F32 backPoint = yLength * mDataBlock->boxTorsoBackPercentage;
//boxTorsoBackPercentage and boxTorsoLeftPercentage need to be flipped negative
F32 backPoint = (yLength * mDataBlock->boxTorsoBackPercentage) * -1.0f;
F32 frontPoint = yLength * mDataBlock->boxTorsoFrontPercentage;
F32 leftPoint = xWidth * mDataBlock->boxTorsoLeftPercentage;
F32 leftPoint = (xWidth * mDataBlock->boxTorsoLeftPercentage) * -1.0f;
F32 rightPoint = xWidth * mDataBlock->boxTorsoRightPercentage;

S32 index = 0; //Middle hits are cases 0-2
Expand Down
Loading