Mercurial > mm7
diff Items.cpp @ 1590:5792fdafe2f5
Слияние
author | Ritor1 |
---|---|
date | Wed, 11 Sep 2013 09:39:09 +0600 |
parents | 75fafd8ced59 |
children | c58916c53d8e |
line wrap: on
line diff
--- a/Items.cpp Wed Sep 11 09:23:41 2013 +0600 +++ b/Items.cpp Wed Sep 11 09:39:09 2013 +0600 @@ -6,7 +6,6 @@ #include "Items.h" #include "MapInfo.h" -#include "Allocator.h" #include "GUIWindow.h" #include "Events2D.h" #include "Chest.h" @@ -281,27 +280,27 @@ void ItemsTable::Release() { if ( pMonstersTXT_Raw ) - pAllocator->FreeChunk(pMonstersTXT_Raw); + free(pMonstersTXT_Raw); if ( pMonsterPlacementTXT_Raw ) - pAllocator->FreeChunk(pMonsterPlacementTXT_Raw); + free(pMonsterPlacementTXT_Raw); if ( pSkillDescTXT_Raw ) - pAllocator->FreeChunk(pSkillDescTXT_Raw); + free(pSkillDescTXT_Raw); if (pSpcItemsTXT_Raw ) - pAllocator->FreeChunk(pSpcItemsTXT_Raw); + free(pSpcItemsTXT_Raw); if ( pStdItemsTXT_Raw ) - pAllocator->FreeChunk(pStdItemsTXT_Raw); + free(pStdItemsTXT_Raw); if ( pRndItemsTXT_Raw ) - pAllocator->FreeChunk(pRndItemsTXT_Raw); + free(pRndItemsTXT_Raw); if ( pItemsTXT_Raw ) - pAllocator->FreeChunk(pItemsTXT_Raw); + free(pItemsTXT_Raw); if ( pHostileTXT_Raw ) - pAllocator->FreeChunk(pHostileTXT_Raw); + free(pHostileTXT_Raw); if ( pHistoryTXT_Raw ) - pAllocator->FreeChunk(pHistoryTXT_Raw); + free(pHistoryTXT_Raw); if ( pPotionsTXT_Raw ) - pAllocator->FreeChunk(pPotionsTXT_Raw); + free(pPotionsTXT_Raw); if ( pPotionNotesTXT_Raw ) - pAllocator->FreeChunk(pPotionNotesTXT_Raw); + free(pPotionNotesTXT_Raw); pSpcItemsTXT_Raw = NULL; pSkillDescTXT_Raw = NULL; pStdItemsTXT_Raw = NULL; @@ -1050,7 +1049,7 @@ if ( pRndItemsTXT_Raw ) { - pAllocator->FreeChunk(pRndItemsTXT_Raw); + free(pRndItemsTXT_Raw); pRndItemsTXT_Raw = NULL; } @@ -1285,7 +1284,7 @@ unsigned __int8 potion_value; if ( pPotionsTXT_Raw ) - pAllocator->FreeChunk(pPotionsTXT_Raw); + free(pPotionsTXT_Raw); pPotionsTXT_Raw = NULL; pPotionsTXT_Raw = (char *)pEvents_LOD->LoadRaw("potion.txt", 0); test_string = strtok(pPotionsTXT_Raw,"\t\r\n"); @@ -1352,7 +1351,7 @@ } if ( pPotionsTXT_Raw ) { - pAllocator->FreeChunk(pPotionsTXT_Raw); + free(pPotionsTXT_Raw); pPotionsTXT_Raw = 0; } } @@ -1368,7 +1367,7 @@ unsigned __int8 potion_note; if ( pPotionNotesTXT_Raw ) - pAllocator->FreeChunk(pPotionNotesTXT_Raw); + free(pPotionNotesTXT_Raw); pPotionNotesTXT_Raw = NULL; pPotionNotesTXT_Raw = (char *)pEvents_LOD->LoadRaw("potnotes.txt", 0); test_string = strtok(pPotionNotesTXT_Raw ,"\t\r\n"); @@ -1599,7 +1598,7 @@ v5 = this; if (!out_item) - out_item = (ItemGen *)pAllocator->AllocNamedChunk(out_item, sizeof(*out_item), "newItemGen"); + out_item = (ItemGen *)malloc(sizeof(ItemGen)); memset(out_item, 0, sizeof(*out_item));