From f60b8eecfdac7543747fbdbfb381f59120bcc278 Mon Sep 17 00:00:00 2001
From: Alexander Batalov <alex.batalov@gmail.com>
Date: Sat, 21 May 2022 03:25:03 +0300
Subject: [PATCH] Fix worldmap window position

See #3
---
 src/core.c      | 13 +++++++++++++
 src/core.h      |  1 +
 src/world_map.c | 12 +++++++-----
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/core.c b/src/core.c
index f530b46..05d5a45 100644
--- a/src/core.c
+++ b/src/core.c
@@ -4629,3 +4629,16 @@ void mouseGetPositionInWindow(int win, int* x, int* y)
         *y -= window->rect.top;
     }
 }
+
+bool mouseHitTestInWindow(int win, int left, int top, int right, int bottom)
+{
+    Window* window = windowGetWindow(win);
+    if (window != NULL) {
+        left += window->rect.left;
+        top += window->rect.top;
+        right += window->rect.left;
+        bottom += window->rect.top;
+    }
+
+    return _mouse_click_in(left, top, right, bottom);
+}
diff --git a/src/core.h b/src/core.h
index 2b8ef81..4534756 100644
--- a/src/core.h
+++ b/src/core.h
@@ -637,5 +637,6 @@ bool _vcr_load_record(STRUCT_51E2F0* ptr, File* stream);
 int screenGetWidth();
 int screenGetHeight();
 void mouseGetPositionInWindow(int win, int* x, int* y);
+bool mouseClickInWindow(int win, int left, int top, int right, int bottom);
 
 #endif /* CORE_H */
diff --git a/src/world_map.c b/src/world_map.c
index 5374b72..ace1d26 100644
--- a/src/world_map.c
+++ b/src/world_map.c
@@ -2843,7 +2843,7 @@ int _wmWorldMapFunc(int a1)
 
         int mouseX;
         int mouseY;
-        mouseGetPosition(&mouseX, &mouseY);
+        mouseGetPositionInWindow(gWorldmapWindow, &mouseX, &mouseY);
 
         int v4 = gWorldmapOffsetX + mouseX - WM_VIEW_X;
         int v5 = gWorldmapOffsetY + mouseY - WM_VIEW_Y;
@@ -2958,7 +2958,7 @@ int _wmWorldMapFunc(int a1)
         }
 
         if ((mouseEvent & MOUSE_EVENT_LEFT_BUTTON_DOWN) != 0 && (mouseEvent & MOUSE_EVENT_LEFT_BUTTON_REPEAT) == 0) {
-            if (_mouse_click_in(WM_VIEW_X, WM_VIEW_Y, 472, 465)) {
+            if (mouseHitTestInWindow(gWorldmapWindow, WM_VIEW_X, WM_VIEW_Y, 472, 465)) {
                 if (!gWorldmapIsTravelling && !_wmGenData && abs(_world_xpos - v4) < 5 && abs(_world_ypos - v5) < 5) {
                     _wmGenData = true;
                     worldmapWindowRefresh();
@@ -3007,7 +3007,7 @@ int _wmWorldMapFunc(int a1)
                     }
                 }
             } else {
-                if (_mouse_click_in(WM_VIEW_X, WM_VIEW_Y, 472, 465)) {
+                if (mouseHitTestInWindow(gWorldmapWindow, WM_VIEW_X, WM_VIEW_Y, 472, 465)) {
                     _wmPartyInitWalking(v4, v5);
                 }
 
@@ -4276,7 +4276,9 @@ int worldmapWindowInit()
     colorCycleDisable();
     gameMouseSetCursor(MOUSE_CURSOR_ARROW);
 
-    gWorldmapWindow = windowCreate(0, 0, WM_WINDOW_WIDTH, WM_WINDOW_HEIGHT, _colorTable[0], WINDOW_FLAG_0x04);
+    int worldmapWindowX = (screenGetWidth() - WM_WINDOW_WIDTH) / 2;
+    int worldmapWindowY = (screenGetHeight() - WM_WINDOW_HEIGHT) / 2;
+    gWorldmapWindow = windowCreate(worldmapWindowX, worldmapWindowY, WM_WINDOW_WIDTH, WM_WINDOW_HEIGHT, _colorTable[0], WINDOW_FLAG_0x04);
     if (gWorldmapWindow == -1) {
         return -1;
     }
@@ -4884,7 +4886,7 @@ void worldmapWindowHandleMouseScrolling()
 {
     int x;
     int y;
-    mouseGetPosition(&x, &y);
+    mouseGetPositionInWindow(gWorldmapWindow, &x, &y);
 
     int dx = 0;
     if (x == 639) {