# HG changeset patch # User Grumpy7 # Date 1369684603 -7200 # Node ID 3395579f6c4dc0c643eccab1259056c7f8ef49a8 # Parent 3b3a0e9aeace4639e474e48e251344b2f9390bb2 stru6_stru1_indoor_sw_billboard destructor fix, removing "extern" from struct definition, fixing probable typo in SPELL_AIR_SPARKS diff -r 3b3a0e9aeace -r 3395579f6c4d mm7_6.cpp --- a/mm7_6.cpp Mon May 27 21:42:09 2013 +0200 +++ b/mm7_6.cpp Mon May 27 21:56:43 2013 +0200 @@ -3915,7 +3915,7 @@ pObjectList->pObjects[(signed __int16)pSpellSprite.uObjectDescID].uSpeed, pCastSpell->uPlayerID + 1) != -1 && pParty->bTurnBasedModeOn == 1 ) - + +pTurnEngine->field_1C; + ++pTurnEngine->field_1C; v188 += _v726 / (amount - 1); } LODWORD(v727) = 1; diff -r 3b3a0e9aeace -r 3395579f6c4d mm7_data.h --- a/mm7_data.h Mon May 27 21:42:09 2013 +0200 +++ b/mm7_data.h Mon May 27 21:56:43 2013 +0200 @@ -1022,7 +1022,7 @@ extern int terrain_76DFC8[128]; extern int terrain_76E1C8[128]; extern int terrain_76E3C8[128]; -extern struct unk_F7B60C +struct unk_F7B60C { int some_data_ptr; // dword @ 000000 float flt_000004; diff -r 3b3a0e9aeace -r 3395579f6c4d stru6.cpp --- a/stru6.cpp Mon May 27 21:42:09 2013 +0200 +++ b/stru6.cpp Mon May 27 21:56:43 2013 +0200 @@ -27,6 +27,18 @@ +//----- (004775C4) -------------------------------------------------------- +stru6_stru1_indoor_sw_billboard::~stru6_stru1_indoor_sw_billboard() +{ + if (pArray1) + delete [] pArray1; + pArray1 = nullptr; + + if (pArray2) + delete [] pArray2; + pArray2 = nullptr; +} + //----- (00478211) -------------------------------------------------------- void stru6_stru1_indoor_sw_billboard::Initialize(int a2) diff -r 3b3a0e9aeace -r 3395579f6c4d stru6.h --- a/stru6.h Mon May 27 21:42:09 2013 +0200 +++ b/stru6.h Mon May 27 21:56:43 2013 +0200 @@ -17,16 +17,7 @@ } //----- (004775C4) -------------------------------------------------------- - virtual ~stru6_stru1_indoor_sw_billboard() - { - if (pArray1) - delete [] pArray1; - pArray1 = nullptr; - - if (pArray2) - delete [] pArray2; - pArray2 = nullptr; - } + virtual ~stru6_stru1_indoor_sw_billboard(); int _4775ED(float a2); int _477927(float a2);