ALL: sync with scummvm

This commit is contained in:
Pawel Kolodziejski 2011-06-09 11:17:15 +02:00
parent 0c962164d4
commit 7329a5d164
126 changed files with 2443 additions and 1679 deletions

View file

@ -359,8 +359,19 @@ void SaveLoadChooser::updateSaveList() {
}
// Fill the rest of the save slots with empty saves
int maximumSaveSlots = (*_plugin)->getMaximumSaveSlot();
#ifdef __DS__
// Low memory on the DS means too many save slots are impractical, so limit
// the maximum here.
if (maximumSaveSlots > 99) {
maximumSaveSlots = 99;
}
#endif
Common::String emptyDesc;
for (int i = curSlot; i <= (*_plugin)->getMaximumSaveSlot(); i++) {
for (int i = curSlot; i <= maximumSaveSlots; i++) {
saveNames.push_back(emptyDesc);
SaveStateDescriptor dummySave(i, "");
_saveList.push_back(dummySave);