From 73d624a46c24ef61413414bcd5e68c91d88e53f7 Mon Sep 17 00:00:00 2001 From: Alexander Batalov Date: Sat, 21 May 2022 02:29:59 +0300 Subject: [PATCH] Fix pipboy position See #3 --- src/core.c | 11 +++++++++++ src/core.h | 1 + src/pipboy.c | 14 ++++++++------ 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/src/core.c b/src/core.c index c75125c..f530b46 100644 --- a/src/core.c +++ b/src/core.c @@ -4618,3 +4618,14 @@ int screenGetHeight() // TODO: Make it on par with _yres. return rectGetHeight(&_scr_size); } + +void mouseGetPositionInWindow(int win, int* x, int* y) +{ + mouseGetPosition(x, y); + + Window* window = windowGetWindow(win); + if (window != NULL) { + *x -= window->rect.left; + *y -= window->rect.top; + } +} diff --git a/src/core.h b/src/core.h index dbdb3ea..2b8ef81 100644 --- a/src/core.h +++ b/src/core.h @@ -636,5 +636,6 @@ bool _vcr_load_record(STRUCT_51E2F0* ptr, File* stream); int screenGetWidth(); int screenGetHeight(); +void mouseGetPositionInWindow(int win, int* x, int* y); #endif /* CORE_H */ diff --git a/src/pipboy.c b/src/pipboy.c index 2ef6349..e7d3738 100644 --- a/src/pipboy.c +++ b/src/pipboy.c @@ -220,7 +220,7 @@ int pipboyOpen(bool forceRest) return -1; } - mouseGetPosition(&gPipboyPreviousMouseX, &gPipboyPreviousMouseY); + mouseGetPositionInWindow(gPipboyWindow, &gPipboyPreviousMouseX, &gPipboyPreviousMouseY); gPipboyLastEventTimestamp = _get_time(); while (true) { @@ -231,7 +231,7 @@ int pipboyOpen(bool forceRest) forceRest = false; } - mouseGetPosition(&gPipboyMouseX, &gPipboyMouseY); + mouseGetPositionInWindow(gPipboyWindow, &gPipboyMouseX, &gPipboyMouseY); if (keyCode != -1 || gPipboyMouseX != gPipboyPreviousMouseX || gPipboyMouseY != gPipboyPreviousMouseY) { gPipboyLastEventTimestamp = _get_time(); @@ -242,7 +242,7 @@ int pipboyOpen(bool forceRest) pipboyRenderScreensaver(); gPipboyLastEventTimestamp = _get_time(); - mouseGetPosition(&gPipboyPreviousMouseX, &gPipboyPreviousMouseY); + mouseGetPositionInWindow(gPipboyWindow, &gPipboyPreviousMouseX, &gPipboyPreviousMouseY); } } @@ -341,7 +341,9 @@ int pipboyWindowInit(bool forceRest) return -1; } - gPipboyWindow = windowCreate(0, 0, PIPBOY_WINDOW_WIDTH, PIPBOY_WINDOW_HEIGHT, _colorTable[0], WINDOW_FLAG_0x10); + int pipboyWindowX = (screenGetWidth() - PIPBOY_WINDOW_WIDTH) / 2; + int pipboyWindowY = (screenGetHeight() - PIPBOY_WINDOW_HEIGHT) / 2; + gPipboyWindow = windowCreate(pipboyWindowX, pipboyWindowY, PIPBOY_WINDOW_WIDTH, PIPBOY_WINDOW_HEIGHT, _colorTable[0], WINDOW_FLAG_0x10); if (gPipboyWindow == -1) { debugPrint("\n** Error opening pipboy window! **\n"); for (int index = 0; index < PIPBOY_FRM_COUNT; index++) { @@ -2001,7 +2003,7 @@ int pipboyRenderScreensaver() { PipboyBomb bombs[PIPBOY_BOMB_COUNT]; - mouseGetPosition(&gPipboyPreviousMouseX, &gPipboyPreviousMouseY); + mouseGetPositionInWindow(gPipboyWindow, &gPipboyPreviousMouseX, &gPipboyPreviousMouseY); for (int index = 0; index < PIPBOY_BOMB_COUNT; index += 1) { bombs[index].field_10 = 0; @@ -2032,7 +2034,7 @@ int pipboyRenderScreensaver() while (true) { unsigned int time = _get_time(); - mouseGetPosition(&gPipboyMouseX, &gPipboyMouseY); + mouseGetPositionInWindow(gPipboyWindow, &gPipboyMouseX, &gPipboyMouseY); if (_get_input() != -1 || gPipboyPreviousMouseX != gPipboyMouseX || gPipboyPreviousMouseY != gPipboyMouseY) { break; }