Mercurial > mm7

comparison UI/UIRest.cpp @ 1477:7ef4b64f6329

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* LODFile::LoadBitmaps & LODFile::LoadIconsOrEvents are merged into LODFile::Load Added support for most of mm6 resources, placeholders for mm8 resources. Fixed few C4258
author Nomad
date Wed, 28 Aug 2013 18:43:07 +0200
parents e6908823897f
children c4ab816fcc5e
comparison
equal deleted inserted replaced
1475:d7720c1f1d3b 1477:7ef4b64f6329
58 uRestUI_FoodRequiredToRest -= 2; 58 uRestUI_FoodRequiredToRest -= 2;
59 if ( CheckHiredNPCSpeciality(Gypsy) ) 59 if ( CheckHiredNPCSpeciality(Gypsy) )
60 --uRestUI_FoodRequiredToRest; 60 --uRestUI_FoodRequiredToRest;
61 if ( uRestUI_FoodRequiredToRest < 1 ) 61 if ( uRestUI_FoodRequiredToRest < 1 )
62 uRestUI_FoodRequiredToRest = 1; 62 uRestUI_FoodRequiredToRest = 1;
63 if ( !_stricmp(pCurrentMapName.data(), "d29.blv") && _449B57_test_bit(pParty->_quest_bits, 98) ) 63 if ( !_stricmp(pCurrentMapName, "d29.blv") && _449B57_test_bit(pParty->_quest_bits, 98) )
64 uRestUI_FoodRequiredToRest = 0; 64 uRestUI_FoodRequiredToRest = 0;
65 65
66 ++pIcons_LOD->uTexturePacksCount; 66 ++pIcons_LOD->uTexturePacksCount;
67 if ( !pIcons_LOD->uNumPrevLoadedFiles ) 67 if ( !pIcons_LOD->uNumPrevLoadedFiles )
68 pIcons_LOD->uNumPrevLoadedFiles = pIcons_LOD->uNumLoadedFiles; 68 pIcons_LOD->uNumPrevLoadedFiles = pIcons_LOD->uNumLoadedFiles;