diff options
Diffstat (limited to 'backends/gp32/gp-fs.cpp')
-rw-r--r-- | backends/gp32/gp-fs.cpp | 90 |
1 files changed, 61 insertions, 29 deletions
diff --git a/backends/gp32/gp-fs.cpp b/backends/gp32/gp-fs.cpp index cd2ca42b6f..f752282ff5 100644 --- a/backends/gp32/gp-fs.cpp +++ b/backends/gp32/gp-fs.cpp @@ -1,72 +1,84 @@ /* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2005 The ScummVM project + * Copyright (C) 2001 Ludvig Strigeus + * Copyright (C) 2001/2004 The ScummVM project + * Copyright (C) 2002 Ph0x - GP32 Backend + * Copyright (C) 2003/2004 DJWillis - GP32 Backend * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * $Header$ + * */ #if defined (__GP32__) -#include "../fs/fs.h" -#include "stdio.h" +#include "stdafx.h" -extern "C" { - #include "gpstdio.h" -} +#include "backends/gp32/gp32.h" +#include "backends/fs/fs.h" +#include <stdio.h> +#include <gpstdio.h> /* - * Implementation of the ScummVM file system API based on GP32. + * Implementation of the ScummVM file system API based on GP32 SMC File Access. */ class GP32FilesystemNode : public FilesystemNode { protected: - String _displayName; + Common::String _displayName; bool _isDirectory; bool _isValid; - String _path; + Common::String _path; public: GP32FilesystemNode(); - GP32FilesystemNode(const String &path); + GP32FilesystemNode(const Common::String &path); GP32FilesystemNode(const GP32FilesystemNode *node); - virtual String displayName() const { return _displayName; } + virtual Common::String displayName() const { return _displayName; } virtual bool isValid() const { return _isValid; } virtual bool isDirectory() const { return _isDirectory; } - virtual String path() const { return _path; } + virtual Common::String path() const { return _path; } - virtual FSList *listDir(ListMode mode = kListDirectoriesOnly) const; + virtual FSList listDir(ListMode mode = kListDirectoriesOnly) const; virtual FilesystemNode *parent() const; virtual FilesystemNode *clone() const { return new GP32FilesystemNode(this); } }; -FilesystemNode *FilesystemNode::getRoot() { +AbstractFilesystemNode *FilesystemNode::getRoot() { return new GP32FilesystemNode(); } GP32FilesystemNode::GP32FilesystemNode() { + _displayName = "gp:\\SCUMMVM\\GAMES\\"; + _isValid = true; + _isDirectory = true; + _path = "gp:\\scummvm\\games\\"; +} + +/* +GP32FilesystemNode::GP32FilesystemNode() { _displayName = "gp:\\"; _isValid = true; _isDirectory = true; _path = "gp:\\"; } +*/ -/* -GP32FilesystemNode::GP32FilesystemNode(const String &p) { +GP32FilesystemNode::GP32FilesystemNode(const Common::String &p) { // TODO - extract last component from path _displayName = p; // TODO - check whether it is a directory, and whether the file actually exists @@ -74,7 +86,6 @@ GP32FilesystemNode::GP32FilesystemNode(const String &p) { _isDirectory = true; _path = p; } -*/ GP32FilesystemNode::GP32FilesystemNode(const GP32FilesystemNode *node) { _displayName = node->_displayName; @@ -83,13 +94,17 @@ GP32FilesystemNode::GP32FilesystemNode(const GP32FilesystemNode *node) { _path = node->_path; } -FSList *GP32FilesystemNode::listDir(ListMode mode) const { +AbstractFilesystemNode *FilesystemNode::getNodeForPath(const String &path) { + return new GP32FilesystemNode(path); +} + +FSList GP32FilesystemNode::listDir(ListMode mode) const { assert(_isDirectory); GPDIRENTRY dp; ulong read; - FSList *myList = new FSList(); + FSList myList; int start=0; // current file @@ -114,7 +129,7 @@ FSList *GP32FilesystemNode::listDir(ListMode mode) const { if (entry._isDirectory) entry._path += "\\"; //ph0x - myList->push_back(entry); + myList.push_back(entry); } return myList; } @@ -134,19 +149,36 @@ FilesystemNode *GP32FilesystemNode::parent() const { GP32FilesystemNode *p = new GP32FilesystemNode(); +// OLD - REMOVE ON CLEAN COMPILE +// // Root node is its own parent. Still we can't just return this +// // as the GUI code will call delete on the old node. +// if (_path != "gp:\\") { //ph0x +// const char *start = _path.c_str(); +// const char *end = lastPathComponent(_path); +// +// p->_path = String(start, end - start); +// p->_isValid = true; +// p->_isDirectory = true; +// p->_displayName = lastPathComponent(p->_path); +// } +// return p; +//} + // Root node is its own parent. Still we can't just return this // as the GUI code will call delete on the old node. - if (_path != "gp:\\") { //ph0x + if (_path != "gp:\\") { const char *start = _path.c_str(); const char *end = lastPathComponent(_path); - p->_path = String(start, end - start); - p->_isValid = true; - p->_isDirectory = true; + p->_path = Common::String(start, end - start); p->_displayName = lastPathComponent(p->_path); + } else { + p->_path = _path; + p->_displayName = _displayName; } + p->_isValid = true; + p->_isDirectory = true; return p; } -#endif // defined(__GP32__) - +#endif /* defined(__GP32__) */ |