Mercurial > mm7

comparison mm7_2.cpp @ 263:8cf4fe6b4941

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Mon, 18 Feb 2013 12:38:38 +0600
parents 2d6dda2e0405 96f3a1177b37
children ac44e716d051
comparison
equal deleted inserted replaced
262:2d6dda2e0405 263:8cf4fe6b4941
1461 v5 = "%24"; 1461 v5 = "%24";
1462 v79 = v4; 1462 v79 = v4;
1463 LABEL_13: 1463 LABEL_13:
1464 v6 = uActiveCharacter - 1; 1464 v6 = uActiveCharacter - 1;
1465 LABEL_14: 1465 LABEL_14:
1466 v7 = sub_495461(v5, v6, v79, (char *)v81, v83, v85); 1466 v7 = BuilDialogueString(v5, v6, v79, (char *)v81, v83, v85);
1467 v86 = 3; 1467 v86 = 3;
1468 v84 = v7; 1468 v84 = v7;
1469 v82 = v105; 1469 v82 = v105;
1470 v80 = v3; 1470 v80 = v3;
1471 v78 = v3; 1471 v78 = v3;
1860 v38 = "%24"; 1860 v38 = "%24";
1861 v87 = v37; 1861 v87 = v37;
1862 LABEL_44: 1862 LABEL_44:
1863 v39 = uActiveCharacter - 1; 1863 v39 = uActiveCharacter - 1;
1864 LABEL_45: 1864 LABEL_45:
1865 v21 = sub_495461(v38, v39, v87, (char *)v89, v91, v93); 1865 v21 = BuilDialogueString(v38, v39, v87, (char *)v89, v91, v93);
1866 v92 = 3; 1866 v92 = 3;
1867 v90 = v21; 1867 v90 = v21;
1868 v88 = v108; 1868 v88 = v108;
1869 v86 = v3; 1869 v86 = v3;
1870 v85 = v3; 1870 v85 = v3;
2427 v99 = _this->_490EEE( 2427 v99 = _this->_490EEE(
2428 (ItemGen *)&pParty->field_C59C[9 * (v95 - 1 + 12 * (int)v96) + 724], 2428 (ItemGen *)&pParty->field_C59C[9 * (v95 - 1 + 12 * (int)v96) + 724],
2429 2, 2429 2,
2430 (int)ptr_507BC0->ptr_1C, 2430 (int)ptr_507BC0->ptr_1C,
2431 2); 2431 2);
2432 v100 = sub_495461((char *)pMerchantsBuyPhrases[v99], v97, v98, (char *)v96, 2, 0); 2432 v100 = BuilDialogueString((char *)pMerchantsBuyPhrases[v99], v97, v98, (char *)v96, 2, 0);
2433 v101 = v100; 2433 v101 = v100;
2434 v102 = v148; 2434 v102 = v148;
2435 v103 = pFontArrus->CalcTextHeight(v100, &v144, 0, 0); 2435 v103 = pFontArrus->CalcTextHeight(v100, &v144, 0, 0);
2436 v144.DrawTitleText(pFontArrus, 0, (174 - v103) / 2 + 138, v102, v101, 3u); 2436 v144.DrawTitleText(pFontArrus, 0, (174 - v103) / 2 + 138, v102, v101, 3u);
2437 } 2437 }
2757 v116 = v77; 2757 v116 = v77;
2758 v15 = pGlobalTXT_LocalizationStrings[181]; 2758 v15 = pGlobalTXT_LocalizationStrings[181];
2759 v14 = uActiveCharacter - 1; 2759 v14 = uActiveCharacter - 1;
2760 } 2760 }
2761 LABEL_36: 2761 LABEL_36:
2762 v36 = sub_495461(v15, v14, v116, (char *)v120, v122, v124); 2762 v36 = BuilDialogueString(v15, v14, v116, (char *)v120, v122, v124);
2763 v123 = 3; 2763 v123 = 3;
2764 v121 = v36; 2764 v121 = v36;
2765 v119 = v148; 2765 v119 = v148;
2766 v117 = (int)v11; 2766 v117 = (int)v11;
2767 v113 = (int)v11; 2767 v113 = (int)v11;
2909 uPlayerID = uActiveCharacter - 1; 2909 uPlayerID = uActiveCharacter - 1;
2910 v8 = v0->_490EEE(v3, 2, v7, 4); 2910 v8 = v0->_490EEE(v3, 2, v7, 4);
2911 v4 = uPlayerID; 2911 v4 = uPlayerID;
2912 v5 = (char *)pMerchantsIdentifyPhrases[v8]; 2912 v5 = (char *)pMerchantsIdentifyPhrases[v8];
2913 } 2913 }
2914 v6 = sub_495461(v5, v4, v114, (char *)v118, 4, 0); 2914 v6 = BuilDialogueString(v5, v4, v114, (char *)v118, 4, 0);
2915 v123 = 3; 2915 v123 = 3;
2916 v121 = v6; 2916 v121 = v6;
2917 v119 = v148; 2917 v119 = v148;
2918 v115 = (174 - pFontArrus->CalcTextHeight(v6, &v144, 0, 0)) / 2 + 138; 2918 v115 = (174 - pFontArrus->CalcTextHeight(v6, &v144, 0, 0)) / 2 + 138;
2919 v112 = 0; 2919 v112 = 0;
13390 unsigned int startms; // [sp+8h] [bp-24h]@55 13390 unsigned int startms; // [sp+8h] [bp-24h]@55
13391 RECT Rect; // [sp+Ch] [bp-20h]@15 13391 RECT Rect; // [sp+Ch] [bp-20h]@15
13392 int a2[4]; // [sp+1Ch] [bp-10h]@15 13392 int a2[4]; // [sp+1Ch] [bp-10h]@15
13393 13393
13394 char test[1024]; 13394 char test[1024];
13395 sprintfex(test, "^Pi[%s]: ^R[;;]", ""); 13395 //sprintfex(test, "^Pi[%s]: ^R[;;]", "");
13396 13396
13397 if (pCmdLine && *pCmdLine) 13397 if (pCmdLine && *pCmdLine)
13398 { 13398 {
13399 if (wcsstr(pCmdLine, L"-usedefs")) 13399 if (wcsstr(pCmdLine, L"-usedefs"))
13400 bDebugResouces = 1; 13400 bDebugResouces = 1;
13409 bNoSound = true; //dword_6BE364_game_settings_1 |= 0x10; 13409 bNoSound = true; //dword_6BE364_game_settings_1 |= 0x10;
13410 13410
13411 bWalkSound = ReadWindowsRegistryInt("WalkSound", 1) != 0; 13411 bWalkSound = ReadWindowsRegistryInt("WalkSound", 1) != 0;
13412 if (wcsstr(pCmdLine, L"-nowalksound")) 13412 if (wcsstr(pCmdLine, L"-nowalksound"))
13413 bWalkSound = false;//dword_6BE364_game_settings_1 |= 0x20; 13413 bWalkSound = false;//dword_6BE364_game_settings_1 |= 0x20;
13414 if (wcsstr(pCmdLine, L"-noanim")) 13414 if (wcsstr(pCmdLine, L"-novideo"))
13415 { 13415 {
13416 dword_6BE364_game_settings_1 |= 0x40; 13416 dword_6BE364_game_settings_1 |= 0x40;
13417 bNoVideo = true; 13417 bNoVideo = true;
13418 } 13418 }
13419 if (wcsstr(pCmdLine, L"-nocd")) 13419 if (wcsstr(pCmdLine, L"-nocd"))