Skip to content

Commit

Permalink
Fix Left_HUD_Input issue
Browse files Browse the repository at this point in the history
  • Loading branch information
jonwil committed Jan 27, 2024
1 parent f4caad2 commit 6804d28
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/game/client/gui/guicallbacks/controlbarcallback.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ WindowMsgHandledType Left_HUD_Input(GameWindow *window, unsigned int message, un
}

if (!needs_target) {
const std::list<Drawable *> *drawables = g_theInGameUI->Get_All_Selected_Drawables();
const std::list<Drawable *> *drawables = g_theInGameUI->Get_All_Selected_Local_Drawables();
MouseCursor cursor = CURSOR_ARROW;

if (!drawables->empty() && message != GWM_MOUSE_LEAVING) {
Expand Down Expand Up @@ -191,7 +191,7 @@ WindowMsgHandledType Left_HUD_Input(GameWindow *window, unsigned int message, un

if ((!g_theRadar->Is_Radar_Hidden() || g_theRadar->Is_Radar_Forced())
&& g_theRadar->Local_Pixel_To_Radar(&pixel, &radar) && g_theRadar->Radar_To_World(&radar, &world)) {
if (g_theInGameUI->Get_All_Selected_Drawables()->empty()
if (g_theInGameUI->Get_All_Selected_Local_Drawables()->empty()
|| (!g_theWriteableGlobalData->m_alternateMouseEnabled && message == GWM_RIGHT_DOWN)
|| (g_theWriteableGlobalData->m_alternateMouseEnabled && message == GWM_LEFT_DOWN)) {
g_theTacticalView->Look_At(&world);
Expand All @@ -212,7 +212,7 @@ WindowMsgHandledType Left_HUD_Input(GameWindow *window, unsigned int message, un
GameMessage *msg = g_theMessageStream->Append_Message(GameMessage::MSG_DO_MOVETO);
msg->Append_Location_Arg(world);
Pick_And_Play_Unit_Voice_Response(
g_theInGameUI->Get_All_Selected_Drawables(), GameMessage::MSG_DO_MOVETO, nullptr);
g_theInGameUI->Get_All_Selected_Local_Drawables(), GameMessage::MSG_DO_MOVETO, nullptr);
}
}
}
Expand Down Expand Up @@ -250,7 +250,7 @@ WindowMsgHandledType Left_HUD_Input(GameWindow *window, unsigned int message, un
g_theMouse->Set_Cursor(index);
}
} else {
const std::list<Drawable *> *drawables = g_theInGameUI->Get_All_Selected_Drawables();
const std::list<Drawable *> *drawables = g_theInGameUI->Get_All_Selected_Local_Drawables();
MouseCursor cursor = CURSOR_ARROW;

if (!drawables->empty() && message != GWM_MOUSE_LEAVING) {
Expand Down

0 comments on commit 6804d28

Please sign in to comment.