Skip to content

fix: Fix unused variables in WW3D #2629

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
Apr 19, 2026
Merged

fix: Fix unused variables in WW3D #2629

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: 2 additions & 0 deletions Dependencies/Utility/Utility/CppMacros.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,11 @@
#if __cplusplus >= 201703L
#define REGISTER
#define FALLTHROUGH [[fallthrough]]
#define MAYBE_UNUSED [[maybe_unused]]
#else
#define REGISTER register
#define FALLTHROUGH
#define MAYBE_UNUSED
#endif

// noexcept for methods of IUNKNOWN interface
Expand Down
6 changes: 4 additions & 2 deletions Generals/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@
**
***********************************************************************************/

float WW3D::LogicFrameTimeMs = 1000.0f / WWSyncPerSecond; // initialized to something to avoid division by zero on first use

Check warning on line 163 in Generals/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp

View workflow job for this annotation

GitHub Actions / Build Generals / win32-debug+t+e 

 operator '/': deprecated between enumerations and floating-point types

Check warning on line 163 in Generals/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp

View workflow job for this annotation

GitHub Actions / Build Generals / win32+t+e 

 operator '/': deprecated between enumerations and floating-point types

Check warning on line 163 in Generals/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp

View workflow job for this annotation

GitHub Actions / Build Generals / win32-profile+t+e 

 operator '/': deprecated between enumerations and floating-point types
float WW3D::FractionalSyncMs = 0.0f;
unsigned int WW3D::SyncTime = 0;
unsigned int WW3D::PreviousSyncTime = 0;
Expand Down Expand Up @@ -278,8 +278,9 @@
WWDEBUG_SAY(("Allocate Debug Resources"));
Allocate_Debug_Resources();

MMRESULT r=timeBeginPeriod(1);
MAYBE_UNUSED MMRESULT r=timeBeginPeriod(1);
WWASSERT(r==TIMERR_NOERROR);
(void)r;

/*
** Initialize the dazzle system
Expand Down Expand Up @@ -336,8 +337,9 @@
#endif //WW3D_DX8

//restore the previous timer resolution
MMRESULT r=timeEndPeriod(1);
MAYBE_UNUSED MMRESULT r=timeEndPeriod(1);
WWASSERT(r==TIMERR_NOERROR);
(void)r;
/*
** Free memory in predictive LOD optimizer
*/
Expand Down
6 changes: 4 additions & 2 deletions GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@
**
***********************************************************************************/

float WW3D::LogicFrameTimeMs = 1000.0f / WWSyncPerSecond; // initialized to something to avoid division by zero on first use

Check warning on line 164 in GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / win32-debug+t+e 

 operator '/': deprecated between enumerations and floating-point types

Check warning on line 164 in GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / win32+t+e 

 operator '/': deprecated between enumerations and floating-point types

Check warning on line 164 in GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / win32-profile+t+e 

 operator '/': deprecated between enumerations and floating-point types
float WW3D::FractionalSyncMs = 0.0f;
unsigned int WW3D::SyncTime = 0;
unsigned int WW3D::PreviousSyncTime = 0;
Expand Down Expand Up @@ -279,8 +279,9 @@
WWDEBUG_SAY(("Allocate Debug Resources"));
Allocate_Debug_Resources();

MMRESULT r=timeBeginPeriod(1);
MAYBE_UNUSED MMRESULT r=timeBeginPeriod(1);
WWASSERT(r==TIMERR_NOERROR);
(void)r;

/*
** Initialize the dazzle system
Expand Down Expand Up @@ -337,8 +338,9 @@
#endif //WW3D_DX8

//restore the previous timer resolution
MMRESULT r=timeEndPeriod(1);
MAYBE_UNUSED MMRESULT r=timeEndPeriod(1);
WWASSERT(r==TIMERR_NOERROR);
(void)r;
/*
** Free memory in predictive LOD optimizer
*/
Expand Down
Loading