Mercurial > mm7
comparison UI/Books/UISpellBook.cpp @ 1465:090ff42290c4
Слияние
author | Ritor1 |
---|---|
date | Mon, 26 Aug 2013 10:39:24 +0600 |
parents | ff2118028c71 |
children | c4ab816fcc5e |
comparison
equal
deleted
inserted
replaced
1464:b870630761df | 1465:090ff42290c4 |
---|---|
95 pRenderer->ClearZBuffer(0, 479); | 95 pRenderer->ClearZBuffer(0, 479); |
96 if ( (11 * player->lastOpenedSpellbookPage) || ((11 * player->lastOpenedSpellbookPage) + 11) )//??? maybe structure need fix | 96 if ( (11 * player->lastOpenedSpellbookPage) || ((11 * player->lastOpenedSpellbookPage) + 11) )//??? maybe structure need fix |
97 { | 97 { |
98 for ( uint i = 1; i <= 11; ++i ) | 98 for ( uint i = 1; i <= 11; ++i ) |
99 { | 99 { |
100 if (player->_guilds_member_bits[(11 * player->lastOpenedSpellbookPage) + i + 63] ) | 100 if (player->_achieved_awards_bits[(11 * player->lastOpenedSpellbookPage) + i + 63] ) |
101 { | 101 { |
102 if ( SBPageSSpellsTextureList[i] != PendingTexture ) | 102 if ( SBPageSSpellsTextureList[i] != PendingTexture ) |
103 { | 103 { |
104 if ( quick_spell_at_page == i ) | 104 if ( quick_spell_at_page == i ) |
105 pTexture = SBPageCSpellsTextureList[i]; | 105 pTexture = SBPageCSpellsTextureList[i]; |