Mercurial > mm7
diff Chest.cpp @ 1028:fbde7d8fcdb1
Merge
author | Nomad |
---|---|
date | Tue, 21 May 2013 11:24:35 +0200 |
parents | 9ac94d00012e |
children | d48c762de563 |
line wrap: on
line diff
--- a/Chest.cpp Tue May 21 11:24:26 2013 +0200 +++ b/Chest.cpp Tue May 21 11:24:35 2013 +0200 @@ -1,13 +1,14 @@ #include <stdio.h> #include <assert.h> +#include "BSPModel.h" +#include "Items.h" #include "Chest.h" #include "FrameTableInc.h" #include "Allocator.h" #include "LOD.h" #include "MapInfo.h" #include "Actor.h" -#include "Indoor.h" #include "Outdoor.h" #include "DecorationList.h" #include "Party.h" @@ -17,10 +18,10 @@ #include "ObjectList.h" #include "GUIWindow.h" #include "Time.h" -#include "Overlays.h" #include "mm7_data.h" #include "MM7.h" +#include "SpriteObject.h" @@ -347,7 +348,7 @@ if ( !areWeLoadingTexture ) { item_texture->Release(); - pIcons_LOD->_40F9C5(); + pIcons_LOD->SyncLoadedFilesCount(); } if ( (texture_cell_width + test_cell_position % chest_cell_width <= chest_cell_width) && (texture_cell_height + test_cell_position / chest_cell_width <= chest_cell_heght) ) @@ -475,7 +476,7 @@ if ( !areWeLoadingTexture ) { ((Texture *)v9)->Release(); - pIcons_LOD->_40F9C5(); + pIcons_LOD->SyncLoadedFilesCount(); } if ( v13 > 0 ) { @@ -550,7 +551,7 @@ if ( !areWeLoadingTexture ) { v8->Release(); - pIcons_LOD->_40F9C5(); + pIcons_LOD->SyncLoadedFilesCount(); } chest_cell_width = pChestWidthsByType[pChests[ uChestID].uChestBitmapID]; chest_cell_row_pos = 0; @@ -787,7 +788,7 @@ if ( !areWeLoadingTexture ) { v5->Release(); - pIcons_LOD->_40F9C5(); + pIcons_LOD->SyncLoadedFilesCount(); v10 = v21; } if ( v10 > 0 )