Apple-2-Tools/AppleWin
1
0
Fork 0
mirror of https://github.com/AppleWin/AppleWin.git synced 2024-12-22 09:30:15 +00:00
Code Issues Projects Releases Wiki Activity

Cmd line: -fs-height: small refactor so that bestWidth/Height are only returned for logging purposes

Browse Source
This commit is contained in:
tomcw 2021-05-31 16:40:44 +01:00
parent cc126d7745
commit 793f2eb507
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/CmdLine.cpp
View File

@ -213,20 +213,21 @@ bool ProcessCmdLine(LPSTR lpCmdLine)
LPSTR lpTmp = lpCmdLine + sizeof(CMD_FS_HEIGHT)-1; LPSTR lpTmp = lpCmdLine + sizeof(CMD_FS_HEIGHT)-1;
bool bRes = false; bool bRes = false;
UINT bestWidth=0, bestHeight=0;
if (strcmp(lpTmp, "best") == 0) if (strcmp(lpTmp, "best") == 0)
{ {
bRes = GetFrame().GetBestDisplayResolutionForFullScreen(g_cmdLine.bestWidth, g_cmdLine.bestHeight); bRes = GetFrame().GetBestDisplayResolutionForFullScreen(bestWidth, bestHeight);
} }
else else
{ {
UINT userSpecifiedHeight = atoi(lpTmp); UINT userSpecifiedHeight = atoi(lpTmp);
if (userSpecifiedHeight) if (userSpecifiedHeight)
bRes = GetFrame().GetBestDisplayResolutionForFullScreen(g_cmdLine.bestWidth, g_cmdLine.bestHeight, userSpecifiedHeight); bRes = GetFrame().GetBestDisplayResolutionForFullScreen(bestWidth, bestHeight, userSpecifiedHeight);
else else
LogFileOutput("Invalid cmd-line parameter for -fs-height=x switch\n"); LogFileOutput("Invalid cmd-line parameter for -fs-height=x switch\n");
} }
if (bRes) if (bRes)
LogFileOutput("Best resolution for -fs-height=x switch: Width=%d, Height=%d\n", g_cmdLine.bestWidth, g_cmdLine.bestHeight); LogFileOutput("Best resolution for -fs-height=x switch: Width=%d, Height=%d\n", bestWidth, bestHeight);
else else
LogFileOutput("Failed to set parameter for -fs-height=x switch\n"); LogFileOutput("Failed to set parameter for -fs-height=x switch\n");
} }

4
source/CmdLine.h
View File

@ -18,8 +18,6 @@ struct CmdLine
bSlot7EmptyOnExit = false; bSlot7EmptyOnExit = false;
bSwapButtons0and1 = false; bSwapButtons0and1 = false;
bRemoveNoSlotClock = false; bRemoveNoSlotClock = false;
bestWidth = 0;
bestHeight = 0;
szImageName_harddisk[HARDDISK_1] = NULL; szImageName_harddisk[HARDDISK_1] = NULL;
szImageName_harddisk[HARDDISK_2] = NULL; szImageName_harddisk[HARDDISK_2] = NULL;
szSnapshotName = NULL; szSnapshotName = NULL;
@ -56,8 +54,6 @@ struct CmdLine
bool bSwapButtons0and1; bool bSwapButtons0and1;
bool bRemoveNoSlotClock; bool bRemoveNoSlotClock;
SS_CARDTYPE slotInsert[NUM_SLOTS]; SS_CARDTYPE slotInsert[NUM_SLOTS];
UINT bestWidth;
UINT bestHeight;
LPSTR szImageName_drive[NUM_SLOTS][NUM_DRIVES]; LPSTR szImageName_drive[NUM_SLOTS][NUM_DRIVES];
bool driveConnected[NUM_SLOTS][NUM_DRIVES]; bool driveConnected[NUM_SLOTS][NUM_DRIVES];
LPSTR szImageName_harddisk[NUM_HARDDISKS]; LPSTR szImageName_harddisk[NUM_HARDDISKS];