Mercurial > might-and-magic-trilogy

diff mm7_1.cpp @ 35:7022d20db19f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Tue, 16 Oct 2012 09:10:55 +0600
parents 93bf1d5f6a6d
children 916bec351934 bcc051713d20
line wrap: on
line diff
--- a/mm7_1.cpp	Tue Oct 16 09:10:39 2012 +0600
+++ b/mm7_1.cpp	Tue Oct 16 09:10:55 2012 +0600
@@ -64,10 +64,11 @@
 
 
 
-void __cdecl crt_deconstruct_ptr_6A0118()
+void __cdecl FreeSavegameThumbnails()
 {
   for (int i = 0; i < 40; ++i)
-    pAllocator->FreeChunk(pSavegameThumbnails[i].pPixels);
+    //pAllocator->FreeChunk(pSavegameThumbnails[i].pPixels);
+    pSavegameThumbnails[i].Release();
 }
 
 
@@ -5855,9 +5856,9 @@
         sprintfex(pTmpBuf2, pGlobalTXT_LocalizationStrings[471], pItemsTable->pItems[v23].pUnidentifiedName);
         ShowStatusBarString(pTmpBuf2, 2u);
         if ( v22->uItemID == 506 )
-          _449B7E_toggle_bit((char *)pParty->_award_bits, 184, 1u);
+          _449B7E_toggle_bit(pParty->_award_bits, 184, 1u);
         if ( v22->uItemID == 455 )
-          _449B7E_toggle_bit((char *)pParty->_award_bits, 185, 1u);
+          _449B7E_toggle_bit(pParty->_award_bits, 185, 1u);
         if ( !pParty->AddItem(v22) )
           pParty->SetHoldingItem(v22);
       }