File tree Expand file tree Collapse file tree 2 files changed +18
-22
lines changed
GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream
Generals/Code/GameEngine/Source/GameClient/MessageStream Expand file tree Collapse file tree 2 files changed +18
-22
lines changed Original file line number Diff line number Diff line change @@ -307,21 +307,19 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
307307 break ;
308308 }
309309
310- if (!TheGlobalData->m_windowed )
310+ // TheSuperHackers @tweak Ayumi/xezon 26/07/2025 Enables edge scrolling in windowed mode.
311+ if (m_isScrolling)
311312 {
312- if (m_isScrolling )
313+ if ( m_scrollType == SCROLL_SCREENEDGE && (m_currentPos. x >= edgeScrollSize && m_currentPos. y >= edgeScrollSize && m_currentPos. y < height-edgeScrollSize && m_currentPos. x < width-edgeScrollSize) )
313314 {
314- if ( m_scrollType == SCROLL_SCREENEDGE && (m_currentPos.x >= edgeScrollSize && m_currentPos.y >= edgeScrollSize && m_currentPos.y < height-edgeScrollSize && m_currentPos.x < width-edgeScrollSize) )
315- {
316- stopScrolling ();
317- }
315+ stopScrolling ();
318316 }
319- else
317+ }
318+ else
319+ {
320+ if ( m_currentPos.x < edgeScrollSize || m_currentPos.y < edgeScrollSize || m_currentPos.y >= height-edgeScrollSize || m_currentPos.x >= width-edgeScrollSize )
320321 {
321- if ( m_currentPos.x < edgeScrollSize || m_currentPos.y < edgeScrollSize || m_currentPos.y >= height-edgeScrollSize || m_currentPos.x >= width-edgeScrollSize )
322- {
323- setScrolling (SCROLL_SCREENEDGE);
324- }
322+ setScrolling (SCROLL_SCREENEDGE);
325323 }
326324 }
327325
Original file line number Diff line number Diff line change @@ -306,21 +306,19 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
306306 break ;
307307 }
308308
309- if (!TheGlobalData->m_windowed )
309+ // TheSuperHackers @tweak Ayumi/xezon 26/07/2025 Enables edge scrolling in windowed mode.
310+ if (m_isScrolling)
310311 {
311- if (m_isScrolling )
312+ if ( m_scrollType == SCROLL_SCREENEDGE && (m_currentPos. x >= edgeScrollSize && m_currentPos. y >= edgeScrollSize && m_currentPos. y < height-edgeScrollSize && m_currentPos. x < width-edgeScrollSize) )
312313 {
313- if ( m_scrollType == SCROLL_SCREENEDGE && (m_currentPos.x >= edgeScrollSize && m_currentPos.y >= edgeScrollSize && m_currentPos.y < height-edgeScrollSize && m_currentPos.x < width-edgeScrollSize) )
314- {
315- stopScrolling ();
316- }
314+ stopScrolling ();
317315 }
318- else
316+ }
317+ else
318+ {
319+ if ( m_currentPos.x < edgeScrollSize || m_currentPos.y < edgeScrollSize || m_currentPos.y >= height-edgeScrollSize || m_currentPos.x >= width-edgeScrollSize )
319320 {
320- if ( m_currentPos.x < edgeScrollSize || m_currentPos.y < edgeScrollSize || m_currentPos.y >= height-edgeScrollSize || m_currentPos.x >= width-edgeScrollSize )
321- {
322- setScrolling (SCROLL_SCREENEDGE);
323- }
321+ setScrolling (SCROLL_SCREENEDGE);
324322 }
325323 }
326324
You can’t perform that action at this time.
0 commit comments