Fix output messages in console

Fixes:
1. show time remaining in system console after each minute;
2. correct form of minute(s);
3. show info "everyone died!" instead of "team SPECTATOR has won
the round!" in demo mode;
4. show correct info to which team (name) was player forced, when player1
is spectator.
This commit is contained in:
aurhat
2014-12-06 17:17:19 +01:00
parent bd50e67f65
commit 990f6e9c8b
2 changed files with 4 additions and 3 deletions
+2 -1
View File
@@ -993,6 +993,7 @@ void timeupdate(int milliscur, int millismax)
if(identexists("onLastMin")) execute("onLastMin");
}
else if(clockdisplay==0) conoutf(_("time remaining: %d minutes"), minutesremaining);
else clientlogf(_("time remaining: %d minutes"), minutesremaining);
}
}
@@ -1344,7 +1345,7 @@ char *votestring(int type, const char *arg1, const char *arg2, const char *arg3)
if(arg3 && arg3[0])
{
int time = atoi(arg3);
if(time > 0 && time != defaultgamelimit(n)) formatstring(timestr)(" for %d minutes", time);
if(time > 0 && time != defaultgamelimit(n)) formatstring(timestr)(" for %d minute%s", time, time == 1 ? "" : "s");
}
if ( n >= GMODE_NUM )