diff options
| author | Nicola Mettifogo | 2007-09-19 08:40:12 +0000 |
|---|---|---|
| committer | Nicola Mettifogo | 2007-09-19 08:40:12 +0000 |
| commit | 258901bab96f0050385a9912c8ea0fe2a41b2d6f (patch) | |
| tree | a3ae8675b679c9f3b58ac8d97c79369502ea23c1 /engines/saga | |
| parent | a89694c0d61a75a960f5bec6c498659c988401cc (diff) | |
| download | scummvm-rg350-258901bab96f0050385a9912c8ea0fe2a41b2d6f.tar.gz scummvm-rg350-258901bab96f0050385a9912c8ea0fe2a41b2d6f.tar.bz2 scummvm-rg350-258901bab96f0050385a9912c8ea0fe2a41b2d6f.zip | |
Merged common/stdafx.h into common/scummsys.h. All referencing files have been updated.
svn-id: r28966
Diffstat (limited to 'engines/saga')
| -rw-r--r-- | engines/saga/saga.cpp | 6 | ||||
| -rw-r--r-- | engines/saga/saveload.cpp | 14 |
2 files changed, 10 insertions, 10 deletions
diff --git a/engines/saga/saga.cpp b/engines/saga/saga.cpp index 01a75f4af1..c9f4bd4da8 100644 --- a/engines/saga/saga.cpp +++ b/engines/saga/saga.cpp @@ -22,7 +22,7 @@ * $Id$ * */ -#include "common/stdafx.h" + #include "common/file.h" @@ -397,7 +397,7 @@ void SagaEngine::getExcuseInfo(int verb, const char *&textString, int &soundReso if (verb == _script->getVerbType(kVerbPickUp)) { textString = getTextString(kTextICantPickup); soundResourceId = RID_BOAR_VOICE_007; - } else + } else if (verb == _script->getVerbType(kVerbLookAt)) { textString = getTextString(kTextNothingSpecial); soundResourceId = RID_BOAR_VOICE_006; @@ -462,7 +462,7 @@ ColorId SagaEngine::KnownColor2ColorId(KnownColor knownColor) { break; case (kKnownColorWhite): colorId = kITEColorBrightWhite; - break; + break; case (kKnownColorBlack): colorId = kIHNMColorBlack; break; diff --git a/engines/saga/saveload.cpp b/engines/saga/saveload.cpp index 55089b4aea..b73a6fae28 100644 --- a/engines/saga/saveload.cpp +++ b/engines/saga/saveload.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/config-manager.h" #include "common/savefile.h" @@ -113,7 +113,7 @@ uint SagaEngine::getNewSaveSlotNumber() { void SagaEngine::fillSaveList() { assert(_saveMarks); - + int i; Common::InSaveFile *in; Common::StringList filenames; @@ -124,20 +124,20 @@ void SagaEngine::fillSaveList() { name = calcSaveFileName(MAX_SAVES); name[strlen(name) - 2] = '*'; name[strlen(name) - 1] = 0; - + memset(_saveMarks, false, MAX_SAVES * sizeof(bool)); //assume no savegames for this title filenames = _saveFileMan->listSavefiles(name); - + for (Common::StringList::iterator file = filenames.begin(); file != filenames.end(); file++){ //Obtain the last 2 digits of the filename, since they correspond to the save slot slot[0] = file->c_str()[file->size()-2]; slot[1] = file->c_str()[file->size()-1]; - + slotNum = atoi(slot); if (slotNum >= 0 && slotNum < MAX_SAVES) _saveMarks[slotNum] = true; //mark this slot as valid } - + _saveFilesMaxCount = 0; for (i = 0; i < MAX_SAVES; i++) { if (_saveMarks[i]) { @@ -291,7 +291,7 @@ void SagaEngine::load(const char *fileName) { if (_scene->currentChapterNumber() == 8) _interface->setMode(kPanelChapterSelection); if (getGameId() != GID_IHNM_DEMO) { - _music->play(_music->_songTable[_scene->getCurrentMusicTrack()], _scene->getCurrentMusicRepeat() ? MUSIC_LOOP : MUSIC_NORMAL); + _music->play(_music->_songTable[_scene->getCurrentMusicTrack()], _scene->getCurrentMusicRepeat() ? MUSIC_LOOP : MUSIC_NORMAL); } else { _music->play(3, MUSIC_LOOP); } |