Mercurial > mm7

comparison mm7_2.cpp @ 148:77ad59c17864

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Tue, 12 Feb 2013 09:11:19 +0600
parents c70fea5013aa 9b0d651821f1
children d92c78ab54fe
comparison
equal deleted inserted replaced
147:c70fea5013aa 148:77ad59c17864
669 if ( (signed int)v10 < v11 ) 669 if ( (signed int)v10 < v11 )
670 { 670 {
671 do 671 do
672 { 672 {
673 v12 = v8->GetControl(v10)->uControlParam - 36; 673 v12 = v8->GetControl(v10)->uControlParam - 36;
674 if ( byte_4ED970_skill_learn_ability_by_class_table[v85->uClass][v12] && !v85->pActiveSkills[v12] ) 674 if ( byte_4ED970_skill_learn_ability_by_class_table[v85->classType][v12] && !v85->pActiveSkills[v12] )
675 { 675 {
676 v13 = pFontArrus->CalcTextHeight(pSkillNames[v12], &v79, 0, 0); 676 v13 = pFontArrus->CalcTextHeight(pSkillNames[v12], &v79, 0, 0);
677 v89 += v13; 677 v89 += v13;
678 ++v86; 678 ++v86;
679 } 679 }
696 do 696 do
697 { 697 {
698 v15 = v8->GetControl(v89); 698 v15 = v8->GetControl(v89);
699 v16 = v15; 699 v16 = v15;
700 v17 = v15->uControlParam - 36; 700 v17 = v15->uControlParam - 36;
701 if ( !byte_4ED970_skill_learn_ability_by_class_table[v85->uClass][v17] || v85->pActiveSkills[v17] ) 701 if ( !byte_4ED970_skill_learn_ability_by_class_table[v85->classType][v17] || v85->pActiveSkills[v17] )
702 { 702 {
703 v16->uW = 0; 703 v16->uW = 0;
704 v16->uHeight = 0; 704 v16->uHeight = 0;
705 v16->uY = 0; 705 v16->uY = 0;
706 } 706 }
730 } 730 }
731 return; 731 return;
732 } 732 }
733 } 733 }
734 v26 = pTmpBuf; 734 v26 = pTmpBuf;
735 sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[544], v85->pName, pClassNames[v85->uClass]); 735 sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[544], v85->pName, pClassNames[v85->classType]);
736 strcat(pTmpBuf, "\n \n"); 736 strcat(pTmpBuf, "\n \n");
737 strcat(pTmpBuf, pGlobalTXT_LocalizationStrings[528]); 737 strcat(pTmpBuf, pGlobalTXT_LocalizationStrings[528]);
738 goto LABEL_97; 738 goto LABEL_97;
739 } 739 }
740 *(_QWORD *)Str = pParty->uNumFoodRations; 740 *(_QWORD *)Str = pParty->uNumFoodRations;
1204 if ( (signed int)v33 >= v34 ) 1204 if ( (signed int)v33 >= v34 )
1205 goto LABEL_105; 1205 goto LABEL_105;
1206 do 1206 do
1207 { 1207 {
1208 v35 = v30->GetControl(v33)->uControlParam - 36; 1208 v35 = v30->GetControl(v33)->uControlParam - 36;
1209 if ( byte_4ED970_skill_learn_ability_by_class_table[_this->uClass][v35] && !_this->pActiveSkills[v35] ) 1209 if ( byte_4ED970_skill_learn_ability_by_class_table[_this->classType][v35] && !_this->pActiveSkills[v35] )
1210 { 1210 {
1211 v36 = pFontArrus->CalcTextHeight(pSkillNames[v35], &v101, 0, 0); 1211 v36 = pFontArrus->CalcTextHeight(pSkillNames[v35], &v101, 0, 0);
1212 v106.y += v36; 1212 v106.y += v36;
1213 v109 = (const char **)((char *)v109 + 1); 1213 v109 = (const char **)((char *)v109 + 1);
1214 } 1214 }
1216 } 1216 }
1217 while ( (signed int)v33 < v30->pNumPresenceButton + v30->pStartingPosActiveItem ); 1217 while ( (signed int)v33 < v30->pNumPresenceButton + v30->pStartingPosActiveItem );
1218 if ( !v109 ) 1218 if ( !v109 )
1219 { 1219 {
1220 LABEL_105: 1220 LABEL_105:
1221 sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[544], _this->pName, pClassNames[_this->uClass]); 1221 sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[544], _this->pName, pClassNames[_this->classType]);
1222 strcat(pTmpBuf, "\n \n"); 1222 strcat(pTmpBuf, "\n \n");
1223 strcat(pTmpBuf, pGlobalTXT_LocalizationStrings[528]); 1223 strcat(pTmpBuf, pGlobalTXT_LocalizationStrings[528]);
1224 v7 = pTmpBuf; 1224 v7 = pTmpBuf;
1225 v86 = 3; 1225 v86 = 3;
1226 v84 = pTmpBuf; 1226 v84 = pTmpBuf;
1245 do 1245 do
1246 { 1246 {
1247 v38 = v30->GetControl(v106.y); 1247 v38 = v30->GetControl(v106.y);
1248 v39 = v38; 1248 v39 = v38;
1249 v40 = v38->uControlParam - 36; 1249 v40 = v38->uControlParam - 36;
1250 if ( !byte_4ED970_skill_learn_ability_by_class_table[_this->uClass][v40] || _this->pActiveSkills[v40] ) 1250 if ( !byte_4ED970_skill_learn_ability_by_class_table[_this->classType][v40] || _this->pActiveSkills[v40] )
1251 { 1251 {
1252 v39->uW = 0; 1252 v39->uW = 0;
1253 v39->uHeight = 0; 1253 v39->uHeight = 0;
1254 v39->uY = 0; 1254 v39->uY = 0;
1255 } 1255 }
1944 if ( (signed int)v6 < v7 ) 1944 if ( (signed int)v6 < v7 )
1945 { 1945 {
1946 do 1946 do
1947 { 1947 {
1948 v8 = v2->GetControl(v6)->uControlParam - 36; 1948 v8 = v2->GetControl(v6)->uControlParam - 36;
1949 if ( byte_4ED970_skill_learn_ability_by_class_table[_this->uClass][v8] && !_this->pActiveSkills[v8] ) 1949 if ( byte_4ED970_skill_learn_ability_by_class_table[_this->classType][v8] && !_this->pActiveSkills[v8] )
1950 { 1950 {
1951 v9 = pFontArrus->CalcTextHeight(pSkillNames[v8], &v104, 0, 0); 1951 v9 = pFontArrus->CalcTextHeight(pSkillNames[v8], &v104, 0, 0);
1952 v112 += v9; 1952 v112 += v9;
1953 ++v114; 1953 ++v114;
1954 } 1954 }
1972 do 1972 do
1973 { 1973 {
1974 v11 = v2->GetControl(v112); 1974 v11 = v2->GetControl(v112);
1975 v12 = v11; 1975 v12 = v11;
1976 v13 = v11->uControlParam - 36; 1976 v13 = v11->uControlParam - 36;
1977 if ( !byte_4ED970_skill_learn_ability_by_class_table[_this->uClass][v13] || _this->pActiveSkills[v13] ) 1977 if ( !byte_4ED970_skill_learn_ability_by_class_table[_this->classType][v13] || _this->pActiveSkills[v13] )
1978 { 1978 {
1979 v12->uW = 0; 1979 v12->uW = 0;
1980 v12->uHeight = 0; 1980 v12->uHeight = 0;
1981 v12->uY = 0; 1981 v12->uY = 0;
1982 } 1982 }
2005 while ( (signed int)v112 < (signed int)result ); 2005 while ( (signed int)v112 < (signed int)result );
2006 } 2006 }
2007 return result; 2007 return result;
2008 } 2008 }
2009 } 2009 }
2010 sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[544], _this->pName, pClassNames[_this->uClass]); 2010 sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[544], _this->pName, pClassNames[_this->classType]);
2011 strcat(pTmpBuf, "\n \n"); 2011 strcat(pTmpBuf, "\n \n");
2012 strcat(pTmpBuf, pGlobalTXT_LocalizationStrings[528]); 2012 strcat(pTmpBuf, pGlobalTXT_LocalizationStrings[528]);
2013 v21 = pTmpBuf; 2013 v21 = pTmpBuf;
2014 v92 = 3; 2014 v92 = 3;
2015 v90 = pTmpBuf; 2015 v90 = pTmpBuf;
2538 if ( (signed int)v39 < (signed int)(v39 + v40) ) 2538 if ( (signed int)v39 < (signed int)(v39 + v40) )
2539 { 2539 {
2540 do 2540 do
2541 { 2541 {
2542 v41 = v37->GetControl(v39)->uControlParam - 36; 2542 v41 = v37->GetControl(v39)->uControlParam - 36;
2543 if ( byte_4ED970_skill_learn_ability_by_class_table[v0->uClass][v41] && !v0->pActiveSkills[v41] ) 2543 if ( byte_4ED970_skill_learn_ability_by_class_table[v0->classType][v41] && !v0->pActiveSkills[v41] )
2544 { 2544 {
2545 v42 = pFontArrus->CalcTextHeight(pSkillNames[v41], &v144, 0, 0); 2545 v42 = pFontArrus->CalcTextHeight(pSkillNames[v41], &v144, 0, 0);
2546 v152 += v42; 2546 v152 += v42;
2547 ++v153; 2547 ++v153;
2548 } 2548 }
2565 do 2565 do
2566 { 2566 {
2567 v44 = v37->GetControl(v152); 2567 v44 = v37->GetControl(v152);
2568 v45 = v44; 2568 v45 = v44;
2569 v46 = v44->uControlParam - 36; 2569 v46 = v44->uControlParam - 36;
2570 if ( !byte_4ED970_skill_learn_ability_by_class_table[v0->uClass][v46] || v0->pActiveSkills[v46] ) 2570 if ( !byte_4ED970_skill_learn_ability_by_class_table[v0->classType][v46] || v0->pActiveSkills[v46] )
2571 { 2571 {
2572 v45->uW = 0; 2572 v45->uW = 0;
2573 v45->uHeight = 0; 2573 v45->uHeight = 0;
2574 v45->uY = 0; 2574 v45->uY = 0;
2575 } 2575 }
2598 while ( v152 < v54 ); 2598 while ( v152 < v54 );
2599 } 2599 }
2600 return; 2600 return;
2601 } 2601 }
2602 } 2602 }
2603 sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[544], v0->pName, pClassNames[v0->uClass]); 2603 sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[544], v0->pName, pClassNames[v0->classType]);
2604 strcat(pTmpBuf, "\n \n"); 2604 strcat(pTmpBuf, "\n \n");
2605 strcat(pTmpBuf, pGlobalTXT_LocalizationStrings[528]); 2605 strcat(pTmpBuf, pGlobalTXT_LocalizationStrings[528]);
2606 v11 = 0; 2606 v11 = 0;
2607 v36 = pTmpBuf; 2607 v36 = pTmpBuf;
2608 v123 = 3; 2608 v123 = 3;
4541 //v43 = (signed __int64)(*(float *)&p2DEvents_minus1__24[13 * (unsigned int)ptr_507BC0->ptr_1C] * 500.0); 4541 //v43 = (signed __int64)(*(float *)&p2DEvents_minus1__24[13 * (unsigned int)ptr_507BC0->ptr_1C] * 500.0);
4542 v43 = (signed __int64)(p2DEvents[(unsigned int)ptr_507BC0->ptr_1C - 1].flt_24 * 500.0); 4542 v43 = (signed __int64)(p2DEvents[(unsigned int)ptr_507BC0->ptr_1C - 1].flt_24 * 500.0);
4543 v44 = v43 * (100 - v0->GetMerchant()) / 100; 4543 v44 = v43 * (100 - v0->GetMerchant()) / 100;
4544 if ( v44 < v43 / 3 ) 4544 if ( v44 < v43 / 3 )
4545 v44 = v43 / 3; 4545 v44 = v43 / 3;
4546 if ( byte_4ED970_skill_learn_ability_by_class_table[v0->uClass][v42] ) 4546 if ( byte_4ED970_skill_learn_ability_by_class_table[v0->classType][v42] )
4547 { 4547 {
4548 pSkill = &v0->pActiveSkills[v42]; 4548 pSkill = &v0->pActiveSkills[v42];
4549 if ( !*pSkill ) 4549 if ( !*pSkill )
4550 { 4550 {
4551 if ( pParty->uNumGold < v44 ) 4551 if ( pParty->uNumGold < v44 )
5142 v23 = 0i64; 5142 v23 = 0i64;
5143 v20 = 0; 5143 v20 = 0;
5144 //for ( i = (int)pParty->pPlayers[0].pName; ; v3 = (char *)i ) 5144 //for ( i = (int)pParty->pPlayers[0].pName; ; v3 = (char *)i )
5145 for ( i = pParty->pPlayers; ; v3 = i ) 5145 for ( i = pParty->pPlayers; ; v3 = i )
5146 { 5146 {
5147 v4 = pClassNames[v3->uClass]; 5147 v4 = pClassNames[v3->classType];
5148 v5 = v3->GetBaseLevel(); 5148 v5 = v3->GetBaseLevel();
5149 sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[129], i->pName, v5, v4); 5149 sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[129], i->pName, v5, v4);
5150 pWindow.DrawTitleText( 5150 pWindow.DrawTitleText(
5151 pFont, 5151 pFont,
5152 1u, 5152 1u,