undo some buggy bugfixes - these need to be redone in a more working way:

- extendmatchtime: it should check for >= 0, not > 0
- QC code should not know about these aliases, as they are just that - aliases
- instead, maybe an alias-provided way should be provided for checking if a votable alias can be executed
- also fix a newly introduced spelling error

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index b42917ba07a7534ed1bacdb84ee0d6316faa7405..307f58fa78b76005964d1a54f514d599d9baac6a 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1375,7 +1375,7 @@ set timelimit_increment 5
 set timelimit_decrement 5
 set timelimit_min 5
 set timelimit_max 60
 set timelimit_decrement 5
 set timelimit_min 5
 set timelimit_max 60

-alias extendmatchtime "sv_cmd rpn /timelimit timelimit timelimit_max 0 timelimit when timelimit timelimit_increment add bound def"
+alias extendmatchtime "sv_cmd rpn /timelimit timelimit timelimit_max timelimit timelimit_increment add bound def"

 alias reducematchtime "sv_cmd rpn /timelimit timelimit timelimit_decrement sub timelimit_min timelimit bound def"
 alias endmatch "timelimit -1"
 
 alias reducematchtime "sv_cmd rpn /timelimit timelimit timelimit_decrement sub timelimit_min timelimit bound def"
 alias endmatch "timelimit -1"
 

diff --git a/qcsrc/server/vote.qc b/qcsrc/server/vote.qc
index 07b71d99968d005ea36083f737ca516ca43c9a2c..338d98476b38b2a685cfd71ce2b396d827e204b5 100644 (file)
--- a/qcsrc/server/vote.qc
+++ b/qcsrc/server/vote.qc
@@ -165,8 +165,6 @@ float GameCommand_Vote(string s, entity e) {
                                                        print_to(e, strcat("^1You have to wait ^2", ftos(ceil(e.vote_next - time)), "^1 seconds before you can again call a vote."));
                                        } else if(VoteCheckNasty(vote)) {
                                                print_to(e, "Syntax error in command. See 'vhelp' for more info.");
                                                        print_to(e, strcat("^1You have to wait ^2", ftos(ceil(e.vote_next - time)), "^1 seconds before you can again call a vote."));
                                        } else if(VoteCheckNasty(vote)) {
                                                print_to(e, "Syntax error in command. See 'vhelp' for more info.");

-                                       } else if(cvar("timelimit") == 0 && (vote == "extendmatchtime" || vote == "reducematchtime")) {
-                                               print_to(e, "^1Match time can not be reduced or extended as it is infinite. See 'vhelp' for more info.");

                                        } else if(RemapVote(vote, "vcall", e)) {
                                                votecalledvote = strzone(RemapVote_vote);
                                                votecalledvote_display = strzone(RemapVote_display);
                                        } else if(RemapVote(vote, "vcall", e)) {
                                                votecalledvote = strzone(RemapVote_vote);
                                                votecalledvote_display = strzone(RemapVote_display);


@@ -205,7 +203,7 @@ float GameCommand_Vote(string s, entity e) {
                                VoteDialog_Reset();
                                VoteStop(e);
                        } else {
                                VoteDialog_Reset();
                                VoteStop(e);
                        } else {

-                               print_to(e, "^1You are not allowed to stop that vote.");
+                               print_to(e, "^1You are not allowed to stop that Vote.");

                        }
                } else if(argv(1) == "master") {
                        if(cvar("sv_vote_master")) {
                        }
                } else if(argv(1) == "master") {
                        if(cvar("sv_vote_master")) {