comparison mm7_1.cpp @ 602:628694cd5744

Margaret working
author zipi
date Wed, 06 Mar 2013 23:26:46 +0000
parents db4a23580e6c
children cfca6297e4ae 5bf285f56fa8
comparison
equal deleted inserted replaced
601:d59398528e4f 602:628694cd5744
2829 }*/ 2829 }*/
2830 v106.uParentBillboardID = -1; 2830 v106.uParentBillboardID = -1;
2831 v3 = &pActors[v2]; 2831 v3 = &pActors[v2];
2832 v121 = v3; 2832 v121 = v3;
2833 v4 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xE1u, 0xFFu, 0x9Bu); 2833 v4 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xE1u, 0xFFu, 0x9Bu);
2834 v5 = v3->uNPC_ID; 2834 v5 = v3->sNPC_ID;
2835 a5 = v4; 2835 a5 = v4;
2836 v6 = GetNPCData(v5); 2836 v6 = GetNPCData(v5);
2837 v7 = v3->pMonsterInfo.uID; 2837 v7 = v3->pMonsterInfo.uID;
2838 v112 = (char **)v6; 2838 v112 = (char **)v6;
2839 v115 = byte_4E2B70[((signed __int16)v7 - 1) / 3] - 40; 2839 v115 = byte_4E2B70[((signed __int16)v7 - 1) / 3] - 40;
3044 pRenderer->FillRectFast(v106.uViewportX, v106.uViewportY, v106.uViewportZ - v106.uViewportX, v106.uViewportW - v106.uViewportY, 0); 3044 pRenderer->FillRectFast(v106.uViewportX, v106.uViewportY, v106.uViewportZ - v106.uViewportX, v106.uViewportW - v106.uViewportY, 0);
3045 v36 = v10->pHwSpriteIDs[0]; 3045 v36 = v10->pHwSpriteIDs[0];
3046 if ( v36 >= 0 ) 3046 if ( v36 >= 0 )
3047 pSprites_LOD->pSpriteHeaders[v36]._4ACC38(&v106, 0); 3047 pSprites_LOD->pSpriteHeaders[v36]._4ACC38(&v106, 0);
3048 } 3048 }
3049 if ( v121->uNPC_ID ) 3049 if ( v121->sNPC_ID )
3050 { 3050 {
3051 v37 = v112[6]; 3051 v37 = v112[6];
3052 if ( v37 ) 3052 if ( v37 )
3053 { 3053 {
3054 sprintfex(pTmpBuf, pGlobalTXT_LocalizationStrings[429], *v112, aNPCProfessionNames[(signed int)v37]); 3054 sprintfex(pTmpBuf, pGlobalTXT_LocalizationStrings[429], *v112, aNPCProfessionNames[(signed int)v37]);
3066 if ( v38 ) 3066 if ( v38 )
3067 v72 = pMonsterStats->pPlaceStrings[v38]; 3067 v72 = pMonsterStats->pPlaceStrings[v38];
3068 else 3068 else
3069 v72 = pMonsterStats->pInfos[v121->pMonsterInfo.uID].pName; 3069 v72 = pMonsterStats->pInfos[v121->pMonsterInfo.uID].pName;
3070 } 3070 }
3071 if(!v121->uNPC_ID || (v121->uNPC_ID && !v37)) 3071 if(!v121->sNPC_ID || (v121->sNPC_ID && !v37))
3072 strncpy(pTmpBuf, v72, v77); 3072 strncpy(pTmpBuf, v72, v77);
3073 v39 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0x9Bu); 3073 v39 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0x9Bu);
3074 a1->DrawTitleText(pFontComic, 0, 0xCu, v39, pTmpBuf, 3u); 3074 a1->DrawTitleText(pFontComic, 0, 0xCu, v39, pTmpBuf, 3u);
3075 Actor::DrawHealthBar(v121, a1); 3075 Actor::DrawHealthBar(v121, a1);
3076 v119 = 0; 3076 v119 = 0;
5312 } 5312 }
5313 if ( !v17->CanAct() ) 5313 if ( !v17->CanAct() )
5314 return; 5314 return;
5315 v18 = a2.y; 5315 v18 = a2.y;
5316 Actor::FaceObject(a2.y, 4u, 0, 0); 5316 Actor::FaceObject(a2.y, 4u, 0, 0);
5317 if ( !v17->uNPC_ID ) 5317 if ( !v17->sNPC_ID )
5318 { 5318 {
5319 v19 = pNPCStats->pGroups_copy[v17->uGroup]; 5319 v19 = pNPCStats->pGroups_copy[v17->uGroup];
5320 if ( v19 ) 5320 if ( v19 )
5321 { 5321 {
5322 v20 = pNPCStats->pCatchPhrases[v19]; 5322 v20 = pNPCStats->pCatchPhrases[v19];