This commit is contained in:
aurhat
2017-05-21 22:08:04 +02:00
parent 8bc1a0121b
commit e126faef15
8 changed files with 12 additions and 11 deletions
+1 -1
View File
@@ -62,7 +62,7 @@ menudirlist demos dmo "demo $arg1" 0 searchdemo
newmenu [search demo]
menuitemtextinput "Part of demo name or description: " "result $searchdemo" [ searchdemo = $arg1 ]
menuitem "\f2\t\t Search demo" [ showmenu [search specific demo] ]
menuitem "\f2\t\t [ Search demo ]" [ showmenu [search specific demo] ]
// in-game menu that opens when pressing escape while watching a demo.
newmenu [Watching demo]
+2 -2
View File
@@ -94,8 +94,8 @@ menudirlist "packages/maps" cgz [map $arg1] 0 searchmap
newmenu [search map]
menuitemtextinput "Part of map name or description: " "result $searchmap" [ searchmap = $arg1 ]
menuitem "\f2\t\tSearch in official maps" [ showmenu [search official map] ]
menuitem "\f2\t\tSearch in custom maps" [ showmenu [search custom map] ]
menuitem "\f2\t [ Search in official maps ]" [ showmenu [search official map] ]
menuitem "\f2\t [ Search in custom maps ]" [ showmenu [search custom map] ]
const showmenu_enemies [ if ($tmp_isbotteammode) [ showmenu [team enemies] ] [ showmenu enemies ] ]
+2 -1
View File
@@ -553,7 +553,8 @@ loop tsl (listlen $DEFAULT_SCOREBOARD_ORDER) [
]
menuitem [] -1
menuitem [Reset to default scoreboard...] [ loop rsl (listlen $DEFAULT_SCOREBOARD_ORDER) [ (at $DEFAULT_SCOREBOARD_ORDER $rsl) (at $DEFAULT_SCOREBOARD_POSITIONS $rsl) ]; refreshcurmenudelayed ]
menuitem [Close] [ closecurmenu ]
menuitem [] -1
menuitem "\t\t\f2[ Back ]" [ closecurmenu ]
alias wallclockformat "" // strftime formatting
alias wallclockformatlist ["" %H:%M %H:%M:%S %I:%M%p %I:%M:%S%p U%H:%M U%H:%M:%S] //"U" at beginning means UTC/GMT time
+1 -2
View File
@@ -101,7 +101,6 @@ loop i (listlen $faqQuestions) [
delalias $tmpMenuAlias
menuitem "" -1
]
menuitem [] -1
menuitem [ Close] [ closecurmenu ]
menuitem "\t\t\t\t\t\f2[ Back ]" [ closecurmenu ]
delalias faqQuestions
+4 -4
View File
@@ -34,14 +34,14 @@ resetSurvAliases
// build menus
const survSetsList [survNumBots survBotsToAdd timeBetChkPts timeUntilTele survMaxBots]
const survDifList ["6 1 60000 90000 20" "8 2 45000 60000 30" "10 3 30000 45000 40" "12 5 10000 20000 50"]
const survSetDif [if (checkrange $arg1 0 3) [ survDifficulty = $arg1; loop sdl 5 [ (at $survSetsList $sdl) = (at (at $survDifList $survDifficulty) $sdl) ] ] [ sleep 1000 [ echo "\f3Error: \f5invalid difficulty, defaulting to (genSurvDifStr 0) ] 1; survSetDif 0 ]; nonSurvDefaults = 0 ]
const survSetDif [if (checkrange $arg1 0 3) [ survDifficulty = $arg1; loop sdl 5 [ (at $survSetsList $sdl) = (at (at $survDifList $survDifficulty) $sdl) ] ] [ sleep 1000 [ echo "\f3Error: \f5invalid difficulty, defaulting to" (genSurvDifStr 0) ] 1; survSetDif 0 ]; nonSurvDefaults = 0 ]
newmenu [Survival Mode]
menuitemslider "Map: " 0 (- (listlen $defaultmaps) 1) "$survMap" 1 [ac_aqueous ac_arabian ac_arctic ac_arid ac_avenue ac_cavern ac_complex ac_depot ac_desert ac_desert2 ac_desert3 ac_douze ac_edifice ac_elevation ac_gothic ac_iceroad ac_industrial ac_ingress ac_keller ac_lainio ac_mines ac_outpost ac_power ac_rattrap ac_scaffold ac_shine ac_snow ac_stellar ac_sunset ac_swamp ac_terros ac_toxic ac_urban ac_venison ac_wasteland ac_werk] [ survMap = $arg1 ]
menuitemslider "Difficulty: " 0 3 "$survDifficulty" 1 [easy intermediate hard impossible] [ survSetDif $arg1 ]
menuitem [] -1
menuitem "\t\t\tCustomize" [ showmenu [Survival Mode - Customize] ]
menuitem "\t\t\tStart!" [ survival (at $defaultmaps $survMap) ]
menuitem "\t\t Customize..." [ showmenu [Survival Mode - Customize] ]
menuitem "\t\t\f2 [ Start! ]" [ survival (at $defaultmaps $survMap) ]
newmenu [Survival Mode - Customize]
menuitemcheckbox "Enable survival damage effects (uses gamespeed/gamma)" "$survDamageEffects" [ survDamageEffects = $arg1 ]
@@ -52,7 +52,7 @@ menuitemslider "# of milliseconds before teleporting: " 10000 180000 "$timeUntil
menuitemslider "Maximum # of bots in survival mode: " 10 50 "$survMaxBots" 2 [] [ survMaxBots = $arg1; nonSurvDefaults = 1 ]
menuitemslider "Spam survival mode messages: " 0 1 "$spamSurvMsgs" 1 [ no yes ] [ spamSurvMsgs = $arg1 ]
menuitem [] -1
menuitem [ Back] [ closecurmenu ]
menuitem "\t\t\t\f2 [ Back ]" [ closecurmenu ]
const genSurvDifStr [
if $nonSurvDefaults [ result "[CUSTOM]" ] [
+1
View File
@@ -185,6 +185,7 @@ void disconnect(int onlyclean, int async)
player1->clientnum = -1;
player1->lifesequence = 0;
player1->clientrole = CR_DEFAULT;
lastpm = -1;
kickallbots();
loopv(players) zapplayer(players[i]);
clearvote();
-1
View File
@@ -241,7 +241,6 @@ char *mlayout = NULL;
int Mv = 0, Ma = 0, F2F = 1000 * MINFF; // moved up:, MA = 0;
float Mh = 0;
extern int connected;
extern int lastpm;
extern bool noflags;
bool item_fail = false;
int map_quality = MAP_IS_EDITABLE;
+1
View File
@@ -555,6 +555,7 @@ extern void setskin(playerent *pl, int skin, int team = -1);
extern void callvote(int type, const char *arg1 = NULL, const char *arg2 = NULL, const char *arg3 = NULL);
extern void addsleep(int msec, const char *cmd, bool persist = false);
extern void resetsleep(bool force = false);
extern int lastpm;
//game mode extras
extern void flagpickup(int fln);
extern void tryflagdrop(bool manual = false);