mm7: mm7_4.cpp comparison

comparison mm7_4.cpp @ 494:af286cec8967

guild ..

author	Gloval
date	Thu, 28 Feb 2013 18:18:52 +0400
parents	59649750a054
children	90fdb47bfcba

comparison

equal deleted inserted replaced

-:59649750a054
+:af286cec8967
 }
 //----- (004B5D7C) --------------------------------------------------------
-int __cdecl GuildDialog()
+void GuildDialog()
 {
 GUIWindow *v0; // ebx@1
 Player *v1; // edi@1
-signed int v2; // ebx@1
+signed int base_teach_price; // ebx@1
 int v3; // edi@6
 int result; // eax@11
 unsigned int v5; // ebx@13
 int v6; // esi@13
 signed int v7; // esi@17
 int v8; // esi@22
 signed int v9; // ecx@22
 char *v10; // eax@22
-const char *v11; // ecx@26
+const char *statusbar_string; // ecx@26
 POINT *v12; // esi@30
 int v13; // ecx@30
 void *v14; // ST1C_4@31
 ItemGen *v15; // ST18_4@31
 int v16; // ST10_4@31
 char v47[100]; // [sp+D4h] [bp-218h]@3
 char v48[100]; // [sp+138h] [bp-1B4h]@3
 char v49[100]; // [sp+19Ch] [bp-150h]@3
 POINT v50; // [sp+264h] [bp-88h]@30
 POINT v51; // [sp+26Ch] [bp-80h]@30
-GUIWindow v52; // [sp+274h] [bp-78h]@1
+GUIWindow working_window; // [sp+274h] [bp-78h]@1
 signed int v53; // [sp+27Ch] [bp-70h]@1
 signed int v54; // [sp+284h] [bp-68h]@1
 int v55; // [sp+2C8h] [bp-24h]@47
-int v56; // [sp+2CCh] [bp-20h]@1
+int main_text_color; // [sp+2CCh] [bp-20h]@1
-int v57; // [sp+2D0h] [bp-1Ch]@1
+int hi_text_color; // [sp+2D0h] [bp-1Ch]@1
 Player *v58; // [sp+2D4h] [bp-18h]@1
 unsigned __int8 uPlayerID; // [sp+2DBh] [bp-11h]@31
 char *Str; // [sp+2DCh] [bp-10h]@35
 int v61; // [sp+2E0h] [bp-Ch]@35
 unsigned int v62; // [sp+2E4h] [bp-8h]@13
 int v63; // [sp+2E8h] [bp-4h]@1
 v0 = window_SpeakInHouse;
-memcpy(&v52, window_SpeakInHouse, sizeof(v52));
+memcpy(&working_window, window_SpeakInHouse, sizeof(GUIWindow));
 v58 = pPlayers[uActiveCharacter];
 v1 = v58;
-v52.uFrameX = 483;
+working_window.uFrameX = 483;
 v53 = 148;
 v54 = 334;
-v56 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0xFFu);
+main_text_color = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0xFFu);
-v57 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0x9Bu);
+hi_text_color = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0x9Bu);
 //v2 = (signed __int64)(p2DEvents_minus1__20[13 * (unsigned int)v0->ptr_1C] * 500.0);
