Mercurial > mm7

comparison Level/Decoration.cpp @ 1489:a27cdb3d753e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cleanup of LevelDecoration and related.
author yoctozepto
date Thu, 29 Aug 2013 22:22:33 +0200
parents 61451d5980bf
children 6d21ef91cb2d
comparison
equal deleted inserted replaced
1488:f62e6d06acac 1489:a27cdb3d753e
5 #include "../mm7_data.h" // for _449B57_test_bit 5 #include "../mm7_data.h" // for _449B57_test_bit
6 6
7 //----- (004583B0) -------------------------------------------------------- 7 //----- (004583B0) --------------------------------------------------------
8 LevelDecoration::LevelDecoration() 8 LevelDecoration::LevelDecoration()
9 { 9 {
10 this->field_1A = 0; 10 memset(this, 0, sizeof(this));
11 this->field_18 = 0;
12 this->vPosition.z = 0;
13 this->vPosition.y = 0;
14 this->vPosition.x = 0;
15 this->uDecorationDescID = 0;
16 this->field_2 = 0;
17 this->field_16_event_id = 0;
18 this->uCog = 0;
19 } 11 }
20 12
21 //----- (00450929) -------------------------------------------------------- 13 //----- (00450929) --------------------------------------------------------
22 int LevelDecoration::GetGlobalEvent() 14 int LevelDecoration::GetGlobalEvent()
23 { 15 {
24 LevelDecoration *v1; // esi@1 16 //LevelDecoration *v1; // esi@1
25 signed int v2; // eax@1 17 //signed int v2; // eax@1
26 int v3; // eax@5 18 //int v3; // eax@5
27 int v4; // eax@6 19 //int v4; // eax@6
28 int v5; // eax@7 20 //int v5; // eax@7
29 int v6; // eax@8 21 //int v6; // eax@8
30 int v7; // eax@9 22 //int v7; // eax@9
31 int result; // eax@14 23 //int result; // eax@14
32 int v9; // eax@18 24 //int v9; // eax@18
33 int v10; // eax@19 25 //int v10; // eax@19
34 int v11; // eax@20 26 //int v11; // eax@20
35 int v12; // eax@21 27 //int v12; // eax@21
36 int v13; // eax@22 28 //int v13; // eax@22
37 29
38 switch (uDecorationDescID) 30 switch (uDecorationDescID)
39 { 31 {
40 case 0: case 1: 32 case 0: case 1:
41 case 2: case 3: 33 case 2: case 3:
142 && _449B57_test_bit(pParty->_quest_bits, 174) 134 && _449B57_test_bit(pParty->_quest_bits, 174)
143 && _449B57_test_bit(pParty->_quest_bits, 175) 135 && _449B57_test_bit(pParty->_quest_bits, 175)
144 && _449B57_test_bit(pParty->_quest_bits, 176) 136 && _449B57_test_bit(pParty->_quest_bits, 176)
145 && _449B57_test_bit(pParty->_quest_bits, 177)) 137 && _449B57_test_bit(pParty->_quest_bits, 177))
146 { 138 {
147 this->field_2 &= ~LEVEL_DECORATION_INVISIBLE; 139 this->uFlags &= ~LEVEL_DECORATION_INVISIBLE;
148 return true; 140 return true;
149 } 141 }
150 142
151 this->field_2 |= LEVEL_DECORATION_INVISIBLE; 143 this->uFlags |= LEVEL_DECORATION_INVISIBLE;
152 return false; 144 return false;
153 } 145 }
154 146
155 //----- (0044C2F4) -------------------------------------------------------- 147 //----- (0044C2F4) --------------------------------------------------------
156 bool LevelDecoration::IsInteractive() 148 bool LevelDecoration::IsInteractive()