Mercurial > mm7

comparison mm7_1.cpp @ 69:f12a7fd4d114

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
skills tab text fixed
author zipi
date Sun, 27 Jan 2013 11:39:11 +0000
parents d7e3f844fc2e
children 2b798f781d1d
comparison
equal deleted inserted replaced
68:d7e3f844fc2e 69:f12a7fd4d114
225 v5 = 2 * LOBYTE(pFontLucida->uFontHeight) + 13;// Weapons, Level 225 v5 = 2 * LOBYTE(pFontLucida->uFontHeight) + 13;// Weapons, Level
226 sprintf(pTmpBuf, "%s\r400%s", pGlobalTXT_LocalizationStrings[242], pGlobalTXT_LocalizationStrings[131]); 226 sprintf(pTmpBuf, "%s\r400%s", pGlobalTXT_LocalizationStrings[242], pGlobalTXT_LocalizationStrings[131]);
227 pGUIWindow_CurrentMenu->DrawText(pFontArrus, 24, v5, a5, pTmpBuf, 0, 0, 0); 227 pGUIWindow_CurrentMenu->DrawText(pFontArrus, 24, v5, a5, pTmpBuf, 0, 0, 0);
228 v6 = pGUIWindow_CurrentMenu; 228 v6 = pGUIWindow_CurrentMenu;
229 v70 = 0; 229 v70 = 0;
230 v80 = dword_4E2A2C; 230 v80 = pWeaponSkills;
231 do 231 do
232 { 232 {
233 v62 = *v80; 233 v62 = *v80;
234 v7 = 0; 234 v7 = 0;
235 for ( i = 0; i < (signed int)v6->uNumControls; v7 = i++ + 1 ) 235 for ( i = 0; i < (signed int)v6->uNumControls; v7 = i++ + 1 )
284 else 284 else
285 { 285 {
286 if ( !(v87 & 0xC0) ) 286 if ( !(v87 & 0xC0) )
287 { 287 {
288 sprintf(pTmpBuf, "%s\r400%2d", pSkillNames[v62], uY); 288 sprintf(pTmpBuf, "%s\r400%2d", pSkillNames[v62], uY);
289 goto LABEL_28; 289 pGUIWindow_CurrentMenu->DrawText(pFontLucida, 24, v5, v58, pTmpBuf, 0, 0, 0);
290 v6 = pGUIWindow_CurrentMenu;
291 continue;
290 } 292 }
291 v16 = pGlobalTXT_LocalizationStrings[432]; 293 v16 = pGlobalTXT_LocalizationStrings[432];
292 if ( (v87 & 0x80u) == 0 ) 294 if ( (v87 & 0x80u) == 0 )
293 v16 = pGlobalTXT_LocalizationStrings[433]; 295 v16 = pGlobalTXT_LocalizationStrings[433];
294 v88 = v16; 296 v88 = v16;
297 v54 = uY; 299 v54 = uY;
298 v50 = v58; 300 v50 = v58;
299 v46 = v88; 301 v46 = v88;
300 } 302 }
301 sprintf(pTmpBuf, "%s ", pSkillNames[v62], v15, v46, v50, v54); 303 sprintf(pTmpBuf, "%s ", pSkillNames[v62], v15, v46, v50, v54);
302 LABEL_28:
303 pGUIWindow_CurrentMenu->DrawText(pFontLucida, 24, v5, v58, pTmpBuf, 0, 0, 0); 304 pGUIWindow_CurrentMenu->DrawText(pFontLucida, 24, v5, v58, pTmpBuf, 0, 0, 0);
304 v6 = pGUIWindow_CurrentMenu; 305 v6 = pGUIWindow_CurrentMenu;
305 } 306 }
306 ++v80; 307 ++v80;
307 } 308 }
308 while ( (signed int)v80 < (signed int)dword_4E2A50 ); 309 while ( v80 <= &pWeaponSkills[8]);
309 if ( !v70 ) 310 if ( !v70 )
310 { 311 {
311 v5 = v5 + LOBYTE(pFontLucida->uFontHeight) - 3; 312 v5 = v5 + LOBYTE(pFontLucida->uFontHeight) - 3;
312 v6->DrawText(pFontLucida, 24, v5, 0, pGlobalTXT_LocalizationStrings[153], 0, 0, 0); 313 v6->DrawText(pFontLucida, 24, v5, 0, pGlobalTXT_LocalizationStrings[153], 0, 0, 0);
313 } 314 }
314 uYa = v5 + 2 * LOBYTE(pFontLucida->uFontHeight) - 10; 315 uYa = v5 + 2 * LOBYTE(pFontLucida->uFontHeight) - 10;
315 sprintf(pTmpBuf, "%s\r400%s", pGlobalTXT_LocalizationStrings[138], pGlobalTXT_LocalizationStrings[131]); 316 sprintf(pTmpBuf, "%s\r400%s", pGlobalTXT_LocalizationStrings[138], pGlobalTXT_LocalizationStrings[131]);
316 pGUIWindow_CurrentMenu->DrawText(pFontArrus, 24, uYa, a5, pTmpBuf, 0, 0, 0); 317 pGUIWindow_CurrentMenu->DrawText(pFontArrus, 24, uYa, a5, pTmpBuf, 0, 0, 0);
317 v17 = pGUIWindow_CurrentMenu; 318 v17 = pGUIWindow_CurrentMenu;
318 v71 = 0; 319 v71 = 0;
319 v81 = _4E2A80_skills; 320 v81 = pMagicSkills;
320 do 321 do
321 { 322 {
322 v18 = 0; 323 v18 = 0;
323 v67 = 0; 324 v67 = 0;
324 v63 = *v81; 325 v63 = *v81;
334 } 335 }
335 while ( v18 ); 336 while ( v18 );
336 } 337 }
337 v20 = v19->field_1C; 338 v20 = v19->field_1C;
338 if ( SBYTE1(v20) >= 0 || (BYTE1(v20) &= 0x7Fu, v20 != v63) ) 339 if ( SBYTE1(v20) >= 0 || (BYTE1(v20) &= 0x7Fu, v20 != v63) )
339 goto LABEL_59; 340 {
341 v18 = v67++ + 1;
342 continue;
343 }
340 ++v71; 344 ++v71;
341 uYa = v19->uY; 345 uYa = v19->uY;
342 v21 = pPlayer->pActiveSkills[v63]; 346 v21 = pPlayer->pActiveSkills[v63];
343 v22 = pPlayer->uSkillPoints; 347 v22 = pPlayer->uSkillPoints;
344 v23 = pPlayer->pActiveSkills[v63] & 0x3F; 348 v23 = pPlayer->pActiveSkills[v63] & 0x3F;
369 else 373 else
370 { 374 {
371 if ( !(v21 & 0xC0) ) 375 if ( !(v21 & 0xC0) )
372 { 376 {
373 sprintf(pTmpBuf, "%s\r400%2d", pSkillNames[v63], v23); 377 sprintf(pTmpBuf, "%s\r400%2d", pSkillNames[v63], v23);
374 goto LABEL_58; 378 pGUIWindow_CurrentMenu->DrawText(pFontLucida, 24, uYa, v59, pTmpBuf, 0, 0, 0);
379 v17 = pGUIWindow_CurrentMenu;
380 v18 = v67++ + 1;
381 continue;
375 } 382 }
376 v25 = (v21 & 0x80u) != 0; 383 v25 = (v21 & 0x80u) != 0;
377 v26 = pGlobalTXT_LocalizationStrings[432]; 384 v26 = pGlobalTXT_LocalizationStrings[432];
378 if ( !v25 ) 385 if ( !v25 )
379 v26 = pGlobalTXT_LocalizationStrings[433]; 386 v26 = pGlobalTXT_LocalizationStrings[433];
383 v55 = v23; 390 v55 = v23;
384 v51 = v59; 391 v51 = v59;
385 v47 = v89; 392 v47 = v89;
386 } 393 }
387 sprintf(pTmpBuf, "%s ", pSkillNames[v63], v24, v47, v51, v55); 394 sprintf(pTmpBuf, "%s ", pSkillNames[v63], v24, v47, v51, v55);
388 LABEL_58: 395 //LABEL_58:
389 pGUIWindow_CurrentMenu->DrawText(pFontLucida, 24, uYa, v59, pTmpBuf, 0, 0, 0); 396 pGUIWindow_CurrentMenu->DrawText(pFontLucida, 24, uYa, v59, pTmpBuf, 0, 0, 0);
390 v17 = pGUIWindow_CurrentMenu; 397 v17 = pGUIWindow_CurrentMenu;
391 LABEL_59: 398 //LABEL_59:
392 v18 = v67++ + 1; 399 v18 = v67++ + 1;
393 } 400 }
394 ++v81; 401 ++v81;
395 } 402 }
396 while ( (signed int)v81 < (signed int)pAwardsTextColors ); 403 while ( v81 <= &pMagicSkills[8]);
397 if ( !v71 ) 404 if ( !v71 )
398 v17->DrawText( 405 v17->DrawText(
399 pFontLucida, 406 pFontLucida,
400 24, 407 24,
401 LOBYTE(pFontLucida->uFontHeight) + uYa - 3, 408 LOBYTE(pFontLucida->uFontHeight) + uYa - 3,
427 } 434 }
428 while ( v29 ); 435 while ( v29 );
429 } 436 }
430 v31 = v30->field_1C; 437 v31 = v30->field_1C;
431 if ( SBYTE1(v31) >= 0 || (BYTE1(v31) &= 0x7Fu, v31 != v64) ) 438 if ( SBYTE1(v31) >= 0 || (BYTE1(v31) &= 0x7Fu, v31 != v64) )
432 goto LABEL_89; 439 {
440 v29 = v68++ + 1;
441 continue;
442 }
433 v27 = v30->uY; 443 v27 = v30->uY;
434 ++v72; 444 ++v72;
435 v60 = 0; 445 v60 = 0;
436 v90 = pPlayer->pActiveSkills[v64]; 446 v90 = pPlayer->pActiveSkills[v64];
437 v32 = pPlayer->uSkillPoints; 447 v32 = pPlayer->uSkillPoints;
463 else 473 else
464 { 474 {
465 if ( !(v90 & 0xC0) ) 475 if ( !(v90 & 0xC0) )
466 { 476 {
467 sprintf(pTmpBuf, "%s\r177%2d", pSkillNames[v64], uYb); 477 sprintf(pTmpBuf, "%s\r177%2d", pSkillNames[v64], uYb);
468 goto LABEL_88; 478 pGUIWindow_CurrentMenu->DrawText(pFontLucida, 248, v27, v60, pTmpBuf, 0, 0, 0);
479 v28 = pGUIWindow_CurrentMenu;
480 v29 = v68++ + 1;
481 continue;
469 } 482 }
470 v35 = pGlobalTXT_LocalizationStrings[432]; 483 v35 = pGlobalTXT_LocalizationStrings[432];
471 if ( (v90 & 0x80u) == 0 ) 484 if ( (v90 & 0x80u) == 0 )
472 v35 = pGlobalTXT_LocalizationStrings[433]; 485 v35 = pGlobalTXT_LocalizationStrings[433];
473 v91 = v35; 486 v91 = v35;
476 v56 = uYb; 489 v56 = uYb;
477 v52 = v60; 490 v52 = v60;
478 v48 = v91; 491 v48 = v91;
479 } 492 }
480 sprintf(pTmpBuf, "%s ", pSkillNames[v64], v34, v48, v52, v56); 493 sprintf(pTmpBuf, "%s ", pSkillNames[v64], v34, v48, v52, v56);
481 LABEL_88: 494 //LABEL_88:
482 pGUIWindow_CurrentMenu->DrawText(pFontLucida, 248, v27, v60, pTmpBuf, 0, 0, 0); 495 pGUIWindow_CurrentMenu->DrawText(pFontLucida, 248, v27, v60, pTmpBuf, 0, 0, 0);
483 v28 = pGUIWindow_CurrentMenu; 496 v28 = pGUIWindow_CurrentMenu;
484 LABEL_89: 497 //LABEL_89:
485 v29 = v68++ + 1; 498 v29 = v68++ + 1;
486 } 499 }
487 ++v82; 500 ++v82;
488 } 501 }
489 while ( (signed int)v82 < (signed int)dword_4E2A2C ); 502 while ( v82 <= &pArmorSkills[4]);
490 if ( !v72 ) 503 if ( !v72 )
491 { 504 {
492 v27 = v27 + LOBYTE(pFontLucida->uFontHeight) - 3; 505 v27 = v27 + LOBYTE(pFontLucida->uFontHeight) - 3;
493 v28->DrawText(pFontLucida, 248, v27, 0, pGlobalTXT_LocalizationStrings[153], 0, 0, 0); 506 v28->DrawText(pFontLucida, 248, v27, 0, pGlobalTXT_LocalizationStrings[153], 0, 0, 0);
494 } 507 }
495 uYc = v27 + 2 * LOBYTE(pFontLucida->uFontHeight) - 10; 508 uYc = v27 + 2 * LOBYTE(pFontLucida->uFontHeight) - 10;
496 sprintf(pTmpBuf, "%s\r177%s", pGlobalTXT_LocalizationStrings[143], pGlobalTXT_LocalizationStrings[131]); 509 sprintf(pTmpBuf, "%s\r177%s", pGlobalTXT_LocalizationStrings[143], pGlobalTXT_LocalizationStrings[131]);
497 pGUIWindow_CurrentMenu->DrawText(pFontArrus, 248, uYc, a5, pTmpBuf, 0, 0, 0); 510 pGUIWindow_CurrentMenu->DrawText(pFontArrus, 248, uYc, a5, pTmpBuf, 0, 0, 0);
498 v36 = pGUIWindow_CurrentMenu; 511 v36 = pGUIWindow_CurrentMenu;
499 v73 = 0; 512 v73 = 0;
500 v83 = dword_4E2A50; 513 v83 = pMiscSkills;
501 do 514 do
502 { 515 {
503 v37 = 0; 516 v37 = 0;
504 v69 = 0; 517 v69 = 0;
505 v38 = (GUIButton *)*v83; 518 v38 = (GUIButton *)*v83;
516 } 529 }
517 while ( v37 ); 530 while ( v37 );
518 } 531 }
519 v39 = v38->field_1C; 532 v39 = v38->field_1C;
520 if ( SBYTE1(v39) >= 0 || (BYTE1(v39) &= 0x7Fu, v39 != v65) ) 533 if ( SBYTE1(v39) >= 0 || (BYTE1(v39) &= 0x7Fu, v39 != v65) )
521 goto LABEL_119; 534 {
535 //goto LABEL_119;
536 v37 = v69++ + 1;
537 continue;
538 }
522 ++v73; 539 ++v73;
523 uYc = v38->uY; 540 uYc = v38->uY;
524 v40 = pPlayer->pActiveSkills[v65]; 541 v40 = pPlayer->pActiveSkills[v65];
525 v41 = pPlayer->uSkillPoints; 542 v41 = pPlayer->uSkillPoints;
526 v42 = pPlayer->pActiveSkills[v65] & 0x3F; 543 v42 = pPlayer->pActiveSkills[v65] & 0x3F;
551 else 568 else
552 { 569 {
553 if ( !(v40 & 0xC0) ) 570 if ( !(v40 & 0xC0) )
554 { 571 {
555 sprintf(pTmpBuf, "%s\r177%2d", pSkillNames[v65], v42); 572 sprintf(pTmpBuf, "%s\r177%2d", pSkillNames[v65], v42);
556 goto LABEL_118; 573 LOBYTE(v38) = pGUIWindow_CurrentMenu->DrawText(pFontLucida, 248, uYc, v61, pTmpBuf, 0, 0, 0);
574 v36 = pGUIWindow_CurrentMenu;
575 v37 = v69++ + 1;
576 continue;
557 } 577 }
558 v25 = (v40 & 0x80u) != 0; 578 v25 = (v40 & 0x80u) != 0;
559 v44 = pGlobalTXT_LocalizationStrings[432]; 579 v44 = pGlobalTXT_LocalizationStrings[432];
560 if ( !v25 ) 580 if ( !v25 )
561 v44 = pGlobalTXT_LocalizationStrings[433]; 581 v44 = pGlobalTXT_LocalizationStrings[433];
565 v57 = v42; 585 v57 = v42;
566 v53 = v61; 586 v53 = v61;
567 v49 = v92; 587 v49 = v92;
568 } 588 }
569 sprintf(pTmpBuf, "%s ", pSkillNames[v65], v43, v49, v53, v57); 589 sprintf(pTmpBuf, "%s ", pSkillNames[v65], v43, v49, v53, v57);
570 LABEL_118:
571 LOBYTE(v38) = pGUIWindow_CurrentMenu->DrawText(pFontLucida, 248, uYc, v61, pTmpBuf, 0, 0, 0); 590 LOBYTE(v38) = pGUIWindow_CurrentMenu->DrawText(pFontLucida, 248, uYc, v61, pTmpBuf, 0, 0, 0);
572 v36 = pGUIWindow_CurrentMenu; 591 v36 = pGUIWindow_CurrentMenu;
573 LABEL_119:
574 v37 = v69++ + 1; 592 v37 = v69++ + 1;
575 } 593 }
576 ++v83; 594 ++v83;
577 } 595 }
578 while ( (signed int)v83 < (signed int)_4E2A80_skills ); 596 while ( v83 <= &pMiscSkills[11]);
579 if ( !v73 ) 597 if ( !v73 )
580 LOBYTE(v38) = v36->DrawText( 598 LOBYTE(v38) = v36->DrawText(
581 pFontLucida, 599 pFontLucida,
582 248, 600 248,
583 LOBYTE(pFontLucida->uFontHeight) + uYc - 3, 601 LOBYTE(pFontLucida->uFontHeight) + uYc - 3,