valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

Remove auto machine type

Browse source 
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@1693
This commit is contained in:
Sjoerd van der Berg 2004-02-29 22:29:31 +00:00
parent 96b66f1d45
commit 1d070676ee
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/dosbox.h
View file

@ -63,8 +63,7 @@ enum MachineType {
MCH_HERC,
MCH_CGA,
MCH_TANDY,
MCH_VGA,
MCH_AUTO
MCH_VGA
};
extern MachineType machine;

7
src/dosbox.cpp
View file

@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/* $Id: dosbox.cpp,v 1.62 2004-02-08 08:35:59 canadacow Exp $ */
/* $Id: dosbox.cpp,v 1.63 2004-02-29 22:29:31 harekiet Exp $ */
#include <stdlib.h>
#include <stdarg.h>
@ -169,7 +169,7 @@ static void DOSBOX_RealInit(Section * sec) {
DOSBOX_SetLoop(&Normal_Loop);
MSG_Init(section);
machine=MCH_AUTO;std::string cmd_machine;
machine=MCH_VGA;std::string cmd_machine;
const char * mtype;
if (control->cmdline->FindString("-machine",cmd_machine,true)) mtype=cmd_machine.c_str();
else mtype=section->Get_string("machine");
@ -177,7 +177,6 @@ static void DOSBOX_RealInit(Section * sec) {
else if (strcasecmp(mtype,"tandy")==0) machine=MCH_TANDY;
else if (strcasecmp(mtype,"hercules")==0) machine=MCH_HERC;
else if (strcasecmp(mtype,"vga")==0) machine=MCH_VGA;
else if (strcasecmp(mtype,"auto")==0) machine=MCH_AUTO;
else LOG_MSG("DOSBOX:Unknown machine type %s",mtype);
}
@ -310,7 +309,7 @@ void DOSBOX_Init(void) {
"cms -- Enable the Creative Music System/Gameblaster emulation.\n"
" Enabling both the adlib and cms might give conflicts!\n"
"cmsrate -- Sample rate of cms emulation.\n"
);
);
secprop=control->AddSection_prop("gus",&GUS_Init);
secprop->Add_bool("gus",true);