From 72dfcd73fe7492628deb3ca35707e0e2dffe4107 Mon Sep 17 00:00:00 2001 From: aurhat Date: Fri, 14 Oct 2016 21:49:53 +0200 Subject: [PATCH] Cleanup "showminremain" enabled by default, "fovcompat" removed. DOCREF showminremain fovcompat --- config/menus.cfg | 10 +++++----- config/menus_bot.cfg | 4 +--- config/menus_settings.cfg | 11 ++++------- .../models/mapmodels/toca/electric/outlet/md3.cfg | 2 +- .../models/mapmodels/toca/electric/switch/md3.cfg | 2 +- .../models/mapmodels/toca/securitycam/secucam/md3.cfg | 2 +- .../mapmodels/toca/securitycam/vertmount/md3.cfg | 2 +- .../mapmodels/toca/securitycam/wallmount/md3.cfg | 2 +- .../mapmodels/toca/stairs_aqueous/stairs1/md3.cfg | 2 +- .../mapmodels/toca/stairs_aqueous/stairs2/md3.cfg | 2 +- .../toca/stairs_aqueous/stairsacc/beam/md3.cfg | 2 +- .../toca/stairs_aqueous/stairsacc/handrail/md3.cfg | 2 +- source/src/audiomanager.cpp | 2 +- source/src/client.cpp | 2 +- source/src/clients2c.cpp | 2 +- source/src/docs.cpp | 2 +- source/src/rendergl.cpp | 9 --------- source/src/serverbrowser.cpp | 2 +- 18 files changed, 24 insertions(+), 38 deletions(-) diff --git a/config/menus.cfg b/config/menus.cfg index 7e954c65..d69a10c2 100644 --- a/config/menus.cfg +++ b/config/menus.cfg @@ -14,15 +14,15 @@ menuitem About [ showmenu about ] menuitem Quit savequit // Start maps. -genmapitems = [ +const genmapitems [ n = (listlen $arg1) loop i $n [ - listmapname = (at $arg1 $i) - menuitemmapload $listmapname + __listmapname = (at $arg1 $i) + menuitemmapload $__listmapname next = (+ $i 1) if (= $next $n) [ next = 0 ] [] nextmap = (at $arg1 $next) - (concatword nextmap_ $listmapname) = $nextmap + (concatword nextmap_ $__listmapname) = $nextmap ] ] @@ -71,7 +71,7 @@ newmenu [Watching demo] menuitem "Stop watching demo" stopdemo menuitem "Restart demo" [ demo $curdemofile ] menuitem "Rewind demo..." [ showmenu rewind ] -menuitemtextinput "Custom description: " [ getalias (concatword "demodesc_" $curdemofile) ] [ alias (concatword "demodesc_" $curdemofile) $arg1 ] [] 50 +menuitemtextinput "Custom description: " [ getalias (concatword "demodesc_" $curdemofile) ] [ alias (concatword "demodesc_" $curdemofile) $arg1 ] [] 100 menuitem "" -1 menuitem "Watch other demo" [ stopdemo; closecurmenu; showmenu [Play demo] ] menuitem "Search demo..." [ showmenu [search demo] ] diff --git a/config/menus_bot.cfg b/config/menus_bot.cfg index 528cf931..e0ff485c 100644 --- a/config/menus_bot.cfg +++ b/config/menus_bot.cfg @@ -5,9 +5,7 @@ persistidents 0 newmenu botmaps const genbotmaps [ - loop gbm (listlen $arg1) [ - listmapname = (at $arg1 $gbm) - menutext = $listmapname (concat map $listmapname) + looplist $arg1 listmapname [ menuitemmapload $listmapname (concat "tmp_botmap =" $listmapname "; startbotmap") ] ] diff --git a/config/menus_settings.cfg b/config/menus_settings.cfg index 1559c31e..ae55bc10 100644 --- a/config/menus_settings.cfg +++ b/config/menus_settings.cfg @@ -48,7 +48,7 @@ menuitem [Police] [ skin_rvsf 5 ] [ chmenumdl RVSF playermodels/RVSF/06 all 50 4 newmenu [QUICK setup] -menuitemtextinput [Nickname:] [] [ name $arg1 ] +menuitemtextinput [Nickname: ] [] [ name $arg1 ] menuitemcheckbox [Use high-res player skins] "(>= (findlist (zipmodlist active) protox_hq_reskin) 0)" [ if $arg1 [addzipmod protox_hq_reskin] [zipmodremove protox_hq_reskin] ] menuitemtextinput [Resolution (width): ] "$scr_w" [ scr_w $arg1 ] menuitemtextinput [Resolution (height): ] "$scr_h" [ scr_h $arg1 ] @@ -404,14 +404,11 @@ menuitemcheckbox [Scorch: ] "$scorch" [ scorch $arg1 ] menuitemcheckbox "Ignore map override: Disable water reflection" "$ignoreoverride_nowaterreflect" [ ignoreoverride_nowaterreflect $arg1 ] menuitemcheckbox "Ignore map override: Limit water waveheight" "$ignoreoverride_limitwaveheight" [ ignoreoverride_limitwaveheight $arg1 ] menuitemcheckbox "Ignore map override: Disable stencil shadows" "$ignoreoverride_nostencilshadows" [ ignoreoverride_nostencilshadows $arg1 ] -menuitem [Enable 0.93 FOV compatiblity...] [ fovcompat; sleep 100 fovcompatmenu ] menuitem [] -1 menuitem [FPS Range...] [ showmenu [FPS Range] ] menuitem [] -1 menuitem "\f2\t\t [ Apply now! ]" [ resetgl ] -const fovcompatmenu [ showmenu settings; showmenu video; showmenu [Advanced video settings] ] - newmenu [FPS Range] menuitem [My 486 0wnz y00 (8-10 FPS)] [ closecurmenu; fpsrange 8 10 ] @@ -600,8 +597,8 @@ muteitem [Submachine gun] 14 muteitem [Submachine gun reloading] 15 muteitem [Sniper] 16 muteitem [Sniper reloading] 17 -muteitem [Assault Rifle] 18 -muteitem [Assault Rifle reloading] 19 +muteitem [Assault rifle] 18 +muteitem [Assault rifle reloading] 19 muteitem [Grenade pull] 41 muteitem [Grenade throw] 42 muteitem [Grenade bounce 1] 43 @@ -702,7 +699,7 @@ muteitem [Got your back] 89 muteitem [Got you covered] 90 muteitem [In position] 91 muteitem [In position now] 92 -muteitem [Report In!] 93 +muteitem [Report in!] 93 muteitem [Nice shot] 94 muteitem [Thanks] 95 muteitem [Thanks, man] 96 diff --git a/packages/models/mapmodels/toca/electric/outlet/md3.cfg b/packages/models/mapmodels/toca/electric/outlet/md3.cfg index 0f7a22f2..2d5df10c 100644 --- a/packages/models/mapmodels/toca/electric/outlet/md3.cfg +++ b/packages/models/mapmodels/toca/electric/outlet/md3.cfg @@ -1,5 +1,5 @@ md3load tris.md3 -md3skin tris ..\outlet.jpg +md3skin tris ../outlet.jpg mdlattribute keywords "office home" mdlattribute desc "Wall power outlet" mdlattribute author toca diff --git a/packages/models/mapmodels/toca/electric/switch/md3.cfg b/packages/models/mapmodels/toca/electric/switch/md3.cfg index 9fe416ce..36eb4d2e 100644 --- a/packages/models/mapmodels/toca/electric/switch/md3.cfg +++ b/packages/models/mapmodels/toca/electric/switch/md3.cfg @@ -1,5 +1,5 @@ md3load tris.md3 -md3skin mesh ..\outlet.jpg +md3skin mesh ../outlet.jpg mdlattribute keywords "office home" mdlattribute desc "Wall switch" mdlattribute author toca diff --git a/packages/models/mapmodels/toca/securitycam/secucam/md3.cfg b/packages/models/mapmodels/toca/securitycam/secucam/md3.cfg index 4ffa491b..ebb95582 100644 --- a/packages/models/mapmodels/toca/securitycam/secucam/md3.cfg +++ b/packages/models/mapmodels/toca/securitycam/secucam/md3.cfg @@ -1,5 +1,5 @@ md3load tris.md3 -md3skin Group ..\skin.jpg +md3skin Group ../skin.jpg md3anim mapmodel 1 98 4 mdlattribute keywords "street" mdlattribute desc "Security camera, swiveling" diff --git a/packages/models/mapmodels/toca/securitycam/vertmount/md3.cfg b/packages/models/mapmodels/toca/securitycam/vertmount/md3.cfg index d204226e..d11ebcf1 100644 --- a/packages/models/mapmodels/toca/securitycam/vertmount/md3.cfg +++ b/packages/models/mapmodels/toca/securitycam/vertmount/md3.cfg @@ -1,5 +1,5 @@ md3load tris.md3 -md3skin vertmount ..\skin.jpg +md3skin vertmount ../skin.jpg mdlattribute keywords "street" mdlattribute desc "Security camera, vertical mount" mdlattribute author toca diff --git a/packages/models/mapmodels/toca/securitycam/wallmount/md3.cfg b/packages/models/mapmodels/toca/securitycam/wallmount/md3.cfg index 5a895d05..ed71c5a0 100644 --- a/packages/models/mapmodels/toca/securitycam/wallmount/md3.cfg +++ b/packages/models/mapmodels/toca/securitycam/wallmount/md3.cfg @@ -1,5 +1,5 @@ md3load tris.md3 -md3skin wallmount ..\skin.jpg +md3skin wallmount ../skin.jpg mdlattribute keywords "street" mdlattribute desc "Security camera, wall mount" mdlattribute author toca diff --git a/packages/models/mapmodels/toca/stairs_aqueous/stairs1/md3.cfg b/packages/models/mapmodels/toca/stairs_aqueous/stairs1/md3.cfg index 57c1bfbb..681c0cfa 100644 --- a/packages/models/mapmodels/toca/stairs_aqueous/stairs1/md3.cfg +++ b/packages/models/mapmodels/toca/stairs_aqueous/stairs1/md3.cfg @@ -1,5 +1,5 @@ md3load tris.md3 -md3skin tris ..\skin.jpg +md3skin tris ../skin.jpg mdlcachelimit 16 mdlvertexlight 1 mdlattribute keywords "stairs" diff --git a/packages/models/mapmodels/toca/stairs_aqueous/stairs2/md3.cfg b/packages/models/mapmodels/toca/stairs_aqueous/stairs2/md3.cfg index 9ef212f0..700723e1 100644 --- a/packages/models/mapmodels/toca/stairs_aqueous/stairs2/md3.cfg +++ b/packages/models/mapmodels/toca/stairs_aqueous/stairs2/md3.cfg @@ -1,5 +1,5 @@ md3load tris.md3 -md3skin tris ..\skin.jpg +md3skin tris ../skin.jpg mdlcachelimit 16 mdlvertexlight 1 mdlattribute keywords "stairs" diff --git a/packages/models/mapmodels/toca/stairs_aqueous/stairsacc/beam/md3.cfg b/packages/models/mapmodels/toca/stairs_aqueous/stairsacc/beam/md3.cfg index 141e5d91..6b68b2bd 100644 --- a/packages/models/mapmodels/toca/stairs_aqueous/stairsacc/beam/md3.cfg +++ b/packages/models/mapmodels/toca/stairs_aqueous/stairsacc/beam/md3.cfg @@ -1,5 +1,5 @@ md3load tris.md3 -md3skin tris ..\..\skin.jpg +md3skin tris ../../skin.jpg mdlcachelimit 16 mdlvertexlight 1 mdlattribute keywords "stairs" diff --git a/packages/models/mapmodels/toca/stairs_aqueous/stairsacc/handrail/md3.cfg b/packages/models/mapmodels/toca/stairs_aqueous/stairsacc/handrail/md3.cfg index 07e1d730..da252792 100644 --- a/packages/models/mapmodels/toca/stairs_aqueous/stairsacc/handrail/md3.cfg +++ b/packages/models/mapmodels/toca/stairs_aqueous/stairsacc/handrail/md3.cfg @@ -1,5 +1,5 @@ md3load tris.md3 -md3skin tris ..\..\skin.jpg +md3skin tris ../../skin.jpg mdlcachelimit 16 mdlvertexlight 1 mdlattribute keywords "stairs" diff --git a/source/src/audiomanager.cpp b/source/src/audiomanager.cpp index e34c2590..98a70def 100644 --- a/source/src/audiomanager.cpp +++ b/source/src/audiomanager.cpp @@ -928,7 +928,7 @@ void editmapsoundslot(int *n, char *name, char *maxuses) // edit slot parameters } result(res); } -COMMAND(editmapsoundslot, "isssss"); +COMMAND(editmapsoundslot, "iss"); void getmapsoundorigin(char *fname) { diff --git a/source/src/client.cpp b/source/src/client.cpp index dd594630..ff1082a0 100644 --- a/source/src/client.cpp +++ b/source/src/client.cpp @@ -802,7 +802,7 @@ void getmap(char *name, char *callback) if(callback && *callback) execute(callback); conoutf("map %s installed successfully", name); } - else conoutf("\f3map download failed."); + else conoutf("\f3map download failed"); } } diff --git a/source/src/clients2c.cpp b/source/src/clients2c.cpp index 672c94b5..0a9da268 100644 --- a/source/src/clients2c.cpp +++ b/source/src/clients2c.cpp @@ -1117,7 +1117,7 @@ void parsemessages(int cn, playerent *d, ucharbuf &p, bool demo = false) { extern int spawnpermission; spawnpermission = getint(p); - if(spawnpermission == SP_REFILLMATCH) hudoutf("\f3You can now spawn to refill your team."); + if(spawnpermission == SP_REFILLMATCH) hudoutf("\f3you can spawn now to refill your team"); break; } case SV_FORCEDEATH: diff --git a/source/src/docs.cpp b/source/src/docs.cpp index d09a33c2..5d589045 100644 --- a/source/src/docs.cpp +++ b/source/src/docs.cpp @@ -130,7 +130,7 @@ void adddocremark(char *remark) lastident->remarks.add(newstring(remark)); } -void adddocref(char *name, char *ident, char *url, char *article) // FIXME... someone, please :P +void adddocref(char *name, char *ident, char *url, char *article) { if(!lastident || !name) return; docref &r = lastident->references.add(); diff --git a/source/src/rendergl.cpp b/source/src/rendergl.cpp index 554c35af..de920273 100644 --- a/source/src/rendergl.cpp +++ b/source/src/rendergl.cpp @@ -474,15 +474,6 @@ void scopefunc() scopesensfunc = tan(((float)scopefov)*0.5f*RAD)/tan(fov*0.5f*RAD); } -// map old fov values to new ones -void fovcompat(int *oldfov) -{ - extern float aspect; - setfvar("fov", atan(tan(RAD/2.0f*(*oldfov)/aspect)*aspect)*2.0f/RAD, true); -} - -COMMAND(fovcompat, "i"); - float dynfov() { if(player1->weaponsel->type == GUN_SNIPER && ((sniperrifle *)player1->weaponsel)->scoped) return (float)scopefov; diff --git a/source/src/serverbrowser.cpp b/source/src/serverbrowser.cpp index 1e91c6fd..49caaedc 100644 --- a/source/src/serverbrowser.cpp +++ b/source/src/serverbrowser.cpp @@ -644,7 +644,7 @@ VARP(serversort, 0, 0, NUMSERVSORT-1); VARP(serversortdir, 0, 0, 1); VARP(showonlygoodservers, 0, 0, 1); VAR(shownamesinbrowser, 0, 0, 1); -VARP(showminremain, 0, 0, 1); +VARP(showminremain, 0, 1, 1); VARP(showallplayersnumber, 0, 1, 1); VARP(serversortpreferofficial, 0, 1, 1);