mm7: mm7_5.cpp comparison

comparison mm7_5.cpp @ 521:663c4f618f56

Awards tab corrrection

author	Gloval
date	Sat, 02 Mar 2013 01:42:05 +0400
parents	cb0ad52d6a26
children	5196a51cc9ec

comparison

equal deleted inserted replaced

-:35f28d4c0ff9
+:663c4f618f56
 sub_4196A0();
 sub_419220();
 pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] = 102;
 GUIWindow::Create(pCharacterScreen_AwardsBtn->uX, pCharacterScreen_AwardsBtn->uY, 0, 0, (WindowType)(WINDOW_HouseInterior|0x42),
 (int)pCharacterScreen_AwardsBtn, 0);
-sub_419100();
+FillAwardsData();
 continue;
 case UIMSG_AutonotesBook:
 switch ( uMessageParam )
 {
 default:
 v13 = pTex_tab_an_6b__zoom_on;
 v11 = pViewport->uViewportY + 1;
 v0 = pViewport->uViewportX + 398;
 }
 pRenderer->DrawTextureTransparent(v0, v11, v13);
-if ( dword_506544 || dword_506528 + dword_506520 >= dword_506524 )
+if ( dword_506544 || dword_506528 + awards_count >= awards_count2 )
 {
 v14 = pTex_tab_an_7a__zoot_off;
 v12 = pViewport->uViewportY + 38;
 v1 = pViewport->uViewportX + 407;
 }
 v1 = pViewport->uViewportX + 398;
 }
 pRenderer->DrawTextureTransparent(v1, v12, v14);
 if ( !byte_5C6D50[dword_506528] )
 {
-v2 = pStru179.field_0[dword_506528];
+v2 = achievedAwardsIndex[dword_506528];
 a1.uFrameWidth = 460;
 a1.uFrameX = 8;
 a1.uFrameY = 8;
 a1.uFrameHeight = 344;
 v3 = (const char *)pStorylineText->StoreLine[v2].pPageTitle;//field_4[];
 a1.uFrameHeight = 264;
 v4 = LOBYTE(pAutonoteFont->uFontHeight) - 3;
 a1.uFrameZ = 407;
 a1.uFrameHeight = v4 * 264 / v4;
 a1.uFrameW = a1.uFrameHeight + 69;
-if ( dword_506544 && dword_506528 + dword_506520 < dword_506524 )
+if ( dword_506544 && dword_506528 + awards_count < awards_count2 )
 {
 pAudioPlayer->PlaySound((SoundID)230, 0, 0, -1, 0, 0, 0, 0);
 v5 = dword_50651C++;
-dword_506528 += dword_506520;
+dword_506528 += awards_count;
-byte_506130[v5] = dword_506520;
+byte_506130[v5] = awards_count;
 }
 if ( dword_506548 && dword_50651C )
 {
 pAudioPlayer->PlaySound((SoundID)230, 0, 0, -1, 0, 0, 0, 0);
 --dword_50651C;
 dword_506528 -= (unsigned __int8)byte_506130[dword_50651C];
 }
-if ( !dword_506520 || dword_506528 < 1 )
+if ( !awards_count || dword_506528 < 1 )
 {
 dword_506528 = 0;
 dword_50651C = 0;
 }
 dword_506544 = 0;
-v6 = pStru179.field_0[dword_506528];
+v6 = achievedAwardsIndex[dword_506528];
 dword_506548 = 0;
-dword_506520 = 0;
+awards_count = 0;
 //v7 = *pStorylineText->StoreLine[v6].pText;//*(&pStorylineText->field_0 + 3 * v6);
 v7 = (int)pStorylineText->StoreLine[v6].pText;//*(&pStorylineText->field_0 + 3 * v6);
 v8 = BuilDialogueString(
 pStorylineText->StoreLine[v6].pText,
 uActiveCharacter - 1,
 (__int64 *)&pParty->field_3C._s_times[ v6 + 21]);
 if ( v7 )
 {
 v9 = pAutonoteFont->_44C6C2(v8, &a1, 1u, (unsigned __int8)byte_5C6D50[dword_506528]);
 LOBYTE(v8) = a1.DrawText(pAutonoteFont, 1, 0, 0, (const char *)v9, 0, a1.uFrameY + a1.uFrameHeight, 0);
-++dword_506520;
+++awards_count;
 }
 return (char)v8;
 }
 v10 = pTex_tab_an_6b__zoom_on;
 v8 = pViewport->uViewportY + 1;
 v0 = pViewport->uViewportX + 398;
 }
 pRenderer->DrawTextureTransparent(v0, v8, v10);
-if ( dword_506544 || dword_506528 + dword_506520 >= dword_506524 )
+if ( dword_506544 || dword_506528 + awards_count >= awards_count2 )
 {
 v11 = pTex_tab_an_7a__zoot_off;
 v9 = pViewport->uViewportY + 38;
 v1 = pViewport->uViewportX + 407;
 }
 a1.uFrameY = 70;
 a1.uFrameWidth = 360;
 a1.uFrameHeight = 264;
 a1.uFrameZ = 407;
 a1.uFrameW = 333;
