Cleanup

"showminremain" enabled by default, "fovcompat" removed. DOCREF showminremain fovcompat
2016-10-14 21:49:53 +02:00
parent a451a0fd61
commit 72dfcd73fe
18 changed files with 24 additions and 38 deletions
@@ -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] ]
@@ -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")
  ]
 ]
@@ -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
@@ -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
@@ -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
@@ -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"
@@ -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
@@ -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
@@ -1,5 +1,5 @@
 md3load tris.md3
-md3skin tris ..\skin.jpg
+md3skin tris ../skin.jpg
 mdlcachelimit 16
 mdlvertexlight 1
 mdlattribute keywords "stairs"
@@ -1,5 +1,5 @@
 md3load tris.md3
-md3skin tris ..\skin.jpg
+md3skin tris ../skin.jpg
 mdlcachelimit 16
 mdlvertexlight 1
 mdlattribute keywords "stairs"
@@ -1,5 +1,5 @@
 md3load tris.md3
-md3skin tris ..\..\skin.jpg
+md3skin tris ../../skin.jpg
 mdlcachelimit 16
 mdlvertexlight 1
 mdlattribute keywords "stairs"
@@ -1,5 +1,5 @@
 md3load tris.md3
-md3skin tris ..\..\skin.jpg
+md3skin tris ../../skin.jpg
 mdlcachelimit 16
 mdlvertexlight 1
 mdlattribute keywords "stairs"
@@ -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)
 {
@@ -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");
    }
 }

@@ -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:
@@ -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();
@@ -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;
@@ -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);