[Scummvm-cvs-logs] SF.net SVN: scummvm: [24602] scummvm/trunk/backends
chrilith at users.sourceforge.net
chrilith at users.sourceforge.net
Sat Nov 4 17:23:11 CET 2006
Revision: 24602
http://svn.sourceforge.net/scummvm/?rev=24602&view=rev
Author: chrilith
Date: 2006-11-04 08:22:58 -0800 (Sat, 04 Nov 2006)
Log Message:
-----------
Fixed and updated Palm save manager
Modified Paths:
--------------
scummvm/trunk/backends/platform/PalmOS/Src/be_base.cpp
scummvm/trunk/backends/platform/PalmOS/Src/be_save.cpp
scummvm/trunk/backends/saves/default/default-saves.cpp
Added Paths:
-----------
scummvm/trunk/backends/platform/PalmOS/Src/be_save.h
Modified: scummvm/trunk/backends/platform/PalmOS/Src/be_base.cpp
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/be_base.cpp 2006-11-04 15:38:37 UTC (rev 24601)
+++ scummvm/trunk/backends/platform/PalmOS/Src/be_base.cpp 2006-11-04 16:22:58 UTC (rev 24602)
@@ -23,10 +23,9 @@
*/
#include "be_base.h"
+#include "be_save.h"
#include "common/config-file.h"
#include "common/config-manager.h"
-
-#include "backends/saves/default/default-saves.h"
#include "backends/timer/default/default-timer.h"
#include "sound/mixer.h"
@@ -101,7 +100,7 @@
// Create the savefile manager, if none exists yet (we check for this to
// allow subclasses to provide their own).
if (_saveMgr == 0) {
- _saveMgr = new DefaultSaveFileManager();
+ _saveMgr = new PalmSaveFileManager();
}
// Create and hook up the mixer, if none exists yet (we check for this to
Modified: scummvm/trunk/backends/platform/PalmOS/Src/be_save.cpp
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/be_save.cpp 2006-11-04 15:38:37 UTC (rev 24601)
+++ scummvm/trunk/backends/platform/PalmOS/Src/be_save.cpp 2006-11-04 16:22:58 UTC (rev 24602)
@@ -24,91 +24,8 @@
#include "be_base.h"
#include "common/savefile.h"
+#include "be_save.h"
-// SaveFile class
-
-class PalmSaveFile : public Common::SaveFile {
-private:
- FILE *fh;
-public:
- PalmSaveFile(const char *filename, bool saveOrLoad) {
- fh = ::fopen(filename, (saveOrLoad? "wb" : "rb"));
- }
- ~PalmSaveFile() {
- if (fh) ::fclose(fh);
- }
-
- bool eos() const { return feof(fh) != 0; }
- bool ioFailed() const { return ferror(fh) != 0; }
- void clearIOFailed() { clearerr(fh); }
-
- bool isOpen() const { return fh != NULL; }
-
- uint32 read(void *buf, uint32 size);
- uint32 write(const void *buf, uint32 size);
-
- uint32 pos() const {
- assert(fh);
- return ftell(fh);
- }
- uint32 size() const {
- assert(fh);
- uint32 oldPos = ftell(fh);
- fseek(fh, 0, SEEK_END);
- uint32 length = ftell(fh);
- fseek(fh, oldPos, SEEK_SET);
- return length;
- }
- void seek(int32 offs, int whence = SEEK_SET) {
- assert(fh);
- fseek(fh, offs, whence);
- }
-};
-
-uint32 PalmSaveFile::read(void *buf, uint32 size) {
- // we must return the size, where fread return nitems upon success ( 1 <=> size)
- if (fh) return (::fread(buf, 1, size, fh));
- return 0;
-}
-
-uint32 PalmSaveFile::write(const void *buf, uint32 size) {
- // we must return the size, where fwrite return nitems upon success ( 1 <=> size)
- if (fh) return ::fwrite(buf, 1, size, fh);
- return 0;
-}
-
-
-
-
-
-// SaveFileManager class
-
-class PalmSaveFileManager : public Common::SaveFileManager {
-public:
- virtual Common::OutSaveFile *openForSaving(const char *filename) {
- return openSavefile(filename, true);
- }
- virtual Common::InSaveFile *openForLoading(const char *filename) {
- return openSavefile(filename, false);
- }
-
- Common::SaveFile *openSavefile(const char *filename, bool saveOrLoad);
- void listSavefiles(const char *prefix, bool *marks, int num);
-
-protected:
- Common::SaveFile *makeSaveFile(const char *filename, bool saveOrLoad);
-};
-
-Common::SaveFile *PalmSaveFileManager::openSavefile(const char *filename, bool saveOrLoad) {
- char buf[256];
-
- strcpy(buf, getSavePath());
- strcat(buf, "/");
- strcat(buf, filename);
-
- return makeSaveFile(buf, saveOrLoad);
-}
-
void PalmSaveFileManager::listSavefiles(const char *prefix, bool *marks, int num) {
FileRef fileRef;
// try to open the dir
@@ -147,13 +64,3 @@
VFSFileClose(fileRef);
}
-
-Common::SaveFile *PalmSaveFileManager::makeSaveFile(const char *filename, bool saveOrLoad) {
- PalmSaveFile *sf = new PalmSaveFile(filename, saveOrLoad);
-
- if (!sf->isOpen()) {
- delete sf;
- sf = 0;
- }
- return sf;
-}
Added: scummvm/trunk/backends/platform/PalmOS/Src/be_save.h
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/be_save.h (rev 0)
+++ scummvm/trunk/backends/platform/PalmOS/Src/be_save.h 2006-11-04 16:22:58 UTC (rev 24602)
@@ -0,0 +1,34 @@
+/* ScummVM - Scumm Interpreter
+ * Copyright (C) 2002-2006 The ScummVM project
+ *
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#ifndef BACKEND_SAVES_PALM_H
+#define BACKEND_SAVES_PALM_H
+
+#include "common/stdafx.h"
+#include "saves/default/default-saves.h"
+
+class PalmSaveFileManager : public DefaultSaveFileManager {
+public:
+ void listSavefiles(const char *prefix, bool *marks, int num);
+};
+
+#endif
Property changes on: scummvm/trunk/backends/platform/PalmOS/Src/be_save.h
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Date Rev Author URL Id
Name: svn:eol-style
+ native
Modified: scummvm/trunk/backends/saves/default/default-saves.cpp
===================================================================
--- scummvm/trunk/backends/saves/default/default-saves.cpp 2006-11-04 15:38:37 UTC (rev 24601)
+++ scummvm/trunk/backends/saves/default/default-saves.cpp 2006-11-04 16:22:58 UTC (rev 24602)
@@ -161,7 +161,7 @@
if (buf[dirLen-1] != ':' && buf[dirLen-1] != '/')
#endif
-#if !defined(__GP32__) && !defined(PALMOS_MODE)
+#if !defined(__GP32__)
strncat(buf, "/", bufsize-1); // prevent double /
#endif
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list