diff options
| author | Max Horn | 2006-07-23 15:08:48 +0000 |
|---|---|---|
| committer | Max Horn | 2006-07-23 15:08:48 +0000 |
| commit | 4fcdbb93497d30de4c0fc606b3bbddeabdbb4746 (patch) | |
| tree | 9c6b98d81c004a191e0c00fa8651e02eab98e593 /engines | |
| parent | 602548cea32612c791ba1951e21f0bdc87ae616d (diff) | |
| download | scummvm-rg350-4fcdbb93497d30de4c0fc606b3bbddeabdbb4746.tar.gz scummvm-rg350-4fcdbb93497d30de4c0fc606b3bbddeabdbb4746.tar.bz2 scummvm-rg350-4fcdbb93497d30de4c0fc606b3bbddeabdbb4746.zip | |
String class usage cleanup
svn-id: r23582
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/gob/gob.cpp | 4 | ||||
| -rw-r--r-- | engines/kyra/resource.cpp | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/engines/gob/gob.cpp b/engines/gob/gob.cpp index 2629286b01..6d5841502b 100644 --- a/engines/gob/gob.cpp +++ b/engines/gob/gob.cpp @@ -47,6 +47,8 @@ #include "gob/util.h" #include "gob/music.h" +#include "sound/mididrv.h" + namespace Gob { enum { @@ -228,7 +230,7 @@ int GobEngine::init() { else error("GobEngine::init(): Unknown version of game engine"); if ((_features & Gob::GF_MAC) || (_features & Gob::GF_GOB1) || (_features & Gob::GF_GOB2)) { - if (ConfMan.get("music_driver") == "null") + if (MidiDriver::parseMusicDriver(ConfMan.get("music_driver")) == MD_NULL) _music = new Music_Dummy(this); else _music = new Music(this); diff --git a/engines/kyra/resource.cpp b/engines/kyra/resource.cpp index 12f671c770..e9b9e91508 100644 --- a/engines/kyra/resource.cpp +++ b/engines/kyra/resource.cpp @@ -373,12 +373,12 @@ uint32 PAKFile::getFileSize(const char* file) { bool PAKFile::openFile(Common::File &filehandle) { filehandle.close(); - if (!filehandle.open(_physfile == "" ? _filename : _physfile)) { + if (!filehandle.open(_physfile.empty() ? _filename : _physfile)) { debug(3, "couldn't open pakfile '%s'\n", _filename.c_str()); return false; } - if (_physfile != "") { + if (!_physfile.empty()) { filehandle.seek(_physOffset, SEEK_CUR); } |