Mercurial > mm7

comparison mm7_5.cpp @ 247:fb8a876f41e1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Nomad
date Mon, 18 Feb 2013 03:59:31 +0200
parents 1bfe546561c4 bb9e946cbcbf
children 37dcbe8f3cca
comparison
equal deleted inserted replaced
246:1bfe546561c4 247:fb8a876f41e1
2899 pParty->pPlayers[0].pConditions[2] = pParty->uTimePlayed; 2899 pParty->pPlayers[0].pConditions[2] = pParty->uTimePlayed;
2900 v90 = pMapStats->GetMapInfo(pCurrentMapName); 2900 v90 = pMapStats->GetMapInfo(pCurrentMapName);
2901 if ( !v90 ) 2901 if ( !v90 )
2902 v90 = rand() % (signed int)pMapStats->uNumMaps + 1; 2902 v90 = rand() % (signed int)pMapStats->uNumMaps + 1;
2903 pMapInfo = &pMapStats->pInfos[v90]; 2903 pMapInfo = &pMapStats->pInfos[v90];
2904 if ( rand() % 100 + 1 <= pMapInfo->field_30 ) 2904 if ( rand() % 100 + 1 <= pMapInfo->Encounter_percent )
2905 { 2905 {
2906 v91 = rand() % 100; 2906 v91 = rand() % 100;
2907 v92 = pMapInfo->field_31; 2907 v92 = pMapInfo->EncM1percent;
2908 v93 = v91 + 1; 2908 v93 = v91 + 1;
2909 if ( v93 > v92 ) 2909 if ( v93 > v92 )
2910 pNPCData4 = (NPCData *)((v93 > v92 + pMapInfo->field_32) + 2); 2910 pNPCData4 = (NPCData *)((v93 > v92 + pMapInfo->EncM2percent) + 2);
2911 else 2911 else
2912 pNPCData4 = (NPCData *)v0; 2912 pNPCData4 = (NPCData *)v0;
2913 if ( !sub_45063B(pMapInfo, (int)pNPCData4) ) 2913 if ( !sub_45063B(pMapInfo, (int)pNPCData4) )
2914 pNPCData4 = 0; 2914 pNPCData4 = 0;
2915 if ( pNPCData4 ) 2915 if ( pNPCData4 )
8584 void __fastcall CharacterUI_DrawPaperdollWithRingOverlay(unsigned int uPlayerID) 8584 void __fastcall CharacterUI_DrawPaperdollWithRingOverlay(unsigned int uPlayerID)
8585 { 8585 {
8586 unsigned int v1; // ebx@1 8586 unsigned int v1; // ebx@1
8587 Player *pPlayer; // edi@1 8587 Player *pPlayer; // edi@1
8588 int v3; // ecx@1 8588 int v3; // ecx@1
8589 int v4; // edi@3 8589 int *v4; // edi@3
8590 unsigned int v5; // ebx@3 8590 unsigned int v5; // ebx@3
8591 int v6; // eax@3 8591 int v6; // eax@3
8592 LODFile_IconsBitmaps *v7; // ecx@7 8592 LODFile_IconsBitmaps *v7; // ecx@7
8593 double v8; // st7@16 8593 double v8; // st7@16
8594 int v9; // edi@17 8594 int v9; // edi@17
8626 int v41; // [sp+10h] [bp-20h]@26 8626 int v41; // [sp+10h] [bp-20h]@26
8627 Texture *v42; // [sp+10h] [bp-20h]@37 8627 Texture *v42; // [sp+10h] [bp-20h]@37
8628 int v43; // [sp+10h] [bp-20h]@47 8628 int v43; // [sp+10h] [bp-20h]@47
8629 unsigned int a3; // [sp+14h] [bp-1Ch]@3 8629 unsigned int a3; // [sp+14h] [bp-1Ch]@3
8630 unsigned int a2; // [sp+18h] [bp-18h]@3 8630 unsigned int a2; // [sp+18h] [bp-18h]@3
8631 int v46; // [sp+1Ch] [bp-14h]@1 8631 unsigned int *v46; // [sp+1Ch] [bp-14h]@1
8632 Player *v47; // [sp+20h] [bp-10h]@1 8632 Player *v47; // [sp+20h] [bp-10h]@1
8633 int v48; // [sp+24h] [bp-Ch]@1 8633 int v48; // [sp+24h] [bp-Ch]@1
8634 int v49; // [sp+24h] [bp-Ch]@26 8634 int v49; // [sp+24h] [bp-Ch]@26
8635 8635
8636 v1 = uPlayerID; 8636 v1 = uPlayerID;
8641 pRenderer->DrawTextureTransparent(0x1D9u, 0, (Texture *)(uTextureID_BACKHAND != -1 ? &pIcons_LOD->pTextures[uTextureID_BACKHAND] : 0)); 8641 pRenderer->DrawTextureTransparent(0x1D9u, 0, (Texture *)(uTextureID_BACKHAND != -1 ? &pIcons_LOD->pTextures[uTextureID_BACKHAND] : 0));
8642 pRenderer->DrawTextureTransparent(0x1D4u, 0, (Texture *)(uTextureID_507B04 != -1 ? &pIcons_LOD->pTextures[uTextureID_507B04] : 0)); 8642 pRenderer->DrawTextureTransparent(0x1D4u, 0, (Texture *)(uTextureID_507B04 != -1 ? &pIcons_LOD->pTextures[uTextureID_507B04] : 0));
8643 pRenderer->DrawTextureIndexed(pCharacterScreen_DetalizBtn->uX, pCharacterScreen_DetalizBtn->uY, 8643 pRenderer->DrawTextureIndexed(pCharacterScreen_DetalizBtn->uX, pCharacterScreen_DetalizBtn->uY,
8644 (Texture *)(uTextureID_5118C8 != -1 ? &pIcons_LOD->pTextures[uTextureID_5118C8] : 0)); 8644 (Texture *)(uTextureID_5118C8 != -1 ? &pIcons_LOD->pTextures[uTextureID_5118C8] : 0));
8645 v3 = 0; 8645 v3 = 0;
8646 v46 = (int)&pPlayer->pEquipment.field_28; 8646 v46 = &pPlayer->pEquipment.field_28;
8647 v48 = 0; 8647 v48 = 0;
8648 do 8648 do
8649 { 8649 {
8650 if ( !*(int *)v46 ) 8650 if ( !*v46 )
8651 goto LABEL_24; 8651 goto LABEL_24;
8652 v39 = *(int *)v46; 8652 v39 = *v46;
8653 v4 = (int)&pPlayer->spellbook.pDarkSpellbook.bIsSpellAvailable[36 * *(int *)v46 + 5]; 8653 v4 = (int *)&pPlayer->pInventoryItems[*v46-1].uItemID;
8654 a3 = pPaperdollRingsY[v3]; 8654 a3 = pPaperdollRingsY[v3];
8655 a2 = pPaperdollRingsX[v3]; 8655 a2 = pPaperdollRingsX[v3];
8656 v5 = pIcons_LOD->LoadTexture(pItemsTable->pItems[*(int *)v4].pIconName, TEXTURE_16BIT_PALETTE); 8656 v5 = pIcons_LOD->LoadTexture(pItemsTable->pItems[*v4].pIconName, TEXTURE_16BIT_PALETTE);
8657 v6 = *(int *)(v4 + 20); 8657 v6 = *(int *)(v4 + 20);
8658 if ( *(int *)(v4 + 20) & 0xF0 ) 8658 if ( *(int *)(v4 + 20) & 0xF0 )
8659 { 8659 {
8660 if ( (*(int *)(v4 + 20) & 0xF0) != 16 ) 8660 if ( (*(int *)(v4 + 20) & 0xF0) != 16 )
8661 { 8661 {
17398 int v135; // [sp+18h] [bp-8h]@27 17398 int v135; // [sp+18h] [bp-8h]@27
17399 int v136; // [sp+18h] [bp-8h]@33 17399 int v136; // [sp+18h] [bp-8h]@33
17400 int v137; // [sp+1Ch] [bp-4h]@27 17400 int v137; // [sp+1Ch] [bp-4h]@27
17401 int v138; // [sp+1Ch] [bp-4h]@33 17401 int v138; // [sp+1Ch] [bp-4h]@33
17402 17402
17403 pPlayer = &pParty->pPlayers[uPlayerID-1];//(Player *)&stru_AA1058[3].pSounds[6972 * uPlayerID + 40552]; 17403 pPlayer = &pParty->pPlayers[uPlayerID-1];
17404 v2 = pIcons_LOD->LoadTexture("fr_stats", TEXTURE_16BIT_PALETTE); 17404 v2 = pIcons_LOD->LoadTexture("fr_stats", TEXTURE_16BIT_PALETTE);
17405 pRenderer->DrawTextureIndexed(8, 8, (Texture *)(v2 != -1 ? (int)&pIcons_LOD->pTextures[v2] : 0)); 17405 pRenderer->DrawTextureIndexed(8, 8, (Texture *)(v2 != -1 ? (int)&pIcons_LOD->pTextures[v2] : 0));
17406 v3 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0x9Bu); 17406 v3 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0x9Bu);
17407 sprintf(pTmpBuf, format_4E2DC8, v3); 17407 sprintf(pTmpBuf, format_4E2DC8, v3);
17408 sprintf(pTmpBuf2, pGlobalTXT_LocalizationStrings[429], pPlayer->pName, pClassNames[pPlayer->classType]);//^Pi[%s] %s 17408 sprintf(pTmpBuf2, pGlobalTXT_LocalizationStrings[429], pPlayer->pName, pClassNames[pPlayer->classType]);//^Pi[%s] %s
17855 v0 = uActiveCharacter; 17855 v0 = uActiveCharacter;
17856 } 17856 }
17857 } 17857 }
17858 v12 = 0; 17858 v12 = 0;
17859 a5 = pGUIWindow_CurrentMenu->uNumControls; 17859 a5 = pGUIWindow_CurrentMenu->uNumControls;
17860 v18 = &pParty->pPlayers[v0-1]; //&stru_AA1058[3].pSounds[6972 * v0 + 40552]; 17860 v18 = &pParty->pPlayers[v0-1];
17861 v2 = pFontLucida; 17861 v2 = pFontLucida;
17862 v14 = pWeaponSkills; 17862 v14 = pWeaponSkills;
17863 v3 = 2 * LOBYTE(pFontLucida->uFontHeight) + 13; 17863 v3 = 2 * LOBYTE(pFontLucida->uFontHeight) + 13;
17864 do 17864 do
17865 { 17865 {