ShuriZma
/
Cxbx-Reloaded
mirror of https://github.com/Cxbx-Reloaded/Cxbx-Reloaded.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Addressed review remarks

This commit is contained in:
ergo720 2020-09-21 11:02:50 +02:00
parent dd24225477
commit fc888cac2d
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/input/InputDevice.h
View File

@ -67,6 +67,10 @@ typedef enum class _XBOX_INPUT_DEVICE : int {
} }
XBOX_INPUT_DEVICE; XBOX_INPUT_DEVICE;
// Flags that indicate that WM_MOUSELEAVE and WM_MOUSEMOVE respectively are being tracked in the rendering window procedure
inline bool g_bIsTrackingMoLeave = false;
inline bool g_bIsTrackingMoMove = false;
// Lookup array used to translate a gui port to an xbox usb port and vice versa // Lookup array used to translate a gui port to an xbox usb port and vice versa
extern int Gui2XboxPortArray[4]; extern int Gui2XboxPortArray[4];

1
src/core/hle/D3D8/Direct3D9/Direct3D9.cpp
View File

@ -82,6 +82,7 @@ using namespace std::literals::chrono_literals;
// Global(s) // Global(s)
HWND g_hEmuWindow = NULL; // rendering window HWND g_hEmuWindow = NULL; // rendering window
bool g_bClipCursor = false; // indicates that the mouse cursor should be confined inside the rendering window
IDirect3DDevice *g_pD3DDevice = nullptr; // Direct3D Device IDirect3DDevice *g_pD3DDevice = nullptr; // Direct3D Device
// Static Variable(s) // Static Variable(s)

4
src/core/kernel/init/CxbxKrnl.cpp
View File

@ -112,11 +112,9 @@ size_t g_SystemMaxMemory = 0;
HANDLE g_CurrentProcessHandle = 0; // Set in CxbxKrnlMain HANDLE g_CurrentProcessHandle = 0; // Set in CxbxKrnlMain
bool g_bIsWine = false; bool g_bIsWine = false;
bool g_bClipCursor = false;
bool g_CxbxPrintUEM = false; bool g_CxbxPrintUEM = false;
ULONG g_CxbxFatalErrorCode = FATAL_ERROR_NONE; ULONG g_CxbxFatalErrorCode = FATAL_ERROR_NONE;
bool g_bIsTrackingMoLeave = false;
bool g_bIsTrackingMoMove = false;
// Define function located in EmuXApi so we can call it from here // Define function located in EmuXApi so we can call it from here
void SetupXboxDeviceTypes(); void SetupXboxDeviceTypes();

2
src/core/kernel/init/CxbxKrnl.h
View File

@ -203,8 +203,6 @@ extern bool g_bIsWine;
extern bool g_bClipCursor; extern bool g_bClipCursor;
extern bool g_CxbxPrintUEM; extern bool g_CxbxPrintUEM;
extern ULONG g_CxbxFatalErrorCode; extern ULONG g_CxbxFatalErrorCode;
extern bool g_bIsTrackingMoLeave;
extern bool g_bIsTrackingMoMove;
extern size_t g_SystemMaxMemory; extern size_t g_SystemMaxMemory;

2
src/gui/resource/ResCxbx.h
View File

@ -377,7 +377,7 @@
#ifndef APSTUDIO_READONLY_SYMBOLS #ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 136 #define _APS_NEXT_RESOURCE_VALUE 136
#define _APS_NEXT_COMMAND_VALUE 40117 #define _APS_NEXT_COMMAND_VALUE 40117
#define _APS_NEXT_CONTROL_VALUE 1305 #define _APS_NEXT_CONTROL_VALUE 1308
#define _APS_NEXT_SYMED_VALUE 109 #define _APS_NEXT_SYMED_VALUE 109
#endif #endif
#endif #endif