minor fixes

assaultcube · May 6, 2022 · 7d0b271 · 7d0b271
1 parent 464e58d
commit 7d0b271
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/config/menus_settings.cfg b/config/menus_settings.cfg
@@ -117,11 +117,11 @@ menuitem [My 486 0wnz y00       (8-10 FPS)]   [ closecurmenu; maxfps   50; fpsra
 menuitem [Slow machine           (20-25 FPS)] [ closecurmenu; maxfps   50; fpsrange  20   25 ]
 menuitem [Sensible default       (30-40 FPS)] [ closecurmenu; maxfps   50; fpsrange  30   40 ]
 menuitem [Solid 60 Hz           (60-60 FPS)]  [ closecurmenu; maxfps  100; fpsrange  60   60 ]
-menuitem [Lockdown-Breakout   (100-150 FPS)]  [ closecurmenu; maxfps  150; fpsrange 100  150 ]
-menuitem [Solid 144 Hz      (144-144 FPS)]    [ closecurmenu; maxfps  150; fpsrange 144  144 ]
-menuitem [Gamer Geekout      (150-240 FPS)]   [ closecurmenu; maxfps  250; fpsrange 150  240 ]
-menuitem [Solid 240 Hz      (240-240 FPS)]    [ closecurmenu; maxfps  250; fpsrange 240  240 ]
-menuitem [I don't understand LOD (250+ FPS)]  [ closecurmenu; maxfps 1000; fpsrange 250 1000 ]
+menuitem [Lockdown-Breakout   (100-150 FPS)]  [ closecurmenu; maxfps    0; fpsrange 100  150 ]
+menuitem [Solid 144 Hz      (144-144 FPS)]    [ closecurmenu; maxfps    0; fpsrange 144  144 ]
+menuitem [Gamer Geekout      (150-240 FPS)]   [ closecurmenu; maxfps    0; fpsrange 150  240 ]
+menuitem [Solid 240 Hz      (240-240 FPS)]    [ closecurmenu; maxfps    0; fpsrange 240  240 ]
+menuitem [I don't understand LOD (250+ FPS)]  [ closecurmenu; maxfps    0; fpsrange 250 1000 ]
 
 ////  Main > Settings > HUD  ////
 

diff --git a/config/opt/compatibility.cfg b/config/opt/compatibility.cfg
@@ -11,7 +11,7 @@ const isSpect       [ if (&& $numargs (isclient $arg1)) [ result (player $arg1 s
 
 const pstat_score [
   if (isclient $arg1) [
-    result (concat (player $arg1 flags) (player $arg1 frags) (player $arg1 deaths) (player $arg1 points) (player $arg1 team) (player $arg1 tks) (player $arg1 name))
+    result (concat (player $arg1 flags) (player $arg1 frags) (player $arg1 deaths) (player $arg1 team) (player $arg1 tks) (player $arg1 name))
   ] [ result (concat [0 0 0 0 -1 0] (addpunct)) ]
 ]
 

diff --git a/source/src/console.cpp b/source/src/console.cpp
@@ -792,7 +792,7 @@ void writekeymap() // create keymap.cfg with proper constants from SDL2 header f
         { SDLK_F15, "F15" },
         { SDLK_NUMLOCKCLEAR, "NUMLOCK" },
         { SDLK_CAPSLOCK, "CAPSLOCK" },
-        { SDLK_SCROLLLOCK, "SCROLLOCK" },
+        { SDLK_SCROLLLOCK, "SCROLLOCK" }, // fixing historic typo could break too much
         { SDLK_RSHIFT, "RSHIFT" },
         { SDLK_LSHIFT, "LSHIFT" },
         { SDLK_RCTRL, "RCTRL" },

diff --git a/source/src/protocol.cpp b/source/src/protocol.cpp
@@ -474,7 +474,7 @@ void filterlang(char *d, const char *s)
 
 void filtercountrycode(char *d, const char *s) // returns exactly two uppercase chars or "--"
 {
-    if(isalpha(s[0]) && isalpha(s[1]) && !s[2])
+    if(strlen(s) == 2 && isalpha(s[0]) && isalpha(s[1]))
     {
         d[0] = toupper(s[0]);
         d[1] = toupper(s[1]);

diff --git a/source/src/server.h b/source/src/server.h
@@ -312,7 +312,7 @@ struct client                   // server side version of "dynent" type
 
     void reset()
     {
-        name[0] = pwd[0] = demoflags = 0;
+        name[0] = pwd[0] = country[0] = lang[0] = demoflags = 0;
         ip = ip_censored = 0;
         pubkeyhex[0] = '\0';
         vita = NULL;