[Scummvm-cvs-logs] scummvm master -> e2c006f7935df5f6e1c37c62b5104d4e24ab4b61
wjp
wjp at usecode.org
Wed Dec 28 20:02:16 CET 2011
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
e2c006f793 DREAMWEB: Remove global file handle
Commit: e2c006f7935df5f6e1c37c62b5104d4e24ab4b61
https://github.com/scummvm/scummvm/commit/e2c006f7935df5f6e1c37c62b5104d4e24ab4b61
Author: Max Horn (max at quendi.de)
Date: 2011-12-28T10:59:53-08:00
Commit Message:
DREAMWEB: Remove global file handle
Changed paths:
engines/dreamweb/dreamweb.cpp
engines/dreamweb/dreamweb.h
engines/dreamweb/stubs.cpp
diff --git a/engines/dreamweb/dreamweb.cpp b/engines/dreamweb/dreamweb.cpp
index f942b84..e790baa 100644
--- a/engines/dreamweb/dreamweb.cpp
+++ b/engines/dreamweb/dreamweb.cpp
@@ -54,7 +54,6 @@ DreamWebEngine::DreamWebEngine(OSystem *syst, const DreamWebGameDescription *gam
_console = 0;
DebugMan.addDebugChannel(kDebugAnimation, "Animation", "Animation Debug Flag");
DebugMan.addDebugChannel(kDebugSaveLoad, "SaveLoad", "Track Save/Load Function");
- _inSaveFile = 0;
_speed = 1;
_turbo = false;
_oldMouseState = 0;
@@ -387,43 +386,6 @@ void DreamWebEngine::setSpeed(uint speed) {
_timer->installTimerProc(vSyncInterrupt, 1000000 / 70 / speed, this, "dreamwebVSync");
}
-void DreamWebEngine::openFile(const Common::String &name) {
- processEvents();
- closeFile();
- if (_file.open(name))
- return;
- // File not found? See if there is a save state with this name
- // FIXME: Is this really needed? If yes, document why; if not,
- // remove all traces of _inSaveFile.
- _inSaveFile = _saveFileMan->openForLoading(name);
- if (_inSaveFile)
- return;
- error("cannot open file %s", name.c_str());
-}
-
-uint32 DreamWebEngine::skipBytes(uint32 bytes) {
- if (!_file.seek(bytes, SEEK_CUR))
- error("seek failed");
- return _file.pos();
-}
-
-uint32 DreamWebEngine::readFromFile(uint8 *dst, unsigned size) {
- processEvents();
- if (_file.isOpen())
- return _file.read(dst, size);
- if (_inSaveFile)
- return _inSaveFile->read(dst, size);
- error("file was not opened (read before open)");
-}
-
-void DreamWebEngine::closeFile() {
- processEvents();
- if (_file.isOpen())
- _file.close();
- delete _inSaveFile;
- _inSaveFile = 0;
-}
-
Common::String DreamWebEngine::getSavegameFilename(int slot) const {
// TODO: Are saves from all versions of Dreamweb compatible with each other?
// Then we can can consider keeping the filenames as DREAMWEB.Dnn.
diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h
index 5200a1b..a38c08f 100644
--- a/engines/dreamweb/dreamweb.h
+++ b/engines/dreamweb/dreamweb.h
@@ -127,11 +127,6 @@ public:
uint8 randomNumber() { return _rnd.getRandomNumber(255); }
- void openFile(const Common::String &name);
- uint32 readFromFile(uint8 *data, unsigned size);
- uint32 skipBytes(uint32 bytes);
- void closeFile();
-
void mouseCall(uint16 *x, uint16 *y, uint16 *state); //fill mouse pos and button state
void processEvents();
void blit(const uint8 *src, int pitch, int x, int y, int w, int h);
@@ -168,9 +163,6 @@ private:
const DreamWebGameDescription *_gameDescription;
Common::RandomSource _rnd;
- Common::File _file;
- Common::InSaveFile *_inSaveFile;
-
uint _speed;
bool _turbo;
uint _oldMouseState;
@@ -806,15 +798,14 @@ public:
void allocateBuffers();
void loadTextFile(TextFile &file, const char *fileName);
void loadGraphicsFile(GraphicsFile &file, const char *fileName);
- void loadGraphicsSegment(GraphicsFile &file, unsigned int len);
- void loadTextSegment(TextFile &file, unsigned int len);
+ void loadGraphicsSegment(GraphicsFile &file, Common::File &inFile, unsigned int len);
+ void loadTextSegment(TextFile &file, Common::File &inFile, unsigned int len);
void loadIntoTemp(const char *fileName);
void loadIntoTemp2(const char *fileName);
void loadIntoTemp3(const char *fileName);
void loadTempCharset(const char *fileName);
void loadTravelText();
void loadTempText(const char *fileName);
- void clearAndLoad(uint8 *buf, uint8 c, unsigned int size, unsigned int maxSize);
void sortOutMap();
void loadRoomData(const Room &room, bool skipDat);
void useTempCharset();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index afa8cc0..94518e8 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -794,21 +794,21 @@ void DreamWebEngine::loadGraphicsFile(GraphicsFile &file, const char *fileName)
f.read(file._data, sizeInBytes - kFrameBlocksize);
}
-void DreamWebEngine::loadGraphicsSegment(GraphicsFile &file, unsigned int len) {
+void DreamWebEngine::loadGraphicsSegment(GraphicsFile &file, Common::File &inFile, unsigned int len) {
assert(len >= kFrameBlocksize);
delete[] file._data;
file._data = new uint8[len - kFrameBlocksize];
- readFromFile((uint8 *)file._frames, kFrameBlocksize);
- readFromFile(file._data, len - kFrameBlocksize);
+ inFile.read((uint8 *)file._frames, kFrameBlocksize);
+ inFile.read(file._data, len - kFrameBlocksize);
}
-void DreamWebEngine::loadTextSegment(TextFile &file, unsigned int len) {
- unsigned int headerSize = 2 * file._size;
+void DreamWebEngine::loadTextSegment(TextFile &file, Common::File &inFile, unsigned int len) {
+ const uint headerSize = 2 * file._size;
assert(len >= headerSize);
delete[] file._text;
file._text = new char[len - headerSize];
- readFromFile((uint8 *)file._offsetsLE, headerSize);
- readFromFile((uint8 *)file._text, len - headerSize);
+ inFile.read((uint8 *)file._offsetsLE, headerSize);
+ inFile.read((uint8 *)file._text, len - headerSize);
}
void DreamWebEngine::loadIntoTemp(const char *fileName) {
@@ -2043,22 +2043,15 @@ void DreamWebEngine::getRidOfAll() {
_freeDesc.clear();
}
-void DreamWebEngine::clearAndLoad(uint8 *buf, uint8 c,
- unsigned int size, unsigned int maxSize) {
- assert(size <= maxSize);
- memset(buf, c, maxSize);
- readFromFile(buf, size);
-}
-
// if skipDat, skip clearing and loading Setdat and Freedat
void DreamWebEngine::loadRoomData(const Room &room, bool skipDat) {
- const uint16 kSetdatlen = 64*128; // == sizeof(_setDat)
- const uint16 kFreedatlen = 16*80; // == sizeof(_freeDat)
-
- openFile(room.name);
+ processEvents();
+ Common::File file;
+ if (!file.open(room.name))
+ error("cannot open file %s", room.name);
FileHeader header;
- readFromFile((uint8 *)&header, sizeof(FileHeader));
+ file.read((uint8 *)&header, sizeof(FileHeader));
// read segment lengths from room file header
int len[15];
@@ -2067,47 +2060,58 @@ void DreamWebEngine::loadRoomData(const Room &room, bool skipDat) {
assert(len[0] >= 192);
_backdropBlocks = new uint8[len[0] - 192];
- readFromFile((uint8 *)_backdropFlags, 192);
- readFromFile(_backdropBlocks, len[0] - 192);
+ file.read((uint8 *)_backdropFlags, 192);
+ file.read(_backdropBlocks, len[0] - 192);
+
+ assert(len[1] <= 132*66); // 132*66 = maplen
+ memset(workspace(), 0, 132*66);
+ file.read(workspace(), len[1]);
- clearAndLoad(workspace(), 0, len[1], 132*66); // 132*66 = maplen
sortOutMap();
- loadGraphicsSegment(_setFrames, len[2]);
- if (!skipDat)
- clearAndLoad((uint8 *)_setDat, 255, len[3], kSetdatlen);
- else
- skipBytes(len[3]);
+ loadGraphicsSegment(_setFrames, file, len[2]);
+ if (!skipDat) {
+ const uint16 kSetdatlen = 64*128;
+ assert(len[3] <= kSetdatlen);
+ memset(_setDat, 255, kSetdatlen);
+ file.read(_setDat, len[3]);
+ } else {
+ file.skip(len[3]);
+ }
// NB: The skipDat version of this function as called by restoreall
// had a 'call bloc' instead of 'call loadseg' for reel1,
// but 'bloc' was not defined.
- loadGraphicsSegment(_reel1, len[4]);
- loadGraphicsSegment(_reel2, len[5]);
- loadGraphicsSegment(_reel3, len[6]);
+ loadGraphicsSegment(_reel1, file, len[4]);
+ loadGraphicsSegment(_reel2, file, len[5]);
+ loadGraphicsSegment(_reel3, file, len[6]);
// segment 7 consists of 36*38 pathNodes followed by 'reelList'
- readFromFile((uint8 *)_pathData, 36*sizeof(RoomPaths));
+ file.read((uint8 *)_pathData, 36*sizeof(RoomPaths));
unsigned int reelLen = len[7] - 36*sizeof(RoomPaths);
unsigned int reelCount = (reelLen + sizeof(Reel) - 1) / sizeof(Reel);
delete[] _reelList;
_reelList = new Reel[reelCount];
- readFromFile((uint8 *)_reelList, reelLen);
+ file.read((uint8 *)_reelList, reelLen);
// segment 8 consists of 12 personFrames followed by a TextFile
- readFromFile((uint8 *)_personFramesLE, 24);
- loadTextSegment(_personText, len[8] - 24);
-
- loadTextSegment(_setDesc, len[9]);
- loadTextSegment(_blockDesc, len[10]);
- loadTextSegment(_roomDesc, len[11]);
- loadGraphicsSegment(_freeFrames, len[12]);
- if (!skipDat)
- clearAndLoad((uint8 *)_freeDat, 255, len[13], kFreedatlen);
- else
- skipBytes(len[13]);
- loadTextSegment(_freeDesc, len[14]);
+ file.read((uint8 *)_personFramesLE, 24);
+ loadTextSegment(_personText, file, len[8] - 24);
+
+ loadTextSegment(_setDesc, file, len[9]);
+ loadTextSegment(_blockDesc, file, len[10]);
+ loadTextSegment(_roomDesc, file, len[11]);
+ loadGraphicsSegment(_freeFrames, file, len[12]);
+ if (!skipDat) {
+ const uint16 kFreedatlen = 16*80;
+ assert(len[13] <= kFreedatlen);
+ memset(_freeDat, 255, kFreedatlen);
+ file.read(_freeDat, len[13]);
+ } else {
+ file.skip(len[13]);
+ }
+ loadTextSegment(_freeDesc, file, len[14]);
- closeFile();
+ processEvents();
}
void DreamWebEngine::restoreAll() {
@@ -2122,25 +2126,28 @@ void DreamWebEngine::restoreReels() {
const Room &room = g_roomData[_realLocation];
- openFile(room.name);
+ processEvents();
+ Common::File file;
+ if (!file.open(room.name))
+ error("cannot open file %s", room.name);
FileHeader header;
- readFromFile((uint8 *)&header, sizeof(FileHeader));
+ file.read((uint8 *)&header, sizeof(FileHeader));
// read segment lengths from room file header
int len[15];
for (int i = 0; i < 15; ++i)
len[i] = header.len(i);
- skipBytes(len[0]);
- skipBytes(len[1]);
- skipBytes(len[2]);
- skipBytes(len[3]);
- loadGraphicsSegment(_reel1, len[4]);
- loadGraphicsSegment(_reel2, len[5]);
- loadGraphicsSegment(_reel3, len[6]);
+ file.skip(len[0]);
+ file.skip(len[1]);
+ file.skip(len[2]);
+ file.skip(len[3]);
+ loadGraphicsSegment(_reel1, file, len[4]);
+ loadGraphicsSegment(_reel2, file, len[5]);
+ loadGraphicsSegment(_reel3, file, len[6]);
- closeFile();
+ processEvents();
}
void DreamWebEngine::showExit() {
More information about the Scummvm-git-logs
mailing list