Merged common/stdafx.h into common/scummsys.h. All referencing files have been updated.
svn-id: r28966
This commit is contained in:
parent
a89694c0d6
commit
258901bab9
693 changed files with 16240 additions and 3908 deletions
|
@ -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);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue