ref: 517824216e5286da0b734da60a0905f1eef24d5e
parent: 26475dacdf1e5cdb2281d83eef9b378ba40dd7d3
parent: 0bcf9784245fdca250080c0ddfb2d8d4e46d2bac
author: Clownacy <[email protected]>
date: Fri Jan 24 16:01:33 EST 2020
Merge branch 'accurate' into portable
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
# Exclude obj directory (object files for Makefile build)
/obj
-# Exclude executables (English)
+# Exclude executables
/game_english/CSE2_debug.exe
/game_english/DoConfig_debug.exe
/game_english/CSE2.exe
@@ -10,8 +10,6 @@
/game_english/DoConfig_debug
/game_english/CSE2
/game_english/DoConfig
-
-# Exclude executables (Japanese)
/game_japanese/CSE2_debug.exe
/game_japanese/DoConfig_debug.exe
/game_japanese/CSE2.exe
@@ -20,6 +18,14 @@
/game_japanese/DoConfig_debug
/game_japanese/CSE2
/game_japanese/DoConfig
+
+# Exclude save data
+/game_english/Config.dat
+/game_english/Profile.dat
+/game_english/290.rec
+/game_japanese/Config.dat
+/game_japanese/Profile.dat
+/game_japanese/290.rec
####
# Accurate branch
--- a/src/Input.cpp
+++ b/src/Input.cpp
@@ -26,13 +26,13 @@
}
// It looks like Pixel declared his functions early, so he could forward-reference
-BOOL HookDirectInputDevice(void);
+BOOL FindAndOpenDirectInputDevice(void);
BOOL InitDirectInput(void)
{SDL_InitSubSystem(SDL_INIT_JOYSTICK);
- if (!HookDirectInputDevice())
+ if (!FindAndOpenDirectInputDevice())
return FALSE;
return TRUE;
@@ -40,7 +40,7 @@
// The original name for this function and its variables are unknown.
// This function finds and hooks the first available DirectInput device (or SDL Joystick, in this case).
-BOOL HookDirectInputDevice(void)
+BOOL FindAndOpenDirectInputDevice(void)
{int i;