Merge branch 'master' into terencehill/ca_arena_freezetag_bugfixes

diff --combined qcsrc/server/g_world.qc
index b460fc8e6000e99410f8edeadf6a66c3c4f40aea,a41389a4fd2803ceea69176fa6f9ed0f9964c449..5ab72ce4efd20776ceacc1d8d2064ade5b14121b
--- 1/qcsrc/server/g_world.qc
--- 2/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@@ -585,6 -585,8 +585,6 @@@ void spawnfunc_worldspawn (void
  
        compressShortVector_init();
  
 -      allowed_to_spawn = TRUE;
 -
        entity head;
        head = nextent(world);
        maxclients = 0;
@@@ -806,10 -808,17 +806,10 @@@
  
        addstat(STAT_HAGAR_LOAD, AS_INT, hagar_load);
  
 -      if(g_ca || g_freezetag)
 +      if(g_ca)
        {
                addstat(STAT_REDALIVE, AS_INT, redalive_stat);
                addstat(STAT_BLUEALIVE, AS_INT, bluealive_stat);
 -              addstat(STAT_YELLOWALIVE, AS_INT, yellowalive_stat);
 -              addstat(STAT_PINKALIVE, AS_INT, pinkalive_stat);
 -      }
 -      if(g_freezetag)
 -      {
 -              addstat(STAT_FROZEN, AS_INT, freezetag_frozen);
 -              addstat(STAT_REVIVE_PROGRESS, AS_FLOAT, freezetag_revive_progress);
        }
  
        // g_movementspeed hack
@@@ -817,18 -826,18 +817,18 @@@
        addstat(STAT_MOVEVARS_MAXSPEED, AS_FLOAT, stat_sv_maxspeed);
        addstat(STAT_MOVEVARS_AIRACCEL_QW, AS_FLOAT, stat_sv_airaccel_qw);
        addstat(STAT_MOVEVARS_AIRSTRAFEACCEL_QW, AS_FLOAT, stat_sv_airstrafeaccel_qw);
-       
+ 
        // secrets
        addstat(STAT_SECRETS_TOTAL, AS_FLOAT, stat_secrets_total);
        addstat(STAT_SECRETS_FOUND, AS_FLOAT, stat_secrets_found);
  
        // misc
        addstat(STAT_RESPAWN_TIME, AS_FLOAT, stat_respawn_time);
-       
+ 
        next_pingtime = time + 5;
  
        detect_maptype();
-       
+ 
        // set up information replies for clients and server to use
        lsmaps_reply = "^7Maps available: ";
        lsnewmaps_reply = "^7Maps without a record set: ";
@@@ -841,18 -850,18 +841,18 @@@
                                        col = "^2";
                                else
                                        col = "^3";
-                                       
+ 
                                ++j;
-                               
+ 
                                lsmaps_reply = strcat(lsmaps_reply, col, MapInfo_Map_bspname, " ");
-                               
+ 
                                if(g_race && !stof(db_get(ServerProgsDB, strcat(MapInfo_Map_bspname, RACE_RECORD, "time"))))
                                        lsnewmaps_reply = strcat(lsnewmaps_reply, col, MapInfo_Map_bspname, " ");
                                else if(g_cts && !stof(db_get(ServerProgsDB, strcat(MapInfo_Map_bspname, CTS_RECORD, "time"))))
                                        lsnewmaps_reply = strcat(lsnewmaps_reply, col, MapInfo_Map_bspname, " ");
                        }
        }
-       
+ 
        lsmaps_reply = strzone(strcat(lsmaps_reply, "\n"));
        lsnewmaps_reply = strzone(strcat(((!g_race && !g_cts) ? "Need to be playing race or CTS for lsnewmaps to work." : lsnewmaps_reply), "\n"));
  
@@@ -875,9 -884,11 +875,11 @@@
  
        for(i = 0; i < 10; ++i)
        {
-               records_reply[i] = strzone(getrecords(i));
+               s = getrecords(i);
+               if (s)
+                       records_reply[i] = strzone(s);
        }
-       
+ 
        ladder_reply = strzone(getladder());
  
        rankings_reply = strzone(getrankings());
@@@ -1336,10 -1347,10 +1338,10 @@@ float mapvote_initialized
  void IntermissionThink()
  {
        FixIntermissionClient(self);
-       
+ 
        float server_screenshot = (autocvar_sv_autoscreenshot && self.cvar_cl_autoscreenshot);
        float client_screenshot = (self.cvar_cl_autoscreenshot == 2);
-       
+ 
        if( (server_screenshot || client_screenshot)
                && ((self.autoscreenshot > 0) && (time > self.autoscreenshot)) )
        {

diff --combined qcsrc/server/miscfunctions.qc
index 34033740ef475493399fe0d524e4a514c9ec9fe9,eed2006a5bd63eb60a9cf27c13fe1c40ec5f2193..0296e2e1a0059d34baa64fac13cec8241425644c
--- 1/qcsrc/server/miscfunctions.qc
--- 2/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@@ -1262,7 -1262,7 +1262,7 @@@ void readlevelcvars(void
      if(!g_weapon_stay)
          g_weapon_stay = cvar("g_weapon_stay");
  
 -      if not(inWarmupStage && !g_ca)
 +      if not(inWarmupStage)
                game_starttime = cvar("g_start_delay");
  
        sv_pitch_min = cvar("sv_pitch_min");
@@@ -2410,8 -2410,8 +2410,8 @@@ vector shotorg_adjust_values(vector vec
        {
                if (visual)
                {
-                       vecs_y = 0;
-                       vecs_z -= 2;
+                       if (autocvar_g_shootfromclient) { vecs = shotorg_adjustfromclient(vecs, y_is_right, (autocvar_g_shootfromclient >= 2), algn); }
+                       else { vecs_y = 0; vecs_z -= 2; }
                }
                else
                {