Apple-2-Tools/AppleWin
1
0
Fork 0
mirror of https://github.com/AppleWin/AppleWin.git synced 2026-04-21 07:17:41 +00:00
Code Issues Projects Releases Wiki Activity

Get rid of duplicate func

Browse Source
This commit is contained in:
tomcw
2019-04-09 19:29:58 +01:00
parent aa1e4cab09
commit 249b15b02d
4 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/Disk.cpp
+10 -14
View File
@@ -78,11 +78,6 @@ int DiskIIInterfaceCard::GetCurrentPhase(void) { return m_floppyDrive[m_currDri
int DiskIIInterfaceCard::GetCurrentOffset(void) { return m_floppyDrive[m_currDrive].disk.byte; }
int DiskIIInterfaceCard::GetTrack(const int drive) { return m_floppyDrive[drive].track; }
LPCTSTR DiskIIInterfaceCard::GetDiskPathFilename(const int drive)
{
return m_floppyDrive[drive].disk.fullname;
}
LPCTSTR DiskIIInterfaceCard::GetCurrentState(void)
{
if (m_floppyDrive[m_currDrive].disk.imagehandle == NULL)
@@ -487,13 +482,6 @@ void DiskIIInterfaceCard::EjectDisk(const int drive)
//===========================================================================
// Return the file or zip name
// . Used by Property Sheet Page (Disk)
LPCTSTR DiskIIInterfaceCard::GetFullName(const int drive)
{
return m_floppyDrive[drive].disk.fullname;
}
// Return the filename
// . Used by Drive Buttons' tooltips
LPCTSTR DiskIIInterfaceCard::GetFullDiskFilename(const int drive)
@@ -504,9 +492,11 @@ LPCTSTR DiskIIInterfaceCard::GetFullDiskFilename(const int drive)
return GetFullName(drive);
}
LPCTSTR DiskIIInterfaceCard::DiskGetFullPathName(const int drive)
// Return the file or zip name
// . Used by Property Sheet Page (Disk)
LPCTSTR DiskIIInterfaceCard::GetFullName(const int drive)
{
return ImageGetPathname(m_floppyDrive[drive].disk.imagehandle);
return m_floppyDrive[drive].disk.fullname;
}
// Return the imagename
@@ -515,6 +505,12 @@ LPCTSTR DiskIIInterfaceCard::GetBaseName(const int drive)
{
return m_floppyDrive[drive].disk.imagename;
}
LPCTSTR DiskIIInterfaceCard::DiskGetFullPathName(const int drive)
{
return ImageGetPathname(m_floppyDrive[drive].disk.imagehandle);
}
//===========================================================================
void DiskIIInterfaceCard::GetLightStatus(Disk_Status_e *pDisk1Status, Disk_Status_e *pDisk2Status)