ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added ability to specify "Dmerge" in the INI file. 

git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@139 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2002-11-11 22:14:56 +00:00
parent af8b8c82f7
commit b5f3c6b225
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
stella/src/stellarc
View File

@ -12,9 +12,10 @@
; Values are the same as those allowed on the commandline. ; Values are the same as those allowed on the commandline.
; Boolean values are specified as 1 (for true) and 0 (for false) ; Boolean values are specified as 1 (for true) and 0 (for false)
; ;
; LINUX VERSION
; This file can be put in "/etc/stellarc" for system-wide access ; This file can be put in "/etc/stellarc" for system-wide access
; or in "$HOME/.stella/stellarc" for individual users. ; or in "$HOME/.stella/stellarc" for individual users.
;display = <display> ;display = <display>
;fps = <number> ;fps = <number>
;owncmap = <0|1> ;owncmap = <0|1>
@ -30,3 +31,4 @@
;ssname = <romname|md5sum> ;ssname = <romname|md5sum>
;sssingle = <0|1> ;sssingle = <0|1>
;accurate = <0|1> ;accurate = <0|1>
;Dmerge = <0|1>

12
stella/src/ui/common/Settings.cxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of // See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
// //
// $Id: Settings.cxx,v 1.5 2002-11-11 02:55:15 stephena Exp $ // $Id: Settings.cxx,v 1.6 2002-11-11 22:14:56 stephena Exp $
//============================================================================ //============================================================================
#ifdef DEVELOPER_SUPPORT #ifdef DEVELOPER_SUPPORT
@ -388,5 +388,15 @@ void Settings::handleRCFile(istream& in)
else if(option == 0) else if(option == 0)
theMultipleSnapShotFlag = true; theMultipleSnapShotFlag = true;
} }
#ifdef DEVELOPER_SUPPORT
else if(key == "Dmerge")
{
uInt32 option = atoi(value.c_str());
if(option == 1)
theMergePropertiesFlag = true;
else if(option == 0)
theMergePropertiesFlag = false;
}
#endif
} }
} }