diff options
| author | Max Horn | 2006-03-04 10:38:05 +0000 |
|---|---|---|
| committer | Max Horn | 2006-03-04 10:38:05 +0000 |
| commit | bb38ea2c17bc9f0de8f674db6a11f0c7af2c5ac7 (patch) | |
| tree | e7f79e0806e268dae30732fa17c67bd89741e2e5 /engines/scumm/he | |
| parent | bea9b5e7d05017fd0018e87ffb206357adcc430f (diff) | |
| download | scummvm-rg350-bb38ea2c17bc9f0de8f674db6a11f0c7af2c5ac7.tar.gz scummvm-rg350-bb38ea2c17bc9f0de8f674db6a11f0c7af2c5ac7.tar.bz2 scummvm-rg350-bb38ea2c17bc9f0de8f674db6a11f0c7af2c5ac7.zip | |
Renamed SubstResFileNames::winName and macName to almostGameID / expandedName (the old names were misleading; the new ones aren't great either :)
svn-id: r21062
Diffstat (limited to 'engines/scumm/he')
| -rw-r--r-- | engines/scumm/he/resource_he.cpp | 4 | ||||
| -rw-r--r-- | engines/scumm/he/sound_he.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/scumm/he/resource_he.cpp b/engines/scumm/he/resource_he.cpp index 0dc61f5366..3d99325db9 100644 --- a/engines/scumm/he/resource_he.cpp +++ b/engines/scumm/he/resource_he.cpp @@ -162,7 +162,7 @@ int Win32ResExtractor::extractResource_(const char *resType, char *resName, byte if (!_fileName[0]) { // We are running for the first time snprintf(_fileName, 256, "%s.he3", _vm->getBaseName()); - if (_vm->_substResFileName.winName != 0) { + if (_vm->_substResFileName.almostGameID != 0) { char buf1[128]; _vm->generateSubstResFileName(_fileName, buf1, sizeof(buf1)); @@ -1291,7 +1291,7 @@ int MacResExtractor::extractResource(int id, byte **buf) { int size; if (!_fileName[0]) // We are running for the first time - if (_vm->_substResFileName.winName != 0) { + if (_vm->_substResFileName.almostGameID != 0) { char buf1[128]; snprintf(buf1, 128, "%s.he3", _vm->getBaseName()); diff --git a/engines/scumm/he/sound_he.cpp b/engines/scumm/he/sound_he.cpp index 06736ab29a..07c7202009 100644 --- a/engines/scumm/he/sound_he.cpp +++ b/engines/scumm/he/sound_he.cpp @@ -161,7 +161,7 @@ void Sound::setupHEMusicFile() { sprintf(buf, "%s.he4", _vm->getBaseName()); - if (_vm->_substResFileName.winName != 0) { + if (_vm->_substResFileName.almostGameID != 0) { _vm->generateSubstResFileName(buf, buf1, sizeof(buf1)); strcpy(buf, buf1); } @@ -360,7 +360,7 @@ void Sound::playHESound(int soundID, int heOffset, int heChannel, int heFlags) { sprintf(buf, "%s.he4", _vm->getBaseName()); - if (_vm->_substResFileName.winName != 0) { + if (_vm->_substResFileName.almostGameID != 0) { _vm->generateSubstResFileName(buf, buf1, sizeof(buf1)); strcpy(buf, buf1); } |