-if ( dword_506544 && dword_506528 + dword_506520 < dword_506524 )
+if ( dword_506544 && dword_506528 + awards_count < awards_count2 )
 {
 pAudioPlayer->PlaySound((SoundID)230, 0, 0, -1, 0, 0, 0, 0);
 v2 = dword_50651C++;
-dword_506528 += dword_506520;
+dword_506528 += awards_count;
-byte_506130[v2] = dword_506520;
+byte_506130[v2] = awards_count;
 }
 if ( dword_506548 && dword_50651C )
 {
 pAudioPlayer->PlaySound((SoundID)230, 0, 0, -1, 0, 0, 0, 0);
 --dword_50651C;
 dword_506528 -= (unsigned __int8)byte_506130[dword_50651C];
 }
-if ( !dword_506520 || (v3 = dword_506528, dword_506528 < 1) )
+if ( !awards_count || (v3 = dword_506528, dword_506528 < 1) )
 {
 v3 = 0;
 dword_50651C = 0;
 dword_506528 = 0;
 }
 dword_506544 = 0;
 dword_506548 = 0;
-dword_506520 = 0;
+awards_count = 0;
-while ( v3 < dword_506524 )
+while ( v3 < awards_count2 )
 {
-v4 = pStru179.field_0[v3];
+v4 = achievedAwardsIndex[v3];
-++dword_506520;
+++awards_count;
 v5 = pQuestTable[v4-1];//(&dword_722F10)[4 * v4];
 a1.DrawText(pAutonoteFont, 1, 0, 0, pQuestTable[v4-1], 0, 0, 0);//(&dword_722F10)[4 * v4], 0, 0, 0);
 v6 = pAutonoteFont->CalcTextHeight(v5, &a1, 1, 0);
 v7 = a1.uFrameY + v6;
 if ( (signed int)(a1.uFrameY + v6) > (signed int)a1.uFrameHeight )
 v24 = pTex_tab_an_6b__zoom_on;
 v17 = pViewport->uViewportY + 1;
 v0 = pViewport->uViewportX + 398;
 }
 pRenderer->DrawTextureTransparent(v0, v17, v24);
-if ( dword_506544 || dword_506528 + dword_506520 >= dword_506524 )
+if ( dword_506544 || dword_506528 + awards_count >= awards_count2 )
 {
 v25 = pTex_tab_an_7a__zoot_off;
 v18 = pViewport->uViewportY + 38;
 v1 = pViewport->uViewportX + 407;
 }
 a1.uFrameHeight = 264;
 a1.uFrameZ = 407;
 a1.uFrameW = 333;
 if ( v31 )
 {
-dword_506524 = 0;
+awards_count2 = 0;
 dword_506528 = 0;
 dword_50651C = 0;
-dword_506520 = 0;
+awards_count = 0;
 v8 = 0;
 do
 {
 //if ( dword_72371C[2 * v8] == dword_506568 )
 	  if ( pAutonoteTxt[v8-1].eType == dword_506568 )
 		v32 = (char *)pAutonoteTxt[v8-1].pText;
 if ( (short)v8 )
 {
 if ( (unsigned __int16)_449B57_test_bit(pParty->_autonote_bits, v8) && v32 )
 {
-v9 = dword_506520++;
+v9 = awards_count++;
-pStru179.field_0[v9] = (signed __int16)v8;
+achievedAwardsIndex[v9] = (signed __int16)v8;
 }
 }
 }
 ++v8;
 }
 while ( v8 < 196 );
-dword_506524 = dword_506520;
+awards_count2 = awards_count;
 }
 else
 {
 if ( dword_506544 )
 {
-v10 = dword_506520 + dword_506528;
+v10 = awards_count + dword_506528;
-if ( dword_506520 + dword_506528 < dword_506524 )
+if ( awards_count + dword_506528 < awards_count2 )
 {
 v11 = dword_50651C++;
-byte_506130[v11] = dword_506520;
+byte_506130[v11] = awards_count;
 dword_506528 = v10;
 pAudioPlayer->PlaySound((SoundID)230, 0, 0, -1, 0, 0, 0, 0);
 }
 }
 if ( dword_506548 && dword_50651C )
 {
 --dword_50651C;
 dword_506528 -= (unsigned __int8)byte_506130[dword_50651C];
 pAudioPlayer->PlaySound((SoundID)230, 0, 0, -1, 0, 0, 0, 0);
 }
-if ( !dword_506520 || dword_506528 < 1 )
+if ( !awards_count || dword_506528 < 1 )
 {
 dword_506528 = 0;
 dword_50651C = 0;
 }
 }
 v12 = dword_506528;
 dword_50652C = 0;
 dword_506544 = 0;
 dword_506548 = 0;
-dword_506520 = 0;
+awards_count = 0;
 dword_506530 = 0;
 dword_506534 = 0;
 dword_506538 = 0;
 dword_50653C = 0;
 dword_506540 = 0;
