Mercurial > mm7

comparison mm7_4.cpp @ 316:922a96fdcc86

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Nomad
date Wed, 20 Feb 2013 01:21:19 +0200
parents 2a09e1d6fc8f 72faa54ff319
children 15decc249a94
comparison
equal deleted inserted replaced
315:2a09e1d6fc8f 316:922a96fdcc86
5738 pTexture_IC_KNIGHT[6] = pIcons_LOD->LoadTexturePtr("IC_CLER", TEXTURE_16BIT_PALETTE); 5738 pTexture_IC_KNIGHT[6] = pIcons_LOD->LoadTexturePtr("IC_CLER", TEXTURE_16BIT_PALETTE);
5739 pTexture_IC_KNIGHT[7] = pIcons_LOD->LoadTexturePtr("IC_DRUID", TEXTURE_16BIT_PALETTE); 5739 pTexture_IC_KNIGHT[7] = pIcons_LOD->LoadTexturePtr("IC_DRUID", TEXTURE_16BIT_PALETTE);
5740 pTexture_IC_KNIGHT[8] = pIcons_LOD->LoadTexturePtr("IC_SORC", TEXTURE_16BIT_PALETTE); 5740 pTexture_IC_KNIGHT[8] = pIcons_LOD->LoadTexturePtr("IC_SORC", TEXTURE_16BIT_PALETTE);
5741 pTexture_MAKETOP = pIcons_LOD->LoadTexturePtr("MAKETOP", TEXTURE_16BIT_PALETTE); 5741 pTexture_MAKETOP = pIcons_LOD->LoadTexturePtr("MAKETOP", TEXTURE_16BIT_PALETTE);
5742 pTexture_MAKESKY = pIcons_LOD->LoadTexturePtr("MAKESKY", TEXTURE_16BIT_PALETTE); 5742 pTexture_MAKESKY = pIcons_LOD->LoadTexturePtr("MAKESKY", TEXTURE_16BIT_PALETTE);
5743 uX = 0; 5743 for(uX=0;uX < 22;++uX ) // load PlayerPortraits texture
5744 do // load PlayerPortraits texture
5745 { 5744 {
5746 sprintf(pTmpBuf, "%s01", pPlayerPortraitsNames[uX]); 5745 sprintf(pTmpBuf, "%s01", pPlayerPortraitsNames[uX]);
5747 v1 = pIcons_LOD->LoadTexture(pTmpBuf, TEXTURE_16BIT_PALETTE); 5746 v1 = pIcons_LOD->LoadTexture(pTmpBuf, TEXTURE_16BIT_PALETTE);
5748 v2 = uX * 4; 5747 pPlayerPortraits[uX] = &pIcons_LOD->pTextures[v1];
5749 ++uX; 5748
5750 *(Texture **)((char *)pPlayerPortraits + v2) = &pIcons_LOD->pTextures[v1]; 5749 }
5751 }
5752 while ( uX < 22 );
5753 pTexture_PlayerFaceMask = &pIcons_LOD->pTextures[pIcons_LOD->LoadTexture("FACEMASK", TEXTURE_16BIT_PALETTE)]; 5750 pTexture_PlayerFaceMask = &pIcons_LOD->pTextures[pIcons_LOD->LoadTexture("FACEMASK", TEXTURE_16BIT_PALETTE)];
5754 pTexture_buttminu = &pIcons_LOD->pTextures[pIcons_LOD->LoadTexture("buttminu", TEXTURE_16BIT_PALETTE)]; 5751 pTexture_buttminu = &pIcons_LOD->pTextures[pIcons_LOD->LoadTexture("buttminu", TEXTURE_16BIT_PALETTE)];
5755 pTexture_buttplus = &pIcons_LOD->pTextures[pIcons_LOD->LoadTexture("buttplus", TEXTURE_16BIT_PALETTE)]; 5752 pTexture_buttplus = &pIcons_LOD->pTextures[pIcons_LOD->LoadTexture("buttplus", TEXTURE_16BIT_PALETTE)];
5756 pTexture_pressrigh = &pIcons_LOD->pTextures[pIcons_LOD->LoadTexture("presrigh", TEXTURE_16BIT_PALETTE)]; 5753 pTexture_pressrigh = &pIcons_LOD->pTextures[pIcons_LOD->LoadTexture("presrigh", TEXTURE_16BIT_PALETTE)];
5757 pTexture_presleft = &pIcons_LOD->pTextures[pIcons_LOD->LoadTexture("presleft", TEXTURE_16BIT_PALETTE)]; 5754 pTexture_presleft = &pIcons_LOD->pTextures[pIcons_LOD->LoadTexture("presleft", TEXTURE_16BIT_PALETTE)];
14720 LABEL_6: 14717 LABEL_6:
14721 result = 0; 14718 result = 0;
14722 } 14719 }
14723 else 14720 else
14724 { 14721 {
14725 v2 = (char *)&pLevelEVT_Events[0].uEventOffsetInEVT; 14722 v2 = (char *)&pLevelEVT_Index[0].uEventOffsetInEVT;
14726 while ( 1 ) 14723 while ( 1 )
14727 { 14724 {
14728 if ( *((int *)v2 - 2) == uEventID ) 14725 if ( *((int *)v2 - 2) == uEventID )
14729 { 14726 {
14730 v3 = *(int *)v2; 14727 v3 = *(int *)v2;
14746 //result = (char *)p2DEvents_minus1_::04[13 * v6]; 14743 //result = (char *)p2DEvents_minus1_::04[13 * v6];
14747 result = (char *)p2DEvents[v6 - 1].pName; 14744 result = (char *)p2DEvents[v6 - 1].pName;
14748 } 14745 }
14749 else 14746 else
14750 { 14747 {
14751 for ( i = (char *)pLevelEVT_Events + 4 * (3 * v1 + 3); *(int *)i == uEventID; i += 12 ) 14748 for ( i = (char *)pLevelEVT_Index + 4 * (3 * v1 + 3); *(int *)i == uEventID; i += 12 )
14752 { 14749 {
14753 v8 = *((int *)i + 2); 14750 v8 = *((int *)i + 2);
14754 if ( pLevelEVT[v8 + 4] == 2 ) 14751 if ( pLevelEVT[v8 + 4] == 2 )
14755 { 14752 {
14756 v6 = (unsigned __int8)pLevelEVT[v8 + 5] 14753 v6 = (unsigned __int8)pLevelEVT[v8 + 5]