From 56e971c6a43dffd8c482b80d248c8895202b3c38 Mon Sep 17 00:00:00 2001 From: Dniel97 Date: Tue, 6 Feb 2024 13:01:26 +0100 Subject: [PATCH] changed default operator buttons to F1, F2 and F3 and fixed subnets --- carolio/config.c | 6 +++--- chuniio/config.c | 6 +++--- cmio/config.c | 6 +++--- dist/carol/segatools.ini | 24 ++++++++++++++++++------ dist/chuni/segatools.ini | 16 ++++++++++------ dist/chusan/segatools.ini | 12 ++++++------ dist/cm/segatools.ini | 13 +++++++------ dist/cxb/segatools.ini | 14 +++++++------- dist/diva/segatools.ini | 28 +++++++++++++++++++++++++++- dist/fgo/segatools.ini | 2 +- dist/idac/segatools.ini | 12 ++++++------ dist/idz/segatools.ini | 13 ++++++------- dist/mai2/segatools.ini | 14 +++++++------- dist/mercury/segatools.ini | 12 ++++++------ dist/mu3/segatools.ini | 27 +++++++++++++-------------- dist/swdc/segatools.ini | 18 +++++++++++------- divaio/config.c | 6 +++--- fgoio/config.c | 6 +++--- idacio/config.c | 6 +++--- idzio/config.c | 7 ++++--- mai2io/config.c | 6 +++--- mercuryio/config.c | 10 +++++----- mu3io/config.c | 6 +++--- swdcio/config.c | 6 +++--- 24 files changed, 161 insertions(+), 115 deletions(-) diff --git a/carolio/config.c b/carolio/config.c index 151e909..fba56ad 100644 --- a/carolio/config.c +++ b/carolio/config.c @@ -14,7 +14,7 @@ void carol_io_config_load( assert(cfg != NULL); assert(filename != NULL); - cfg->vk_test = GetPrivateProfileIntW(L"io3", L"test", '1', filename); - cfg->vk_service = GetPrivateProfileIntW(L"io3", L"service", '2', filename); - cfg->vk_coin = GetPrivateProfileIntW(L"io3", L"coin", '3', filename); + cfg->vk_test = GetPrivateProfileIntW(L"io3", L"test", VK_F1, filename); + cfg->vk_service = GetPrivateProfileIntW(L"io3", L"service", VK_F2, filename); + cfg->vk_coin = GetPrivateProfileIntW(L"io3", L"coin", VK_F3, filename); } diff --git a/chuniio/config.c b/chuniio/config.c index 0ce06a2..c41ae99 100644 --- a/chuniio/config.c +++ b/chuniio/config.c @@ -34,9 +34,9 @@ void chuni_io_config_load( assert(filename != NULL); // Technically it's io4 but leave this for compatibility with old configs. - cfg->vk_test = GetPrivateProfileIntW(L"io3", L"test", '1', filename); - cfg->vk_service = GetPrivateProfileIntW(L"io3", L"service", '2', filename); - cfg->vk_coin = GetPrivateProfileIntW(L"io3", L"coin", '3', filename); + cfg->vk_test = GetPrivateProfileIntW(L"io3", L"test", VK_F1, filename); + cfg->vk_service = GetPrivateProfileIntW(L"io3", L"service", VK_F2, filename); + cfg->vk_coin = GetPrivateProfileIntW(L"io3", L"coin", VK_F3, filename); cfg->vk_ir_emu = GetPrivateProfileIntW(L"io3", L"ir", VK_SPACE, filename); for (i = 0 ; i < 6 ; i++) { diff --git a/cmio/config.c b/cmio/config.c index 4c37f96..452f3b3 100644 --- a/cmio/config.c +++ b/cmio/config.c @@ -16,7 +16,7 @@ void cm_io_config_load( assert(cfg != NULL); assert(filename != NULL); - cfg->vk_test = GetPrivateProfileIntW(L"io4", L"test", '1', filename); - cfg->vk_service = GetPrivateProfileIntW(L"io4", L"service", '2', filename); - cfg->vk_coin = GetPrivateProfileIntW(L"io4", L"coin", '3', filename); + cfg->vk_test = GetPrivateProfileIntW(L"io4", L"test", VK_F1, filename); + cfg->vk_service = GetPrivateProfileIntW(L"io4", L"service", VK_F2, filename); + cfg->vk_coin = GetPrivateProfileIntW(L"io4", L"coin", VK_F3, filename); } diff --git a/dist/carol/segatools.ini b/dist/carol/segatools.ini index d43cfe0..a73747f 100644 --- a/dist/carol/segatools.ini +++ b/dist/carol/segatools.ini @@ -39,10 +39,22 @@ monitor=0 ; Leave empty if you want to use Segatools built-in keyboard input. path= +; ----------------------------------------------------------------------------- +; Input settings +; ----------------------------------------------------------------------------- + +; Keyboard bindings are specified as hexadecimal (prefixed with 0x) or decimal +; (not prefixed with 0x) virtual-key codes, a list of which can be found here: +; +; https://docs.microsoft.com/en-us/windows/win32/inputdev/virtual-key-codes +; +; This is, admittedly, not the most user-friendly configuration method in the +; world. An improved solution will be provided later. + [io3] -; Test button virtual-key code. Default is the 1 key. -test=0x31 -; Service button virtual-key code. Default is the 2 key. -service=0x32 -; Keyboard button to increment coin counter. Default is the 3 key. -coin=0x33 +; Test button virtual-key code. Default is the F1 key. +test=0x70 +; Service button virtual-key code. Default is the F2 key. +service=0x71 +; Keyboard button to increment coin counter. Default is the F3 key. +coin=0x72 \ No newline at end of file diff --git a/dist/chuni/segatools.ini b/dist/chuni/segatools.ini index 57524f8..69bc339 100644 --- a/dist/chuni/segatools.ini +++ b/dist/chuni/segatools.ini @@ -18,6 +18,10 @@ default=127.0.0.1 ; Chunithm is extremely picky about its LAN environment, so leaving this ; setting enabled is strongly recommended. enable=1 +; The final octet of the local host's IP address on the virtualized subnet (so, +; if the keychip subnet is `192.168.32.0` and this value is set to `11`, then the +; local host's virtualized LAN IP is `192.168.32.11`). +addrSuffix=11 [keychip] ; The /24 LAN subnet that the emulated keychip will tell the game to expect. @@ -97,12 +101,12 @@ controllerLedOutputSerial=0 ; world. An improved solution will be provided later. [io3] -; Test button virtual-key code. Default is the 1 key. -test=0x31 -; Service button virtual-key code. Default is the 2 key. -service=0x32 -; Keyboard button to increment coin counter. Default is the 3 key. -coin=0x33 +; Test button virtual-key code. Default is the F1 key. +test=0x70 +; Service button virtual-key code. Default is the F2 key. +service=0x71 +; Keyboard button to increment coin counter. Default is the F3 key. +coin=0x72 ; Set to 0 for enable separate ir control. Deafult is space key. ir=0x20 diff --git a/dist/chusan/segatools.ini b/dist/chusan/segatools.ini index f6959d3..72e3fd4 100644 --- a/dist/chusan/segatools.ini +++ b/dist/chusan/segatools.ini @@ -137,12 +137,12 @@ controllerLedOutputSerial=0 ; world. An improved solution will be provided later. [io3] -; Test button virtual-key code. Default is the 1 key. -test=0x31 -; Service button virtual-key code. Default is the 2 key. -service=0x32 -; Keyboard button to increment coin counter. Default is the 3 key. -coin=0x33 +; Test button virtual-key code. Default is the F1 key. +test=0x70 +; Service button virtual-key code. Default is the F2 key. +service=0x71 +; Keyboard button to increment coin counter. Default is the F3 key. +coin=0x72 ; Set to 0 for enable separate ir control. Deafult is space key. ir=0x20 diff --git a/dist/cm/segatools.ini b/dist/cm/segatools.ini index 9ca7041..0eb44bf 100644 --- a/dist/cm/segatools.ini +++ b/dist/cm/segatools.ini @@ -48,6 +48,7 @@ dipsw1=0 ; Enable/Disable WinTouch emulation enable=0 + ; ----------------------------------------------------------------------------- ; Input settings ; ----------------------------------------------------------------------------- @@ -61,9 +62,9 @@ enable=0 ; world. An improved solution will be provided later. [io4] -; Test button virtual-key code. Default is the 1 key. -test=0x31 -; Service button virtual-key code. Default is the 2 key. -service=0x32 -; Keyboard button to increment coin counter. Default is the 3 key. -coin=0x33 +; Test button virtual-key code. Default is the F1 key. +test=0x70 +; Service button virtual-key code. Default is the F2 key. +service=0x71 +; Keyboard button to increment coin counter. Default is the F3 key. +coin=0x72 diff --git a/dist/cxb/segatools.ini b/dist/cxb/segatools.ini index e0491ff..6caf61d 100644 --- a/dist/cxb/segatools.ini +++ b/dist/cxb/segatools.ini @@ -24,7 +24,7 @@ enable=1 ; The /24 LAN subnet that the emulated keychip will tell the game to expect. ; If you disable netenv then you must set this to your LAN's IP subnet, and ; that subnet must start with 192.168. -subnet=192.168.100.0 +subnet=192.168.150.0 billingCa=../DEVICE/ca.crt billingPub=../DEVICE/billing.pub billingType=2 @@ -61,12 +61,12 @@ enable=1 [revio] ; Enable emulation of the rev IO board enabe=1 -; Test button virtual-key code. Default is the 1 key. -test=0x31 -; Service button virtual-key code. Default is the 2 key. -service=0x32 -; Keyboard button to increment coin counter. Default is the 3 key. -coin=0x33 +; Test button virtual-key code. Default is the F1 key. +test=0x70 +; Service button virtual-key code. Default is the F2 key. +service=0x71 +; Keyboard button to increment coin counter. Default is the F3 key. +coin=0x72 ; Menu up key. Default is up arrow. up=0x26 ; Menu down key. Default is down arrow. diff --git a/dist/diva/segatools.ini b/dist/diva/segatools.ini index e2608c0..5735503 100644 --- a/dist/diva/segatools.ini +++ b/dist/diva/segatools.ini @@ -8,6 +8,12 @@ option= ; NOTE: This has nothing to do with Windows %APPDATA%. appdata= +[aime] +; Enable Aime card reader assembly emulation. Disable to use a real SEGA Aime +; reader. +enable=1 +aimePath=DEVICE\aime.txt + [dns] ; Insert the hostname or IP address of the server you wish to use here. ; Note that 127.0.0.1, localhost etc are specifically rejected. @@ -26,7 +32,27 @@ dipsw1=1 ; The /24 LAN subnet that the emulated keychip will tell the game to expect. ; If you disable netenv then you must set this to your LAN's IP subnet, and ; that subnet must start with 192.168. -subnet=192.168.150.0 +subnet=192.168.78.0 + +; ----------------------------------------------------------------------------- +; Input settings +; ----------------------------------------------------------------------------- + +; Keyboard bindings are specified as hexadecimal (prefixed with 0x) or decimal +; (not prefixed with 0x) virtual-key codes, a list of which can be found here: +; +; https://docs.microsoft.com/en-us/windows/win32/inputdev/virtual-key-codes +; +; This is, admittedly, not the most user-friendly configuration method in the +; world. An improved solution will be provided later. + +[io3] +; Test button virtual-key code. Default is the F1 key. +test=0x70 +; Service button virtual-key code. Default is the F2 key. +service=0x71 +; Keyboard button to increment coin counter. Default is the F3 key. +coin=0x72 [slider] cell1=0x51 diff --git a/dist/fgo/segatools.ini b/dist/fgo/segatools.ini index 4d83225..3404d65 100644 --- a/dist/fgo/segatools.ini +++ b/dist/fgo/segatools.ini @@ -38,7 +38,7 @@ addrSuffix=11 ; The /24 LAN subnet that the emulated keychip will tell the game to expect. ; If you disable netenv then you must set this to your LAN's IP subnet, and ; that subnet must start with 192.168. -subnet=192.168.172.0 +subnet=192.168.167.0 [touch] ; WinTouch emulation setting. diff --git a/dist/idac/segatools.ini b/dist/idac/segatools.ini index bf9bafc..4143aa7 100644 --- a/dist/idac/segatools.ini +++ b/dist/idac/segatools.ini @@ -82,12 +82,12 @@ path= ; world. An improved solution will be provided later. [io4] -; Test button virtual-key code. Default is the 1 key. -test=0x31 -; Service button virtual-key code. Default is the 2 key. -service=0x32 -; Keyboard button to increment coin counter. Default is the 3 key. -coin=0x33 +; Test button virtual-key code. Default is the F1 key. +test=0x70 +; Service button virtual-key code. Default is the F2 key. +service=0x71 +; Keyboard button to increment coin counter. Default is the F3 key. +coin=0x72 ; Input API selection for IO4 input emulator. ; Set "xinput" to use a gamepad and "dinput" to use a steering wheel. diff --git a/dist/idz/segatools.ini b/dist/idz/segatools.ini index e7b0701..68cdae0 100644 --- a/dist/idz/segatools.ini +++ b/dist/idz/segatools.ini @@ -34,7 +34,6 @@ region=4 ; SEGA games are somewhat picky about their LAN environment, so leaving this ; setting enabled is recommended. enable=1 - ; The final octet of the local host's IP address on the virtualized subnet ; (so, if the keychip subnet is 192.168.32.0 and this value is set to 11, ; then the local host's virtualized LAN IP is 192.168.32.11). @@ -88,12 +87,12 @@ path= ; world. An improved solution will be provided later. [io3] -; Test button virtual-key code. Default is the 1 key. -test=0x31 -; Service button virtual-key code. Default is the 2 key. -service=0x32 -; Keyboard button to increment coin counter. Default is the 3 key. -coin=0x33 +; Test button virtual-key code. Default is the F1 key. +test=0x70 +; Service button virtual-key code. Default is the F2 key. +service=0x71 +; Keyboard button to increment coin counter. Default is the F3 key. +coin=0x72 ; Input API selection for JVS input emulator. ; Set "xinput" to use a gamepad and "dinput" to use a steering wheel. diff --git a/dist/mai2/segatools.ini b/dist/mai2/segatools.ini index d8ad3d2..9cd0baa 100644 --- a/dist/mai2/segatools.ini +++ b/dist/mai2/segatools.ini @@ -34,7 +34,7 @@ enable=1 ; The /24 LAN subnet that the emulated keychip will tell the game to expect. ; If you disable netenv then you must set this to your LAN's IP subnet, and ; that subnet must start with 192.168. -subnet=192.168.100.0 +subnet=192.168.172.0 [gpio] ; ALLS DIP switches. @@ -62,12 +62,12 @@ dipsw1=1 ; world. An improved solution will be provided later. [io4] -; Test button virtual-key code. Default is the 1 key. -test=0x31 -; Service button virtual-key code. Default is the 2 key. -service=0x32 -; Keyboard button to increment coin counter. Default is the 3 key. -coin=0x33 +; Test button virtual-key code. Default is the F1 key. +test=0x70 +; Service button virtual-key code. Default is the F2 key. +service=0x71 +; Keyboard button to increment coin counter. Default is the F3 key. +coin=0x72 ; Key bindings for buttons around screen. The default key map, depicted ; in clockwise order, is as follows: diff --git a/dist/mercury/segatools.ini b/dist/mercury/segatools.ini index 5a7cfa3..2586c9c 100644 --- a/dist/mercury/segatools.ini +++ b/dist/mercury/segatools.ini @@ -64,12 +64,12 @@ dipsw1=1 ; world. An improved solution will be provided later. [io4] -; Test button virtual-key code. Default is the 1 key. -test=0x31 -; Service button virtual-key code. Default is the 2 key. -service=0x32 -; Keyboard button to increment coin counter. Default is the 3 key. -coin=0x33 +; Test button virtual-key code. Default is the F1 key. +test=0x70 +; Service button virtual-key code. Default is the F2 key. +service=0x71 +; Keyboard button to increment coin counter. Default is the F3 key. +coin=0x72 ; Volume up virtual-key code. Default is the "UP" key. volup=0x26 diff --git a/dist/mu3/segatools.ini b/dist/mu3/segatools.ini index a6e68fa..5464257 100644 --- a/dist/mu3/segatools.ini +++ b/dist/mu3/segatools.ini @@ -69,28 +69,27 @@ enable=1 ; world. An improved solution will be provided later. [io4] -; Input API selection for JVS input emulator. -; Test button virtual-key code. Default is the 1 key. -test=0x31 -; Service button virtual-key code. Default is the 2 key. -service=0x32 -; Keyboard button to increment coin counter. Default is the 3 key. -coin=0x33 +; Test button virtual-key code. Default is the F1 key. +test=0x70 +; Service button virtual-key code. Default is the F2 key. +service=0x71 +; Keyboard button to increment coin counter. Default is the F3 key. +coin=0x72 ; Set "1" to enable mouse lever emulation, "0" to use XInput mouse=1 ; Keyboard input bindings left1=0x41 ; A -left2=0x53 ; S -left3=0x44 ; D +left2=0x53 ; S +left3=0x44 ; D -leftSide=0x01 ; Mouse Left -rightSide=0x02 ; Mouse Right +leftSide=0x01 ; Mouse Left +rightSide=0x02 ; Mouse Right right1=0x4A ; J right1=0x4B ; K -right3=0x4C ; L +right3=0x4C ; L -leftMenu=0x55 ; U -rightMenu=0x4F ; O +leftMenu=0x55 ; U +rightMenu=0x4F ; O diff --git a/dist/swdc/segatools.ini b/dist/swdc/segatools.ini index 7b64550..ef182cc 100644 --- a/dist/swdc/segatools.ini +++ b/dist/swdc/segatools.ini @@ -29,12 +29,16 @@ default=127.0.0.1 ; SEGA games are somewhat picky about their LAN environment, so leaving this ; setting enabled is recommended. enable=1 +; The final octet of the local host's IP address on the virtualized subnet (so, +; if the keychip subnet is `192.168.32.0` and this value is set to `11`, then the +; local host's virtualized LAN IP is `192.168.32.11`). +addrSuffix=11 [keychip] ; The /24 LAN subnet that the emulated keychip will tell the game to expect. ; You must set this to your LAN's IP subnet, and that subnet must start with 192.168, ; in order to find the MAIN cabinet. -subnet=192.168.100.0 +subnet=192.168.160.0 [aimeio] ; To use a custom card reader IO DLL enter its path here. @@ -68,12 +72,12 @@ freeplay=0 ; world. An improved solution will be provided later. [io4] -; Test button virtual-key code. Default is the 1 key. -test=0x31 -; Service button virtual-key code. Default is the 2 key. -service=0x32 -; Keyboard button to increment coin counter. Default is the 3 key. -coin=0x33 +; Test button virtual-key code. Default is the F1 key. +test=0x70 +; Service button virtual-key code. Default is the F2 key. +service=0x71 +; Keyboard button to increment coin counter. Default is the F3 key. +coin=0x72 ; Input API selection for IO4 input emulator. ; Set "xinput" to use a gamepad and "dinput" to use a steering wheel. diff --git a/divaio/config.c b/divaio/config.c index 886277e..110392e 100644 --- a/divaio/config.c +++ b/divaio/config.c @@ -27,9 +27,9 @@ void diva_io_config_load( assert(cfg != NULL); assert(filename != NULL); - cfg->vk_test = GetPrivateProfileIntW(L"io3", L"test", '1', filename); - cfg->vk_service = GetPrivateProfileIntW(L"io3", L"service", '2', filename); - cfg->vk_coin = GetPrivateProfileIntW(L"io3", L"coin", '3', filename); + cfg->vk_test = GetPrivateProfileIntW(L"io3", L"test", VK_F1, filename); + cfg->vk_service = GetPrivateProfileIntW(L"io3", L"service", VK_F2, filename); + cfg->vk_coin = GetPrivateProfileIntW(L"io3", L"coin", VK_F3, filename); for (i = 0 ; i < _countof(cfg->vk_buttons) ; i++) { swprintf_s(key, _countof(key), L"key%i", i + 1); diff --git a/fgoio/config.c b/fgoio/config.c index 7f1f5e4..6270391 100644 --- a/fgoio/config.c +++ b/fgoio/config.c @@ -14,7 +14,7 @@ void fgo_io_config_load( assert(cfg != NULL); assert(filename != NULL); - cfg->vk_test = GetPrivateProfileIntW(L"io4", L"test", '1', filename); - cfg->vk_service = GetPrivateProfileIntW(L"io4", L"service", '2', filename); - cfg->vk_coin = GetPrivateProfileIntW(L"io4", L"coin", '3', filename); + cfg->vk_test = GetPrivateProfileIntW(L"io4", L"test", VK_F1, filename); + cfg->vk_service = GetPrivateProfileIntW(L"io4", L"service", VK_F2, filename); + cfg->vk_coin = GetPrivateProfileIntW(L"io4", L"coin", VK_F3, filename); } diff --git a/idacio/config.c b/idacio/config.c index 2daeb8f..6bf6996 100644 --- a/idacio/config.c +++ b/idacio/config.c @@ -124,9 +124,9 @@ void idac_io_config_load(struct idac_io_config *cfg, const wchar_t *filename) assert(cfg != NULL); assert(filename != NULL); - cfg->vk_test = GetPrivateProfileIntW(L"io4", L"test", '1', filename); - cfg->vk_service = GetPrivateProfileIntW(L"io4", L"service", '2', filename); - cfg->vk_coin = GetPrivateProfileIntW(L"io4", L"coin", '3', filename); + cfg->vk_test = GetPrivateProfileIntW(L"io4", L"test", VK_F1, filename); + cfg->vk_service = GetPrivateProfileIntW(L"io4", L"service", VK_F2, filename); + cfg->vk_coin = GetPrivateProfileIntW(L"io4", L"coin", VK_F3, filename); cfg->restrict_ = GetPrivateProfileIntW(L"io4", L"restrict", 128, filename); GetPrivateProfileStringW( diff --git a/idzio/config.c b/idzio/config.c index 2a6e083..aec8261 100644 --- a/idzio/config.c +++ b/idzio/config.c @@ -121,9 +121,10 @@ void idz_io_config_load(struct idz_io_config *cfg, const wchar_t *filename) assert(cfg != NULL); assert(filename != NULL); - cfg->vk_test = GetPrivateProfileIntW(L"io3", L"test", '1', filename); - cfg->vk_service = GetPrivateProfileIntW(L"io3", L"service", '2', filename); - cfg->vk_coin = GetPrivateProfileIntW(L"io3", L"coin", '3', filename); + /* Technically it's io4 */ + cfg->vk_test = GetPrivateProfileIntW(L"io3", L"test", VK_F1, filename); + cfg->vk_service = GetPrivateProfileIntW(L"io3", L"service", VK_F2, filename); + cfg->vk_coin = GetPrivateProfileIntW(L"io3", L"coin", VK_F3, filename); cfg->restrict_ = GetPrivateProfileIntW(L"io3", L"restrict", 97, filename); GetPrivateProfileStringW( diff --git a/mai2io/config.c b/mai2io/config.c index 75e842a..619b0ef 100644 --- a/mai2io/config.c +++ b/mai2io/config.c @@ -24,9 +24,9 @@ void mai2_io_config_load( assert(cfg != NULL); assert(filename != NULL); - cfg->vk_test = GetPrivateProfileIntW(L"io4", L"test", '1', filename); - cfg->vk_service = GetPrivateProfileIntW(L"io4", L"service", '2', filename); - cfg->vk_coin = GetPrivateProfileIntW(L"io4", L"coin", '3', filename); + cfg->vk_test = GetPrivateProfileIntW(L"io4", L"test", VK_F1, filename); + cfg->vk_service = GetPrivateProfileIntW(L"io4", L"service", VK_F2, filename); + cfg->vk_coin = GetPrivateProfileIntW(L"io4", L"coin", VK_F3, filename); for (i = 0 ; i < 9 ; i++) { swprintf_s(key, _countof(key), L"1p_btn%i", i + 1); diff --git a/mercuryio/config.c b/mercuryio/config.c index f3c8e54..853ed29 100644 --- a/mercuryio/config.c +++ b/mercuryio/config.c @@ -27,11 +27,11 @@ void mercury_io_config_load( assert(cfg != NULL); assert(filename != NULL); - cfg->vk_test = GetPrivateProfileIntW(L"io4", L"test", 0x2D, filename); - cfg->vk_service = GetPrivateProfileIntW(L"io4", L"service", 0x2E, filename); - cfg->vk_coin = GetPrivateProfileIntW(L"io4", L"coin", 0x24, filename); - cfg->vk_vol_up = GetPrivateProfileIntW(L"io4", L"volup", 0x26, filename); - cfg->vk_vol_down = GetPrivateProfileIntW(L"io4", L"voldown", 0x28, filename); + cfg->vk_test = GetPrivateProfileIntW(L"io4", L"test", VK_F1, filename); + cfg->vk_service = GetPrivateProfileIntW(L"io4", L"service", VK_F2, filename); + cfg->vk_coin = GetPrivateProfileIntW(L"io4", L"coin", VK_F3, filename); + cfg->vk_vol_up = GetPrivateProfileIntW(L"io4", L"volup", VK_UP, filename); + cfg->vk_vol_down = GetPrivateProfileIntW(L"io4", L"voldown", VK_DOWN, filename); for (i = 0 ; i < 240 ; i++) { swprintf_s(key, _countof(key), L"cell%i", i + 1); diff --git a/mu3io/config.c b/mu3io/config.c index b47a4dc..612c860 100644 --- a/mu3io/config.c +++ b/mu3io/config.c @@ -14,9 +14,9 @@ void mu3_io_config_load( assert(cfg != NULL); assert(filename != NULL); - cfg->vk_test = GetPrivateProfileIntW(L"io4", L"test", '1', filename); - cfg->vk_service = GetPrivateProfileIntW(L"io4", L"service", '2', filename); - cfg->vk_coin = GetPrivateProfileIntW(L"io4", L"coin", '3', filename); + cfg->vk_test = GetPrivateProfileIntW(L"io4", L"test", VK_F1, filename); + cfg->vk_service = GetPrivateProfileIntW(L"io4", L"service", VK_F2, filename); + cfg->vk_coin = GetPrivateProfileIntW(L"io4", L"coin", VK_F3, filename); cfg->use_mouse = GetPrivateProfileIntW(L"io4", L"mouse", 0, filename); diff --git a/swdcio/config.c b/swdcio/config.c index 4208c76..131b403 100644 --- a/swdcio/config.c +++ b/swdcio/config.c @@ -112,9 +112,9 @@ void swdc_io_config_load(struct swdc_io_config *cfg, const wchar_t *filename) assert(cfg != NULL); assert(filename != NULL); - cfg->vk_test = GetPrivateProfileIntW(L"io4", L"test", '1', filename); - cfg->vk_service = GetPrivateProfileIntW(L"io4", L"service", '2', filename); - cfg->vk_coin = GetPrivateProfileIntW(L"io4", L"coin", '3', filename); + cfg->vk_test = GetPrivateProfileIntW(L"io4", L"test", VK_F1, filename); + cfg->vk_service = GetPrivateProfileIntW(L"io4", L"service", VK_F2, filename); + cfg->vk_coin = GetPrivateProfileIntW(L"io4", L"coin", VK_F3, filename); cfg->restrict_ = GetPrivateProfileIntW(L"io4", L"restrict", 128, filename); GetPrivateProfileStringW(