-v2 = (signed __int64)(p2DEvents[(unsigned int)v0->ptr_1C - 1].fPriceMultiplier * 500.0);
+base_teach_price = (signed __int64)(p2DEvents[(unsigned int)v0->ptr_1C - 1].fPriceMultiplier * 500.0);
-v63 = v2 * (100 - v1->GetMerchant()) / 100;
+v63 = base_teach_price * (100 - v1->GetMerchant()) / 100;
-if ( v63 < v2 / 3 )
+if ( v63 < base_teach_price / 3 )
-v63 = v2 / 3;
+v63 = base_teach_price / 3;
 strcpy(Dest, "");
 strcpy(v46, "");
 strcpy(v47, "");
 strcpy(v48, "");
 strcpy(v49, "");
 if ( dword_F8B19C != 1 )
 {
-if ( dword_F8B19C != 18 )
+if ( dword_F8B19C != 18 ) //buy skill
 {
 if ( sub_4B1784_check_if_player_concious__draw_warning_else_mess_with_dlg_win() )
 {
-v3 = (int)(&v1->uIntelligence + dword_F8B19C);
+v3 = (int)(&v1->uIntelligence + dword_F8B19C); //test skill
 if ( *(short *)v3 )
 {
-sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[403], pClassNames[dword_F8B19C + 20]);
+sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[403], pClassNames[dword_F8B19C + 20]); //"You already know the %s skill"
 ShowStatusBarString(pTmpBuf, 2u);
 pAudioPlayer->PlaySound(SOUND_27, 0, 0, -1, 0, 0, 0, 0);
 }
 else
 {
 if ( pParty->uNumGold < v63 )
 {
-ShowStatusBarString(pGlobalTXT_LocalizationStrings[155], 2u);
+ShowStatusBarString(pGlobalTXT_LocalizationStrings[155], 2u); //"You don't have enough gold"
 HousePlaySomeSound((unsigned int)window_SpeakInHouse->ptr_1C, 2);
 }
 else
 {
 Party::TakeGold(v63);
 *(short *)v3 = 1;
 }
 }
 }
-/*result = pMessageQueue_50CBD0->uNumMessages;
-if ( (signed int)pMessageQueue_50CBD0->uNumMessages < 40 )
-{
-pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = (UIMessageType)113;
-pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].param = 1;
-result = 3 * pMessageQueue_50CBD0->uNumMessages + 3;
-*(&pMessageQueue_50CBD0->uNumMessages + result) = 0;
-++pMessageQueue_50CBD0->uNumMessages;
-}*/
 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0);
-return 1; // void function actually
+return;
 }
 pRenderer->DrawTextureIndexed(8u, 8u, dword_F8B164);
 v5 = 0;
 v6 = 0;
 v62 = 0;
 v63 += 70;
 v62 += 280;
 ++v6;
 }
 while ( v63 < 452 );
 v62 = 1680;
 v7 = 6;
 v63 = 32;
 do
 {
 v63 += 70;
 v62 += 280;
 ++v7;
 }
 while ( v63 < 452 );
-result = sub_4B1784_check_if_player_concious__draw_warning_else_mess_with_dlg_win();
-if ( result )
+if ( sub_4B1784_check_if_player_concious__draw_warning_else_mess_with_dlg_win() )
 {
 v8 = 0;
 v9 = 12;
 v10 = (char *)(&pParty->pPlayers[1].pInstalledBeacons[0].field_18 + 108 * (unsigned int)window_SpeakInHouse->ptr_1C);
 do
 ++v8;
 v10 += 36;
 --v9;
 }
 while ( v9 );
 GetAsyncKeyState(17);
-v11 = pGlobalTXT_LocalizationStrings[195];
+statusbar_string = pGlobalTXT_LocalizationStrings[195]; //"Select the Item to Buy"
 if ( dword_F8B19C != 2 )
