[Scummvm-cvs-logs] CVS: scummvm/sky compact.cpp,1.35,1.36 compact.h,1.16,1.17 disk.cpp,1.66,1.67 disk.h,1.19,1.20
Max Horn
fingolfin at users.sourceforge.net
Tue May 10 16:00:22 CEST 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/sound audiostream.cpp,1.71,1.72 flac.cpp,1.7,1.8 flac.h,1.3,1.4 mixer.h,1.103,1.104 mp3.cpp,1.18,1.19 mp3.h,1.9,1.10 vorbis.cpp,1.22,1.23 vorbis.h,1.9,1.10
- Next message: [Scummvm-cvs-logs] CVS: scummvm/gob dataio.cpp,1.7,1.8 dataio.h,1.5,1.6 global.cpp,1.5,1.6 global.h,1.4,1.5 gob.cpp,1.13,1.14 inter.cpp,1.18,1.19
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17315/sky
Modified Files:
compact.cpp compact.h disk.cpp disk.h
Log Message:
Moved class File and the MD5 stuff to namespace Common
Index: compact.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compact.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- compact.cpp 20 Feb 2005 18:33:36 -0000 1.35
+++ compact.cpp 10 May 2005 22:56:18 -0000 1.36
@@ -118,7 +118,7 @@
#define TURNTABLE_SIZE (sizeof(turnTableOffsets)/sizeof(uint32))
SkyCompact::SkyCompact(void) {
- _cptFile = new File();
+ _cptFile = new Common::File();
if (!_cptFile->open("sky.cpt")) {
GUI::MessageDialog dialog("Unable to find \"sky.cpt\" file!\n"
"Please download it from www.scummvm.org", "OK", NULL);
Index: compact.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compact.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- compact.h 20 Feb 2005 18:33:36 -0000 1.16
+++ compact.h 10 May 2005 22:56:18 -0000 1.17
@@ -26,7 +26,9 @@
#include "sky/struc.h"
#include "sky/skydefs.h"
-class File;
+namespace Common {
+ class File;
+}
enum CptIds {
CPT_JOEY = 1,
@@ -79,7 +81,7 @@
char ***_cptNames;
uint16 **_cptSizes;
uint16 **_cptTypes;
- File *_cptFile;
+ Common::File *_cptFile;
uint32 _resetDataPos;
};
Index: disk.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/disk.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- disk.cpp 11 Mar 2005 10:55:10 -0000 1.66
+++ disk.cpp 10 May 2005 22:56:19 -0000 1.67
@@ -41,8 +41,8 @@
Disk::Disk(const Common::String &gameDataPath) {
_prefRoot = NULL;
- _dataDiskHandle = new File();
- _dnrHandle = new File();
+ _dataDiskHandle = new Common::File();
+ _dnrHandle = new Common::File();
uint32 entriesRead;
@@ -404,14 +404,14 @@
void Disk::dumpFile(uint16 fileNr) {
char buf[128];
- File out;
+ Common::File out;
byte* filePtr;
filePtr = loadFile(fileNr);
sprintf(buf, "dumps/file-%d.dmp", fileNr);
if (!out.exists(buf, "")) {
- if (out.open(buf, File::kFileWriteMode, ""))
+ if (out.open(buf, Common::File::kFileWriteMode, ""))
out.write(filePtr, _lastLoadedFileSize);
}
free(filePtr);
Index: disk.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/disk.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- disk.h 11 Feb 2005 11:14:31 -0000 1.19
+++ disk.h 10 May 2005 22:56:19 -0000 1.20
@@ -27,7 +27,9 @@
#include "common/str.h"
#include "sky/rnc_deco.h"
-class File;
+namespace Common {
+ class File;
+}
namespace Sky {
@@ -73,8 +75,8 @@
uint32 _dinnerTableEntries;
uint8 *_dinnerTableArea;
- File *_dataDiskHandle;
- File *_dnrHandle;
+ Common::File *_dataDiskHandle;
+ Common::File *_dnrHandle;
RncDecoder _rncDecoder;
uint16 _buildList[MAX_FILES_IN_LIST];
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/sound audiostream.cpp,1.71,1.72 flac.cpp,1.7,1.8 flac.h,1.3,1.4 mixer.h,1.103,1.104 mp3.cpp,1.18,1.19 mp3.h,1.9,1.10 vorbis.cpp,1.22,1.23 vorbis.h,1.9,1.10
- Next message: [Scummvm-cvs-logs] CVS: scummvm/gob dataio.cpp,1.7,1.8 dataio.h,1.5,1.6 global.cpp,1.5,1.6 global.h,1.4,1.5 gob.cpp,1.13,1.14 inter.cpp,1.18,1.19
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list