duuqnd/cave-story-solaris
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'accurate' into portable

Browse source
This commit is contained in:
Clownacy 2020-01-24 21:01:33 +00:00
commit 517824216e
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
.gitignore vendored
View file

@ -1,7 +1,7 @@
# Exclude obj directory (object files for Makefile build) # Exclude obj directory (object files for Makefile build)
/obj /obj
# Exclude executables (English) # Exclude executables
/game_english/CSE2_debug.exe /game_english/CSE2_debug.exe
/game_english/DoConfig_debug.exe /game_english/DoConfig_debug.exe
/game_english/CSE2.exe /game_english/CSE2.exe
@ -10,8 +10,6 @@
/game_english/DoConfig_debug /game_english/DoConfig_debug
/game_english/CSE2 /game_english/CSE2
/game_english/DoConfig /game_english/DoConfig
# Exclude executables (Japanese)
/game_japanese/CSE2_debug.exe /game_japanese/CSE2_debug.exe
/game_japanese/DoConfig_debug.exe /game_japanese/DoConfig_debug.exe
/game_japanese/CSE2.exe /game_japanese/CSE2.exe
@ -21,6 +19,14 @@
/game_japanese/CSE2 /game_japanese/CSE2
/game_japanese/DoConfig /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 # Accurate branch
#### ####

6
src/Input.cpp
View file

@ -26,13 +26,13 @@ void ReleaseDirectInput(void)
} }
// It looks like Pixel declared his functions early, so he could forward-reference // It looks like Pixel declared his functions early, so he could forward-reference
BOOL HookDirectInputDevice(void); BOOL FindAndOpenDirectInputDevice(void);
BOOL InitDirectInput(void) BOOL InitDirectInput(void)
{ {
SDL_InitSubSystem(SDL_INIT_JOYSTICK); SDL_InitSubSystem(SDL_INIT_JOYSTICK);
if (!HookDirectInputDevice()) if (!FindAndOpenDirectInputDevice())
return FALSE; return FALSE;
return TRUE; return TRUE;
@ -40,7 +40,7 @@ BOOL InitDirectInput(void)
// The original name for this function and its variables are unknown. // 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). // This function finds and hooks the first available DirectInput device (or SDL Joystick, in this case).
BOOL HookDirectInputDevice(void) BOOL FindAndOpenDirectInputDevice(void)
{ {
int i; int i;