Menu
▾
▴
[Armagetronad-commits] SF.net SVN: armagetronad: [8263] armagetronad/branches/0.2.8/armagetronad
|
From: <baz...@us...> - 2008-03-06 00:27:59
|
Revision: 8263
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8263&view=rev
Author: bazaarmagetron
Date: 2008-03-05 16:28:01 -0800 (Wed, 05 Mar 2008)
Log Message:
-----------
Manuel Moos: Restored behavior that kick votes over the chat interface don't get transformed to removal votes.
Modified Paths:
--------------
armagetronad/branches/0.2.8/armagetronad/src/engine/eVoter.cpp
Property Changed:
----------------
armagetronad/branches/0.2.8/armagetronad/
Property changes on: armagetronad/branches/0.2.8/armagetronad
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-03-06 01:14:17.005000114 +0100
committer: Manuel Moos <z-...@us...>
properties:
branch-nick: armagetronad
+ timestamp: 2008-03-06 01:20:55.526000023 +0100
committer: Manuel Moos <z-...@us...>
properties:
branch-nick: armagetronad
Name: 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
+ 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
Modified: armagetronad/branches/0.2.8/armagetronad/src/engine/eVoter.cpp
===================================================================
--- armagetronad/branches/0.2.8/armagetronad/src/engine/eVoter.cpp 2008-03-06 00:27:22 UTC (rev 8262)
+++ armagetronad/branches/0.2.8/armagetronad/src/engine/eVoter.cpp 2008-03-06 00:28:01 UTC (rev 8263)
@@ -1315,8 +1315,8 @@
{
public:
// constructors/destructor
- eVoteItemKickServerControlled( ePlayerNetID* player = 0 )
- : eVoteItemHarm( player ), eVoteItemKick( player )
+ eVoteItemKickServerControlled( bool fromMenu, ePlayerNetID* player )
+ : eVoteItemHarm( player ), eVoteItemKick( player ), fromMenu_( fromMenu )
{}
~eVoteItemKickServerControlled()
@@ -1326,7 +1326,7 @@
{
// check whether enough harmful votes were collected already
ePlayerNetID * p = GetPlayer();
- if ( p && p->GetVoter()->HarmCount() - 1 < se_kickMinHarm )
+ if ( fromMenu_ && p && p->GetVoter()->HarmCount() - 1 < se_kickMinHarm )
{
// try to transfor the vote to a suspension
eVoteItem * item = tNEW ( eVoteItemSuspend )( p );
@@ -1355,6 +1355,8 @@
{
eVoteItemKick::DoExecute();
}
+private:
+ bool fromMenu_; // flag set if the vote came from the menu
};
static void se_HandleKickVote( nMessage& m )
@@ -1362,7 +1364,7 @@
// accept message
if ( eVoteItem::AcceptNewVote( m ) )
{
- eVoteItemHarm* item = tNEW( eVoteItemKickServerControlled )();
+ eVoteItemHarm* item = tNEW( eVoteItemKickServerControlled )( true, 0 );
if ( !item->FillFromMessage( m ) )
{
delete item;
@@ -2037,7 +2039,7 @@
if ( toKick )
{
// accept message
- item = tNEW( eVoteItemKickServerControlled )( toKick );
+ item = tNEW( eVoteItemKickServerControlled )( false, toKick );
}
}
else if ( command == "suspend" )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|