claunia/VARCem
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed some stuff found while testing the installer.

Browse Source
This commit is contained in:
waltje
2018-03-29 03:05:07 -04:00
parent 6366c1bc31
commit bfc507d5f4
6 changed files with 173 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/win/VARCem.rc
View File

@@ -8,7 +8,7 @@
*
* Application resource script for Windows.
*
* Version: @(#)VARCem.rc 1.0.8 2018/03/25
* Version: @(#)VARCem.rc 1.0.9 2018/03/28
*
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com>
@@ -953,14 +953,14 @@ BEGIN
IDS_2141 "Invalid PCap device"
IDS_2142 "&Notify disk change"
IDS_2143 "Type"
IDS_2144 "Standard 2-button joystick(s)"
IDS_2145 "Standard 4-button joystick"
IDS_2146 "Standard 6-button joystick"
IDS_2147 "Standard 8-button joystick"
IDS_2148 "CH Flightstick Pro"
IDS_2149 "Microsoft SideWinder Pad"
IDS_2150 "Thrustmaster Flight Control System"
IDS_2151 "Disabled"
IDS_2144 "Disabled"
IDS_2145 "Standard 2-button joystick(s)"
IDS_2146 "Standard 4-button joystick"
IDS_2147 "Standard 6-button joystick"
IDS_2148 "Standard 8-button joystick"
IDS_2149 "CH Flightstick Pro"
IDS_2150 "Microsoft SideWinder Pad"
IDS_2151 "Thrustmaster Flight Control System"
IDS_2152 "None"
IDS_2153 "Unable to load Keyboard Accelerators!"
IDS_2154 "Unable to register Raw Input!"

11
src/win/win_joystick.cpp
View File

@@ -11,7 +11,7 @@
* NOTE: Hacks currently needed to compile with MSVC; DX needs to
* be updated to 11 or 12 or so. --FvK
*
* Version: @(#)win_joystick.cpp 1.0.7 2018/03/26
* Version: @(#)win_joystick.cpp 1.0.8 2018/03/28
*
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com>
@@ -125,11 +125,11 @@ BOOL CALLBACK DIEnumDeviceObjectsCallback(
return DIENUM_CONTINUE;
}
void joystick_init()
void joystick_init(void)
{
int c;
if (joystick_type == 7) return;
if (joystick_type == JOYSTICK_TYPE_NONE) return;
atexit(joystick_close);
@@ -203,7 +203,7 @@ void joystick_init()
}
}
void joystick_close()
void joystick_close(void)
{
if (lpdi_joystick[1])
{
@@ -245,7 +245,7 @@ void joystick_process(void)
{
int c, d;
if (joystick_type == 7) return;
if (joystick_type == JOYSTICK_TYPE_NONE) return;
for (c = 0; c < joysticks_present; c++)
{
@@ -318,4 +318,3 @@ void joystick_process(void)
}
}
}