hans/CnC_Remastered_Collection
1
0
Fork 0
mirror of https://github.com/jmarshall23/CnC_Remastered_Collection.git synced 2026-08-12 08:00:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into nev6502_branch

Browse Source
This commit is contained in:
nev6502
2020-06-14 00:14:32 -06:00
parent ccbdfd163d 41691916b3
commit c8d084c4f1
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/REDALERT/WIN32LIB/MOUSEWW.CPP
+10 -3
View File
@@ -201,6 +201,9 @@ void WWMouseClass::Process_Mouse(void)
void *WWMouseClass::Set_Cursor(int xhotspot, int yhotspot, int cursor)
{
Set_Hotspot_X(xhotspot);
Set_Hotspot_Y(yhotspot);
if (cursor >= MAX_CURSOR_FRAMES) {
assert(!"Max_Cursor_Frames out of range!");
}
@@ -238,10 +241,14 @@ void WWMouseClass::RenderMouse(void) {
//ImVec2 size(current_cursor->width, current_cursor->height);
//ImGui::Image((ImTextureID)current_cursor->image, size);
int _my = mousey + (current_cursor->height * 0.25);
ImVec2 mi(mousex, _my);
ImVec2 ma(mousex + current_cursor->width, _my + current_cursor->height);
int xstart = mousex - Get_Hotspot_X();
int ystart = _my - Get_Hotspot_Y();
int yend = current_cursor->height + ystart - 1;
int xend = current_cursor->width + xstart - 1;
ImVec2 mi(xstart, ystart);
ImVec2 ma(xend, yend);
ImGui::SetMouseCursor(ImGuiMouseCursor_None);