Don't attempt to network more than the maximum number of shown spectators, fixes...

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / main.qc

diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc
index e4661468d8a8c050f44d19aea9973131b0023f6b..c2c9ee8a2f4e6c717a1dd38b653f1a5d035a2d23 100644 (file)
--- a/qcsrc/client/main.qc
+++ b/qcsrc/client/main.qc
@@ -1,6 +1,6 @@
 #include "main.qh"
 
-#include "defs.qh"
+#include <client/items/items.qh>
 #include <common/ent_cs.qh>
 #include "miscfunctions.qh"
 #include <common/effects/effect.qh>
@@ -16,10 +16,10 @@
 #include "hud/panel/quickmenu.qh"
 #include "shownames.qh"
 #include "view.qh"
-#include <common/t_items.qh>
 #include "weapons/projectile.qh"
 #include <common/deathtypes/all.qh>
 #include <common/items/_mod.qh>
+#include <common/gamemodes/gamemode/nexball/cl_nexball.qh>
 #include <common/mapinfo.qh>
 #include <common/minigames/cl_minigames.qh>
 #include <common/minigames/cl_minigames_hud.qh>
@@ -38,58 +38,6 @@
 
 #define DP_CSQC_ENTITY_REMOVE_IS_B0RKED
 
-void draw_cursor(vector pos, vector ofs, string img, vector col, float a)
-{
-       ofs = vec2(ofs.x * SIZE_CURSOR.x, ofs.y * SIZE_CURSOR.y);
-       drawpic(pos - ofs, strcat(draw_currentSkin, img), SIZE_CURSOR, col, a, DRAWFLAG_NORMAL);
-}
-
-void draw_cursor_normal(vector pos, vector col, float a)
-{
-       draw_cursor(pos, OFFSET_CURSOR, "/cursor", col, a);
-}
-
-void LoadMenuSkinValues()
-{
-       int fh = -1;
-       if(cvar_string("menu_skin") != "")
-       {
-               draw_currentSkin = strcat("gfx/menu/", cvar_string("menu_skin"));
-               fh = fopen(strcat(draw_currentSkin, "/skinvalues.txt"), FILE_READ);
-       }
-       if(fh < 0 && cvar_defstring("menu_skin") != "")
-       {
-               cvar_set("menu_skin", cvar_defstring("menu_skin"));
-               draw_currentSkin = strcat("gfx/menu/", cvar_string("menu_skin"));
-               fh = fopen(strcat(draw_currentSkin, "/skinvalues.txt"), FILE_READ);
-       }
-       if(fh < 0)
-       {
-               draw_currentSkin = "gfx/menu/default";
-               fh = fopen(strcat(draw_currentSkin, "/skinvalues.txt"), FILE_READ);
-       }
-
-       draw_currentSkin = strzone(draw_currentSkin);
-
-       if(fh >= 0)
-       {
-               string s;
-               while((s = fgets(fh)))
-               {
-                       int n = tokenize_console(s);
-                       if (n < 2)
-                               continue;
-                       if(substring(argv(0), 0, 2) == "//")
-                               continue;
-                       if(argv(0) == "SIZE_CURSOR")
-                               SIZE_CURSOR = stov(substring(s, argv_start_index(1), argv_end_index(-1) - argv_start_index(1)));
-                       else if(argv(0) == "OFFSET_CURSOR")
-                               OFFSET_CURSOR = stov(substring(s, argv_start_index(1), argv_end_index(-1) - argv_start_index(1)));
-               }
-               fclose(fh);
-       }
-}
-
 // CSQC_Init : Called every time the CSQC code is initialized (essentially at map load)
 // Useful for precaching things
 
@@ -526,12 +474,19 @@ NET_HANDLE(ENT_CLIENT_CLIENTDATA, bool isnew)
                for(i = 0; i < MAX_SPECTATORS; ++i)
                        spectatorlist[i] = 0; // reset list first
 
-               for(i = 0; i < num_spectators; ++i)
+               int limit = min(num_spectators, MAX_SPECTATORS);
+               for(i = 0; i < limit; ++i)
                {
                        slot = ReadByte();
                        spectatorlist[i] = slot - 1;
                }
        }
+       else
+       {
+               for(int j = 0; j < MAX_SPECTATORS; ++j)
+                       spectatorlist[j] = 0; // reset list if showspectators has been turned off
+               num_spectators = 0;
+       }
 
        return = true;
 
@@ -754,8 +709,11 @@ NET_HANDLE(ENT_CLIENT_SPAWNEVENT, bool is_new)
        // local spawn actions
        if(is_new && (!entnum || (entnum == player_localentnum)))
        {
-               zoomin_effect = 1;
-               current_viewzoom = (1 / bound(1, autocvar_cl_spawnzoom_factor, 16));
+               if(autocvar_cl_spawnzoom && !autocvar_cl_lockview)
+               {
+                       zoomin_effect = 1;
+                       current_viewzoom = (1 / bound(1, autocvar_cl_spawnzoom_factor, 16));
+               }
 
                if(autocvar_cl_unpress_zoom_on_spawn)
                {
@@ -975,16 +933,11 @@ float GetSpeedUnitFactor(int speed_unit)
        switch(speed_unit)
        {
                default:
-               case 1:
-                       return 1.0;
-               case 2:
-                       return 0.0254;
-               case 3:
-                       return 0.0254 * 3.6;
-               case 4:
-                       return 0.0254 * 3.6 * 0.6213711922;
-               case 5:
-                       return 0.0254 * 1.943844492; // 1 m/s = 1.943844492 knots, because 1 knot = 1.852 km/h
+               case 1: return 1.0;
+               case 2: return 0.0254;
+               case 3: return 0.0254 * 3.6;
+               case 4: return 0.0254 * 3.6 * 0.6213711922;
+               case 5: return 0.0254 * 1.943844492; // 1 m/s = 1.943844492 knots, because 1 knot = 1.852 km/h
        }
 }
 
@@ -992,17 +945,13 @@ string GetSpeedUnit(int speed_unit)
 {
        switch(speed_unit)
        {
+               // translator-friendly strings without the initial space
                default:
-               case 1:
-                       return _(" qu/s");
-               case 2:
-                       return _(" m/s");
-               case 3:
-                       return _(" km/h");
-               case 4:
-                       return _(" mph");
-               case 5:
-                       return _(" knots");
+               case 1: return strcat(" ", _("qu/s"));
+               case 2: return strcat(" ", _("m/s"));
+               case 3: return strcat(" ", _("km/h"));
+               case 4: return strcat(" ", _("mph"));
+               case 5: return strcat(" ", _("knots"));
        }
 }