Mercurial > mm7
diff Level/Decoration.cpp @ 1489:a27cdb3d753e
Cleanup of LevelDecoration and related.
author | yoctozepto |
---|---|
date | Thu, 29 Aug 2013 22:22:33 +0200 |
parents | 61451d5980bf |
children | 6d21ef91cb2d |
line wrap: on
line diff
--- a/Level/Decoration.cpp Fri Aug 30 01:49:29 2013 +0600 +++ b/Level/Decoration.cpp Thu Aug 29 22:22:33 2013 +0200 @@ -7,33 +7,25 @@ //----- (004583B0) -------------------------------------------------------- LevelDecoration::LevelDecoration() { - this->field_1A = 0; - this->field_18 = 0; - this->vPosition.z = 0; - this->vPosition.y = 0; - this->vPosition.x = 0; - this->uDecorationDescID = 0; - this->field_2 = 0; - this->field_16_event_id = 0; - this->uCog = 0; + memset(this, 0, sizeof(this)); } //----- (00450929) -------------------------------------------------------- int LevelDecoration::GetGlobalEvent() { - LevelDecoration *v1; // esi@1 - signed int v2; // eax@1 - int v3; // eax@5 - int v4; // eax@6 - int v5; // eax@7 - int v6; // eax@8 - int v7; // eax@9 - int result; // eax@14 - int v9; // eax@18 - int v10; // eax@19 - int v11; // eax@20 - int v12; // eax@21 - int v13; // eax@22 + //LevelDecoration *v1; // esi@1 + //signed int v2; // eax@1 + //int v3; // eax@5 + //int v4; // eax@6 + //int v5; // eax@7 + //int v6; // eax@8 + //int v7; // eax@9 + //int result; // eax@14 + //int v9; // eax@18 + //int v10; // eax@19 + //int v11; // eax@20 + //int v12; // eax@21 + //int v13; // eax@22 switch (uDecorationDescID) { @@ -144,11 +136,11 @@ && _449B57_test_bit(pParty->_quest_bits, 176) && _449B57_test_bit(pParty->_quest_bits, 177)) { - this->field_2 &= ~LEVEL_DECORATION_INVISIBLE; + this->uFlags &= ~LEVEL_DECORATION_INVISIBLE; return true; } - this->field_2 |= LEVEL_DECORATION_INVISIBLE; + this->uFlags |= LEVEL_DECORATION_INVISIBLE; return false; }