Mercurial > mm7

comparison GUIWindow.cpp @ 130:1c471f3629fb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Party expressions update
author Nomad
date Mon, 11 Feb 2013 19:40:49 +0200
parents b7ff791b1333
children 9b0d651821f1
comparison
equal deleted inserted replaced
122:48bea61a12a5 130:1c471f3629fb
196 v13 = pTexture_PlayerFaceEradicated; 196 v13 = pTexture_PlayerFaceEradicated;
197 else if (pPlayer->Dead()) 197 else if (pPlayer->Dead())
198 v13 = pTexture_PlayerFaceDead; 198 v13 = pTexture_PlayerFaceDead;
199 else 199 else
200 { 200 {
201 uFramesetID = pPlayerFrameTable->GetFrameIdBy_field0(pPlayer->uExpressionID); 201 uFramesetID = pPlayerFrameTable->GetFrameIdByExpression(pPlayer->expression);
202 if ( !uFramesetID ) 202 if ( !uFramesetID )
203 uFramesetID = 1; 203 uFramesetID = 1;
204 if ( pPlayer->uExpressionID == 21 ) 204 if ( pPlayer->expression == CHARACTER_EXPRESSION_21)
205 { 205 {
206 v15 = pPlayerFrameTable->GetFrameBy_y( 206 v15 = pPlayerFrameTable->GetFrameBy_y(
207 &pPlayer->field_1AA8, 207 &pPlayer->field_1AA8,
208 &pPlayer->field_1AA4, 208 &pPlayer->field_1AA4,
209 pMiscTimer->uTimeElapsed); 209 pMiscTimer->uTimeElapsed);
1882 v14 = sub_4466C4(v13); 1882 v14 = sub_4466C4(v13);
1883 if ( v14 == 1 || v14 == 2 ) 1883 if ( v14 == 1 || v14 == 2 )
1884 pWindow->CreateButton(0x1E0u, a4a++ * v11 + 130, 0x8Cu, v11, 1, 0, 0x88u, 0x13u, 0, "", 0); 1884 pWindow->CreateButton(0x1E0u, a4a++ * v11 + 130, 0x8Cu, v11, 1, 0, 0x88u, 0x13u, 0, "", 0);
1885 } 1885 }
1886 } 1886 }
1887 v15 = (void *)v12->evtb; 1887 v15 = (void *)v12->_anim_current_time;
1888 if ( v15 ) 1888 if ( v15 )
1889 { 1889 {
1890 if ( a4a < 4 ) 1890 if ( a4a < 4 )
1891 { 1891 {
1892 v16 = sub_4466C4(v15); 1892 v16 = sub_4466C4(v15);
1893 if ( v16 == 1 || v16 == 2 ) 1893 if ( v16 == 1 || v16 == 2 )
1894 pWindow->CreateButton(0x1E0u, a4a++ * v11 + 130, 0x8Cu, v11, 1, 0, 0x88u, 0x14u, 0, "", 0); 1894 pWindow->CreateButton(0x1E0u, a4a++ * v11 + 130, 0x8Cu, v11, 1, 0, 0x88u, 0x14u, 0, "", 0);
1895 } 1895 }
1896 } 1896 }
1897 v17 = (void *)v12->evtc; 1897 v17 = (void *)v12->_anim_end_time;
1898 if ( v17 ) 1898 if ( v17 )
1899 { 1899 {
1900 if ( a4a < 4 ) 1900 if ( a4a < 4 )
1901 { 1901 {
1902 v18 = sub_4466C4(v17); 1902 v18 = sub_4466C4(v17);