a_dinosaur/ZSNES
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Made gui option save config override dontsave option. Fixed bug #13.

Browse Source
This commit is contained in:
n-a-c-h
2005-10-10 01:33:53 +00:00
parent a1a0e83a97
commit 16f1580684
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
zsnes/src/cfgload.c
View File

@@ -130,6 +130,8 @@ extern unsigned char soundon;
extern unsigned char spcon; extern unsigned char spcon;
extern unsigned char vsyncon; extern unsigned char vsyncon;
extern unsigned char savecfgforce;
//extern void Open_File(); //extern void Open_File();
extern unsigned int ZFileRead(); extern unsigned int ZFileRead();
extern unsigned int ZOpenMode; extern unsigned int ZOpenMode;
@@ -369,7 +371,7 @@ void DOScreatenewcfg()
char buffer[4096]; char buffer[4096];
FILE *fp = 0; FILE *fp = 0;
if (cfgdontsave == 1) if (cfgdontsave && !savecfgforce)
{ {
return; return;
} }

6
zsnes/src/gui/gui.asm
View File

@@ -2206,7 +2206,7 @@ GUITryMenuItem: ; Defines which menu item calls what window
jne .nomovie jne .nomovie
mov byte[MovieRecordWinVal],0 mov byte[MovieRecordWinVal],0
.nomovie .nomovie
GUICheckMenuItem 16, 3 GUICheckMenuItem 16, 3 ; Save Config
cmp byte[GUIcrowpos],4 cmp byte[GUIcrowpos],4
jne .nosavestuff jne .nosavestuff
@@ -2214,8 +2214,11 @@ GUITryMenuItem: ; Defines which menu item calls what window
mov dl,[InitDrive] mov dl,[InitDrive]
mov ebx,InitDir mov ebx,InitDir
call Change_Dir call Change_Dir
mov byte[savecfgforce],1
call createnewcfg call createnewcfg
call GUISaveVars call GUISaveVars
mov byte[savecfgforce],0
call Makemode7Table call Makemode7Table
mov dword[GUICMessage],.message1 mov dword[GUICMessage],.message1
@@ -2231,6 +2234,7 @@ GUITryMenuItem: ; Defines which menu item calls what window
SECTION .data SECTION .data
.message1 db 'CONFIGURATION FILES SAVED.',0 .message1 db 'CONFIGURATION FILES SAVED.',0
NEWSYM savecfgforce, db 0
SECTION .text SECTION .text
DisplayBoxes: ; Displays window when item is clicked DisplayBoxes: ; Displays window when item is clicked

4
zsnes/src/gui/guifuncs.c
View File

@@ -36,7 +36,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
extern unsigned char ComboHeader[23], ComboBlHeader[23], GUIRAdd; extern unsigned char ComboHeader[23], ComboBlHeader[23], GUIRAdd;
extern unsigned char GUIsmallscreenon, ScreenScale, TimeChecker; extern unsigned char GUIsmallscreenon, ScreenScale, TimeChecker;
extern unsigned char GUIScreenScale, ShowTimer, ReCalib, cfgdontsave; extern unsigned char GUIScreenScale, ShowTimer, ReCalib, cfgdontsave;
extern unsigned char CombinDataGlob[3300]; extern unsigned char CombinDataGlob[3300], savecfgforce;
extern unsigned int PHnumGUIsave, smallscreenon, SnowTimer, NumSnow; extern unsigned int PHnumGUIsave, smallscreenon, SnowTimer, NumSnow;
extern unsigned int CalibXmin, CalibXmax, CalibYmin, CalibYmax, NumComboGlob; extern unsigned int CalibXmin, CalibXmax, CalibYmin, CalibYmax, NumComboGlob;
extern unsigned int CalibXmin209, CalibXmax209, CalibYmin209, CalibYmax209; extern unsigned int CalibXmin209, CalibXmax209, CalibYmin209, CalibYmax209;
@@ -109,7 +109,7 @@ void ExecGUISaveVars()
if (ShowTimer == 1) { TimeChecker = CalcCfgChecksum(); } if (ShowTimer == 1) { TimeChecker = CalcCfgChecksum(); }
if (!cfgdontsave) if (!cfgdontsave || savecfgforce)
{ {
write_cfg_vars(GUIFName); write_cfg_vars(GUIFName);
} }