ShuriZma
/
fbneo
mirror of https://github.com/finalburnneo/FBNeo.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

luaengine.cpp, fix mouse coords, quiet some warnings

This commit is contained in:
dinkc64 2023-12-13 21:09:39 -05:00
parent d831a9e700
commit 4e7758f424
2 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/burner/luaengine.cpp
View File

@ -1133,6 +1133,12 @@ LuaMemHookType MatchHookTypeToCPU(lua_State* L, LuaMemHookType hookType)
case LUAMEMHOOK_WRITE: return LUAMEMHOOK_WRITE_SUB;
case LUAMEMHOOK_READ: return LUAMEMHOOK_READ_SUB;
case LUAMEMHOOK_EXEC: return LUAMEMHOOK_EXEC_SUB;
case LUAMEMHOOK_WRITE_SUB: // shh
case LUAMEMHOOK_READ_SUB:
case LUAMEMHOOK_EXEC_SUB:
case LUAMEMHOOK_COUNT:
return hookType;
}
}
return hookType;
@ -3371,13 +3377,15 @@ const char* s_keyToName[256] =
"quote",
};
extern int ScrnGetMouseX();
extern int ScrnGetMouseY();
void GetMouseData(UINT32 *md)
{
extern UINT32 mousex,mousey;
RECT t;
GetClientRect(hScrnWnd, &t);
//md[0] = (UINT32)(mousex / ((float)t.right / iScreenWidth));
//md[1] = (UINT32)(mousey / ((float)t.bottom / iScreenHeight));
md[0] = (UINT32)(ScrnGetMouseX() / ((float)t.right / iScreenWidth));
md[1] = (UINT32)(ScrnGetMouseY() / ((float)t.bottom / iScreenHeight));
}
#endif
@ -3413,7 +3421,7 @@ static int input_getcurrentinputstatus(lua_State *L) {
}
// mouse position in game screen pixel coordinates
{
UINT32 MouseData[2];
UINT32 MouseData[2] = { 0, 0 };
int x, y;
GetMouseData(MouseData);
x = MouseData[0];

14
src/burner/win32/scrn.cpp
View File

@ -596,8 +596,22 @@ static int OnRButtonUp(HWND hwnd, int, int, UINT)
}
/*************************************************************************/
static int mousex, mousey;
int ScrnGetMouseX()
{
return mousex;
}
int ScrnGetMouseY()
{
return mousey;
}
static int OnMouseMove(HWND hwnd, int x, int y, UINT keyIndicators)
{
mousex = x;
mousey = y;
if (bDrag && hwnd == hScrnWnd && keyIndicators == MK_LBUTTON && !nVidFullscreen && !bMenuEnabled) {
RECT clientRect;