diff options
| author | oy <Tom_Adams@web.de> | 2011-04-04 20:37:12 +0200 |
|---|---|---|
| committer | oy <Tom_Adams@web.de> | 2011-04-04 20:37:12 +0200 |
| commit | 5c6e274a885d8df97e208071f8006d1005868e65 (patch) | |
| tree | 5521405ad43852b072d0dca6609b93ab6a130083 | |
| parent | 4ad6d2f01e5b972a969dced080976f2e8dfbd939 (diff) | |
| download | zcatch-5c6e274a885d8df97e208071f8006d1005868e65.tar.gz zcatch-5c6e274a885d8df97e208071f8006d1005868e65.zip | |
added more and resized flags by Crises and made them show up smaller and less of an eye-catcher. Closes #566
87 files changed, 708 insertions, 43 deletions
diff --git a/data/countryflags/AR.png b/data/countryflags/AR.png new file mode 100644 index 00000000..09d3705c --- /dev/null +++ b/data/countryflags/AR.png Binary files differdiff --git a/data/countryflags/AT.png b/data/countryflags/AT.png new file mode 100644 index 00000000..2fa26168 --- /dev/null +++ b/data/countryflags/AT.png Binary files differdiff --git a/data/countryflags/AU.png b/data/countryflags/AU.png new file mode 100644 index 00000000..d4c897e8 --- /dev/null +++ b/data/countryflags/AU.png Binary files differdiff --git a/data/countryflags/BE.png b/data/countryflags/BE.png new file mode 100644 index 00000000..c630efe6 --- /dev/null +++ b/data/countryflags/BE.png Binary files differdiff --git a/data/countryflags/BG.png b/data/countryflags/BG.png new file mode 100644 index 00000000..052f44b7 --- /dev/null +++ b/data/countryflags/BG.png Binary files differdiff --git a/data/countryflags/BR.png b/data/countryflags/BR.png new file mode 100644 index 00000000..2def6d20 --- /dev/null +++ b/data/countryflags/BR.png Binary files differdiff --git a/data/countryflags/BY.png b/data/countryflags/BY.png new file mode 100644 index 00000000..8ac67926 --- /dev/null +++ b/data/countryflags/BY.png Binary files differdiff --git a/data/countryflags/CA.png b/data/countryflags/CA.png new file mode 100644 index 00000000..b21135fb --- /dev/null +++ b/data/countryflags/CA.png Binary files differdiff --git a/data/countryflags/CH.png b/data/countryflags/CH.png new file mode 100644 index 00000000..347fa7d0 --- /dev/null +++ b/data/countryflags/CH.png Binary files differdiff --git a/data/countryflags/CL.png b/data/countryflags/CL.png new file mode 100644 index 00000000..aa361de7 --- /dev/null +++ b/data/countryflags/CL.png Binary files differdiff --git a/data/countryflags/CN.png b/data/countryflags/CN.png new file mode 100644 index 00000000..d85c9cec --- /dev/null +++ b/data/countryflags/CN.png Binary files differdiff --git a/data/countryflags/CO.png b/data/countryflags/CO.png new file mode 100644 index 00000000..5b4f9ea1 --- /dev/null +++ b/data/countryflags/CO.png Binary files differdiff --git a/data/countryflags/CZ.png b/data/countryflags/CZ.png new file mode 100644 index 00000000..ea348968 --- /dev/null +++ b/data/countryflags/CZ.png Binary files differdiff --git a/data/countryflags/DE.png b/data/countryflags/DE.png new file mode 100644 index 00000000..703af264 --- /dev/null +++ b/data/countryflags/DE.png Binary files differdiff --git a/data/countryflags/DK.png b/data/countryflags/DK.png new file mode 100644 index 00000000..43e50351 --- /dev/null +++ b/data/countryflags/DK.png Binary files differdiff --git a/data/countryflags/EE.png b/data/countryflags/EE.png new file mode 100644 index 00000000..13412644 --- /dev/null +++ b/data/countryflags/EE.png Binary files differdiff --git a/data/countryflags/EG.png b/data/countryflags/EG.png new file mode 100644 index 00000000..e9bdcf7d --- /dev/null +++ b/data/countryflags/EG.png Binary files differdiff --git a/data/countryflags/ES.png b/data/countryflags/ES.png new file mode 100644 index 00000000..0447ba5d --- /dev/null +++ b/data/countryflags/ES.png Binary files differdiff --git a/data/countryflags/FI.png b/data/countryflags/FI.png new file mode 100644 index 00000000..7bb5f882 --- /dev/null +++ b/data/countryflags/FI.png Binary files differdiff --git a/data/countryflags/FR.png b/data/countryflags/FR.png new file mode 100644 index 00000000..50203b03 --- /dev/null +++ b/data/countryflags/FR.png Binary files differdiff --git a/data/countryflags/GB.png b/data/countryflags/GB.png new file mode 100644 index 00000000..c26eae17 --- /dev/null +++ b/data/countryflags/GB.png Binary files differdiff --git a/data/countryflags/GR.png b/data/countryflags/GR.png new file mode 100644 index 00000000..9656cae4 --- /dev/null +++ b/data/countryflags/GR.png Binary files differdiff --git a/data/countryflags/HR.png b/data/countryflags/HR.png new file mode 100644 index 00000000..dd5dd81b --- /dev/null +++ b/data/countryflags/HR.png Binary files differdiff --git a/data/countryflags/HU.png b/data/countryflags/HU.png new file mode 100644 index 00000000..180c4772 --- /dev/null +++ b/data/countryflags/HU.png Binary files differdiff --git a/data/countryflags/ID.png b/data/countryflags/ID.png new file mode 100644 index 00000000..ccf1501c --- /dev/null +++ b/data/countryflags/ID.png Binary files differdiff --git a/data/countryflags/IL.png b/data/countryflags/IL.png new file mode 100644 index 00000000..c97db558 --- /dev/null +++ b/data/countryflags/IL.png Binary files differdiff --git a/data/countryflags/IN.png b/data/countryflags/IN.png new file mode 100644 index 00000000..8db53a56 --- /dev/null +++ b/data/countryflags/IN.png Binary files differdiff --git a/data/countryflags/IR.png b/data/countryflags/IR.png new file mode 100644 index 00000000..72999bfa --- /dev/null +++ b/data/countryflags/IR.png Binary files differdiff --git a/data/countryflags/IT.png b/data/countryflags/IT.png new file mode 100644 index 00000000..d79039b3 --- /dev/null +++ b/data/countryflags/IT.png Binary files differdiff --git a/data/countryflags/KZ.png b/data/countryflags/KZ.png new file mode 100644 index 00000000..5e2cb4e5 --- /dev/null +++ b/data/countryflags/KZ.png Binary files differdiff --git a/data/countryflags/LT.png b/data/countryflags/LT.png new file mode 100644 index 00000000..72999316 --- /dev/null +++ b/data/countryflags/LT.png Binary files differdiff --git a/data/countryflags/LV.png b/data/countryflags/LV.png new file mode 100644 index 00000000..da2a5ffc --- /dev/null +++ b/data/countryflags/LV.png Binary files differdiff --git a/data/countryflags/MX.png b/data/countryflags/MX.png new file mode 100644 index 00000000..bb355119 --- /dev/null +++ b/data/countryflags/MX.png Binary files differdiff --git a/data/countryflags/NL.png b/data/countryflags/NL.png new file mode 100644 index 00000000..9e58270d --- /dev/null +++ b/data/countryflags/NL.png Binary files differdiff --git a/data/countryflags/NO.png b/data/countryflags/NO.png new file mode 100644 index 00000000..04b59bef --- /dev/null +++ b/data/countryflags/NO.png Binary files differdiff --git a/data/countryflags/PH.png b/data/countryflags/PH.png new file mode 100644 index 00000000..35dc34a1 --- /dev/null +++ b/data/countryflags/PH.png Binary files differdiff --git a/data/countryflags/PK.png b/data/countryflags/PK.png new file mode 100644 index 00000000..5bfa662a --- /dev/null +++ b/data/countryflags/PK.png Binary files differdiff --git a/data/countryflags/PL.png b/data/countryflags/PL.png new file mode 100644 index 00000000..bed7d9a2 --- /dev/null +++ b/data/countryflags/PL.png Binary files differdiff --git a/data/countryflags/PT.png b/data/countryflags/PT.png new file mode 100644 index 00000000..88986a5e --- /dev/null +++ b/data/countryflags/PT.png Binary files differdiff --git a/data/countryflags/RO.png b/data/countryflags/RO.png new file mode 100644 index 00000000..f460f03c --- /dev/null +++ b/data/countryflags/RO.png Binary files differdiff --git a/data/countryflags/RS.png b/data/countryflags/RS.png new file mode 100644 index 00000000..a83434ec --- /dev/null +++ b/data/countryflags/RS.png Binary files differdiff --git a/data/countryflags/RU.png b/data/countryflags/RU.png new file mode 100644 index 00000000..a9845c79 --- /dev/null +++ b/data/countryflags/RU.png Binary files differdiff --git a/data/countryflags/SA.png b/data/countryflags/SA.png new file mode 100644 index 00000000..ee8dab1a --- /dev/null +++ b/data/countryflags/SA.png Binary files differdiff --git a/data/countryflags/SE.png b/data/countryflags/SE.png new file mode 100644 index 00000000..50eaf8ea --- /dev/null +++ b/data/countryflags/SE.png Binary files differdiff --git a/data/countryflags/SK.png b/data/countryflags/SK.png new file mode 100644 index 00000000..a2a2cc9a --- /dev/null +++ b/data/countryflags/SK.png Binary files differdiff --git a/data/countryflags/TR.png b/data/countryflags/TR.png new file mode 100644 index 00000000..6a0839ef --- /dev/null +++ b/data/countryflags/TR.png Binary files differdiff --git a/data/countryflags/UA.png b/data/countryflags/UA.png new file mode 100644 index 00000000..c18de0a0 --- /dev/null +++ b/data/countryflags/UA.png Binary files differdiff --git a/data/countryflags/US.png b/data/countryflags/US.png new file mode 100644 index 00000000..4660d464 --- /dev/null +++ b/data/countryflags/US.png Binary files differdiff --git a/data/countryflags/XEN.png b/data/countryflags/XEN.png new file mode 100644 index 00000000..baecb8f7 --- /dev/null +++ b/data/countryflags/XEN.png Binary files differdiff --git a/data/countryflags/XNI.png b/data/countryflags/XNI.png new file mode 100644 index 00000000..8402e355 --- /dev/null +++ b/data/countryflags/XNI.png Binary files differdiff --git a/data/countryflags/XSC.png b/data/countryflags/XSC.png new file mode 100644 index 00000000..e0f57e16 --- /dev/null +++ b/data/countryflags/XSC.png Binary files differdiff --git a/data/countryflags/XWA.png b/data/countryflags/XWA.png new file mode 100644 index 00000000..0787133d --- /dev/null +++ b/data/countryflags/XWA.png Binary files differdiff --git a/data/countryflags/ZA.png b/data/countryflags/ZA.png new file mode 100644 index 00000000..5ba80299 --- /dev/null +++ b/data/countryflags/ZA.png Binary files differdiff --git a/data/countryflags/argentina.png b/data/countryflags/argentina.png deleted file mode 100644 index ed6472e3..00000000 --- a/data/countryflags/argentina.png +++ /dev/null Binary files differdiff --git a/data/countryflags/austria.png b/data/countryflags/austria.png deleted file mode 100644 index 66f223c3..00000000 --- a/data/countryflags/austria.png +++ /dev/null Binary files differdiff --git a/data/countryflags/belgium.png b/data/countryflags/belgium.png deleted file mode 100644 index bdcd3e31..00000000 --- a/data/countryflags/belgium.png +++ /dev/null Binary files differdiff --git a/data/countryflags/bosnia_and_herzegovina.png b/data/countryflags/bosnia_and_herzegovina.png deleted file mode 100644 index 272007dc..00000000 --- a/data/countryflags/bosnia_and_herzegovina.png +++ /dev/null Binary files differdiff --git a/data/countryflags/czech_republic.png b/data/countryflags/czech_republic.png deleted file mode 100644 index c31ebde9..00000000 --- a/data/countryflags/czech_republic.png +++ /dev/null Binary files differdiff --git a/data/countryflags/default.png b/data/countryflags/default.png index 08e2bb0b..3f9bfb70 100644 --- a/data/countryflags/default.png +++ b/data/countryflags/default.png Binary files differdiff --git a/data/countryflags/denmark.png b/data/countryflags/denmark.png deleted file mode 100644 index 4addafbd..00000000 --- a/data/countryflags/denmark.png +++ /dev/null Binary files differdiff --git a/data/countryflags/england.png b/data/countryflags/england.png deleted file mode 100644 index fa877767..00000000 --- a/data/countryflags/england.png +++ /dev/null Binary files differdiff --git a/data/countryflags/finland.png b/data/countryflags/finland.png deleted file mode 100644 index e46e77e8..00000000 --- a/data/countryflags/finland.png +++ /dev/null Binary files differdiff --git a/data/countryflags/france.png b/data/countryflags/france.png deleted file mode 100644 index 56006266..00000000 --- a/data/countryflags/france.png +++ /dev/null Binary files differdiff --git a/data/countryflags/germany.png b/data/countryflags/germany.png deleted file mode 100644 index 840dabbb..00000000 --- a/data/countryflags/germany.png +++ /dev/null Binary files differdiff --git a/data/countryflags/greece.png b/data/countryflags/greece.png deleted file mode 100644 index a91061cf..00000000 --- a/data/countryflags/greece.png +++ /dev/null Binary files differdiff --git a/data/countryflags/index.txt b/data/countryflags/index.txt index 593e22ac..a07b6fba 100644 --- a/data/countryflags/index.txt +++ b/data/countryflags/index.txt @@ -6,95 +6,760 @@ default == -1 -england +XEN == 901 -northern_ireland +XNI == 902 -scotland +XSC == 903 -wales +XWA == 904 ##### ISO 3166-1 based ##### -argentina -== 032 +AF +== 4 -austria -== 040 +AX +== 248 -belgium -== 056 +AL +== 8 -bosnia_and_herzegovina -== 070 +DZ +== 12 -czech_republic +AS +== 16 + +AD +== 20 + +AO +== 24 + +AI +== 660 + +AQ +== 10 + +AG +== 28 + +AR +== 32 + +AM +== 51 + +AW +== 533 + +AU +== 36 + +AT +== 40 + +AZ +== 31 + +BS +== 44 + +BH +== 48 + +BD +== 50 + +BB +== 52 + +BY +== 112 + +BE +== 56 + +BZ +== 84 + +BJ +== 204 + +BM +== 60 + +BT +== 64 + +BO +== 68 + +BQ +== 535 + +BA +== 70 + +BW +== 72 + +BV +== 74 + +BR +== 76 + +IO +== 86 + +BN +== 96 + +BG +== 100 + +BF +== 854 + +BI +== 108 + +KH +== 116 + +CM +== 120 + +CA +== 124 + +CV +== 132 + +KY +== 136 + +CF +== 140 + +TD +== 148 + +CL +== 152 + +CN +== 156 + +CX +== 162 + +CC +== 166 + +CO +== 170 + +KM +== 174 + +CG +== 178 + +CD +== 180 + +CK +== 184 + +CR +== 188 + +CI +== 384 + +HR +== 191 + +CU +== 192 + +CW +== 531 + +CY +== 196 + +CZ == 203 -denmark +DK == 208 -finland +DJ +== 262 + +DM +== 212 + +DO +== 214 + +EC +== 218 + +EG +== 818 + +SV +== 222 + +GQ +== 226 + +ER +== 232 + +EE +== 233 + +ET +== 231 + +FK +== 238 + +FO +== 234 + +FJ +== 242 + +FI == 246 -france +FR == 250 -germany +GF +== 254 + +PF +== 258 + +TF +== 260 + +GA +== 266 + +GM +== 270 + +GE +== 268 + +DE == 276 -greece +GH +== 288 + +GI +== 292 + +GR == 300 -#ireland -#== 372 +GL +== 304 + +GD +== 308 + +GP +== 312 + +GU +== 316 + +GT +== 320 + +GG +== 831 + +GN +== 324 + +GW +== 624 + +GY +== 328 -italy +HT +== 332 + +HM +== 334 + +VA +== 336 + +HN +== 340 + +HK +== 344 + +HU +== 348 + +IS +== 352 + +IN +== 356 + +ID +== 360 + +IR +== 364 + +IQ +== 368 + +IE +== 372 + +IM +== 833 + +IL +== 376 + +IT == 380 -netherlands +JM +== 388 + +JP +== 392 + +JE +== 832 + +JO +== 400 + +KZ +== 398 + +KE +== 404 + +KI +== 296 + +KP +== 408 + +KR +== 410 + +KW +== 414 + +KG +== 417 + +LA +== 418 + +LV +== 428 + +LB +== 422 + +LS +== 426 + +LR +== 430 + +LY +== 434 + +LI +== 438 + +LT +== 440 + +LU +== 442 + +MO +== 446 + +MK +== 807 + +MG +== 450 + +MW +== 454 + +MY +== 458 + +MV +== 462 + +ML +== 466 + +MT +== 470 + +MH +== 584 + +MQ +== 474 + +MR +== 478 + +MU +== 480 + +YT +== 175 + +MX +== 484 + +FM +== 583 + +MD +== 498 + +MC +== 492 + +MN +== 496 + +ME +== 499 + +MS +== 500 + +MA +== 504 + +MZ +== 508 + +MM +== 104 + +NA +== 516 + +NR +== 520 + +NP +== 524 + +NL == 528 -norway +NC +== 540 + +NZ +== 554 + +NI +== 558 + +NE +== 562 + +NG +== 566 + +NU +== 570 + +NF +== 574 + +MP +== 580 + +NO == 578 -poland +OM +== 512 + +PK +== 586 + +PW +== 585 + +PS +== 275 + +PA +== 591 + +PG +== 598 + +PY +== 600 + +PE +== 604 + +PH +== 608 + +PN +== 612 + +PL == 616 -portugal +PT == 620 -romania +PR +== 630 + +QA +== 634 + +RE +== 638 + +RO == 642 -russian_federation +RU == 643 -serbia +RW +== 646 + +BL +== 652 + +SH +== 654 + +KN +== 659 + +LC +== 662 + +MF +== 663 + +PM +== 666 + +VC +== 670 + +WS +== 882 + +SM +== 674 + +ST +== 678 + +SA +== 682 + +SN +== 686 + +RS == 688 -slovakia +SC +== 690 + +SL +== 694 + +SG +== 702 + +SX +== 534 + +SK == 703 -spain +SI +== 705 + +SB +== 90 + +SO +== 706 + +ZA +== 710 + +GS +== 239 + +ES == 724 -sweden +LK +== 144 + +SD +== 736 + +SR +== 740 + +SJ +== 744 + +SZ +== 748 + +SE == 752 -switzerland +CH == 756 -ukraine +SY +== 760 + +TW +== 158 + +TJ +== 762 + +TZ +== 834 + +TH +== 764 + +TL +== 626 + +TG +== 768 + +TK +== 772 + +TO +== 776 + +TT +== 780 + +TN +== 788 + +TR +== 792 + +TM +== 795 + +TC +== 796 + +TV +== 798 + +UG +== 800 + +UA == 804 -united_kingdom +AE +== 784 + +GB == 826 -united_states +US == 840 +UM +== 581 + +UY +== 858 + +UZ +== 860 + +VU +== 548 + +VE +== 862 + +VN +== 704 + +VG +== 92 + +VI +== 850 + +WF +== 876 + +EH +== 732 + +YE +== 887 + +ZM +== 894 + +ZW +== 716 diff --git a/data/countryflags/italy.png b/data/countryflags/italy.png deleted file mode 100644 index aca1d147..00000000 --- a/data/countryflags/italy.png +++ /dev/null Binary files differdiff --git a/data/countryflags/netherlands.png b/data/countryflags/netherlands.png deleted file mode 100644 index 455d27c9..00000000 --- a/data/countryflags/netherlands.png +++ /dev/null Binary files differdiff --git a/data/countryflags/northern_ireland.png b/data/countryflags/northern_ireland.png deleted file mode 100644 index 057ff8e2..00000000 --- a/data/countryflags/northern_ireland.png +++ /dev/null Binary files differdiff --git a/data/countryflags/norway.png b/data/countryflags/norway.png deleted file mode 100644 index d9469154..00000000 --- a/data/countryflags/norway.png +++ /dev/null Binary files differdiff --git a/data/countryflags/poland.png b/data/countryflags/poland.png deleted file mode 100644 index c0f8dfe9..00000000 --- a/data/countryflags/poland.png +++ /dev/null Binary files differdiff --git a/data/countryflags/portugal.png b/data/countryflags/portugal.png deleted file mode 100644 index 7dfef2f7..00000000 --- a/data/countryflags/portugal.png +++ /dev/null Binary files differdiff --git a/data/countryflags/romania.png b/data/countryflags/romania.png deleted file mode 100644 index ff19c26f..00000000 --- a/data/countryflags/romania.png +++ /dev/null Binary files differdiff --git a/data/countryflags/russian_federation.png b/data/countryflags/russian_federation.png deleted file mode 100644 index c706ab4e..00000000 --- a/data/countryflags/russian_federation.png +++ /dev/null Binary files differdiff --git a/data/countryflags/scotland.png b/data/countryflags/scotland.png deleted file mode 100644 index 41897261..00000000 --- a/data/countryflags/scotland.png +++ /dev/null Binary files differdiff --git a/data/countryflags/serbia.png b/data/countryflags/serbia.png deleted file mode 100644 index 86591c5e..00000000 --- a/data/countryflags/serbia.png +++ /dev/null Binary files differdiff --git a/data/countryflags/slovakia.png b/data/countryflags/slovakia.png deleted file mode 100644 index 34976fa1..00000000 --- a/data/countryflags/slovakia.png +++ /dev/null Binary files differdiff --git a/data/countryflags/spain.png b/data/countryflags/spain.png deleted file mode 100644 index d3bf783d..00000000 --- a/data/countryflags/spain.png +++ /dev/null Binary files differdiff --git a/data/countryflags/sweden.png b/data/countryflags/sweden.png deleted file mode 100644 index 8bb89f5d..00000000 --- a/data/countryflags/sweden.png +++ /dev/null Binary files differdiff --git a/data/countryflags/switzerland.png b/data/countryflags/switzerland.png deleted file mode 100644 index 3b124496..00000000 --- a/data/countryflags/switzerland.png +++ /dev/null Binary files differdiff --git a/data/countryflags/ukraine.png b/data/countryflags/ukraine.png deleted file mode 100644 index c5f6b324..00000000 --- a/data/countryflags/ukraine.png +++ /dev/null Binary files differdiff --git a/data/countryflags/united_kingdom.png b/data/countryflags/united_kingdom.png deleted file mode 100644 index 4fc2b981..00000000 --- a/data/countryflags/united_kingdom.png +++ /dev/null Binary files differdiff --git a/data/countryflags/united_states.png b/data/countryflags/united_states.png deleted file mode 100644 index 5049df18..00000000 --- a/data/countryflags/united_states.png +++ /dev/null Binary files differdiff --git a/data/countryflags/wales.png b/data/countryflags/wales.png deleted file mode 100644 index 702ca59e..00000000 --- a/data/countryflags/wales.png +++ /dev/null Binary files differdiff --git a/src/game/client/components/menus_browser.cpp b/src/game/client/components/menus_browser.cpp index 6a17a286..344aa537 100644 --- a/src/game/client/components/menus_browser.cpp +++ b/src/game/client/components/menus_browser.cpp @@ -626,8 +626,8 @@ void CMenus::RenderServerbrowserServerDetail(CUIRect View) CUIRect Name, Clan, Score, Flag; ServerScoreBoard.HSplitTop(25.0f, &Name, &ServerScoreBoard); Name.VSplitLeft(30.0f, &Score, &Name); - Name.VSplitRight(23.0f*96.0f/64.0f, &Name, &Flag); - Flag.HMargin(1.0f, &Flag); + Name.VSplitRight(34.0f, &Name, &Flag); + Flag.HMargin(4.0f, &Flag); Name.HSplitTop(12.0f, &Name, &Clan); // score @@ -687,7 +687,7 @@ void CMenus::RenderServerbrowserServerDetail(CUIRect View) // flag Graphics()->TextureSet(m_pClient->m_pCountryFlags->Get(pSelectedServer->m_aClients[i].m_Country)->m_Texture); Graphics()->QuadsBegin(); - Graphics()->SetColor(1.0f, 1.0f, 1.0f, 1.0f); + Graphics()->SetColor(1.0f, 1.0f, 1.0f, 0.5f); IGraphics::CQuadItem QuadItem(Flag.x, Flag.y, Flag.w, Flag.h); Graphics()->QuadsDrawTL(&QuadItem, 1); Graphics()->QuadsEnd(); diff --git a/src/game/client/components/menus_settings.cpp b/src/game/client/components/menus_settings.cpp index 8d03d2a9..a5ec18cc 100644 --- a/src/game/client/components/menus_settings.cpp +++ b/src/game/client/components/menus_settings.cpp @@ -219,7 +219,7 @@ void CMenus::RenderSettingsPlayer(CUIRect MainView) { Item.m_Rect.Margin(10.0f, &Item.m_Rect); float OldWidth = Item.m_Rect.w; - Item.m_Rect.w = 96.0f*Item.m_Rect.h/64.0f; + Item.m_Rect.w = Item.m_Rect.h*2; Item.m_Rect.x += (OldWidth-Item.m_Rect.w)/ 2.0f; Graphics()->TextureSet(pEntry->m_Texture); Graphics()->QuadsBegin(); diff --git a/src/game/client/components/scoreboard.cpp b/src/game/client/components/scoreboard.cpp index a8c9d93b..07e076db 100644 --- a/src/game/client/components/scoreboard.cpp +++ b/src/game/client/components/scoreboard.cpp @@ -169,7 +169,7 @@ void CScoreboard::RenderScoreboard(float x, float y, float w, int Team, const ch x += 10.0f; float LineHeight = 60.0f; float TeeSizeMod = 1.0f; - float Spacing = 10.0f; + float Spacing = 16.0f; if(m_pClient->m_Snap.m_aTeamSize[Team] > 12) { LineHeight = 40.0f; @@ -180,14 +180,14 @@ void CScoreboard::RenderScoreboard(float x, float y, float w, int Team, const ch { LineHeight = 50.0f; TeeSizeMod = 0.9f; - Spacing = 5.0f; + Spacing = 8.0f; } float ScoreOffset = x+10.0f, ScoreLength = 60.0f; float TeeOffset = ScoreOffset+ScoreLength, TeeLength = 60*TeeSizeMod; float NameOffset = TeeOffset+TeeLength, NameLength = 300.0f-TeeLength; float PingOffset = x+610.0f, PingLength = 65.0f; - float CountryOffset = PingOffset-(LineHeight-Spacing-TeeSizeMod*5.0f)*96.0f/64.0f, CountryLength = (LineHeight-Spacing-TeeSizeMod*5.0f)*96.0f/64.0f; + float CountryOffset = PingOffset-(LineHeight-Spacing-TeeSizeMod*5.0f)*2.0f, CountryLength = (LineHeight-Spacing-TeeSizeMod*5.0f)*2.0f; float ClanOffset = x+370.0f, ClanLength = 230.0f-CountryLength; // render headlines @@ -269,7 +269,7 @@ void CScoreboard::RenderScoreboard(float x, float y, float w, int Team, const ch // country flag Graphics()->TextureSet(m_pClient->m_pCountryFlags->Get(m_pClient->m_aClients[pInfo->m_ClientID].m_Country)->m_Texture); Graphics()->QuadsBegin(); - Graphics()->SetColor(1.0f, 1.0f, 1.0f, 1.0f); + Graphics()->SetColor(1.0f, 1.0f, 1.0f, 0.5f); IGraphics::CQuadItem QuadItem(CountryOffset, y+(Spacing+TeeSizeMod*5.0f)/2.0f, CountryLength, LineHeight-Spacing-TeeSizeMod*5.0f); Graphics()->QuadsDrawTL(&QuadItem, 1); Graphics()->QuadsEnd(); |