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

-pal won't die if dendy was loaded from config on launch. if -dendy isn't specified, and if left from config, it will get overridden by -pal. 

make deploy.bat a bit more handy
This commit is contained in:
feos-tas 2016-07-31 20:46:32 +00:00
parent b830b49724
commit d61634cfe4
5 changed files with 41 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
trunk/src/drivers/win/args.cpp
View File

@ -44,7 +44,7 @@ char *ParseArgies(int argc, char *argv[])
{ {
static ARGPSTRUCT FCEUArgs[]={ static ARGPSTRUCT FCEUArgs[]={
{"-pal", &pal_setting_specified, &PAL, 0}, {"-pal", &pal_setting_specified, &PAL, 0},
{"-dendy", &pal_setting_specified,&dendy, 0}, {"-dendy", &dendy_setting_specified,&dendy, 0},
{"-noicon", 0, &status_icon, 0}, {"-noicon", 0, &status_icon, 0},
{"-gg", 0, &genie, 0}, {"-gg", 0, &genie, 0},
{"-no8lim", 0, &eoptions, 0x8000|EO_NOSPRLIM}, {"-no8lim", 0, &eoptions, 0x8000|EO_NOSPRLIM},

8
trunk/src/drivers/win/main.cpp
View File

@ -147,6 +147,7 @@ int genie = 0;
int pal_emulation = 0; int pal_emulation = 0;
int pal_setting_specified = 0; int pal_setting_specified = 0;
int dendy = 0; int dendy = 0;
int dendy_setting_specified = 0;
bool swapDuty = 0; // some Famicom and NES clones had duty cycle bits swapped bool swapDuty = 0; // some Famicom and NES clones had duty cycle bits swapped
int ntsccol = 0, ntsctint, ntschue; int ntsccol = 0, ntsctint, ntschue;
std::string BaseDirectory; std::string BaseDirectory;
@ -767,12 +768,15 @@ int main(int argc,char *argv[])
LoadNewGamey(hAppWnd, 0); LoadNewGamey(hAppWnd, 0);
} }
if (PAL && pal_setting_specified && !dendy_setting_specified)
dendy = 0;
if (PAL && !dendy) if (PAL && !dendy)
FCEUI_SetRegion(1, pal_setting_specified); FCEUI_SetRegion(1, pal_setting_specified);
else if (dendy) else if (dendy)
FCEUI_SetRegion(2, pal_setting_specified); FCEUI_SetRegion(2, dendy_setting_specified);
else else
FCEUI_SetRegion(0, pal_setting_specified); FCEUI_SetRegion(0, pal_setting_specified || dendy_setting_specified);
if(PaletteToLoad) if(PaletteToLoad)
{ {

1
trunk/src/drivers/win/main.h
View File

@ -46,6 +46,7 @@ extern int pal_setting_specified;
// dendy and pal should have been designed alongside, using enum or alike // dendy and pal should have been designed alongside, using enum or alike
// now it's not possible to do it easily, so we'll just use the flag here and there, not to touch PAL logics // now it's not possible to do it easily, so we'll just use the flag here and there, not to touch PAL logics
extern int dendy; extern int dendy;
extern int dendy_setting_specified;
extern int status_icon; extern int status_icon;
extern int frame_display; extern int frame_display;
extern int rerecord_display; extern int rerecord_display;

2
trunk/src/drivers/win/window.cpp
View File

@ -1042,7 +1042,7 @@ bool ALoad(const char *nameo, char* innerFilename, bool silent)
if (GameInfo) FCEUI_CloseGame(); if (GameInfo) FCEUI_CloseGame();
if (FCEUI_LoadGameVirtual(nameo, !pal_setting_specified, silent)) if (FCEUI_LoadGameVirtual(nameo, !(pal_setting_specified || dendy_setting_specified), silent))
{ {
pal_emulation = FCEUI_GetCurrentVidSystem(0, 0); pal_emulation = FCEUI_GetCurrentVidSystem(0, 0);

6
trunk/vc/deploy.bat
View File

@ -1,2 +1,6 @@
@echo off
echo Password:
set /p ANSWER=
@echo on
call archive.bat call archive.bat
call upload.bat %1 call upload.bat %ANSWER%