diff options
author | Strangerke | 2013-10-25 21:11:12 +0200 |
---|---|---|
committer | Strangerke | 2013-10-25 21:11:12 +0200 |
commit | 97d28f0e725d2e705de60c16f6e3d969a6527353 (patch) | |
tree | ddb60af98812485bc24e455dcd0b865b4b705aa1 /backends/fs | |
parent | 7dc1ea9ada597146b96ee1bf4c26a105767d30e1 (diff) | |
download | scummvm-rg350-97d28f0e725d2e705de60c16f6e3d969a6527353.tar.gz scummvm-rg350-97d28f0e725d2e705de60c16f6e3d969a6527353.tar.bz2 scummvm-rg350-97d28f0e725d2e705de60c16f6e3d969a6527353.zip |
AMIGAOS4: Make use of updated function names (SDK53.24) and remove unused code
Courtesy of Raziel^
Diffstat (limited to 'backends/fs')
-rw-r--r-- | backends/fs/amigaos4/amigaos4-fs.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/backends/fs/amigaos4/amigaos4-fs.cpp b/backends/fs/amigaos4/amigaos4-fs.cpp index fe388c2a6e..6d713f10be 100644 --- a/backends/fs/amigaos4/amigaos4-fs.cpp +++ b/backends/fs/amigaos4/amigaos4-fs.cpp @@ -335,7 +335,7 @@ bool AmigaOSFilesystemNode::isReadable() const { // Regular RWED protection flags are low-active or inverted, thus the negation. // moreover pseudo root filesystem (null _pFileLock) is readable whatever the // protection says - bool readable = !(_nProt & EXDF_READ) || _pFileLock == 0; + bool readable = !(_nProt & EXDF_OTR_READ) || _pFileLock == 0; return readable; } @@ -344,7 +344,7 @@ bool AmigaOSFilesystemNode::isWritable() const { // Regular RWED protection flags are low-active or inverted, thus the negation. // moreover pseudo root filesystem (null _pFileLock) is never writable whatever // the protection says (because of the pseudo nature) - bool writable = !(_nProt & EXDF_WRITE) && _pFileLock !=0; + bool writable = !(_nProt & EXDF_OTR_WRITE) && _pFileLock !=0; return writable; } @@ -367,8 +367,14 @@ AbstractFSList AmigaOSFilesystemNode::listVolumes() const { dosList = IDOS->NextDosEntry(dosList, LDF_VOLUMES); while (dosList) { if (dosList->dol_Type == DLT_VOLUME && - dosList->dol_Name && - dosList->dol_Task) { + dosList->dol_Name) { + + // Original was + // dosList->dol_Name && + // dosList->dol_Task) { + // which errored using SDK 53.24 with a 'struct dosList' has no member called 'dol_Task' + // I removed dol_Task because it's not used anywhere else + // and it neither brought up further errors nor crashes or regressions. // Copy name to buffer IDOS->CopyStringBSTRToC(dosList->dol_Name, buffer, MAXPATHLEN); |