Mercurial > mm7
diff mm7_4.cpp @ 398:7189d0bddf07
Слияние
author | Ritor1 |
---|---|
date | Sat, 23 Feb 2013 02:12:55 +0600 |
parents | 4a60371fd70c 39a60868e9c7 |
children | c0700eaabeb8 |
line wrap: on
line diff
--- a/mm7_4.cpp Sat Feb 23 02:12:36 2013 +0600 +++ b/mm7_4.cpp Sat Feb 23 02:12:55 2013 +0600 @@ -1165,7 +1165,7 @@ if ( !(v1->field_2 & 0x20) ) { v2 = &pDecorationList->pDecorations[v1->uDecorationDescID]; - if ( !(v2->uFlags & 1) ) + if (!v2->CanMoveThrough()) { v3 = v2->uRadius; v4 = v1->vPosition.x; @@ -1274,7 +1274,7 @@ if ( !(v5->field_2 & 0x20) ) { v6 = &pDecorationList->pDecorations[v5->uDecorationDescID]; - if ( !(v6->uFlags & 1) ) + if (!v6->CanMoveThrough()) { v7 = v6->uRadius; v8 = v5->vPosition.x; @@ -3562,7 +3562,7 @@ } else { - v25 = v21->pInventoryItems[_idx].uAdditionalValue; + v25 = v21->pInventoryItems[_idx].uSpecEnchantmentType; if ( v25 <= 50 ) { if ( v25 != 50 ) @@ -6173,6 +6173,7 @@ pColor2 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xECu, 0xE6u, 0x9Cu); pString = (char *)operator new(2 * pSize); strncpy(pString, ptr, pSize); + pString[pSize]=0; pFontQuick->_44D2FD_prolly_draw_credits_entry(pFontCChar, 0, a4, (signed __int16)pTexture2.uWidth, (signed __int16)pTexture2.uHeight, pColor1, pColor2, pString, pTexture2.pPixels, (signed __int16)pTexture2.uWidth); free(pString); @@ -9340,9 +9341,9 @@ { if ( v7->uItemID == 601 ) { - if ( !v7->field_1A ) + if ( !v7->uHolderPlayer ) v9 = v7; - if ( v7->field_1A == v5 ) + if ( v7->uHolderPlayer == v5 ) v10 = 1; } ++v7; @@ -9361,7 +9362,7 @@ return; } if ( v9 ) - v9->field_1A = v5; + v9->uHolderPlayer = v5; } } // 4F08EC: using guessed type int dword_4F08EC[];