[GEN][ZH] Cleans up inconsistencies #654
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
xezon
reviewed
Apr 11, 2025
xezon
left a comment
xezon
left a comment
There was a problem hiding this comment.
I will pause reviewing this change.
The whitespace changes were incorrectly applied to Zero Hour source files. It looks like double spaces have been mass replaced with tabs. This is wrong, because it will affect inline spaces as well. This kind of refactor would need to be done with a script that only looks at leading whitespace and corrects them.
| // Because of changes in wind, pressure, etc. | ||
| // Those changes are added here, then the | ||
|
|
||
|
|
| CString loopCountText; | ||
| loopCountText.Format( "%d", audioEventInfo->m_loopCount ); | ||
| loopCountEdit->SetWindowText( loopCountText ); | ||
| } | ||
|
|
||
| /// Move data from object to dialog controls | ||
| void MapObjectProps::dictToEnabled() |
There was a problem hiding this comment.
The github diff in this function looks suspiciously broken, which indicates that something is not right.
| if ( flagSpikes ) | ||
| { | ||
| if ( Debug_Statistics::Get_Draw_Calls()>2000 ) | ||
| fprintf( m_fp, " DRAWS OUT OF TOLERANCE(2000)\n" ); |
There was a problem hiding this comment.
Are these fprintf's meant to use tabs in this file!? It seems odd.
| DEBUG_LOG((remark)); | ||
| drawGraph( "@", graphScale, timeNoPart ); | ||
|
|
||
| sprintf(remark, "Without Spawn %f \n", timeNoSpawn ); |
| // Real muzzleHeight = attachTransform.Get_Z_Translation(); | ||
| // DEBUG_ASSERTCRASH( muzzleHeight > 0.001f, ("YOUR TURRET HAS A VERY LOW PROJECTILE LAUNCH POSITION, BUT FOUND A VALID BONE. DID YOU PICK THE WRONG ONE? %s", launcher->getTemplate()->getName().str())); | ||
| // Real muzzleHeight = attachTransform.Get_Z_Translation(); | ||
| // DEBUG_ASSERTCRASH( muzzleHeight > 0.001f, ("YOUR TURRET HAS A VERY LOW PROJECTILE LAUNCH POSITION, BUT FOUND A VALID BONE. DID YOU PICK THE WRONG ONE? %s", launcher->getTemplate()->getName().str())); |
bobtista
added a commit
to bobtista/GeneralsGameCode
that referenced
this pull request
Oct 25, 2025
Reverting unification of these files to avoid conflicts with: - PR TheSuperHackers#654 (tomsons26): Cleans up inconsistencies - PR TheSuperHackers#670 (zzambers): Replacements for rest of asm code - PR TheSuperHackers#688 (tomsons26): Backports various things from ZH - PR TheSuperHackers#1066 (xezon): Prevent AMD/ATI driver crash - PR TheSuperHackers#1703 (Stubbjax): Add replay archive feature - PR TheSuperHackers#1741 (Skyaero42): Remove redundant include guards Files reverted: - BitFlagsIO.h, DataChunk.h, GameType.h, List.h - Money.h, Radar.h, Recorder.h, SpecialPowerMaskType.h, StackDump.h - NameKeyGenerator.cpp, GameCommon.cpp, StackDump.cpp
bobtista
added a commit
to bobtista/GeneralsGameCode
that referenced
this pull request
Oct 25, 2025
Reverting unification to avoid conflicts with: - PR TheSuperHackers#654 (tomsons26): Cleans up inconsistencies - PR TheSuperHackers#688 (tomsons26): Backports various things from ZH Files reverted: Color.h, Mouse.h, Color.cpp
bobtista
added a commit
to bobtista/GeneralsGameCode
that referenced
this pull request
Oct 25, 2025
Reverting to avoid conflict with PR TheSuperHackers#654 (tomsons26)
bobtista
added a commit
to bobtista/GeneralsGameCode
that referenced
this pull request
Oct 25, 2025
Reverting unification to avoid conflicts with: - PR TheSuperHackers#654 (tomsons26): Cleans up inconsistencies - PR TheSuperHackers#688 (tomsons26): Backports various things from ZH Files reverted: Color.h, Mouse.h, Color.cpp
bobtista
added a commit
to bobtista/GeneralsGameCode
that referenced
this pull request
Oct 26, 2025
Reverting unification of these files to avoid conflicts with: - PR TheSuperHackers#654 (tomsons26): Cleans up inconsistencies - PR TheSuperHackers#670 (zzambers): Replacements for rest of asm code - PR TheSuperHackers#688 (tomsons26): Backports various things from ZH - PR TheSuperHackers#1066 (xezon): Prevent AMD/ATI driver crash - PR TheSuperHackers#1703 (Stubbjax): Add replay archive feature - PR TheSuperHackers#1741 (Skyaero42): Remove redundant include guards Files reverted: - BitFlagsIO.h, DataChunk.h, GameType.h, List.h - Money.h, Radar.h, Recorder.h, SpecialPowerMaskType.h, StackDump.h - NameKeyGenerator.cpp, GameCommon.cpp, StackDump.cpp
bobtista
added a commit
to bobtista/GeneralsGameCode
that referenced
this pull request
Oct 26, 2025
Reverting unification to avoid conflicts with: - PR TheSuperHackers#654 (tomsons26): Cleans up inconsistencies - PR TheSuperHackers#688 (tomsons26): Backports various things from ZH Files reverted: Color.h, Mouse.h, Color.cpp
|
Is this something that could be automated with clang-tidy? #1807 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Cleans up whitespace issues
Fixes inconsistent comments
Makes include order consistent with ZH