marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Send mouse coordinates directly with control if SendCursorPos is true

qteditor^2
Sven Eberhardt 2016-08-07 10:48:54 -04:00 committed by Clonkonaut
parent a9a2ffd95c
commit 231a0ba9b4
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/control/C4PlayerControl.cpp
View File

@ -1025,6 +1025,7 @@ bool C4PlayerControl::ProcessKeyEvent(const C4KeyCodeEx &pressed_key, const C4Ke
assert(pControlSet); // shouldn't get this callback for players without control set
pControlSet->GetAssignmentsByKey(ControlDefs, matched_key, state != CONS_Down, &Matches, DownKeys, RecentKeys);
// process async controls
bool cursor_pos_added = false;
C4ControlPlayerControl *pControlPacket = NULL;
for (C4PlayerControlAssignmentPVec::const_iterator i = Matches.begin(); i != Matches.end(); ++i)
{
@ -1055,7 +1056,21 @@ bool C4PlayerControl::ProcessKeyEvent(const C4KeyCodeEx &pressed_key, const C4Ke
if (reset_down_states_only) extra_trigger_mode |= C4PlayerControlAssignment::CTM_HandleDownStatesOnly;
pControlPacket->AddControl(iControlIndex, pAssignment->GetTriggerMode() | extra_trigger_mode);
// sync cursor pos request; pos will be added to control before it is synced/executed
if (pControlDef->IsSendCursorPos()) IsCursorPosRequested = true;
if (pControlDef->IsSendCursorPos() && !cursor_pos_added)
{
int32_t x, y, game_x, game_y;
// Add current cursor pos in GUI and game coordinates to input
if (GetCurrentPlayerCursorPos(&x, &y, &game_x, &game_y))
{
C4KeyEventData cursor_key_data(rKeyExtraData);
cursor_key_data.vp_x = x; cursor_key_data.vp_y = y;
cursor_key_data.game_x = game_x; cursor_key_data.game_y = game_y;
pControlPacket->SetExtraData(cursor_key_data);
}
// Will also send a CON_CursorPos packet separately
IsCursorPosRequested = true;
cursor_pos_added = true;
}
}
}
}