From c1e9daee1e089e93cdcc3ba4ad87d389827bae4b Mon Sep 17 00:00:00 2001 From: aurhat Date: Sun, 17 Jul 2016 13:26:21 +0200 Subject: [PATCH] Cleanup --- config/font.cfg | 2 +- config/menus.cfg | 1 - config/menus_settings.cfg | 3 +-- config/menus_voicecom.cfg | 6 +++--- config/opt/faq.cfg | 6 +++--- config/scripts.cfg | 4 ++-- source/src/clientgame.cpp | 6 +++--- source/src/texture.cpp | 2 +- 8 files changed, 14 insertions(+), 16 deletions(-) diff --git a/config/font.cfg b/config/font.cfg index c4edc10a..5fc3d9c6 100644 --- a/config/font.cfg +++ b/config/font.cfg @@ -15,7 +15,7 @@ exec config/font_serif.cfg // Note that the fonts are defined in the particular order shown in the comments. // You can also use the "TTF2Font" tool to assist you: -// http://sourceforge.net/apps/mediawiki/bloodfrontier/index.php?title=TTF2Font +// https://sourceforge.net/projects/bloodfrontier/files/Vault/TTF2Font/ diff --git a/config/menus.cfg b/config/menus.cfg index 50a6ea36..f195c3d5 100644 --- a/config/menus.cfg +++ b/config/menus.cfg @@ -45,7 +45,6 @@ menuitem [] -1 menuitem [Show all maps..] [showmenu [all maps]] newmenu [Play demo] -menuinit [ echo [To stop demo playback, type:] (red)/stopdemo ] menudirlist demos dmo "demo $arg1" newmenu rewind diff --git a/config/menus_settings.cfg b/config/menus_settings.cfg index 52e7d12b..4303eef4 100644 --- a/config/menus_settings.cfg +++ b/config/menus_settings.cfg @@ -308,8 +308,7 @@ menuitem [Back] [ closecurmenu ] menuitem [Click to use alternate edit binds] [ exec config/opt/alternateeditbinds.cfg; closecurmenu ] [ echo (red) See config/opt/alternateeditbinds.cfg ] newmenu [Reset Binds] -menuinit [ resetbindsyes = 0 ] // Ensures this menu works correctly. -menuitemcheckbox [Yes, reset all binds: ] [ resetbindsyes = 1 ] [ resetbindsyes = $arg1 ] +menuitemcheckbox [Yes, reset all binds: ] [ resetbindsyes = 0 ] [ resetbindsyes = $arg1 ] menuitem "\f2 [ Apply! ] " [ if $resetbindsyes resetbinds [ showmenu [] ] ] alias defaultgamma 100 diff --git a/config/menus_voicecom.cfg b/config/menus_voicecom.cfg index b4a22387..67d66c90 100644 --- a/config/menus_voicecom.cfg +++ b/config/menus_voicecom.cfg @@ -32,13 +32,13 @@ genvcitem [Yes Affirmative "All right, Sir"] [yes affirmative genvcitem [Negative "No can do" "There's no way, Sir!"] [negative nocando theresnowaysir] 2 // * genvcitem ["On the move" "On my way"] [onthemove_1 onthemove_2] 3 genvcitem ["Got your back!" "Got you covered!"] [igotyourback igotyoucovered] 4 -genvcitem ["In Position!" "In Position now!"] [inposition_1 inposition_2] 5 +genvcitem ["In position!" "In position now!"] [inposition_1 inposition_2] 5 // V 2 [ 1,2,3 ] newmenu [Team Commands] 1 1 genvcitem [Recover the flag!] recovertheflag 1 // * genvcitem [Defend the flag!] defendtheflag 2 // # -genvcitem ["Come on, move!" "Spread Out!"] [comeonmove spreadout] 3 // * +genvcitem ["Come on, move!" "Spread out!"] [comeonmove spreadout] 3 // * // V 3 [ 2,3,4 ] newmenu [Team State] 1 1 @@ -59,7 +59,7 @@ newmenu [Team Tactics] 1 1 genvcitem [Cover me!] coverme 1 genvcitem [Stay together!] staytogether 2 genvcitem [Stay here!] stayhere 3 -genvcitem [Report In!] reportin 4 // * +genvcitem [Report in!] reportin 4 // * // V 6 [ 1,2,3 ] newmenu [Public Talk] 1 1 diff --git a/config/opt/faq.cfg b/config/opt/faq.cfg index 9ddd5a1e..017fe536 100644 --- a/config/opt/faq.cfg +++ b/config/opt/faq.cfg @@ -23,8 +23,8 @@ faqAnswer_1 = [ faqAnswer_2 = [ "Your AssaultCube version can be determined by launching the game and executing" - "the /version command. It should output a 4 digit number such as 1104 -" - "this would indicate that you have AssaultCube version 1.1.0.4 installed." + "the /version command. It should output a 4 digit number such as 1202 -" + "this would indicate that you have AssaultCube version 1.2.0.2 installed." ] faqAnswer_3 = [ @@ -70,7 +70,7 @@ faqAnswer_7 = [ "Proper format and evidence (screenshots/demos/logs) are required." "" "Links:" - "http://forum.cubers.net/thread-1.html - AssaultCube Blacklist Report Thread" + "http://forum.cubers.net/forum-12.html - AssaultCube Blacklist Subforum" ] faqAnswer_8 = [ diff --git a/config/scripts.cfg b/config/scripts.cfg index da0673ba..7132aa46 100644 --- a/config/scripts.cfg +++ b/config/scripts.cfg @@ -445,8 +445,8 @@ const convertcase [ ] ingall = 0 -const ignoreall [ if $connected [ ingall = 1; loop ia (+ (highestcn) 1) [ ignore $ia ]; echo (blue)NOTE: (white)All clients currently on the server were ignored. ] ] -const unignoreall [ if $connected [ ingall = 0; clearignored -1; echo (blue)NOTE: (white)All clients currently on the server were unignored. ] ] +const ignoreall [ if $connected [ ingall = 1; loop ia (+ (highestcn) 1) [ ignore $ia ]; echo (blue)NOTE: (white)all clients currently on the server were ignored ] ] +const unignoreall [ if $connected [ ingall = 0; clearignored -1; echo (blue)NOTE: (white)all clients currently on the server were unignored ] ] const ignoreteam [ if (curmodeattr team) [ _arg1 = (toupper $arg1) diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp index 766ff77a..b2b87c47 100644 --- a/source/src/clientgame.cpp +++ b/source/src/clientgame.cpp @@ -120,7 +120,7 @@ void listignored() pl[0] = '\0'; loopv(players) if(players[i] && players[i]->ignored) concatformatstring(pl, ", %s", colorname(players[i])); if(*pl) conoutf("ignored players: %s", pl + 2); - else conoutf("no players were ignored."); + else conoutf("no players are ignored"); } void clearignored(int *cn) @@ -140,7 +140,7 @@ void listmuted() pl[0] = '\0'; loopv(players) if(players[i] && players[i]->muted) concatformatstring(pl, ", %s", colorname(players[i])); if(*pl) conoutf("muted players: %s", pl + 2); - else conoutf("no players were muted."); + else conoutf("no players are muted"); } void clearmuted(char *cn) @@ -183,7 +183,7 @@ void newteam(char *name) { int nt = teamatoi(name); if(nt == player1->team) return; // same team - if(!team_isvalid(nt)) { conoutf("\f3\"%s\" is not a valid team name (try CLA, RVSF or SPECTATOR)", name); return; } + if(!team_isvalid(nt)) { conoutf("\f3\"%s\" is not a valid team name or number", name); return; } if(player1->state == CS_EDITING) conoutf("you can't change team while editing"); else addmsg(SV_SWITCHTEAM, "ri", nt); } diff --git a/source/src/texture.cpp b/source/src/texture.cpp index 91474f69..bdb411b3 100644 --- a/source/src/texture.cpp +++ b/source/src/texture.cpp @@ -894,7 +894,7 @@ void guidetoggle() } else { - conoutf("\fBGuide view is only avaiable when editing."); + conoutf("\fBGuide view is only available when editing."); } }