nit: remove nader comments round 2 #1876
Conversation
bobtista
commented
Nov 18, 2025
bobtista
commented
- Closes //Added By Sadullah Nader #1829
bobtista
force-pushed
the
bobtista/remove-nader-comments-comprehensive
branch
2 times, most recently
from
25053af to
ad86912
Compare
|
|
||
| m_queuedDownloads.clear(); | ||
|
|
||
| // |
There was a problem hiding this comment.
You should also check for unnecessary blank lines that result from the removal of these comments.
There was a problem hiding this comment.
Ok I found a bunch and removed them. At some point we should use prettier or clang-tidy or something and unify the formatting across the repo.
There was a problem hiding this comment.
There are quite a few left that imho should be dealt with in this PR, because they are part of the comments
e.g.
// End Add
// Added By Sadullah Nader
// Initialization missing and needed
m_putInContainerName.clear();I think you need to look above and below the removed comments and remove empty lines
There was a problem hiding this comment.
I've been going through and manually looking at files for a few hours now. Sometimes the empty lines above or below where Nader's comments lived are perfectly reasonable - eg the blocks of code would have had an empty line anyway, eg when variables are grouped or there are just newlines every n lines of assignments for style/readabilty. I'm about 1/4 of the way through reviewing all of the comments individually, addressing the empty lines around them, and feeling like I'm really using my time poorly.
If you have an idea for a script here I'm happy to chat about this more. For now I'm going to take a break. I'll push the latest changes when able (git is down) EDIT: pushed latest
bobtista
force-pushed
the
bobtista/remove-nader-comments-comprehensive
branch
from
1ada54a to
f0c3eea
Compare
bobtista
force-pushed
the
bobtista/remove-nader-comments-comprehensive
branch
from
f0c3eea to
c70ad0e
Compare
bobtista
force-pushed
the
bobtista/remove-nader-comments-comprehensive
branch
from
c70ad0e to
7f2be45
Compare
Core/GameEngine/Source/GameNetwork/GameSpy/Thread/PeerThread.cpp
Outdated
Show resolved
Hide resolved
Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp
Show resolved
Hide resolved
Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp
Show resolved
Hide resolved
Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/CrateCollide.cpp
Show resolved
Hide resolved
Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeliverPayloadAIUpdate.cpp
Show resolved
Hide resolved
...meEngine/Source/GameLogic/Object/Update/ProductionExitUpdate/DefaultProductionExitUpdate.cpp
Show resolved
Hide resolved
xezon
added
the
Refactor
Skyaero42
left a comment
Skyaero42
left a comment
There was a problem hiding this comment.
I went through all the changed files.
I think these are the last ones that could be removed.
Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp
Outdated
Show resolved
Hide resolved
Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp
Outdated
Show resolved
Hide resolved
Generals/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp
Outdated
Show resolved
Hide resolved
Generals/Code/GameEngine/Source/GameLogic/Object/Update/StructureToppleUpdate.cpp
Outdated
Show resolved
Hide resolved
GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp
Outdated
Show resolved
Hide resolved
GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp
Show resolved
Hide resolved
GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StructureToppleUpdate.cpp
Outdated
Show resolved
Hide resolved
|
Mr Nader left a lot of work here for us. |
xezon
left a comment
xezon
left a comment
There was a problem hiding this comment.
Given Generals and GeneralsMD files were touched individually by hand, how confident are we that the edits are in sync?
| m_failed(L"***FATAL*** String Manager failed to initialize properly") | ||
| { | ||
| // Added By Sadullah Nader | ||
| // Initializations missing and needed |
| m_showRandomColor = TRUE; | ||
|
|
||
| m_observerColor; | ||
| m_randomColor; |
There was a problem hiding this comment.
Initialization missing here. Can fix in separate change.
| m_showRandomPlayerTemplate = TRUE; | ||
| m_showRandomStartPos = TRUE; | ||
| m_showRandomColor = TRUE; | ||
|
|
| // Initialization missing and needed | ||
| m_nextDrawable = NULL; | ||
| m_prevDrawable = NULL; | ||
| // |
3 participants
