Mercurial > mm7
diff mm7_5.cpp @ 396:4a60371fd70c
Слияние
author | Ritor1 |
---|---|
date | Fri, 22 Feb 2013 21:47:55 +0600 |
parents | edd2d8b7e3c4 |
children | 243418228760 |
line wrap: on
line diff
--- a/mm7_5.cpp Fri Feb 22 21:47:42 2013 +0600 +++ b/mm7_5.cpp Fri Feb 22 21:47:55 2013 +0600 @@ -2753,7 +2753,7 @@ //_set_status_string_pTmpBuf_and_continue: sub_41C0B8_set_status_string(pTmpBuf); continue; - case UIMSG_4F: + case UIMSG_SPellbook_ShowHightlightedSpellInfo: if ( !uActiveCharacter || (uNumSeconds = (unsigned int)pPlayers[uActiveCharacter], !*(char *)(uNumSeconds + 11 * *(char *)(uNumSeconds + 6734) + uMessageParam + 402)) ) continue; @@ -2907,17 +2907,12 @@ } } continue; - case UIMSG_8E: - if ( pTurnEngine->field_4 == 3 ) - continue; - v175 = 0; - v159 = 0; - v147 = 0; - //goto LABEL_678; - v80 = v199; - v79 = uMessageParam; - _42777D_CastSpell_UseWand_ShootArrow(v79, v80, v147, v159, v175); - continue; + + case UIMSG_CastSpellFromBook: + if ( pTurnEngine->field_4 != 3 ) + _42777D_CastSpell_UseWand_ShootArrow(uMessageParam, v199, 0, 0, 0); + continue; + case UIMSG_92: if ( pTurnEngine->field_4 != 3 ) { @@ -6278,8 +6273,8 @@ char pContainer[128]; // [sp+24h] [bp-14h]@12 uTextureID_MAGNIF_B = pIcons_LOD->LoadTexture("MAGNIF-B", TEXTURE_16BIT_PALETTE); - if ( !pParty->uAlignment || pParty->uAlignment == 1 || pParty->uAlignment == 2 ) - uTextureID_BACKDOLL = pIcons_LOD->LoadTexture("BACKDOLL", TEXTURE_16BIT_PALETTE); + //if ( !pParty->uAlignment || pParty->uAlignment == 1 || pParty->uAlignment == 2 ) + uTextureID_BACKDOLL = pIcons_LOD->LoadTexture("BACKDOLL", TEXTURE_16BIT_PALETTE); uTextureID_507B04 = uTextureID_right_panel; v30 = 0; uTextureID_BACKHAND = pIcons_LOD->LoadTexture("BACKHAND", TEXTURE_16BIT_PALETTE);