-v11 = pGlobalTXT_LocalizationStrings[196];
+statusbar_string = pGlobalTXT_LocalizationStrings[196]; //"Select the Special Item to Buy"
-DrawTextAtStatusBar(v11, 0);
+DrawTextAtStatusBar(statusbar_string, 0);
 if ( !v8 )
 		  {
-v52.DrawCurrentTime(
+working_window.DrawCurrentTime(
 __PAIR__(
 *(int *)&stru_AA1058[3].pSounds[8 * (unsigned int)window_SpeakInHouse->ptr_1C + 44472],
 *(int *)&stru_AA1058[3].pSounds[8 * (unsigned int)window_SpeakInHouse->ptr_1C + 44468])
 - pParty->uTimePlayed);
-		return 0;
+		return;
 		  }
 v12 = pMouse->GetCursorPos(&v51);
 result = v12->x + pSRZBufferLineOffsets[pMouse->GetCursorPos(&v50)->y];
 v13 = pRenderer->pActiveZBuffer[result] & 0xFFFF;
 if ( pRenderer->pActiveZBuffer[result] & 0xFFFF )
 {
 v14 = window_SpeakInHouse->ptr_1C;
 v15 = (ItemGen *)(&pParty->pPlayers[1].uExpressionTimeLength + 18 * (v13 + 12 * (int)v14));
 v16 = (int)window_SpeakInHouse->ptr_1C;
 uPlayerID = uActiveCharacter - 1;
-v17 = v1->_490EEE(
+v17 = v1->_490EEE( (ItemGen *)&pParty->pPlayers[1].uExpressionTimeLength + v13 + 12 * (int)v14, 3, v16,  2);
-(ItemGen *)&pParty->pPlayers[1].uExpressionTimeLength + v13 + 12 * (int)v14,
+v18 = BuilDialogueString((char *)pMerchantsBuyPhrases[v17], uPlayerID, v15, (char *)v14, 2, 0);
-3,
+v19 = pFontArrus->CalcTextHeight(v18, &working_window, 0, 0);
-v16,
+working_window.DrawTitleText(pFontArrus, v5, (174 - v19) / 2 + 138,  main_text_color, v18, 3);
-2);
+return;
-v18 = BuilDialogueString((char *)pMerchantsBuyPhrases[v17], uPlayerID, v15, (char *)v14, 2, 0);
+}
-v44 = 3;
+}
-v43 = v18;
+return;
-v42 = v56;
-v41 = 0;
-v40 = 0;
-v39 = &v52;
-LABEL_32:
-v19 = pFontArrus->CalcTextHeight(v18, v39, v40, v41);
-return (int)v52.DrawTitleText(pFontArrus, v5, (174 - v19) / 2 + 138, v42, v43, v44);
-}
-}
-return result;
 }
 if ( !(unsigned __int16)_449B57_test_bit(
 (unsigned __int8 *)v1->_guilds_member_bits,
 word_4F0704[(unsigned int)window_SpeakInHouse->ptr_1C-139]) )
-{
+{ //you must me member
 v36 = pNPCTopics[121].pText;
-v37 = v57;
+v37 = hi_text_color;
-v38 = pFontArrus->CalcTextHeight(pNPCTopics[121].pText, &v52, 0, 0);
+v38 = pFontArrus->CalcTextHeight(pNPCTopics[121].pText, &working_window, 0, 0);
-v52.DrawTitleText(pFontArrus, 0, (212 - v38) / 2 + 101, v37, v36, 3u);
+working_window.DrawTitleText(pFontArrus, 0, (212 - v38) / 2 + 101, v37, v36, 3u);
-result = (int)pDialogueWindow;
 pDialogueWindow->pNumPresenceButton = 0;
-return result;
+return;
 }
-result = sub_4B1784_check_if_player_concious__draw_warning_else_mess_with_dlg_win();
-if ( !result )
+if ( !sub_4B1784_check_if_player_concious__draw_warning_else_mess_with_dlg_win() )
-return result;
+return;
 v20 = pDialogueWindow;
 v5 = 0;
 v62 = 0;
 Str = 0;
 v21 = pDialogueWindow->pStartingPosActiveItem;
 v22 = v21 + pDialogueWindow->pNumPresenceButton;
 v61 = 0;
 if ( v21 >= v22 )
-goto LABEL_64;
+	  sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[544], pPlayers[uActiveCharacter]->pName, pClassNames[pPlayers[uActiveCharacter]->classType]); // "Seek knowledge elsewhere %s the %s"
+	strcat(pTmpBuf, "\n \n");
+	strcat(pTmpBuf, pGlobalTXT_LocalizationStrings[528]); //"I can offer you nothing further."
+	v19 = pFontArrus->CalcTextHeight(pTmpBuf, &working_window, 0, 0);
+	working_window.DrawTitleText(pFontArrus, v5, (174 - v19) / 2 + 138, hi_text_color, pTmpBuf, 3);
+	return;
 do
 {
 v23 = v20->GetControl(v21)->uControlParam;
 if ( v23 == 18 )
 {
-v25 = pFontArrus->CalcTextHeight(pGlobalTXT_LocalizationStrings[400], &v52, 0, 0);
+v25 = pFontArrus->CalcTextHeight(pGlobalTXT_LocalizationStrings[400], &working_window, 0, 0); //"Buy Spells"
 v62 += v25;
 ++v61;
 }
 else
 {
 // or
 //byte_4ED970_skill_learn_ability_by_class_table[v58->uClass - 1][v23 + 1]
 //if ( *(&byte_4ED94C[37 * v58->uClass] + v23) && !*(&v58->uIntelligence + v23) )
 {
-v24 = pFontArrus->CalcTextHeight(pClassNames[v23 + 20], &v52, 0, 0);
+v24 = pFontArrus->CalcTextHeight(pClassNames[v23 + 20], &working_window, 0, 0);
 v62 += v24;
 ++v61;
 ++Str;
 }
 }
 }
 while ( v21 < v20->pNumPresenceButton + v20->pStartingPosActiveItem );
 if ( !v61 )
 {
 LABEL_64:
-sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[544], v58->pName, pClassNames[v58->classType]);
+sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[544], v58->pName, pClassNames[v58->classType]); // "Seek knowledge elsewhere %s the %s"
 strcat(pTmpBuf, "\n \n");
