[Scummvm-cvs-logs] SF.net SVN: scummvm: [23528] scummvm/branches/branch-0-9-0/backends/fs/gp32/gp32-fs.cpp
wonst719 at users.sourceforge.net
wonst719 at users.sourceforge.net
Thu Jul 20 22:52:11 CEST 2006
Revision: 23528
http://svn.sourceforge.net/scummvm/?rev=23528&view=rev
Author: wonst719
Date: 2006-07-16 01:33:50 -0700 (Sun, 16 Jul 2006)
Log Message:
-----------
Backport FS fix
Modified Paths:
--------------
scummvm/branches/branch-0-9-0/backends/fs/gp32/gp32-fs.cpp
Modified: scummvm/branches/branch-0-9-0/backends/fs/gp32/gp32-fs.cpp
===================================================================
--- scummvm/branches/branch-0-9-0/backends/fs/gp32/gp32-fs.cpp 2006-07-16 08:32:23 UTC (rev 23527)
+++ scummvm/branches/branch-0-9-0/backends/fs/gp32/gp32-fs.cpp 2006-07-16 08:33:50 UTC (rev 23528)
@@ -1,8 +1,8 @@
/* ScummVM - Scumm Interpreter
* Copyright (C) 2001-2006 The ScummVM project
* Copyright (C) 2002 Ph0x - GP32 Backend
- * Copyright (C) 2003/2004 DJWillis - GP32 Backend
- * Copyright (C) 2005 Won Star - GP32 Backend
+ * Copyright (C) 2003-2004 DJWillis - GP32 Backend
+ * Copyright (C) 2005-2006 Won Star - GP32 Backend
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -18,8 +18,8 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL: https://svn.sourceforge.net/svnroot/scummvm/scummvm/trunk/backends/gp32/gp32-fs.cpp $
- * $Id: gp32-fs.cpp 23022 2006-06-11 10:08:53Z wonst719 $
+ * $URL: https://svn.sourceforge.net/svnroot/scummvm/scummvm/trunk/backends/fs/gp32/gp32-fs.cpp $
+ * $Id: gp32-fs.cpp 23274 2006-06-24 08:07:48Z fingolfin $
*
*/
@@ -142,6 +142,7 @@
_isRoot = true;
_displayName = "GP32 Root";
} else {
+ _isRoot = false;
_displayName = String(dsplName);
}
_isDirectory = true;
@@ -171,6 +172,7 @@
entry._displayName = dirEntry.name;
entry._path = _path;
entry._path += dirEntry.name;
+ entry._isRoot = false;
GpFileAttr(entry._path.c_str(), &attr);
entry._isDirectory = attr.attr & (1 << 4);
@@ -205,19 +207,13 @@
if(_isRoot)
return 0;
- GP32FilesystemNode *p = new GP32FilesystemNode();
- if (_path.size() > 4) {
- const char *start = _path.c_str();
- const char *end = lastPathComponent(_path);
+ const char *start = _path.c_str();
+ const char *end = lastPathComponent(_path);
- p->_path = String(start, end - start);
- p->_isDirectory = true;
- p->_displayName = lastPathComponent(p->_path);
- p->_isRoot = false;
-
- GPDEBUG("%s", p->_path.c_str());
- }
+ GP32FilesystemNode *p = new GP32FilesystemNode(String(start, end - start));
+ NP("%s", p->_path.c_str());
+
return p;
}
More information about the Scummvm-git-logs
mailing list