Skip to content

bugfix(logic): Fix broken camera edge scroll after loading a savegame from the ingame menu #2000

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
Mar 24, 2026
Merged

bugfix(logic): Fix broken camera edge scroll after loading a savegame from the ingame menu #2000

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
4 changes: 2 additions & 2 deletions Generals/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,13 +388,13 @@ void GameLogic::reset( void )
#endif

m_pauseFrame = 0;
m_gamePaused = FALSE;
m_pauseSound = FALSE;
m_pauseMusic = FALSE;
m_pauseInput = FALSE;
m_inputEnabledMemory = TRUE;
m_mouseVisibleMemory = TRUE;
m_logicTimeScaleEnabledMemory = FALSE;
pauseGameLogic(FALSE);
pauseGameInput(FALSE);
Copy link
Copy Markdown

@xezon xezon Feb 23, 2026

Choose a reason for hiding this comment

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

This means

	m_inputEnabledMemory = TRUE;
	m_mouseVisibleMemory = TRUE;

is set before pauseGameInput is called. Is this correct? Should not be called before?

Copy link
Copy Markdown
Author

@stephanmeesters stephanmeesters Feb 23, 2026 •
edited
Loading

Choose a reason for hiding this comment

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

I think it's alright, with paused set to false and m_inputEnabledMemory set to true it will trigger an additional call to TheInGameUI->SetInputEnabled(TRUE) however very shortly after it will call the reset function of TheInGameUI and reset any changes anyway

So it should be fine regardless of order but I’ll check if swapping is more efficient here in case m_inputEnabledMemory is often false

Copy link
Copy Markdown
Author

@stephanmeesters stephanmeesters Feb 24, 2026

Choose a reason for hiding this comment

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

I had another look still think it's OK: input=enabled and mouse=visible are the right default values to enforce, plus I was only ever able to see both m_inputEnabledMemory = TRUE and m_mouseVisibleMemory = TRUE in the debugger when entering reset.


setFPMode();

Expand Down
4 changes: 2 additions & 2 deletions GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,13 +400,13 @@ void GameLogic::reset( void )
m_objVector.resize(OBJ_HASH_SIZE, nullptr);

m_pauseFrame = 0;
m_gamePaused = FALSE;
m_pauseSound = FALSE;
m_pauseMusic = FALSE;
m_pauseInput = FALSE;
m_inputEnabledMemory = TRUE;
m_mouseVisibleMemory = TRUE;
m_logicTimeScaleEnabledMemory = FALSE;
pauseGameLogic(FALSE);
pauseGameInput(FALSE);

setFPMode();

Expand Down
Loading