diff --git a/source/Utilities.cpp b/source/Utilities.cpp index 7aa8b688..f511fd54 100644 --- a/source/Utilities.cpp +++ b/source/Utilities.cpp @@ -349,7 +349,7 @@ static void SetCurrentDir(std::string pathname) SetCurrentImageDir(path); } -bool DoDiskInsert(const UINT slot, const int nDrive, LPCSTR szFileName) +static bool DoDiskInsert(const UINT slot, const int nDrive, LPCSTR szFileName) { Disk2InterfaceCard& disk2Card = dynamic_cast(GetCardMgr().GetRef(slot)); @@ -369,7 +369,7 @@ bool DoDiskInsert(const UINT slot, const int nDrive, LPCSTR szFileName) return res; } -bool DoHardDiskInsert(const int nDrive, LPCSTR szFileName) +static bool DoHardDiskInsert(const int nDrive, LPCSTR szFileName) { if (szFileName[0] == '\0') { diff --git a/source/Utilities.h b/source/Utilities.h index 47dc1b31..c5f7586b 100644 --- a/source/Utilities.h +++ b/source/Utilities.h @@ -5,8 +5,6 @@ void LoadConfiguration(); -bool DoDiskInsert(const UINT slot, const int nDrive, LPCSTR szFileName); -bool DoHardDiskInsert(const int nDrive, LPCSTR szFileName); void InsertFloppyDisks(const UINT slot, LPSTR szImageName_drive[NUM_DRIVES], bool driveConnected[NUM_DRIVES], bool& bBoot); void InsertHardDisks(LPSTR szImageName_harddisk[NUM_HARDDISKS], bool& bBoot); void UnplugHardDiskControllerCard(void); diff --git a/source/Windows/AppleWin.cpp b/source/Windows/AppleWin.cpp index a0fdff91..4fc8e0c8 100644 --- a/source/Windows/AppleWin.cpp +++ b/source/Windows/AppleWin.cpp @@ -780,7 +780,7 @@ static void RepeatInitialization(void) InsertHardDisks(g_cmdLine.szImageName_harddisk, g_cmdLine.bBoot); g_cmdLine.szImageName_harddisk[HARDDISK_1] = g_cmdLine.szImageName_harddisk[HARDDISK_2] = NULL; // Don't insert on a restart - if (g_cmdLine.bSlotEmpty[7]) + if (g_cmdLine.bSlotEmpty[SLOT7]) { HD_SetEnabled(false); // Disable HDD controller, but don't persist this to Registry/conf.ini (consistent with other '-sn empty' cmds) Snapshot_UpdatePath(); // If save-state's filename is a harddisk, and the floppy is in the same path, then the filename won't be updated