[Scummvm-cvs-logs] SF.net SVN: scummvm: [31396] scummvm/trunk/engines/kyra/gui_v2.cpp

[lordhoto at users.sourceforge.net]

Revision: 31396
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31396&view=rev
Author:   lordhoto
Date:     2008-04-04 19:24:43 -0700 (Fri, 04 Apr 2008)

Log Message:
-----------
Cleanup.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/gui_v2.cpp

Modified: scummvm/trunk/engines/kyra/gui_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/gui_v2.cpp	2008-04-05 02:22:11 UTC (rev 31395)
+++ scummvm/trunk/engines/kyra/gui_v2.cpp	2008-04-05 02:24:43 UTC (rev 31396)
@@ -1942,17 +1942,16 @@
 	updateAllMenuButtons();
 	_vm->_saveFileMan->removeSavefile(_vm->getSavegameFilename(_slotToDelete));
 	Common::Array<int>::iterator i = Common::find(_saveSlots.begin(), _saveSlots.end(), _slotToDelete);
-	int lastSlot = _slotToDelete;
 	while (i != _saveSlots.end()) {
 		++i;
 		if (i == _saveSlots.end())
 			break;
-		if (lastSlot + 1 != *i)
+		// We are only renaming all savefiles until we get some slots missing
+		if (*(i-1) != *i)
 			break;
 		Common::String oldName = _vm->getSavegameFilename(*i);
 		Common::String newName = _vm->getSavegameFilename(*i-1);
 		_vm->_saveFileMan->renameSavefile(oldName.c_str(), newName.c_str());
-		lastSlot = *i;
 	}	
 	_saveMenu.menuNameId = 9;
 	return 0;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.