cleanup/updates

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@7224 e016b1c5-ed68-44aa-a2f7-31cac88cffde

config/autosave.cfg

@@ -1,7 +1,7 @@
 persistidents 0
 
-checkinit mapstartalways [ if $autosavemap autoSaveCheck; numAutoSaves = 0 ]
-checkinit onNewMap [ if $autosavemap autoSaveCheck; numAutoSaves = 0 ]
+checkinit mapstartalways [if $autosavemap autoSaveCheck; numAutoSaves = 0]
+checkinit onNewMap [if $autosavemap autoSaveCheck; numAutoSaves = 0]
 check2init autosavemap 0           // Autosavemap system disabled by default
 check2init timeBetAutoSaves 300000 // Once every 5 minutes.
 check2init numAutoSaveBackups 3    // Make a map .bak every 3 autosaves (15 minutes) by default

config/firstrun.cfg

@@ -2,19 +2,19 @@
 
 persistidents 0
 
-delayed_firstrun = [
-  music "pingpong/Ping_Pong_-_Kamikadze.ogg" 89000 " " // 90 secs, fade
+const delayed_firstrun [
+  music "pingpong/Ping_Pong_-_Kamikadze.ogg" 89000 [ ] // 90 secs, fade
 
   new_gfx_quality 3
   echo (orange)Welcome to AssaultCube
   echo Developed by (blue)'Rabid Viper Productions'
-  echo ""
+  echo []
   echo Use the below menu to change some necessary settings...
-  echo ""
+  echo []
   echo Further help & information can be found in your (concatword (red) README (white) ,) which is inside your AssaultCube directory.
   showmenu [QUICK setup]
 ]
 
-sleep 1000 [ delayed_firstrun ]
+sleep 1000 delayed_firstrun
 
 persistidents 1

config/menus.cfg

@@ -94,7 +94,7 @@ menuitem "AssaultCube is developed by various people around the" -1
 menuitem "world. People that enjoy making this game together." -1
 menuitem [] -1
 menuitem "Thank you to everyone participating to help us make" -1
-menuitem "AssaultCube what it is today. To find out the team" -1
+menuitem "AssaultCube what it is today. To learn about the team" -1
 menuitem "(Rabid Viper Productions) behind the game, read here:" -1
 menuitem "	1http://assault.cubers.net/docs/team.html" -1
 if $mappack_version [ menuitem [] -1 ]
@@ -108,7 +108,7 @@ newmenu help
 
 menuitem [AssaultCube reference] [ showmenu reference ]
 menuitem [Search the reference]  [ showmenu [Reference search] ]
-menuitem [Keyboard controls]     [ showmenu controls ]
+// menuitem [Keyboard controls]     [ showmenu controls ] // This was never implemented or something? - Bukz
 menuitem [View the FAQ]          [ showmenu faq ]
 menuitem [] -1
 menuitem [...for further information/help see the README] [ echo (yellow)The readme can be found in the base AssaultCube directory. ]

config/menus_bot.cfg

@@ -91,16 +91,17 @@ menuitem [Bot Survival]                [ showmenu [Survival Mode] ]
 menuitem [] -1
 menuitem [Empty Map] emptymap
 
+const showmenu_enemies [ if (isbotteammode $tmp_mode) [ showmenu [team enemies] ] [ showmenu enemies ] ]
+
 newmenu botskill
 
-showmenu_enemies = [ if (|| (= $tmp_mode 7) (|| (= $tmp_mode 20) (= $tmp_mode 21))) [ showmenu [team enemies] ] [ showmenu enemies ] ]
 menuitem [Best]           [ tmp_botskill = best; showmenu_enemies ]
 menuitem "Good (default)" [ tmp_botskill = good; showmenu_enemies ]
 menuitem [Medium]         [ tmp_botskill = medium; showmenu_enemies ]
 menuitem [Worse]          [ tmp_botskill = worse; showmenu_enemies ]
 menuitem [Bad]            [ tmp_botskill = bad; showmenu_enemies ]
 
-genenemyitems = [
+const genenemyitems [
   loop i (listlen $arg1) [
     numplayers = (at $arg1 $i)
     if (= $arg2 0) [ // DM
@@ -120,9 +121,9 @@ genenemyitems [2 4 8 12 16 24 32] 0
 newmenu [team enemies]
 genenemyitems [4 8 12 16 24 32] 1
 
-survSetsList = [survNumBots survBotsToAdd timeBetChkPts timeUntilTele survMaxBots]
-survDifList = [ "6 1 60000 90000 20" "8 2 45000 60000 30" "10 3 30000 45000 40" "12 5 10000 20000 50" ]
-survSetDif = [ if (checkrange $arg1 0 3) [ survDifficulty = $arg1; loop sdl 5 [ (at $survSetsList $sdl) = (at (at $survDifList $survDifficulty) $sdl) ] ] [ sleep 1000 [ echo (c 3)Error: (c 5)invalid difficulty, defaulting to (genSurvDifStr 0) ] 1; survSetDif 0 ]; nonSurvDefaults = 0 ]
+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 (c 3)Error: (c 5)invalid 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_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_mines ac_outpost ac_power ac_rattrap ac_scaffold ac_shine ac_snow ac_stellar ac_sunset ac_swamp ac_toxic ac_urban ac_werk] [ survMap = $arg1 ]

config/menus_edit.cfg

@@ -143,7 +143,7 @@ menuitemslider [Select only these entities: ] 0 15 "$_closestenttypestatus" 1 [A
 _closestentslider = [ closestenttype (at ["" light playerstart pistol ammobox grenades health armour akimbo mapmodel ladder ctf-flag sound clip helmet plclip] $arg1); _closestenttypestatus = $arg1 ]
 
 // Map-message edit/creation menu
-menumapmsg = [ if (= (strcmp (getmapmsg) [Untitled Map by Unknown]) 1) [ showmenu [Create a map message] ] [ showmenu [Edit a map message] ] ]
+const menumapmsg [ if (strcmp (getmapmsg) [Untitled Map by Unknown]) [ showmenu [Create a map message] ] [ showmenu [Edit a map message] ] ]
 
 newmenu [Create a map message]
 menuinit [ menumapmsgtext = [] ]
@@ -430,11 +430,13 @@ menuitemslider [Sound size: ] 0 25 "$soundsize" 1 []  [ soundsize = $arg1 ]
 menuitemslider [Sound volume: ] 1 255 "$ambientsoundvol" 5 [] [ ambientsoundvol = $arg1 ]
 menuitem "2		     [ OK ]" [ newent sound $ambientsoundmenu $soundrad $soundsize $ambientsoundvol ]
 
+showedBAKinfo = 0
+
 newmenu [Editing settings]
 menuitemslider [Grid/Selection style: ] 0 1 "$oldselstyle" 1 [triangles "squares (default)"] [ oldselstyle $arg1 ]
 menuitemslider [Fly speeds multiplier: ] 1 5 "$flyspeed" 1 [] [ flyspeed $arg1 ]
 menuitemcheckbox [Enable auto save map: ] "$autosavemap" [ autosavemap = $arg1 ]
-menuitemslider [Time between auto saves (in minutes): ] 2 60 "$timeBetAutoSaves" 1 [] [ timeBetAutoSaves = (* $arg1 60000) ]
-menuitemtextinput [Make a map backup (.BAK) every: ] "$numAutoSaveBackups" [ numAutoSaveBackups = $arg1 ] [] 4
+menuitemslider [Time between auto saves (in minutes): ] 2 60 "(div $timeBetAutoSaves 60000)" 1 [] [ timeBetAutoSaves = (* $arg1 60000) ]
+menuitemtextinput [Make a map backup (.BAK) every: ] "$numAutoSaveBackups" [ numAutoSaveBackups = $arg1 ] [ if (! $showedBAKinfo) [ echo This setting effects the number of autosavemaps between making a map backup file. "(.BAK)"; showedBAKinfo = 1 ] ] 4
 
 persistidents 1

config/menus_multiplayer.cfg

@@ -1,11 +1,11 @@
 persistidents 0
 
 // Decides whether to open the admin or normal in-game menu.
-ingamemenu = [ if (currole) [ showmenu [In-game admin] ] [ showmenu In-game ] ]
+const ingamemenu [ if (currole) [ showmenu [In-game admin] ] [ showmenu In-game ] ]
 
 // "Join server" menu.
 personalserverlist = []
-joinservermenu = [
+const joinservermenu [
   searchlan 1
   showallservers 1
   showonlyfavourites 0
@@ -36,7 +36,7 @@ menuitem "3Disconnect from server" disconnect
 menuitem "3Quit AssaultCube"       savequit
 menuinitselection 13
 
-__ingamemenu_showmodel = [
+const __ingamemenu_showmodel [
   if (&& (< (curteam) 4) $arg2) [
     chmenumdl $arg1 (concatword "playermodels/" (at [CLA RVSF CLA RVSF] (curteam)) "/0" (+ 1 (skin))) idle 15 3
   ] [
@@ -184,7 +184,7 @@ menuitem [] -1
 menuitem "2		  [ Connect ]		" [ echo connecting to $sbdesc ; connect $sbdns $sbport $sbpwd ]
 menuinitselection 3
 
-addfavcatmenu = [
+const addfavcatmenu [
   i = (+ 1 (findlist (listfavcats) $arg1))
   newmenu [edit favourites]
   if (< $i 11) [
@@ -212,7 +212,7 @@ addfavcatmenu = [
   menuitem [Show servers of this category] (concat showonlyfavourites $i ";showmenu server") [ showonlyfavourites 0 ]
 ]
 
-addallfavcatmenus = [
+const addallfavcatmenus [
 	newmenu [serverbrowser help]
 	menuitem [] -1
 	menuitem [Keys to add/remove servers from categories:] -1

config/menus_settings.cfg

@@ -58,7 +58,7 @@ menuitem [] -1
 menuitem "0			        [ OK; View FAQ ]" [ closemenu [QUICK setup]; resetgl; showmenu faq ]
 menuitem "2			        [ OK ]" [ closemenu [QUICK setup]; resetgl ]
 
-new_gfx_quality = [
+const new_gfx_quality [
   if (= $arg1 6) [ // "INSANE!" gfx quality
     fsaa 8
     minlod 250
@@ -206,7 +206,7 @@ new_gfx_quality = [
   ]
 ]
 
-new_sound_quality = [
+const new_sound_quality [
   if (= $arg1 3) [ // high sound (DEFAULT)
     soundqualityalias = 3
     maxsoundsatonce 10
@@ -304,9 +304,9 @@ menuitem [Advanced video settings...] [ showmenu [Advanced video settings] ]
 menuitem [] -1
 menuitem "2			  [ Apply now! ]"   [ resetgl ]
 
-fsaa_valuemap = [-1 2 4 8 16]
-minlod_valuemap = [60 100 200 250]
-watersubdiv_valuemap = [16 8 4 2 1]
+const fsaa_valuemap [-1 2 4 8 16]
+const minlod_valuemap [60 100 200 250]
+const watersubdiv_valuemap [16 8 4 2 1]
 
 newmenu [Advanced video settings]
 
@@ -319,13 +319,13 @@ menuitemslider [Dynamic shadows: ] 0 2 getshadowq 1 [Off Blob Stencil] [ setshad
 menuitemslider [Tex-reduce: ] -1 3 "$texreduce" 1 []  [ texreduce $arg1 ]
 menuitemcheckbox [Water reflection: ] "$waterreflect" [ waterreflect $arg1 ]
 
-getshadowq = [
+const getshadowq [
   if (&& $stencilshadow (>= $stencilbits 8)) [result 2] [
     if $dynshadow [result 1] [result 0]
   ]
 ]
 
-setshadowq = [
+const setshadowq [
   if (= $arg1 2) [
     stencilshadow 40
     stencilbits 8
@@ -352,7 +352,7 @@ menuitem [FPS Range...] [ showmenu [FPS Range] ]
 menuitem [] -1
 menuitem "2		        [ Apply now! ]" [ resetgl ]
 
-fovcompatmenu = [ showmenu settings; showmenu video; showmenu [Advanced video settings] ]
+const fovcompatmenu [ showmenu settings; showmenu video; showmenu [Advanced video settings] ]
 
 newmenu [FPS Range]
 
@@ -415,7 +415,7 @@ menuitemcheckbox [Enable per-official map dynamic gamma: ] "$dyngamma" [ dyngamm
 menuitemtextinput [Set default gamma for this map: ] "(at $ofc_gamma_list (findlist $defaultmaps (curmap 1)))" [ setgamma $arg1 ]
 
 // Reduced game violence mode...
-reducedviolencemode = [
+const reducedviolencemode [
   if (= $arg1 1) [
     poniesmodeon = 1
     blood 0

config/menus_voicecom.cfg

@@ -9,7 +9,7 @@ menuitem [4. Team Talk]     [ showmenu [Team Talk] ]
 menuitem [5. Team Tactics]  [ showmenu [Team Tactics] ]
 menuitem [6. Public Talk]   [ showmenu [Public Talk] ]
 
-vcrnd = [ // pick random shout if possible
+const vcrnd [ // pick random shout if possible
   len = (listlen $arg1)
   if (> $len 1) [
     r = (rnd $len)
@@ -19,7 +19,7 @@ vcrnd = [ // pick random shout if possible
   ]
 ]
 
-genvcitem = [
+const genvcitem [
   if (> (listlen $arg2) 1) [ text = (at $arg1 0) ] [ text = $arg1 ] // split multiple shouts
   action = (concatword vcrnd " [" $arg2 "]" " [" $arg1 "]")
   menuitem (concatword $arg3 ". " $text) $action // add as numbered list

config/prefabs.cfg

@@ -4,7 +4,7 @@
 // vertices not defined have a 0 delta
 persistidents 0
 
-av = [
+const av [
   loop i $arg1 [
     archvertex (+ $arg1 1) (+ $i 1) (at $arg2 $i)
   ]

config/scontext.cfg

@@ -4,15 +4,15 @@
 persistidents 0
 
 // supported contexts
-context_core   = 0 // hardcoded scripts
-context_cfg    = 1 // known scripts
-context_prompt = 2 // command prompt
-context_mapcfg = 3 // map configs, we don't trust them
-context_mdlcfg = 4 // mdl configs, same
+const context_core 0   // hardcoded scripts
+const context_cfg 1    // known scripts
+const context_prompt 2 // command prompt
+const context_mapcfg 3 // map configs, we don't trust them
+const context_mdlcfg 4 // mdl configs, same
 
 // set allowed commands for the map config context
-mapcfgidents = [ loadnotexture loadsky mapmodelreset mapmodel texturereset texture fog fogcolour mapsoundreset mapsound watercolour shadowyaw ]
-mdlcfgidents = [ md2anim md2emit md2tag md3anim md3emit md3link md3load md3skin mdlalphatest mdlalphablend mdlcachelimit mdlcullface mdlscale mdlshadowdist mdltrans mdltranslucent mdlvertexlight]
+mapcfgidents = [loadnotexture loadsky mapmodelreset mapmodel texturereset texture fog fogcolour mapsoundreset mapsound watercolour shadowyaw]
+mdlcfgidents = [md2anim md2emit md2tag md3anim md3emit md3link md3load md3skin mdlalphatest mdlalphablend mdlcachelimit mdlcullface mdlscale mdlshadowdist mdltrans mdltranslucent mdlvertexlight]
 loop i (listlen $mapcfgidents) [ scriptcontext $context_mapcfg (at $mapcfgidents $i) ]
 loop i (listlen $mdlcfgidents) [ scriptcontext $context_mdlcfg (at $mdlcfgidents $i) ]