1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-09 14:46:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

re-enabled the scrolling functionality via mouse wheel on the message scroll bar which got lost due to previous change to message region boundaries

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9203 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Shadooow
2021-10-28 14:34:44 +00:00
parent c9b9652940
commit 14e963e338
1 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/mapscreen.cpp
+18
View File
@@ -614,6 +614,7 @@ MOUSE_REGION gTrashCanRegion;
MOUSE_REGION gMapMercWeightRegion; MOUSE_REGION gMapMercWeightRegion;
MOUSE_REGION gMapMercCamoRegion; MOUSE_REGION gMapMercCamoRegion;
extern MOUSE_REGION gMapMessageRegion; extern MOUSE_REGION gMapMessageRegion;
extern MOUSE_REGION gMapMessageScrollBarRegion;
// mouse regions for team info panel // mouse regions for team info panel
MOUSE_REGION gTeamListNameRegion[ CODE_MAXIMUM_NUMBER_OF_PLAYER_SLOTS ]; MOUSE_REGION gTeamListNameRegion[ CODE_MAXIMUM_NUMBER_OF_PLAYER_SLOTS ];
@@ -8890,6 +8891,7 @@ void RenderMapHighlight( INT16 sMapX, INT16 sMapY, UINT16 usLineColor, BOOLEAN f
void PollWheelInMapView(UINT32 *puiNewEvent) void PollWheelInMapView(UINT32 *puiNewEvent)
{ {
gMapMessageRegion.WheelState = gMapMessageRegion.WheelState * (gGameSettings.fOptions[TOPTION_INVERT_WHEEL] ? -1 : 1); gMapMessageRegion.WheelState = gMapMessageRegion.WheelState * (gGameSettings.fOptions[TOPTION_INVERT_WHEEL] ? -1 : 1);
gMapMessageScrollBarRegion.WheelState = gMapMessageScrollBarRegion.WheelState * (gGameSettings.fOptions[TOPTION_INVERT_WHEEL] ? -1 : 1);
if (gMapMessageRegion.uiFlags & MSYS_MOUSE_IN_AREA) if (gMapMessageRegion.uiFlags & MSYS_MOUSE_IN_AREA)
{ {
@@ -8906,6 +8908,22 @@ void PollWheelInMapView(UINT32 *puiNewEvent)
ResetWheelState(&gMapMessageRegion); ResetWheelState(&gMapMessageRegion);
} }
} }
if (gMapMessageScrollBarRegion.uiFlags & MSYS_MOUSE_IN_AREA)
{
if (gMapMessageScrollBarRegion.WheelState != 0)
{
if (gMapMessageScrollBarRegion.WheelState > 0)
{
MapScreenMsgScrollUp(1);
}
else
{
MapScreenMsgScrollDown(1);
}
ResetWheelState(&gMapMessageScrollBarRegion);
}
}
} }
void PollLeftButtonInMapView( UINT32 *puiNewEvent ) void PollLeftButtonInMapView( UINT32 *puiNewEvent )