Skip to content

Commit 777f430

Browse files
committed
save NoWaitMode to config file
1 parent a1baf20 commit 777f430

File tree

4 files changed

+9
-7
lines changed

4 files changed

+9
-7
lines changed

x11/prop.c

+5
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,8 @@ void LoadConfig(void)
281281

282282
Config.HwJoyBtn[1] = GetPrivateProfileInt(ini_title, "HwJoyBtn1", 1, winx68k_ini);
283283

284+
Config.NoWaitMode = GetPrivateProfileInt(ini_title, "NoWaitMode", 0, winx68k_ini);
285+
284286
for (i=0; i<2; i++)
285287
{
286288
for (j=0; j<8; j++)
@@ -413,6 +415,9 @@ void SaveConfig(void)
413415
wsprintf(buf, "%d", Config.HwJoyBtn[1]);
414416
WritePrivateProfileString(ini_title, "HwJoyBtn1", buf, winx68k_ini);
415417

418+
wsprintf(buf, "%d", Config.NoWaitMode);
419+
WritePrivateProfileString(ini_title, "NoWaitMode", buf, winx68k_ini);
420+
416421
for (i=0; i<2; i++)
417422
{
418423
for (j=0; j<8; j++)

x11/prop.h

+1
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ typedef struct
5151
int HwJoyAxis[2];
5252
int HwJoyHat;
5353
int HwJoyBtn[2];
54+
int NoWaitMode;
5455
} Win68Conf;
5556

5657
extern Win68Conf Config;

x11/winui.c

+2-4
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ extern unsigned int hTimerID;
7979
extern int FullScreenFlag;
8080
int UI_MouseFlag = 0;
8181
int UI_MouseX = -1, UI_MouseY = -1;
82-
extern int NoWaitMode;
8382
extern short timertrace;
8483

8584
BYTE MenuClearFlag = 0;
@@ -192,7 +191,7 @@ WinUI_Init(void)
192191
menu_hwjoy_print(i);
193192
}
194193

195-
mval_y[8] = NoWaitMode;
194+
mval_y[8] = Config.NoWaitMode;
196195

197196
strcpy(mfl.dir[0], CUR_DIR_STR);
198197
strcpy(mfl.dir[1], CUR_DIR_STR);
@@ -413,8 +412,7 @@ static void menu_hwjoy_setting(int v)
413412

414413
static void menu_nowait(int v)
415414
{
416-
// xxx Not saving to config file.
417-
NoWaitMode = v;
415+
Config.NoWaitMode = v;
418416
}
419417

420418
// ex. ./hoge/.. -> ./

x11/winx68k.cpp

+1-3
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ BYTE DispFrame = 0;
8585
extern BYTE FrameRate;
8686
DWORD SoundSampleRate;
8787
int CurFrameRate = 1;
88-
int NoWaitMode = 0;
8988

9089
unsigned int hTimerID = 0;
9190
DWORD TimerICount = 0;
@@ -608,7 +607,6 @@ int main(int argc, char *argv[])
608607
#else
609608
Config.SampleRate = 11025;
610609
FrameRate = 5;
611-
NoWaitMode = 0;
612610
#endif
613611

614612
#ifndef NOSOUND
@@ -771,7 +769,7 @@ int main(int argc, char *argv[])
771769
while (1) {
772770
// OPM_RomeoOut(Config.BufferSize * 5);
773771
if (menu_mode == menu_out
774-
&& (NoWaitMode || Timer_GetCount())) {
772+
&& (Config.NoWaitMode || Timer_GetCount())) {
775773
WinX68k_Exec();
776774
#if defined(ANDROID) || TARGET_OS_IPHONE
777775
if (vk_cnt > 0) {

0 commit comments

Comments
 (0)