Mercurial > mm7

comparison Level/Decoration.cpp @ 1495:990fadbaac18

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cleanup of LevelDecoration. (2)
author yoctozepto
date Sun, 01 Sep 2013 11:57:07 +0200
parents 480b09200f88
children ee5c98a437d9
comparison
equal deleted inserted replaced
1494:3efe35df79c3 1495:990fadbaac18
117 bool LevelDecoration::IsObeliskChestActive() 117 bool LevelDecoration::IsObeliskChestActive()
118 { 118 {
119 //bool v1; // ebx@1 119 //bool v1; // ebx@1
120 //LevelDecoration *v2; // edi@1 120 //LevelDecoration *v2; // edi@1
121 121
122 static const std::array<const PARTY_QUEST_BITS, 14> aObeliskQuests = {
123 PARTY_QUEST_OBELISK_HARMONDALE,
124 PARTY_QUEST_OBELISK_ERATHIA,
125 PARTY_QUEST_OBELISK_TULAREAN_FOREST,
126 PARTY_QUEST_OBELISK_DEYJA,
127 PARTY_QUEST_OBELISK_BRACADA_DESERT,
128 PARTY_QUEST_OBELISK_CELESTE,
129 PARTY_QUEST_OBELISK_THE_PIT,
130 PARTY_QUEST_OBELISK_EVENMORN_ISLAND,
131 PARTY_QUEST_OBELISK_MOUNT_NIGHON,
132 PARTY_QUEST_OBELISK_BARROW_DOWNS,
133 PARTY_QUEST_OBELISK_LAND_OF_THE_GIANTS,
134 PARTY_QUEST_OBELISK_TATALIA,
135 PARTY_QUEST_OBELISK_AVLEE,
136 PARTY_QUEST_OBELISK_STONE_CITY
137 };
138
122 if (pParty->uCurrentHour == 0 139 if (pParty->uCurrentHour == 0
123 && !_449B57_test_bit(pParty->_quest_bits, 178) 140 && !TestPartyQuestBit(PARTY_QUEST_OBELISK_TREASURE_FOUND)
124 && _449B57_test_bit(pParty->_quest_bits, 164) 141 && std::all_of(aObeliskQuests.begin(), aObeliskQuests.end(), TestPartyQuestBit))
125 && _449B57_test_bit(pParty->_quest_bits, 165)
126 && _449B57_test_bit(pParty->_quest_bits, 166)
127 && _449B57_test_bit(pParty->_quest_bits, 167)
128 && _449B57_test_bit(pParty->_quest_bits, 168)
129 && _449B57_test_bit(pParty->_quest_bits, 169)
130 && _449B57_test_bit(pParty->_quest_bits, 170)
131 && _449B57_test_bit(pParty->_quest_bits, 171)
132 && _449B57_test_bit(pParty->_quest_bits, 172)
133 && _449B57_test_bit(pParty->_quest_bits, 173)
134 && _449B57_test_bit(pParty->_quest_bits, 174)
135 && _449B57_test_bit(pParty->_quest_bits, 175)
136 && _449B57_test_bit(pParty->_quest_bits, 176)
137 && _449B57_test_bit(pParty->_quest_bits, 177))
138 { 142 {
139 this->uFlags &= ~LEVEL_DECORATION_INVISIBLE; 143 this->uFlags &= ~LEVEL_DECORATION_INVISIBLE;
140 return true; 144 return true;
141 } 145 }
142 146