Skip to content

bugfix(baseheightmap): Restore Generals retail compatibility from floor math changes in BaseHeightMapRenderObjClass::getHeightMapHeight() #3644

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
xezon merged 1 commit into from
Nov 9, 2026
Merged

bugfix(baseheightmap): Restore Generals retail compatibility from floor math changes in BaseHeightMapRenderObjClass::getHeightMapHeight() #3644

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
9 changes: 7 additions & 2 deletions Core/GameEngineDevice/Source/W3DDevice/GameClient/BaseHeightMap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -908,8 +908,13 @@ Real BaseHeightMapRenderObjClass::getHeightMapHeight(Real x, Real y, Coord3D* no
float xdiv = x * MAP_XY_FACTOR_INV;
float ydiv = y * MAP_XY_FACTOR_INV;

float ixf = FAST_REAL_FLOOR(xdiv);
float iyf = FAST_REAL_FLOOR(ydiv);
#if RTS_ZEROHOUR && RETAIL_COMPATIBLE_CRC

@xezon xezon Nov 1, 2026

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

RTS_ZEROHOUR instead of RTS_GENERALS is intentional. The goal is to get rid of fast_float_floor in all builds that do not need it, because fast_float_floor is flawed. See #3645 for more details.

float ixf = fast_float_floor(xdiv);
float iyf = fast_float_floor(ydiv);
#else
float ixf = WWMath::Floorf(xdiv);
float iyf = WWMath::Floorf(ydiv);
#endif
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved

float fx = xdiv - ixf; //get fraction
float fy = ydiv - iyf; //get fraction
Expand Down
4 changes: 0 additions & 4 deletions Core/Libraries/Source/Lib/Include/Lib/BaseFunctions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,6 @@ __forceinline float fast_float_ceil(float f)
#define REAL_TO_INT_FLOOR(x) (fast_float2long_round(fast_float_floor(x)))
#endif

#define FAST_REAL_TRUNC(x) fast_float_trunc(x)
#define FAST_REAL_CEIL(x) fast_float_ceil(x)
#define FAST_REAL_FLOOR(x) fast_float_floor(x)

//-------------------------------------------------------------------------------------------------
// Checking whether a size matches the bit flags count from an enum definition:
// enum MyEnum
Expand Down
Loading