-strcat(pTmpBuf, pGlobalTXT_LocalizationStrings[528]);
+strcat(pTmpBuf, pGlobalTXT_LocalizationStrings[528]); //"I can offer you nothing further."
-v18 = pTmpBuf;
+	v19 = pFontArrus->CalcTextHeight(pTmpBuf, &working_window, 0, 0);
-v44 = 3;
+	working_window.DrawTitleText(pFontArrus, v5, (174 - v19) / 2 + 138, hi_text_color, pTmpBuf, 3);
-v43 = pTmpBuf;
+	return;
-v42 = v57;
-v41 = 0;
-v40 = 0;
-v39 = &v52;
-goto LABEL_32;
 }
 if ( Str )
 {
-sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[401], v63);
+sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[401], v63); //"Skill Cost: %lu"
-v52.DrawTitleText(pFontArrus, 0, 0x92u, 0, pTmpBuf, 3u);
+working_window.DrawTitleText(pFontArrus, 0, 0x92u, 0, pTmpBuf, 3u);
 }
 v63 = (signed int)(149 - v62) / v61;
 if ( v63 > 32 )
 v63 = 32;
-result = v20->pStartingPosActiveItem;
 v26 = (signed int)(149 - v61 * v63 - v62) / 2 - v63 / 2 + 162;
-v62 = result;
+v62 = v20->pStartingPosActiveItem;
 v55 = v26;
-if ( result < result + v20->pNumPresenceButton )
+if (v20->pStartingPosActiveItem < v20->pStartingPosActiveItem + v20->pNumPresenceButton )
 {
 v61 = 2;
 while ( 1 )
 {
 v27 = v20->GetControl(v62);
 {
 v30 = pClassNames[v29 + 20];
 LABEL_55:
 Str = v30;
 v28->uY = v63 + v55;
-v31 = pFontArrus->CalcTextHeight(v30, &v52, 0, 0);
+v31 = pFontArrus->CalcTextHeight(v30, &working_window, 0, 0);
 v32 = v28->uY;
 v28->uHeight = v31;
 v33 = v32 + v31 - 1;
 v28->uW = v33;
 v55 = v33;
-v34 = v57;
+v34 = hi_text_color;
 if ( pDialogueWindow->pCurrentPosActiveItem != v61 )
-v34 = v56;
+v34 = main_text_color;
-v52.DrawTitleText(pFontArrus, 0, v32, v34, Str, 3u);
+working_window.DrawTitleText(pFontArrus, 0, v32, v34, Str, 3u);
-goto LABEL_58;
+		v35 = v20->pStartingPosActiveItem;
+		++v62;
+		++v61;
+		if ( (signed int)v62 >=v20->pNumPresenceButton +v20->pStartingPosActiveItem  )
+			return;
 }
 v28->uW = 0;
 v28->uHeight = 0;
 v28->uY = 0;
 LABEL_58:
 v35 = v20->pStartingPosActiveItem;
 ++v62;
-result = v20->pNumPresenceButton + v35;
 ++v61;
-if ( (signed int)v62 >= result )
+if ( (signed int)v62 >=v20->pNumPresenceButton +v20->pStartingPosActiveItem  )
-return result;
+return;
 }
-v30 = pGlobalTXT_LocalizationStrings[400];
+v30 = pGlobalTXT_LocalizationStrings[400]; //"Buy Spells"
 goto LABEL_55;
 }
-return result;
+return;
 }
 //----- (004B705E) --------------------------------------------------------

Mercurial > mm7

comparison mm7_4.cpp @ 494:af286cec8967