comparison mm7_1.cpp @ 243:a6a8fa73b4ec

cleaning
author zipi
date Sun, 17 Feb 2013 23:40:46 +0000
parents 578b4a1e58ba
children bb9e946cbcbf
comparison
equal deleted inserted replaced
242:578b4a1e58ba 243:a6a8fa73b4ec
205 a5 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0x9Bu); 205 a5 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0x9Bu);
206 v84 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0, 0xAFu, 0xFFu); 206 v84 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0, 0xAFu, 0xFFu);
207 v85 = pGUIWindow_CurrentMenu->pCurrentPosActiveItem; 207 v85 = pGUIWindow_CurrentMenu->pCurrentPosActiveItem;
208 v86 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0, 0); 208 v86 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0, 0);
209 v79 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0, 0xFFu, 0); 209 v79 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0, 0xFFu, 0);
210 pPlayer = &pParty->pPlayers[v1-1];//(Player *)&stru_AA1058[3].pSounds[6972 * v1 + 40552]; 210 pPlayer = &pParty->pPlayers[v1-1];
211 v3 = pIcons_LOD->LoadTexture("fr_skill", TEXTURE_16BIT_PALETTE); 211 v3 = pIcons_LOD->LoadTexture("fr_skill", TEXTURE_16BIT_PALETTE);
212 pRenderer->DrawTextureIndexed(8u, 8u, (Texture *)(v3 != -1 ? (int)&pIcons_LOD->pTextures[v3] : 0)); 212 pRenderer->DrawTextureIndexed(8u, 8u, (Texture *)(v3 != -1 ? (int)&pIcons_LOD->pTextures[v3] : 0));
213 v4 = v79; 213 v4 = v79;
214 if ( !pPlayer->uSkillPoints ) 214 if ( !pPlayer->uSkillPoints )
215 v4 = 65535; 215 v4 = 65535;
639 v3 = pIcons_LOD->LoadTexture("fr_award", TEXTURE_16BIT_PALETTE); 639 v3 = pIcons_LOD->LoadTexture("fr_award", TEXTURE_16BIT_PALETTE);
640 pRenderer->DrawTextureIndexed(8u, 8u, (Texture *)(v3 != -1 ? (int)&pIcons_LOD->pTextures[v3] : 0)); 640 pRenderer->DrawTextureIndexed(8u, 8u, (Texture *)(v3 != -1 ? (int)&pIcons_LOD->pTextures[v3] : 0));
641 sprintf(pTmpBuf, "%s \f%05d", pGlobalTXT_LocalizationStrings[23], v2);// TODO check args 641 sprintf(pTmpBuf, "%s \f%05d", pGlobalTXT_LocalizationStrings[23], v2);// TODO check args
642 sprintf(Source, 642 sprintf(Source,
643 pGlobalTXT_LocalizationStrings[429], 643 pGlobalTXT_LocalizationStrings[429],
644 &pParty->pPlayers[v1-1].pName,//&stru_AA1058[3].pSounds[6972 * v1 + 40720], 644 &pParty->pPlayers[v1-1].pName,
645 pClassNames[pParty->pPlayers[v1-1].classType]);//&pClassNames[stru_AA1058[3].pSounds[6972 * v1 + 40737]]); 645 pClassNames[pParty->pPlayers[v1-1].classType]);
646 strcat(pTmpBuf, Source); 646 strcat(pTmpBuf, Source);
647 strcat(pTmpBuf, "\xC" "00000"); 647 strcat(pTmpBuf, "\xC" "00000");
648 pGUIWindow_CurrentMenu->DrawText(pFontArrus, 24, 18, 0, pTmpBuf, 0, 0, 0); 648 pGUIWindow_CurrentMenu->DrawText(pFontArrus, 24, 18, 0, pTmpBuf, 0, 0, 0);
649 result = dword_506528; 649 result = dword_506528;
650 a1.uFrameX = 12; 650 a1.uFrameX = 12;
2801 NPCData *v6; // eax@3 2801 NPCData *v6; // eax@3
2802 unsigned __int16 v7; // cx@3 2802 unsigned __int16 v7; // cx@3
2803 int v8; // eax@4 2803 int v8; // eax@4
2804 unsigned __int16 v9; // dx@4 2804 unsigned __int16 v9; // dx@4
2805 SpriteFrame *v10; // edi@17 2805 SpriteFrame *v10; // edi@17
2806 int v11; // esi@17 2806 LODSprite *v11; // esi@17
2807 unsigned int v12; // ecx@17 2807 unsigned int v12; // ecx@17
2808 Sprite *v13; // edi@18 2808 Sprite *v13; // edi@18
2809 int v14; // ecx@18 2809 int v14; // ecx@18
2810 int v15; // edx@18 2810 int v15; // edx@18
2811 int v16; // edx@18 2811 int v16; // edx@18
2954 } 2954 }
2955 } 2955 }
2956 v10 = pSpriteFrameTable->GetFrame( 2956 v10 = pSpriteFrameTable->GetFrame(
2957 v3->pSpriteIDs[(signed __int16)pMonsterInfoUI_Doll.uCurrentActionAnimation], 2957 v3->pSpriteIDs[(signed __int16)pMonsterInfoUI_Doll.uCurrentActionAnimation],
2958 pMonsterInfoUI_Doll.uCurrentActionTime); 2958 pMonsterInfoUI_Doll.uCurrentActionTime);
2959 v11 = (int)pSprites_LOD[v10->pHwSpriteIDs[0]].pSpriteHeaders;//40 * v10->pHwSpriteIDs[0] + 7218180; 2959 v11 = pSprites_LOD[v10->pHwSpriteIDs[0]].pSpriteHeaders;//40 * v10->pHwSpriteIDs[0] + 7218180;
2960 v106.pTarget = pRenderer->pTargetSurface; 2960 v106.pTarget = pRenderer->pTargetSurface;
2961 v106.pTargetZ = pRenderer->pActiveZBuffer; 2961 v106.pTargetZ = pRenderer->pActiveZBuffer;
2962 v106.uTargetPitch = pRenderer->uTargetSurfacePitch; 2962 v106.uTargetPitch = pRenderer->uTargetSurfacePitch;
2963 v12 = a1->uFrameY + 52; 2963 v12 = a1->uFrameY + 52;
2964 v106.uViewportX = a1->uFrameX + 13; 2964 v106.uViewportX = a1->uFrameX + 13;
2966 v106.uViewportW = v12 + 128; 2966 v106.uViewportW = v12 + 128;
2967 v106.uViewportZ = v106.uViewportX + 128; 2967 v106.uViewportZ = v106.uViewportX + 128;
2968 v106.uScreenSpaceX = (signed int)(v106.uViewportX + 128 + v106.uViewportX) / 2; 2968 v106.uScreenSpaceX = (signed int)(v106.uViewportX + 128 + v106.uViewportX) / 2;
2969 v106._screenspace_x_scaler_packedfloat = 65536; 2969 v106._screenspace_x_scaler_packedfloat = 65536;
2970 v106._screenspace_y_scaler_packedfloat = 65536; 2970 v106._screenspace_y_scaler_packedfloat = 65536;
2971 v106.uScreenSpaceY = v115 + v12 + *(short *)(v11 + 18); 2971 v106.uScreenSpaceY = v115 + v12 + v11->uHeight;
2972 v106.pPalette = PaletteManager::Get_Dark_or_Red_LUT(v10->uPaletteIndex, 0, 1); 2972 v106.pPalette = PaletteManager::Get_Dark_or_Red_LUT(v10->uPaletteIndex, 0, 1);
2973 v106.sZValue = 0; 2973 v106.sZValue = 0;
2974 v106.uFlags = 0; 2974 v106.uFlags = 0;
2975 pRenderer->Clip_v2(0, 0, 0x27Fu, 0x1DFu); 2975 pRenderer->Clip_v2(0, 0, 0x27Fu, 0x1DFu);
2976 pRenderer->Line2D(v106.uViewportX - 1, v106.uViewportY - 1, v106.uViewportX + 129, v106.uViewportY - 1, a5); 2976 pRenderer->Line2D(v106.uViewportX - 1, v106.uViewportY - 1, v106.uViewportX + 129, v106.uViewportY - 1, a5);