-while ( v12 < dword_506524 )
+while ( v12 < awards_count2 )
 {
-v13 = pStru179.field_0[v12];
+v13 = achievedAwardsIndex[v12];
-++dword_506520;
+++awards_count;
 //v14 = (&dword_723718_autonote_related)[8 * v13];
 	v14 = pAutonoteTxt[v13-1].pText;
 //a1.DrawText(pAutonoteFont, 1, 0, 0, (&dword_723718_autonote_related)[8 * v13], 0, 0, 0);
 	a1.DrawText(pAutonoteFont, 1, 0, 0, pAutonoteTxt[v13-1].pText, 0, 0, 0);
 v15 = pAutonoteFont->CalcTextHeight(v14, &a1, 1, 0);
 }
 return pGUIWindow_CurrentMenu->DrawText(pFontArrus, 266, uYh, 0, pTmpBuf, 0, 0, 0);
 }
 //----- (00419100) --------------------------------------------------------
-int __cdecl sub_419100()
+void FillAwardsData()
 {
 Player *pPlayer; // esi@1
-int v1; // ebx@1
-unsigned __int8 *v2; // esi@1
+pPlayer = pPlayers[uActiveCharacter];
-int v3; // eax@4
+memset(&achievedAwardsIndex, 0, 4000);
-int result; // eax@6
+memset(pTmpBuf2, 0, 0x7D0u);
-int v5; // esi@6
+dword_506544 = 0;
-unsigned __int8 v6; // zf@6
+dword_506548 = 0;
-unsigned __int8 v7; // sf@6
+awards_count = 0;
-int v8; // edx@7
+dword_50651C = 0;
-int v9; // ecx@7
+dword_506528 = 0;
-unsigned __int8 v10; // of@7
+for(int i=0; i<105; ++i)
-stru179 *v11; // edi@9
-int v12; // edx@11
-char *v13; // [sp+Ch] [bp-8h]@2
-signed int v14; // [sp+Ch] [bp-8h]@9
-int i; // [sp+10h] [bp-4h]@10
-pPlayer = pPlayers[uActiveCharacter];
-memset(&pStru179, 0, 0xFA0u);
-memset(pTmpBuf2, 0, 0x7D0u);
-v1 = 0;
-dword_506544 = 0;
-dword_506548 = 0;
-dword_506520 = 0;
-dword_50651C = 0;
-dword_506528 = 0;
-v2 = (unsigned __int8 *)pPlayer->_guilds_member_bits;
-do
-{
-v13 = (char *)pAwards[v1].pText;//dword_723E80_award_related[2 * v1];
-if ( (unsigned __int16)_449B57_test_bit(v2, v1) && v13 )
-{
-v3 = dword_506520++;
-pStru179.field_0[v3] = v1;
-}
-++v1;
-}
-while ( v1 < 105 );
-result = dword_506520;
-v5 = 0;
-v6 = dword_506520 == 0;
-v7 = dword_506520 < 0;
-dword_506524 = dword_506520;
-dword_506520 = 0;
-if ( !(v7 | v6) )
-{
-do
-{
-v8 = rand() % 16;
-result = dword_506524;
-v9 = dword_506524 + v5++;
-v10 = v5 > dword_506524;//__OFSUB__(v5, dword_506524);
-v7 = v5 - dword_506524 < 0;
-pStru179.field_0[v9] = v8;
-}
-while ( v7 ^ v10 );
-if ( result > 0 )
-{
-v14 = 1;
-v11 = &pStru179;
-do
-{
-for ( i = v14; i < result; ++i )
 {
-v12 = pStru179.field_0[i];
+if ( _449B57_test_bit((unsigned char*)&pPlayer->_guilds_member_bits, i) && pAwards[i].pText )
-//if ( dword_723E84[2 * v12] < dword_723E84[2 * v11->field_0[0]] )
+achievedAwardsIndex[awards_count++] = i;
-		  if(pAwards[v12-1].uSort < pAwards[v11->field_0[0]].uSort)
-{
-pStru179.field_0[i] = v11->field_0[0];
-v11->field_0[0] = v12;
-}
 }
-++v14;
+awards_count2 = awards_count;
-v11 = (stru179 *)((char *)v11 + 4);
+awards_count = 0;
-}
+//sort awards index
-while ( v14 - 1 < result );
+if ( awards_count2>0 )
-}
+{
-}
+for(int i=0; i<awards_count2; ++i)
-return result;
+achievedAwardsIndex[awards_count2 + i] = rand() % 16;
-}
+for(int i=1; i<awards_count2-1; ++i)
+{
+for (int j = i; j < awards_count2-1; ++j )
+{
+int tmp=achievedAwardsIndex[j];
+if(pAwards[j].uSort < pAwards[i].uSort)
+{
+achievedAwardsIndex[j] = achievedAwardsIndex[i];
+achievedAwardsIndex[i] = tmp;
+}
+}
+}
+}
+}
 //----- (00419220) --------------------------------------------------------
 void __cdecl sub_419220()
 {

Mercurial > mm7

comparison mm7_5.cpp @ 521:663c4f618f56