diff --git a/config/scripts.cfg b/config/scripts.cfg index 9fb5fd7d..e8cb6efa 100644 --- a/config/scripts.cfg +++ b/config/scripts.cfg @@ -113,6 +113,8 @@ loop d $NUM_WEAPONS [ const (at $WEAPONS $d) $d ] loop r $NUM_MODES [ const (at $MODES $r) (addpunct (concat votemap $r (addpunct arg1 3)) 2) ] loop f $NUM_MODES [ const (toupper (at $MODES $f)) $f ] +const MAX_BOT_MATCH_LENGTH 60 + // Mode/map-setting aliases. const votemap [ mode $arg1; map $arg2 ] diff --git a/config/survival.cfg b/config/survival.cfg index c4c11fa1..575ff7a0 100644 --- a/config/survival.cfg +++ b/config/survival.cfg @@ -52,6 +52,7 @@ const survival [ if (strstr $defaultmaps (curmap 1)) [ survMap = (findlist $defaultmaps (curmap 1)) ] setOfcZones; checkzone ] + setbottimeout 2 $MAX_BOT_MATCH_LENGTH votemap 7 $arg1 ] diff --git a/source/src/menus.cpp b/source/src/menus.cpp index ac803b5d..76c9e180 100644 --- a/source/src/menus.cpp +++ b/source/src/menus.cpp @@ -1197,7 +1197,7 @@ void gmenu::conprintmenu() void gmenu::init() { - if(dirlist && dirlist->ext != NULL) + if(dirlist && ((dirlist->dir != NULL) && (dirlist->ext != NULL))) { items.deletecontents(); vector files;