diff SaveLoad.cpp @ 466:91e1ba340f39

Слияние
author Ritor1
date Mon, 25 Feb 2013 09:09:08 +0600
parents a4a5996fea5b
children a3939d5067c4
line wrap: on
line diff
--- a/SaveLoad.cpp	Mon Feb 25 09:08:13 2013 +0600
+++ b/SaveLoad.cpp	Mon Feb 25 09:09:08 2013 +0600
@@ -85,7 +85,7 @@
         }
     }
 
-  sprintf(pTmpBuf, "saves\\%s", pSavegameList->pSavesNames[uSlot]);
+  sprintf(pTmpBuf, "saves\\%s", pSavegameList->pFileList[uSlot].pSaveFileName);
 
   pNew_LOD->CloseWriteFile();
   if (!CopyFileA(pTmpBuf, "data\\new.lod", 0))
@@ -196,7 +196,7 @@
 
   viewparams->bRedrawGameUI = true;
 
-  SetUserInterface(pParty->uAlignment, true);
+  SetUserInterface(pParty->alignment, true);
 
   pEventTimer->Resume();
   pEventTimer->StopGameTime();
@@ -671,12 +671,13 @@
 void SavegameList::Initialize(unsigned int bHideEmptySlots)
 {
     memset(pSavegameList, 0, 0x3138);
+ // Reset();
     uNumSavegameFiles = 0;
 
   _chdir("saves");
   {
     if (!bHideEmptySlots && _access(pGlobalTXT_LocalizationStrings[613], 0) != -1 ) // AutoSave.MM7
-      strcpy(pSavesNames[uNumSavegameFiles++], pGlobalTXT_LocalizationStrings[613]);
+      strcpy(pSavegameList->pFileList[uNumSavegameFiles++].pSaveFileName, pGlobalTXT_LocalizationStrings[613]);
 
     for (uint i = 0; i < 40; ++i)
     {
@@ -687,7 +688,7 @@
       uint idx = i;
       if (!bHideEmptySlots)
         idx = uNumSavegameFiles;
-      strcpy(pSavesNames[idx], pTmpBuf);
+      strcpy(pSavegameList->pFileList[idx].pSaveFileName, pTmpBuf);
 
       ++uNumSavegameFiles;
     }