From: <baz...@us...> - 2008-11-28 21:55:38
|
Revision: 8603 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8603&view=rev Author: bazaarmagetron Date: 2008-11-28 21:44:18 +0000 (Fri, 28 Nov 2008) Log Message: ----------- author: Bazaarmagetron Automatic merging of commits that would change history order: ------------------------------------------------------------ revno: 905.1.7 committer: Manuel Moos <z-...@us...> branch nick: armagetronad timestamp: Mon 2008-11-24 23:32:33 +0100 message: Clarified vote_redunant a bit. ------------------------------------------------------------ revno: 905.1.6 committer: epsy <ep...@fr...> branch nick: 0.2.8-armagetronad-work timestamp: Sun 2008-11-23 18:59:27 +0100 message: disable pthread ------------------------------------------------------------ revno: 905.1.5 committer: epsy <ep...@fr...> branch nick: 0.2.8 timestamp: Mon 2008-10-27 12:41:42 +0100 message: Fix Durka's issue ------------------------------------------------------------ revno: 905.1.4 committer: epsy <ep...@fr...> branch nick: 0.2.8 timestamp: Sat 2008-10-25 14:39:52 +0200 message: Fixed bug #287683. ------------------------------------------------------------ revno: 905.1.3 committer: epsy <ep...@fr...> branch nick: 0.2.8 timestamp: Fri 2008-10-24 18:59:30 +0200 message: feedback for /listadmins and /listplayers ------------------------------------------------------------ revno: 905.1.2 committer: epsy <ep...@fr...> branch nick: 0.2.8 timestamp: Fri 2008-10-24 18:20:20 +0200 message: KRAWALL -> KRAWALL_SERVER X_x ------------------------------------------------------------ revno: 905.1.1 committer: epsy <ep...@fr...> branch nick: 0.2.8 timestamp: Fri 2008-10-24 18:12:10 +0200 message: Default LEGACY_LOG_NAMES to true on non-authentication builds. Modified Paths: -------------- armagetronad/branches/0.2.8/armagetronad/configure.ac armagetronad/branches/0.2.8/armagetronad/language/deutsch.txt armagetronad/branches/0.2.8/armagetronad/language/english_base.txt armagetronad/branches/0.2.8/armagetronad/src/engine/ePlayer.cpp Property Changed: ---------------- armagetronad/branches/0.2.8/armagetronad/ Property changes on: armagetronad/branches/0.2.8/armagetronad ___________________________________________________________________ Modified: bzr:revision-info - timestamp: 2008-10-18 17:03:53.457000017 +0200 committer: Bazaarmagetron <z-...@us...> properties: branch-nick: 0.2.8-armagetronad-work rebase-of: z-...@us...-20081018150353-ewxoj4qx82sp75ag + timestamp: 2008-11-28 22:41:12.092000008 +0100 committer: Bazaarmagetron <z-...@us...> properties: branch-nick: 0.2.8-armagetronad-sync Modified: bzr:ancestry:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - z-...@us...-20080208133752-2gw99n7wzsq0ltfk wrt...@us...-20080212214934-v54mfu759ziymru7 z-...@us...-20080214125233-8hc05ipgtpm53z2y z-...@us...-20080218102004-k7o07blcekpsy6pi epsy-20080318191455-5ote91wclfg68qdy z-...@us...-20080318193704-gtnd68g3kjoquken z-...@us...-20080318200922-e17yjjvbwsktis36 epsy-20080319185658-etcxfg4wz00xazo0 z-...@us...-20080319200200-f26b4cmyob009jkx epsy-20080408171021-bdfdnf7eebr1j84o ep...@fr...-20080419185551-j1w85g81ys92q950 ep...@fr...-20081018145751-3rj1vwltgjqvsbjz + z-...@us...-20080208133752-2gw99n7wzsq0ltfk wrt...@us...-20080212214934-v54mfu759ziymru7 z-...@us...-20080214125233-8hc05ipgtpm53z2y z-...@us...-20080218102004-k7o07blcekpsy6pi epsy-20080318191455-5ote91wclfg68qdy z-...@us...-20080318193704-gtnd68g3kjoquken z-...@us...-20080318200922-e17yjjvbwsktis36 epsy-20080319185658-etcxfg4wz00xazo0 z-...@us...-20080319200200-f26b4cmyob009jkx epsy-20080408171021-bdfdnf7eebr1j84o ep...@fr...-20080419185551-j1w85g81ys92q950 ep...@fr...-20081018145751-3rj1vwltgjqvsbjz z-...@us...-20081124223233-dj1edw5cy89alga3 Modified: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 538 z-...@us...-20080207163247-91eo4mrbiind6xrz 540 z-...@us...-20080208122252-nvhak6io6j0ui3aa 541 z-...@us...-20080208123045-76r9p0l7iwpbq1hy 542 z-...@us...-20080208124439-10s870zpb61b8buo 543 z-...@us...-20080208133845-a22a5j0z6vjgfaby 544 z-...@us...-20080208134134-bxi2z09linxnzl63 545 z-...@us...-20080208165812-xabnqfq34666e2z5 546 z-...@us...-20080208170201-jmubp7bm7lrpmw4z 551 z-...@us...-20080209115751-1w0yo2lwtv1xxmsc 552 z-...@us...-20080209121700-8mf9ure4bfaxtqfp 553 z-...@us...-20080209130301-0kw4jxjm7cvmbptp 561 z-...@us...-20080210002729-ee7t2nfh542nxksj 563 wrt...@us...-20080210153610-ucwvl013f1yil7og 564 z-...@us...-20080210212253-bxpkh4mtyisctr39 565 z-...@us...-20080211084800-j2c13scyxqc31m8x 566 z-...@us...-20080211092807-gx4kehlz96356bpc 567 z-...@us...-20080211093118-7l2xf6tr891yx5ap 568 z-...@us...-20080211105013-2k81i8bnj2k4hhoy 569 z-...@us...-20080211112608-8qx1tlf94iwrrt1l 570 z-...@us...-20080211140216-bdm3bpx8zkv5z3se 571 z-...@us...-20080211151812-grth0h6loq9xxd3o 572 z-...@us...-20080211151834-b3vk44tzyhtm744f 573 z-...@us...-20080211152418-o4a4kj326igqh1k8 574 z-...@us...-20080211154253-1etqludquvn7co8g 575 z-...@us...-20080211160428-8ilc9qovrarz8w62 576 z-...@us...-20080211193858-at0c5em1d3lm8nbe 577 z-...@us...-20080211200418-qdmnetojj8pme9xy 578 z-...@us...-20080211200716-e44opbnzxkha3c75 579 z-...@us...-20080211200826-m9ogo5duturpmsmt 580 wrt...@us...-20080211221232-nqw6a4oxgj4ntika 581 z-...@us...-20080211232908-79iedh9xr87l8yta 582 z-...@us...-20080211232937-iolwhcxmqa1njxcb 583 z-...@us...-20080211233009-zdmtdhf1vg9bdbqt 584 z-...@us...-20080211233052-bzwl4p5d9kmxqrez 585 z-...@us...-20080211235937-6r1abzr9i24hi28j 586 z-...@us...-20080212001854-jy3lv5lpiti2am0i 587 z-...@us...-20080212004511-1guj58f0ll5o4g2u 588 z-...@us...-20080212004523-d30hcrujanooulp6 589 z-...@us...-20080212013442-k2dt1qg06vpm0riz 590 z-...@us...-20080212111458-w1vg4vbqmsxs0apt 591 z-...@us...-20080212111803-hlydu4wbw7upc32b 592 z-...@us...-20080212113358-rittno0wqzk5oh2c 593 z-...@us...-20080212115640-h8bs2cwm75tqmgt8 594 z-...@us...-20080212123800-5r9ttplpbdw88m2q 595 z-...@us...-20080212125109-t8afy73nty55ih47 596 z-...@us...-20080212135138-mevw0j5m97vchlgo 597 z-...@us...-20080212141438-2yz5c9esxrswak61 598 z-...@us...-20080212141535-vtic2yccgieyn7v0 599 z-...@us...-20080212143704-jd8pg0cnuh0kwab5 600 z-...@us...-20080212154606-ppxy7dl99fk8xk6j 601 z-...@us...-20080212154658-z5x6zuir7bxoq48i 602 z-...@us...-20080212212236-9803ovcxrzfzqf40 603 z-...@us...-20080212214530-sqlc3x9wk3b36169 604 z-...@us...-20080212215644-d36an0w0zdlipf03 605 z-...@us...-20080212224923-7d3wi96op47p4zyt 606 z-...@us...-20080212235107-l67eu41fhlpy0jkp 607 z-...@us...-20080213005523-2qet70xfnd34ool9 608 z-...@us...-20080213005609-16omuuhsf5svvtnf 609 z-...@us...-20080213091828-7k5xdbmhgvqacwfk 610 z-...@us...-20080213120826-83e9b69ps9gpncqm 611 z-...@us...-20080213141821-4av1kc6gjlpqxb9k 612 z-...@us...-20080213231607-9x5ea54snffyzeu4 613 z-...@us...-20080213231745-t7gutswv6pm0d9ts 614 z-...@us...-20080213235902-yct0jy7rtc8rm0ey 615 z-...@us...-20080213235919-8tl1388zcggq9tzc 616 z-...@us...-20080214082816-dfdjmj4fm9vy6orh 618 z-...@us...-20080214125233-3nrgfrnzogj7nmu7 619 z-...@us...-20080214130153-c49jc9bo0yq6wcun 620 z-...@us...-20080214125233-13kffzv1qhyqfh1g 621 z-...@us...-20080214143550-ovwirpmzh2demiau 622 z-...@us...-20080214145926-xh49sbvcmoa3dfnx 623 z-...@us...-20080214152942-i1gwyqby6t3gfsyd 624 z-...@us...-20080214160347-mrqwdogtsvt2jwx6 627 z-...@us...-20080215083038-kpe7i3xxibqs4w3t 630 z-...@us...-20080215113602-1v0jq31ocroi9ien 631 z-...@us...-20080215125814-qrc5baipd0es0f8s 632 z-...@us...-20080215132414-ap75kohnhkyot3io 633 z-...@us...-20080215142819-78at0b7fjz12df4f 634 z-...@us...-20080215144155-vvuudbxe5dfta35q 635 z-...@us...-20080215144410-jq4n72ifnb7fz0q2 636 z-...@us...-20080215202858-10plx59rnos3h3wx 637 z-...@us...-20080215203022-6lmmz1kflk335csv 638 z-...@us...-20080215203921-qhp01ccwowaws5zw 639 z-...@us...-20080215213800-wgwgohw6qj484v1l 640 z-...@us...-20080216125315-tcl1mu3dogdnj4oz 641 z-...@us...-20080216152929-tj517suzlvqe988j 642 z-...@us...-20080216160207-fne52uek26c8xsbq 644 z-...@us...-20080216210312-etwwtuziwqfiee4a 645 z-...@us...-20080216223305-fllgpnypalakrto9 646 z-...@us...-20080216224028-yub72nzo00wuuen6 647 z-...@us...-20080216225216-5dvqho6samx7taz0 648 z-...@us...-20080216233325-5m9la64qlix7yqgm 649 z-...@us...-20080216233406-mjevvwajyd3ttlx3 650 z-...@us...-20080217105133-rsruvt5qroz8x2ev 651 z-...@us...-20080217110247-f5pimrjhvwm3rx8a 652 z-...@us...-20080217151109-n3f7wdio7x2heq7a 653 z-...@us...-20080217151344-nndna800a0t8mj97 655 z-...@us...-20080217223209-fxf60qpiypsv10rx 656 z-...@us...-20080217225340-uv9y4fnalqhokc9z 658 z-...@us...-20080218102004-cdjayf0lz9e02fi4 659 z-...@us...-20080218102004-q7xyz5f56x82q3ya 660 z-...@us...-20080218105535-hy8er6w05toruntx 661 z-...@us...-20080218102004-0vx3aabq0fgbxwp1 662 z-...@us...-20080218113302-hz95tbxan759a49b 665 z-...@us...-20080220221226-vhyt8ef6nmv3wrma 666 z-...@us...-20080229183043-i04z65cxb7azya01 672 z-...@us...-20080229235852-zdhq3v1iwvllb1ch 673 z-...@us...-20080301001554-1n05n5oh6lncev3j 674 z-...@us...-20080304110341-uf7982hzslcgqdz4 675 z-...@us...-20080304113003-9cxdx6ign2beip25 676 z-...@us...-20080304135251-7payt727hknvj051 677 z-...@us...-20080304142133-z44uzew53a4b5ahe 678 z-...@us...-20080304145813-zl9ix8gjzx96x3to 679 z-...@us...-20080304150213-o0zqdvudc2ydckiw 680 z-...@us...-20080304150606-ojhkiuu0nkfsdzxh 681 z-...@us...-20080304153343-11zuw8l4qpy6c804 682 z-...@us...-20080304161108-35q9938k4uz45e7n 683 z-...@us...-20080304162218-0met1wl2hiarehxx 684 z-...@us...-20080304162409-a83mleet1q1oxvyl 685 z-...@us...-20080304163815-eza6ew840zbu3g8t 687 z-...@us...-20080304170429-67o62a20eaf5m71t 688 z-...@us...-20080304170806-ibhma13xv66iqmrn 689 z-...@us...-20080304181719-va2qxujt8xymlvnw 694 z-...@us...-20080305104648-j8yrdtlvn1fbl16f 695 z-...@us...-20080305105143-or3sfnz59o1lrpko 696 z-...@us...-20080305111936-1lkgcc0nxlht67rc 697 z-...@us...-20080305121112-ma05x8g2xxe97577 698 z-...@us...-20080305144132-u1z3dlmqx7w66i57 699 z-...@us...-20080305183702-042b1hpkp4b4131d 700 z-...@us...-20080305213644-2k7zxvqir5qwashd 701 z-...@us...-20080306001417-1xic7kn4id0o48wy 702 z-...@us...-20080306002055-ps9m9ub2pis24h1s 708 z-...@us...-20080306184205-5trimli63k50yw0i 711 z-...@us...-20080307234229-6d37bxl8qwm9p071 712 z-...@us...-20080307234333-he0ahafy7eio8os7 721 z-...@us...-20080308202032-762gimjyorbshgw5 725 z-...@us...-20080309203540-72yytsrt4eh2fpnz 726 z-...@us...-20080309204413-oqf7py0cckchcvuk 727 z-...@us...-20080309204558-5z4x0jbf1qsnlt14 728 z-...@us...-20080310160543-or6d04u4wd2lqf86 729 z-...@us...-20080310204637-m3ny5zti4bz0jut1 730 z-...@us...-20080310210722-3omh1ng139qke53d 735 z-...@us...-20080311214611-on2weees1k1dt8hr 736 z-...@us...-20080311221921-0ohk3zz2ago8uoen 742 z-...@us...-20080314122729-1pzdi3xnnc1oaxhz 743 z-...@us...-20080315004823-6463oolvbj2a2k5e 744 z-...@us...-20080315004845-j5in82malq71kb31 745 z-...@us...-20080315234805-wgdyhfi1ujsqlewo 747 z-...@us...-20080316152908-51424mv65ivsiy0b 748 ep...@fr...-20080316153532-xlki6lf0fjb5wf57 750 epsy-20080317072934-5pr4ygp142kqkqr0 752 z-...@us...-20080317103020-t06zcug1jca7wkad 753 z-...@us...-20080317105914-tugsi7atv1qt0kjm 754 epsy-20080317203445-88howmqbme4na1fi 756 z-...@us...-20080318154654-g2jjh105v55bnlx7 757 z-...@us...-20080318163754-nx4unl68ktk3o2y1 758 z-...@us...-20080318164536-4shuy567zu9yzfy5 761 z-...@us...-20080318190251-u8vth8wwcy0bv6wm 762 z-...@us...-20080318191455-0ushdbdwzw0xdei7 763 z-...@us...-20080318193704-uey2w3pj1rk7hv98 765 z-...@us...-20080318200922-fif4v3t16bqjkb98 767 z-...@us...-20080318204138-hfwol9rkawm83qq8 772 z-...@us...-20080319185658-33i263bew6glphlo 773 z-...@us...-20080319191210-vzr9cnahx7lnq8vn 774 epsy-20080319191936-4mv6w2p4clrg5xqp 775 epsy-20080319192123-r1jjinuafv028u6w 777 z-...@us...-20080319202314-36j2sl34bdnxv42a 779 z-...@us...-20080320120501-17v2020goqsm3uy9 780 z-...@us...-20080320122108-fxon3du35opw4w9l 781 z-...@us...-20080320122804-p78fl209ouit4rac 782 z-...@us...-20080320124133-ogwmpgzawf7k7mb9 783 z-...@us...-20080320153458-kzpvdq4ot20jq2ys 784 z-...@us...-20080320154738-1hqwrdd4ur85t0wc 785 z-...@us...-20080320161752-z16barxhajr6g3u1 790 wrt...@us...-20080324114314-ovpngfceabgdrjw1 791 z-...@us...-20080324140643-mi4bbst3otkixvxr 792 z-...@us...-20080324140702-my3a8324osylxu5w 793 z-...@us...-20080324150602-8qcaza12xvnb5656 794 z-...@us...-20080324150903-102wwxv4ftujx0ri 795 z-...@us...-20080324200209-697loupzo7vful5m 796 z-...@us...-20080324201344-ltgkffdh25bca1h1 797 z-...@us...-20080324201704-t8ojf8wo6yuf0w3q 798 z-...@us...-20080325142406-elvu8lo7f1vpqykf 801 z-...@us...-20080408225027-z6jtik5hyyvh1r3k 802 epsy-20080409143340-tmynld6yvx0hrupq 803 epsy-20080409161853-5dyty0sra1j4wu20 804 epsy-20080410203444-uv8005sqv29niznl 805 epsy-20080410210652-4v8qz498xx2xf9gm 806 epsy-20080412215911-an0ciuot2xcw0j3e 807 wrt...@us...-20080413150948-6st3fg3amcpljyrs 808 z-...@us...-20080415221847-luq99q83qk1kf0qj 810 ep...@fr...-20080419003256-1d34b0frf3sghbgt 811 wrt...@us...-20080419181752-qybwic6wstifb6xi 812 wrt...@us...-20080419183353-nhlu69c5lo303fd0 813 wrt...@us...-20080419185359-juo8h5gk2l11nvzi 814 ep...@fr...-20080419213144-85xf2i2xxdjafk2e 815 ep...@fr...-20080419233923-v43obolbngvor406 816 ep...@fr...-20080420003559-3810398ehhzczafg 817 ep...@fr...-20080420005606-o6mowvehnj0pjsmi 818 wrt...@us...-20080420071152-mbkfch313g1h2vju 819 wrt...@us...-20080420075907-t0pmgotsp7nten1o 820 ep...@fr...-20080420125327-nq8pw3il9595u9g2 821 ep...@fr...-20080420131953-ky7en17kayfhu97e 822 ep...@fr...-20080420212056-mbqt6drsssz4zzzy 823 ep...@fr...-20080420222024-qlhfgf31j14sjf7d 824 ep...@fr...-20080420222823-f4a1zkgdg3albqi5 825 ep...@fr...-20080421124825-lb6x4xy1iuvcaodn 826 wrt...@us...-20080423170341-paa199v58y3ljdp0 827 wrt...@us...-20080425161423-473r38izwwgqt3jf 828 wrt...@us...-20080425163112-timnz2siusxp7v31 829 epsy46-20080428150045-myo0nii0sybiy93v 830 epsy46-20080428154331-sfj53fhm0ywyny81 831 epsy46-20080428162250-65tkq33p0wjhqnec 832 wrt...@us...-20080430085126-6e7br0gkc38ih8a6 833 wrt...@us...-20080505151247-5i79l1qwaew3mbah 834 wrt...@us...-20080507121451-7r5ojn36w51opi64 835 epsy46-20080511094040-lo5w3itly6id0fsy 836 ep...@fr...-20080512110550-f3nkczow65dwyojz 837 ep...@fr...-20080512110803-qyxagisdcy71dxni 838 ep...@fr...-20080512121755-ia5xskksmda5p9an 839 ep...@fr...-20080512164237-iq7kt0e48bbe0r6x 840 ep...@fr...-20080512171800-0vbmjpnwm24m2d8n 841 ep...@fr...-20080512181223-7q9c8xpmr4iluoml 842 ep...@fr...-20080512211925-638nrswr6sjsmi9h 843 ep...@fr...-20080514122329-0gukvi8i6f29rv2w 844 ep...@fr...-20080515161749-y51rd50rg2xl69r8 845 ep...@fr...-20080517160133-ijjuya3wjj1hpmc7 846 ep...@fr...-20080518152353-n038p6d92y8lywem 847 z-...@us...-20080526073919-2pndbydmjlcuw8v0 848 ep...@fr...-20080607213935-1v4n40d7aq11ylvs 849 ep...@fr...-20080608183938-uis232zh51gtziq9 850 ep...@fr...-20080608195855-5ry1im9uai9w3t11 851 ep...@fr...-20080612203505-69q2z18h679g7199 852 z-...@us...-20080614230242-f73r9ea48vupi9wq 853 ep...@fr...-20080619170247-5vcwrintak1dydgb 854 ep...@fr...-20080620103655-gy5kl2pfnho6dljf 855 ep...@fr...-20080620191427-97183vpi5tw5pq13 856 ep...@fr...-20080620201212-mljtje9y93o308mp 857 ep...@fr...-20080703225514-ozk2kz3yo0boftkz 858 ep...@fr...-20080703231807-rszc7jw4pdx9ps8o 859 ep...@fr...-20080703235008-6cv3rrifa1jjcp65 860 ep...@fr...-20080704001029-ueh28yt0fsut7tlj 861 ep...@fr...-20080704193513-3vwo0rimli50kt8n 862 ep...@fr...-20080704200813-q4gzzka1nenac68r 863 ep...@fr...-20080704204734-b16wt0l2e84lhkr1 865 ep...@fr...-20080721164248-s143jzzia9dpxj0l 866 ep...@fr...-20080721164345-ul7k54abldoyam5v 867 z-...@us...-20080724100919-xv3wfonweecgeszs 868 z-...@us...-20080728224130-t25ksxbizznkiu1i 869 z-...@us...-20080802083308-u60jtt4uvwvnwdoc 870 z-...@us...-20080805205032-n0svedt55s6lmtk3 871 z-...@us...-20080813120525-vcsspcz96s4tnvhu 872 z-...@us...-20080819195115-g9yb9e7w1koi886f 873 ep...@fr...-20080823191324-att9wx806xno0gcv 874 ep...@fr...-20080825185815-6zp2vmyquxz4kj8f 875 z-...@us...-20080831202237-4cy02srbhb82hovd 876 ep...@fr...-20080901165053-bosytm60g85nzuxr 877 ep...@fr...-20080902141140-lifrijnnivr9x49o 878 z-...@us...-20080906081012-lg92zz9772sp4ra5 880 z-...@us...-20080908094528-dd9jyusr6irmtfin 881 z-...@us...-20080908101051-oq6e7xp806wvsaun 882 ep...@fr...-20080910130353-a3tjc5tuo6pjtott 883 ep...@fr...-20080910143223-ek3bci28ygj1abv1 884 ep...@fr...-20080913200531-uth9rv20ozia1u31 887 ep...@fr...-20080916171821-o8fc4ps68uc3djw6 888 ep...@fr...-20080917212414-k2k7mu678jcmfz3p 889 ep...@fr...-20080925211236-vc11gvzv1yjtse3e 890 ep...@fr...-20080928211138-nst1nxcmnpizlqv1 891 ep...@fr...-20080929214116-9e83mxekcm33g9sh 892 ep...@fr...-20080929214302-bb8r2vgtvx60c230 893 ep...@fr...-20080929223608-6dpsx9r5xurq905u 894 ep...@fr...-20080930153110-i6kwarpzd57n20o1 895 ep...@fr...-20080930165947-3xqw03te5592h1te 896 ep...@fr...-20080930170854-czyy2oqn4oig3x70 900 ep...@fr...-20081018144914-s9lyfbeo3i23ejdt 903 z-...@us...-20081018150353-8lv2s2lx6b1gws8b + 538 z-...@us...-20080207163247-91eo4mrbiind6xrz 540 z-...@us...-20080208122252-nvhak6io6j0ui3aa 541 z-...@us...-20080208123045-76r9p0l7iwpbq1hy 542 z-...@us...-20080208124439-10s870zpb61b8buo 543 z-...@us...-20080208133845-a22a5j0z6vjgfaby 544 z-...@us...-20080208134134-bxi2z09linxnzl63 545 z-...@us...-20080208165812-xabnqfq34666e2z5 546 z-...@us...-20080208170201-jmubp7bm7lrpmw4z 551 z-...@us...-20080209115751-1w0yo2lwtv1xxmsc 552 z-...@us...-20080209121700-8mf9ure4bfaxtqfp 553 z-...@us...-20080209130301-0kw4jxjm7cvmbptp 561 z-...@us...-20080210002729-ee7t2nfh542nxksj 563 wrt...@us...-20080210153610-ucwvl013f1yil7og 564 z-...@us...-20080210212253-bxpkh4mtyisctr39 565 z-...@us...-20080211084800-j2c13scyxqc31m8x 566 z-...@us...-20080211092807-gx4kehlz96356bpc 567 z-...@us...-20080211093118-7l2xf6tr891yx5ap 568 z-...@us...-20080211105013-2k81i8bnj2k4hhoy 569 z-...@us...-20080211112608-8qx1tlf94iwrrt1l 570 z-...@us...-20080211140216-bdm3bpx8zkv5z3se 571 z-...@us...-20080211151812-grth0h6loq9xxd3o 572 z-...@us...-20080211151834-b3vk44tzyhtm744f 573 z-...@us...-20080211152418-o4a4kj326igqh1k8 574 z-...@us...-20080211154253-1etqludquvn7co8g 575 z-...@us...-20080211160428-8ilc9qovrarz8w62 576 z-...@us...-20080211193858-at0c5em1d3lm8nbe 577 z-...@us...-20080211200418-qdmnetojj8pme9xy 578 z-...@us...-20080211200716-e44opbnzxkha3c75 579 z-...@us...-20080211200826-m9ogo5duturpmsmt 580 wrt...@us...-20080211221232-nqw6a4oxgj4ntika 581 z-...@us...-20080211232908-79iedh9xr87l8yta 582 z-...@us...-20080211232937-iolwhcxmqa1njxcb 583 z-...@us...-20080211233009-zdmtdhf1vg9bdbqt 584 z-...@us...-20080211233052-bzwl4p5d9kmxqrez 585 z-...@us...-20080211235937-6r1abzr9i24hi28j 586 z-...@us...-20080212001854-jy3lv5lpiti2am0i 587 z-...@us...-20080212004511-1guj58f0ll5o4g2u 588 z-...@us...-20080212004523-d30hcrujanooulp6 589 z-...@us...-20080212013442-k2dt1qg06vpm0riz 590 z-...@us...-20080212111458-w1vg4vbqmsxs0apt 591 z-...@us...-20080212111803-hlydu4wbw7upc32b 592 z-...@us...-20080212113358-rittno0wqzk5oh2c 593 z-...@us...-20080212115640-h8bs2cwm75tqmgt8 594 z-...@us...-20080212123800-5r9ttplpbdw88m2q 595 z-...@us...-20080212125109-t8afy73nty55ih47 596 z-...@us...-20080212135138-mevw0j5m97vchlgo 597 z-...@us...-20080212141438-2yz5c9esxrswak61 598 z-...@us...-20080212141535-vtic2yccgieyn7v0 599 z-...@us...-20080212143704-jd8pg0cnuh0kwab5 600 z-...@us...-20080212154606-ppxy7dl99fk8xk6j 601 z-...@us...-20080212154658-z5x6zuir7bxoq48i 602 z-...@us...-20080212212236-9803ovcxrzfzqf40 603 z-...@us...-20080212214530-sqlc3x9wk3b36169 604 z-...@us...-20080212215644-d36an0w0zdlipf03 605 z-...@us...-20080212224923-7d3wi96op47p4zyt 606 z-...@us...-20080212235107-l67eu41fhlpy0jkp 607 z-...@us...-20080213005523-2qet70xfnd34ool9 608 z-...@us...-20080213005609-16omuuhsf5svvtnf 609 z-...@us...-20080213091828-7k5xdbmhgvqacwfk 610 z-...@us...-20080213120826-83e9b69ps9gpncqm 611 z-...@us...-20080213141821-4av1kc6gjlpqxb9k 612 z-...@us...-20080213231607-9x5ea54snffyzeu4 613 z-...@us...-20080213231745-t7gutswv6pm0d9ts 614 z-...@us...-20080213235902-yct0jy7rtc8rm0ey 615 z-...@us...-20080213235919-8tl1388zcggq9tzc 616 z-...@us...-20080214082816-dfdjmj4fm9vy6orh 618 z-...@us...-20080214125233-3nrgfrnzogj7nmu7 619 z-...@us...-20080214130153-c49jc9bo0yq6wcun 620 z-...@us...-20080214125233-13kffzv1qhyqfh1g 621 z-...@us...-20080214143550-ovwirpmzh2demiau 622 z-...@us...-20080214145926-xh49sbvcmoa3dfnx 623 z-...@us...-20080214152942-i1gwyqby6t3gfsyd 624 z-...@us...-20080214160347-mrqwdogtsvt2jwx6 627 z-...@us...-20080215083038-kpe7i3xxibqs4w3t 630 z-...@us...-20080215113602-1v0jq31ocroi9ien 631 z-...@us...-20080215125814-qrc5baipd0es0f8s 632 z-...@us...-20080215132414-ap75kohnhkyot3io 633 z-...@us...-20080215142819-78at0b7fjz12df4f 634 z-...@us...-20080215144155-vvuudbxe5dfta35q 635 z-...@us...-20080215144410-jq4n72ifnb7fz0q2 636 z-...@us...-20080215202858-10plx59rnos3h3wx 637 z-...@us...-20080215203022-6lmmz1kflk335csv 638 z-...@us...-20080215203921-qhp01ccwowaws5zw 639 z-...@us...-20080215213800-wgwgohw6qj484v1l 640 z-...@us...-20080216125315-tcl1mu3dogdnj4oz 641 z-...@us...-20080216152929-tj517suzlvqe988j 642 z-...@us...-20080216160207-fne52uek26c8xsbq 644 z-...@us...-20080216210312-etwwtuziwqfiee4a 645 z-...@us...-20080216223305-fllgpnypalakrto9 646 z-...@us...-20080216224028-yub72nzo00wuuen6 647 z-...@us...-20080216225216-5dvqho6samx7taz0 648 z-...@us...-20080216233325-5m9la64qlix7yqgm 649 z-...@us...-20080216233406-mjevvwajyd3ttlx3 650 z-...@us...-20080217105133-rsruvt5qroz8x2ev 651 z-...@us...-20080217110247-f5pimrjhvwm3rx8a 652 z-...@us...-20080217151109-n3f7wdio7x2heq7a 653 z-...@us...-20080217151344-nndna800a0t8mj97 655 z-...@us...-20080217223209-fxf60qpiypsv10rx 656 z-...@us...-20080217225340-uv9y4fnalqhokc9z 658 z-...@us...-20080218102004-cdjayf0lz9e02fi4 659 z-...@us...-20080218102004-q7xyz5f56x82q3ya 660 z-...@us...-20080218105535-hy8er6w05toruntx 661 z-...@us...-20080218102004-0vx3aabq0fgbxwp1 662 z-...@us...-20080218113302-hz95tbxan759a49b 665 z-...@us...-20080220221226-vhyt8ef6nmv3wrma 666 z-...@us...-20080229183043-i04z65cxb7azya01 672 z-...@us...-20080229235852-zdhq3v1iwvllb1ch 673 z-...@us...-20080301001554-1n05n5oh6lncev3j 674 z-...@us...-20080304110341-uf7982hzslcgqdz4 675 z-...@us...-20080304113003-9cxdx6ign2beip25 676 z-...@us...-20080304135251-7payt727hknvj051 677 z-...@us...-20080304142133-z44uzew53a4b5ahe 678 z-...@us...-20080304145813-zl9ix8gjzx96x3to 679 z-...@us...-20080304150213-o0zqdvudc2ydckiw 680 z-...@us...-20080304150606-ojhkiuu0nkfsdzxh 681 z-...@us...-20080304153343-11zuw8l4qpy6c804 682 z-...@us...-20080304161108-35q9938k4uz45e7n 683 z-...@us...-20080304162218-0met1wl2hiarehxx 684 z-...@us...-20080304162409-a83mleet1q1oxvyl 685 z-...@us...-20080304163815-eza6ew840zbu3g8t 687 z-...@us...-20080304170429-67o62a20eaf5m71t 688 z-...@us...-20080304170806-ibhma13xv66iqmrn 689 z-...@us...-20080304181719-va2qxujt8xymlvnw 694 z-...@us...-20080305104648-j8yrdtlvn1fbl16f 695 z-...@us...-20080305105143-or3sfnz59o1lrpko 696 z-...@us...-20080305111936-1lkgcc0nxlht67rc 697 z-...@us...-20080305121112-ma05x8g2xxe97577 698 z-...@us...-20080305144132-u1z3dlmqx7w66i57 699 z-...@us...-20080305183702-042b1hpkp4b4131d 700 z-...@us...-20080305213644-2k7zxvqir5qwashd 701 z-...@us...-20080306001417-1xic7kn4id0o48wy 702 z-...@us...-20080306002055-ps9m9ub2pis24h1s 708 z-...@us...-20080306184205-5trimli63k50yw0i 711 z-...@us...-20080307234229-6d37bxl8qwm9p071 712 z-...@us...-20080307234333-he0ahafy7eio8os7 721 z-...@us...-20080308202032-762gimjyorbshgw5 725 z-...@us...-20080309203540-72yytsrt4eh2fpnz 726 z-...@us...-20080309204413-oqf7py0cckchcvuk 727 z-...@us...-20080309204558-5z4x0jbf1qsnlt14 728 z-...@us...-20080310160543-or6d04u4wd2lqf86 729 z-...@us...-20080310204637-m3ny5zti4bz0jut1 730 z-...@us...-20080310210722-3omh1ng139qke53d 735 z-...@us...-20080311214611-on2weees1k1dt8hr 736 z-...@us...-20080311221921-0ohk3zz2ago8uoen 742 z-...@us...-20080314122729-1pzdi3xnnc1oaxhz 743 z-...@us...-20080315004823-6463oolvbj2a2k5e 744 z-...@us...-20080315004845-j5in82malq71kb31 745 z-...@us...-20080315234805-wgdyhfi1ujsqlewo 747 z-...@us...-20080316152908-51424mv65ivsiy0b 748 ep...@fr...-20080316153532-xlki6lf0fjb5wf57 750 epsy-20080317072934-5pr4ygp142kqkqr0 752 z-...@us...-20080317103020-t06zcug1jca7wkad 753 z-...@us...-20080317105914-tugsi7atv1qt0kjm 754 epsy-20080317203445-88howmqbme4na1fi 756 z-...@us...-20080318154654-g2jjh105v55bnlx7 757 z-...@us...-20080318163754-nx4unl68ktk3o2y1 758 z-...@us...-20080318164536-4shuy567zu9yzfy5 761 z-...@us...-20080318190251-u8vth8wwcy0bv6wm 762 z-...@us...-20080318191455-0ushdbdwzw0xdei7 763 z-...@us...-20080318193704-uey2w3pj1rk7hv98 765 z-...@us...-20080318200922-fif4v3t16bqjkb98 767 z-...@us...-20080318204138-hfwol9rkawm83qq8 772 z-...@us...-20080319185658-33i263bew6glphlo 773 z-...@us...-20080319191210-vzr9cnahx7lnq8vn 774 epsy-20080319191936-4mv6w2p4clrg5xqp 775 epsy-20080319192123-r1jjinuafv028u6w 777 z-...@us...-20080319202314-36j2sl34bdnxv42a 779 z-...@us...-20080320120501-17v2020goqsm3uy9 780 z-...@us...-20080320122108-fxon3du35opw4w9l 781 z-...@us...-20080320122804-p78fl209ouit4rac 782 z-...@us...-20080320124133-ogwmpgzawf7k7mb9 783 z-...@us...-20080320153458-kzpvdq4ot20jq2ys 784 z-...@us...-20080320154738-1hqwrdd4ur85t0wc 785 z-...@us...-20080320161752-z16barxhajr6g3u1 790 wrt...@us...-20080324114314-ovpngfceabgdrjw1 791 z-...@us...-20080324140643-mi4bbst3otkixvxr 792 z-...@us...-20080324140702-my3a8324osylxu5w 793 z-...@us...-20080324150602-8qcaza12xvnb5656 794 z-...@us...-20080324150903-102wwxv4ftujx0ri 795 z-...@us...-20080324200209-697loupzo7vful5m 796 z-...@us...-20080324201344-ltgkffdh25bca1h1 797 z-...@us...-20080324201704-t8ojf8wo6yuf0w3q 798 z-...@us...-20080325142406-elvu8lo7f1vpqykf 801 z-...@us...-20080408225027-z6jtik5hyyvh1r3k 802 epsy-20080409143340-tmynld6yvx0hrupq 803 epsy-20080409161853-5dyty0sra1j4wu20 804 epsy-20080410203444-uv8005sqv29niznl 805 epsy-20080410210652-4v8qz498xx2xf9gm 806 epsy-20080412215911-an0ciuot2xcw0j3e 807 wrt...@us...-20080413150948-6st3fg3amcpljyrs 808 z-...@us...-20080415221847-luq99q83qk1kf0qj 810 ep...@fr...-20080419003256-1d34b0frf3sghbgt 811 wrt...@us...-20080419181752-qybwic6wstifb6xi 812 wrt...@us...-20080419183353-nhlu69c5lo303fd0 813 wrt...@us...-20080419185359-juo8h5gk2l11nvzi 814 ep...@fr...-20080419213144-85xf2i2xxdjafk2e 815 ep...@fr...-20080419233923-v43obolbngvor406 816 ep...@fr...-20080420003559-3810398ehhzczafg 817 ep...@fr...-20080420005606-o6mowvehnj0pjsmi 818 wrt...@us...-20080420071152-mbkfch313g1h2vju 819 wrt...@us...-20080420075907-t0pmgotsp7nten1o 820 ep...@fr...-20080420125327-nq8pw3il9595u9g2 821 ep...@fr...-20080420131953-ky7en17kayfhu97e 822 ep...@fr...-20080420212056-mbqt6drsssz4zzzy 823 ep...@fr...-20080420222024-qlhfgf31j14sjf7d 824 ep...@fr...-20080420222823-f4a1zkgdg3albqi5 825 ep...@fr...-20080421124825-lb6x4xy1iuvcaodn 826 wrt...@us...-20080423170341-paa199v58y3ljdp0 827 wrt...@us...-20080425161423-473r38izwwgqt3jf 828 wrt...@us...-20080425163112-timnz2siusxp7v31 829 epsy46-20080428150045-myo0nii0sybiy93v 830 epsy46-20080428154331-sfj53fhm0ywyny81 831 epsy46-20080428162250-65tkq33p0wjhqnec 832 wrt...@us...-20080430085126-6e7br0gkc38ih8a6 833 wrt...@us...-20080505151247-5i79l1qwaew3mbah 834 wrt...@us...-20080507121451-7r5ojn36w51opi64 835 epsy46-20080511094040-lo5w3itly6id0fsy 836 ep...@fr...-20080512110550-f3nkczow65dwyojz 837 ep...@fr...-20080512110803-qyxagisdcy71dxni 838 ep...@fr...-20080512121755-ia5xskksmda5p9an 839 ep...@fr...-20080512164237-iq7kt0e48bbe0r6x 840 ep...@fr...-20080512171800-0vbmjpnwm24m2d8n 841 ep...@fr...-20080512181223-7q9c8xpmr4iluoml 842 ep...@fr...-20080512211925-638nrswr6sjsmi9h 843 ep...@fr...-20080514122329-0gukvi8i6f29rv2w 844 ep...@fr...-20080515161749-y51rd50rg2xl69r8 845 ep...@fr...-20080517160133-ijjuya3wjj1hpmc7 846 ep...@fr...-20080518152353-n038p6d92y8lywem 847 z-...@us...-20080526073919-2pndbydmjlcuw8v0 848 ep...@fr...-20080607213935-1v4n40d7aq11ylvs 849 ep...@fr...-20080608183938-uis232zh51gtziq9 850 ep...@fr...-20080608195855-5ry1im9uai9w3t11 851 ep...@fr...-20080612203505-69q2z18h679g7199 852 z-...@us...-20080614230242-f73r9ea48vupi9wq 853 ep...@fr...-20080619170247-5vcwrintak1dydgb 854 ep...@fr...-20080620103655-gy5kl2pfnho6dljf 855 ep...@fr...-20080620191427-97183vpi5tw5pq13 856 ep...@fr...-20080620201212-mljtje9y93o308mp 857 ep...@fr...-20080703225514-ozk2kz3yo0boftkz 858 ep...@fr...-20080703231807-rszc7jw4pdx9ps8o 859 ep...@fr...-20080703235008-6cv3rrifa1jjcp65 860 ep...@fr...-20080704001029-ueh28yt0fsut7tlj 861 ep...@fr...-20080704193513-3vwo0rimli50kt8n 862 ep...@fr...-20080704200813-q4gzzka1nenac68r 863 ep...@fr...-20080704204734-b16wt0l2e84lhkr1 865 ep...@fr...-20080721164248-s143jzzia9dpxj0l 866 ep...@fr...-20080721164345-ul7k54abldoyam5v 867 z-...@us...-20080724100919-xv3wfonweecgeszs 868 z-...@us...-20080728224130-t25ksxbizznkiu1i 869 z-...@us...-20080802083308-u60jtt4uvwvnwdoc 870 z-...@us...-20080805205032-n0svedt55s6lmtk3 871 z-...@us...-20080813120525-vcsspcz96s4tnvhu 872 z-...@us...-20080819195115-g9yb9e7w1koi886f 873 ep...@fr...-20080823191324-att9wx806xno0gcv 874 ep...@fr...-20080825185815-6zp2vmyquxz4kj8f 875 z-...@us...-20080831202237-4cy02srbhb82hovd 876 ep...@fr...-20080901165053-bosytm60g85nzuxr 877 ep...@fr...-20080902141140-lifrijnnivr9x49o 878 z-...@us...-20080906081012-lg92zz9772sp4ra5 880 z-...@us...-20080908094528-dd9jyusr6irmtfin 881 z-...@us...-20080908101051-oq6e7xp806wvsaun 882 ep...@fr...-20080910130353-a3tjc5tuo6pjtott 883 ep...@fr...-20080910143223-ek3bci28ygj1abv1 884 ep...@fr...-20080913200531-uth9rv20ozia1u31 887 ep...@fr...-20080916171821-o8fc4ps68uc3djw6 888 ep...@fr...-20080917212414-k2k7mu678jcmfz3p 889 ep...@fr...-20080925211236-vc11gvzv1yjtse3e 890 ep...@fr...-20080928211138-nst1nxcmnpizlqv1 891 ep...@fr...-20080929214116-9e83mxekcm33g9sh 892 ep...@fr...-20080929214302-bb8r2vgtvx60c230 893 ep...@fr...-20080929223608-6dpsx9r5xurq905u 894 ep...@fr...-20080930153110-i6kwarpzd57n20o1 895 ep...@fr...-20080930165947-3xqw03te5592h1te 896 ep...@fr...-20080930170854-czyy2oqn4oig3x70 900 ep...@fr...-20081018144914-s9lyfbeo3i23ejdt 903 z-...@us...-20081018150353-8lv2s2lx6b1gws8b 907 z-...@us...-20081128214112-5av6sbd3wzesoq2o Modified: armagetronad/branches/0.2.8/armagetronad/configure.ac =================================================================== --- armagetronad/branches/0.2.8/armagetronad/configure.ac 2008-11-16 20:35:54 UTC (rev 8602) +++ armagetronad/branches/0.2.8/armagetronad/configure.ac 2008-11-28 21:44:18 UTC (rev 8603) @@ -552,20 +552,20 @@ if test x$enable_armathentication = xyes; then -ACX_PTHREAD([ +dnl ACX_PTHREAD([ -LIBS="${PTHREAD_LIBS} ${LIBS}" -CXXFLAGS="${CXXFLAGS} ${PTHREAD_CFLAGS}" -CC="${PTHREAD_CC}" -AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.]) +dnl LIBS="${PTHREAD_LIBS} ${LIBS}" +dnl CXXFLAGS="${CXXFLAGS} ${PTHREAD_CFLAGS}" +dnl CC="${PTHREAD_CC}" +dnl AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.]) -],[ +dnl ],[ AM_PATH_ZTHREAD_AA(2.3.2) CXXFLAGS="${CXXFLAGS} ${ZTHREAD_CXXFLAGS}" LIBS="${LIBS} ${ZTHREAD_LIBS}" -]) +dnl ]) fi # krawall fi # armamain Modified: armagetronad/branches/0.2.8/armagetronad/language/deutsch.txt =================================================================== --- armagetronad/branches/0.2.8/armagetronad/language/deutsch.txt 2008-11-16 20:35:54 UTC (rev 8602) +++ armagetronad/branches/0.2.8/armagetronad/language/deutsch.txt 2008-11-28 21:44:18 UTC (rev 8603) @@ -2295,7 +2295,7 @@ vote_rejected Vorschlag "\1" wurde abgelehnt.\n vote_timeout Abstimmung "\1" wurde ohne Ergebnis beendet.\n vote_new Neuer Abstimmungsvorschlag: "\1". Gib deine Stimme im Hauptmenu ab.\n -vote_redundant Vorschlag abgelehnt, ein identischer Vorschlag wurde bereits gemacht.\n +vote_redundant Vorschlag abgelehnt, ein identischer Vorschlag wurde bereits vor kurzem gemacht.\n vote_maturity Vorschlag abgelehnt, du bist noch nicht alt genug, warte \1 Sekunden.\n vote_overflow Vorschlag abgelehnt, es sind bereits zu viele Vorschl\xE4ge aktiv.\n vote_disabled Abstimmungen wurden leider von Serveradministrator abgeschaltet.\n Modified: armagetronad/branches/0.2.8/armagetronad/language/english_base.txt =================================================================== --- armagetronad/branches/0.2.8/armagetronad/language/english_base.txt 2008-11-16 20:35:54 UTC (rev 8602) +++ armagetronad/branches/0.2.8/armagetronad/language/english_base.txt 2008-11-28 21:44:18 UTC (rev 8603) @@ -892,14 +892,16 @@ unban_ip_help Revokes the ban of the specified IP address. player_list_hidden_player_prefix_help The prefix that is shown on hidden players' Global ID and access level when we can see it. -player_list_search Search string "\1" matches:\n -player_list_search_no_results Search string "\1" returned no result.\n -player_list_search_end End of search (\1 matches).\n +player_list_search \1: Search string "\2" matches:\n +player_list_search_no_results \1: Search string "\2" returned no result.\n +player_list_search_end \1: End of search (\2 matches).\n +player_list_end \1: Listed \2 players.\n admins_help Lists the server admins. You should use /admins or /listadmins instead of this. -admin_list_cant_see You are not allowed to list these admins.\n +admin_list_cant_see \1: You are not allowed to list these admins.\n admin_list_authoritylevel users from authority \1 +admin_list_end \1: Listed \2 users and \3 authorities on \4 access levels.\n admin_list_colors_best_red_help Red color component to the best access level listed by /admins admin_list_colors_best_green_help Green color component to the best access level listed by /admins @@ -2483,7 +2485,7 @@ vote_timeout Poll "\1" timed out.\n vote_cancel_all All polls have been canceled by an administrator.\n vote_new New poll: "\1". Enter the main menu vote on it.\n -vote_redundant Poll rejected, same suggestion was made already.\n +vote_redundant Poll rejected, same suggestion was made already recently.\n vote_maturity Poll rejected, you're not old enough to issue votes, wait \1 seconds.\n vote_overflow Poll rejected, too many pending polls.\n vote_disabled Poll rejected, disabled by server admin.\n @@ -2760,7 +2762,7 @@ access_level_list_admins_see_everyone_help Users with this access level or better will be able to list any configured admin, regardless of ADMIN_LIST_MIN_ACCESS_LEVEL. chat_command_unknown Unknown chat command "\1".\n -chat_command_accesslevel Sorry, your access level is not high enough to use the "\1" command You're \1, required would be \2.\n +chat_command_accesslevel Sorry, your access level is not high enough to use the "\1" command. You're \2, required would be \3.\n authority_blacklist_help Comma separated list of authorities your server should refuse to query. authority_whitelist_help If non-empty, only authorities on this comma separated list will be queried by your server. Modified: armagetronad/branches/0.2.8/armagetronad/src/engine/ePlayer.cpp =================================================================== --- armagetronad/branches/0.2.8/armagetronad/src/engine/ePlayer.cpp 2008-11-16 20:35:54 UTC (rev 8602) +++ armagetronad/branches/0.2.8/armagetronad/src/engine/ePlayer.cpp 2008-11-28 21:44:18 UTC (rev 8603) @@ -184,7 +184,11 @@ // if unsed, usernames of non-authenticated players get all special characters escaped (especially all @) // and usernames of authenticated players get left as they are (with all special characters except the last // escaped.) +#if defined(KRAWALL_SERVER) bool se_legacyLogNames = false; +#else +bool se_legacyLogNames = true; +#endif static tSettingItem<bool> se_llnConf("LEGACY_LOG_NAMES", se_legacyLogNames ); // transform special characters in name to escape sequences @@ -615,6 +619,8 @@ // force a small console while we are in here rSmallConsoleCallback cb(&tr); + se_ChatState( ePlayerNetID::ChatFlags_Menu, true ); + login.Enter(); // return username/scrambled password @@ -637,6 +643,8 @@ storage->save = (se_PasswordStorageMode > 0); } } + + se_ChatState( ePlayerNetID::ChatFlags_Menu, false ); } #ifdef DEDICATED @@ -2991,7 +2999,7 @@ se_ListTeams( p ); } -static void se_ListPlayers( ePlayerNetID * receiver, std::istream &s ) +static void se_ListPlayers( ePlayerNetID * receiver, std::istream &s, tString command ) { tString search; bool doSearch = false; @@ -3060,7 +3068,10 @@ tos << "\n"; if ( !doSearch ) + { sn_ConsoleOut( tos, receiver->Owner() ); + count++; + } else { tString tosLowercase( tColoredString::RemoveColors(tos) ); @@ -3071,7 +3082,7 @@ count++; if ( count == 1 ) { - sn_ConsoleOut( tOutput( "$player_list_search", search ) , receiver->Owner() ); + sn_ConsoleOut( tOutput( "$player_list_search", command, search ) , receiver->Owner() ); } sn_ConsoleOut( tos, receiver->Owner() ); } @@ -3080,17 +3091,21 @@ if ( doSearch && !count ) { - sn_ConsoleOut( tOutput( "$player_list_search_no_results", search ) , receiver->Owner() ); + sn_ConsoleOut( tOutput( "$player_list_search_no_results", command, search ) , receiver->Owner() ); } else if ( doSearch ) { - sn_ConsoleOut( tOutput( "$player_list_search_end", count ) , receiver->Owner() ); + sn_ConsoleOut( tOutput( "$player_list_search_end", command, count ) , receiver->Owner() ); } + else + { + sn_ConsoleOut( tOutput( "$player_list_end", command, count ) , receiver->Owner() ); + } } static void players_conf(std::istream &s) { - se_ListPlayers( 0, s ); + se_ListPlayers( 0, s, tString("PLAYERS") ); } static tConfItemFunc players("PLAYERS",&players_conf); @@ -3098,9 +3113,9 @@ // /players gives a player list -static void se_ChatPlayers( ePlayerNetID * p, std::istream &s ) +static void se_ChatPlayers( ePlayerNetID * p, std::istream &s, tString command ) { - se_ListPlayers( p, s ); + se_ListPlayers( p, s, command ); } @@ -3381,8 +3396,8 @@ } #endif -#if defined(DEDICATED) && defined(KRAWALL) -void se_ListAdmins( ePlayerNetID *, std::istream &s, tString ); +#if defined(DEDICATED) && defined(KRAWALL_SERVER) +void se_ListAdmins( ePlayerNetID *, std::istream &s, tString command ); #endif void handle_chat( nMessage &m ) @@ -3458,10 +3473,10 @@ return; } else if (command == "/players" || command == "/listplayers") { - se_ChatPlayers( p, s ); + se_ChatPlayers( p, s, command ); return; } -#if defined(DEDICATED) && defined(KRAWALL) +#if defined(DEDICATED) && defined(KRAWALL_SERVER) else if (command == "/admins" || command == "/listadmins") { se_ListAdmins( p, s, command ); return; @@ -4545,6 +4560,8 @@ } } + int userCount = 0, authorityCount = 0; + std::set< tAccessLevel > accessLevelsToList; if ( gotFirstNumber && !gotSecondNumber ) @@ -4555,7 +4572,7 @@ } else { - sn_ConsoleOut( tOutput("$admin_list_cant_see"), receiver->Owner() ); + sn_ConsoleOut( tOutput( "$admin_list_cant_see", command ), receiver->Owner() ); return; } } @@ -4628,9 +4645,9 @@ lowerUser = user; tToLower( lowerUser ); - theRightSet[ lowerUser ] =user; + theRightSet[ lowerUser ] = user; - // sn_ConsoleOut( userinfo, receiver->Owner() ); + userCount++; } } @@ -4663,6 +4680,8 @@ user = tOutput ( "$admin_list_authoritylevel", user ); lowerUser = tString( "AAA" ) << lowerUser; theRightSet[ lowerUser ] = user; + + authorityCount++; } } @@ -4722,6 +4741,11 @@ ++advancement; } + + tOutput sumup; + sumup = ""; + + sn_ConsoleOut( tOutput( "$admin_list_end", command, userCount, authorityCount, static_cast<int>( adminLevelsMap.size() ) ), receiver->Owner() ); } static void se_ListAdmins_conf( std::istream &s ) @@ -7621,8 +7645,8 @@ // apply client change, stripping excess spaces if ( sn_GetNetState() == nSTANDALONE - || ( !IsHuman() && sn_GetNetState() != nCLIENT ) - || ( + || ( Owner() == 0 && sn_GetNetState() != nCLIENT ) + || ( IsHuman() && ( sn_GetNetState() == nCLIENT || !messenger.adminRename_ ) && ( sn_GetNetState() != nCLIENT || Owner() == sn_myNetID ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |