Skip to content

Conversation

@bobtista
Copy link

@bobtista bobtista self-assigned this Nov 18, 2025
@bobtista bobtista force-pushed the bobtista/remove-nader-comments-comprehensive branch 2 times, most recently from 25053af to ad86912 Compare November 18, 2025 03:34

m_queuedDownloads.clear();

//

Choose a reason for hiding this comment

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

You should also check for unnecessary blank lines that result from the removal of these comments.

Copy link
Author

Choose a reason for hiding this comment

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

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.

Choose a reason for hiding this comment

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

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

Copy link
Author

@bobtista bobtista Nov 18, 2025

Choose a reason for hiding this comment

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

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 bobtista force-pushed the bobtista/remove-nader-comments-comprehensive branch 3 times, most recently from c70ad0e to 7f2be45 Compare November 18, 2025 22:33
@xezon xezon added the Refactor Edits the code with insignificant behavior changes, is never user facing label Nov 19, 2025
Copy link

@Skyaero42 Skyaero42 left a comment

Choose a reason for hiding this comment

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

I went through all the changed files.

I think these are the last ones that could be removed.

@xezon
Copy link

xezon commented Nov 19, 2025

Mr Nader left a lot of work here for us.

Copy link

@xezon xezon left a comment

Choose a reason for hiding this comment

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

Given Generals and GeneralsMD files were touched individually by hand, how confident are we that the edits are in sync?

m_showRandomColor = TRUE;

m_observerColor;
m_randomColor;
Copy link

Choose a reason for hiding this comment

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

Initialization missing here. Can fix in separate change.

@bobtista
Copy link
Author

Given Generals and GeneralsMD files were touched individually by hand, how confident are we that the edits are in sync?

I ran a script - The only "mismatches" are comments that existed in one codebase but not the other (e.g., Generals had "//Fixed And Added Code By Sadullah Nader" which GeneralsMD never had) so the removal only happened there.

Copy link

@xezon xezon left a comment

Choose a reason for hiding this comment

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

Ok. It is impossible to verify that the edits are consistent between the games but we can live with it if they are some discrepancies. They will be merged later anyway.

Copy link

@Skyaero42 Skyaero42 left a comment

Choose a reason for hiding this comment

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

What you can do is create diffs for the generals and generalsMD directories and then use winmerge to compare:

git diff superhackers/main -- GeneralsMD > /tmp/diff_generalsmd.patch
git diff superhackers/main -- Generals > /tmp/diff_generals.patch

I've marked the differences.

//-------------------------------------------------------------------------------------------------
void ToggleQuitMenu()
{

Choose a reason for hiding this comment

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

Remove line to be consistent with Generals

Copy link

@xezon xezon left a comment

Choose a reason for hiding this comment

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

Looks ok as far as I can tell.

@xezon xezon requested a review from Skyaero42 November 29, 2025 20:19
@xezon
Copy link

xezon commented Nov 30, 2025

There are merge conflicts now.

Copy link

@Skyaero42 Skyaero42 left a comment

Choose a reason for hiding this comment

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

All good now

@bobtista bobtista force-pushed the bobtista/remove-nader-comments-comprehensive branch from c43e0ae to 329202a Compare November 30, 2025 17:47
Copy link

@xezon xezon left a comment

Choose a reason for hiding this comment

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

The trash has been taken out. I was looking forward to this day.

@xezon xezon changed the title nit: remove nader comments round 2 refactor: Remove superfluous variable init comments Nov 30, 2025
@xezon xezon merged commit 963d7f7 into TheSuperHackers:main Nov 30, 2025
24 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Refactor Edits the code with insignificant behavior changes, is never user facing

Projects

None yet

Development

Successfully merging this pull request may close these issues.

//Added By Sadullah Nader

3 participants