MattTheTekie/devilutionX
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Hardware Cursor: Use item hotpoint

Browse source 
For a hardware item cursor, set the hotpoint to the center
instead of manually setting the cursor position.
This commit is contained in:
Gleb Mazovetskiy 2021-06-19 11:52:40 +01:00
commit 523d838bd4
2 changed files with 34 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Source/inv.cpp
View file

@ -11,6 +11,7 @@
#include "cursor.h"
#include "engine/render/cel_render.hpp"
#include "engine/render/text_render.hpp"
#include "hwcursor.hpp"
#include "minitext.h"
#include "options.h"
#include "plrmsg.h"
@ -808,8 +809,8 @@ void CheckInvPaste(int pnum, Point cursorPosition)
auto &player = plr[pnum];
SetICursor(player.HoldItem._iCurs + CURSOR_FIRSTITEM);
int i = cursorPosition.x + (icursW / 2);
int j = cursorPosition.y + (icursH / 2);
int i = cursorPosition.x + (IsHardwareCursorEnabled() ? 0 : (icursW / 2));
int j = cursorPosition.y + (IsHardwareCursorEnabled() ? 0 : (icursH / 2));
int sx = icursW28;
int sy = icursH28;
bool done = false;
@ -1177,7 +1178,7 @@ void CheckInvPaste(int pnum, Point cursorPosition)
}
CalcPlrInv(pnum, true);
if (pnum == myplr) {
if (cn == CURSOR_HAND)
if (cn == CURSOR_HAND && !IsHardwareCursorEnabled())
SetCursorPos(MouseX + (cursW / 2), MouseY + (cursH / 2));
NewCursor(cn);
}
@ -1416,7 +1417,10 @@ void CheckInvCut(int pnum, Point cursorPosition, bool automaticMove)
holdItem._itype = ITYPE_NONE;
} else {
NewCursor(holdItem._iCurs + CURSOR_FIRSTITEM);
SetCursorPos(cursorPosition.x - (cursW / 2), MouseY - (cursH / 2));
if (!IsHardwareCursorEnabled()) {
// For a hardware cursor, we set the "hot point" to the center of the item instead.
SetCursorPos(cursorPosition.x - (cursW / 2), cursorPosition.y - (cursH / 2));
}
}
}
}