[Scummvm-cvs-logs] SF.net SVN: scummvm: [31289] scummvm/trunk/engines
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Fri Mar 28 09:31:57 CET 2008
Revision: 31289
http://scummvm.svn.sourceforge.net/scummvm/?rev=31289&view=rev
Author: fingolfin
Date: 2008-03-28 01:30:42 -0700 (Fri, 28 Mar 2008)
Log Message:
-----------
cleanup
Modified Paths:
--------------
scummvm/trunk/engines/kyra/resource.cpp
scummvm/trunk/engines/parallaction/disk_ns.cpp
scummvm/trunk/engines/scumm/file.cpp
scummvm/trunk/engines/scumm/file.h
Modified: scummvm/trunk/engines/kyra/resource.cpp
===================================================================
--- scummvm/trunk/engines/kyra/resource.cpp 2008-03-28 06:06:11 UTC (rev 31288)
+++ scummvm/trunk/engines/kyra/resource.cpp 2008-03-28 08:30:42 UTC (rev 31289)
@@ -374,7 +374,7 @@
return loader->loadFileFromArchive(file, parent, iter->_value);
} else {
Common::File *stream = new Common::File();
- if (!stream->open(file.c_str())) {
+ if (!stream->open(file)) {
warning("Couldn't open file '%s'", file.c_str());
return 0;
}
Modified: scummvm/trunk/engines/parallaction/disk_ns.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/disk_ns.cpp 2008-03-28 06:06:11 UTC (rev 31288)
+++ scummvm/trunk/engines/parallaction/disk_ns.cpp 2008-03-28 08:30:42 UTC (rev 31289)
@@ -70,12 +70,9 @@
if (_archive.isOpen())
close();
- char path[PATH_LEN];
+ if (!_archive.open(file))
+ error("archive '%s' not found", file);
- strcpy(path, file);
- if (!_archive.open(path))
- error("archive '%s' not found", path);
-
_archiveName = file;
bool isSmallArchive = false;
Modified: scummvm/trunk/engines/scumm/file.cpp
===================================================================
--- scummvm/trunk/engines/scumm/file.cpp 2008-03-28 06:06:11 UTC (rev 31288)
+++ scummvm/trunk/engines/scumm/file.cpp 2008-03-28 08:30:42 UTC (rev 31289)
@@ -229,13 +229,10 @@
return 2;
}
-ScummDiskImage::ScummDiskImage(const char *disk1, const char *disk2, GameSettings game) : _stream(0), _buf(0) {
- _disk1 = disk1;
- _disk2 = disk2;
- _game = game;
+ScummDiskImage::ScummDiskImage(const char *disk1, const char *disk2, GameSettings game)
+ : _stream(0), _buf(0), _game(game),
+ _disk1(disk1), _disk2(disk2), _openedDisk(0) {
- _openedDisk = 0;
-
if (_game.id == GID_MANIAC) {
_numGlobalObjects = 256;
_numRooms = 55;
@@ -285,9 +282,9 @@
File::close();
if (num == 1)
- File::open(_disk1.c_str());
+ File::open(_disk1);
else if (num == 2)
- File::open(_disk2.c_str());
+ File::open(_disk2);
else {
error("ScummDiskImage::open(): wrong disk (%c)", num);
return false;
@@ -468,17 +465,14 @@
extractResource(&out, res);
- if (_stream)
- delete _stream;
-
+ delete _stream;
_stream = new Common::MemoryReadStream(_buf, bufsize);
return true;
}
void ScummDiskImage::close() {
- if (_stream)
- delete _stream;
+ delete _stream;
_stream = 0;
free(_buf);
Modified: scummvm/trunk/engines/scumm/file.h
===================================================================
--- scummvm/trunk/engines/scumm/file.h 2008-03-28 06:06:11 UTC (rev 31288)
+++ scummvm/trunk/engines/scumm/file.h 2008-03-28 08:30:42 UTC (rev 31289)
@@ -77,9 +77,9 @@
byte *_buf;
- GameSettings _game;
+ const GameSettings _game;
- Common::String _disk1, _disk2;
+ const Common::String _disk1, _disk2;
int _openedDisk;
int _numGlobalObjects;
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