Merge remote-tracking branch 'origin/master' into samual/combined_updates

Conflicts:
	qcsrc/server/cl_client.qc

diff --cc qcsrc/client/Main.qc
Simple merge

diff --cc qcsrc/common/playerstats.qh
index d7860a03f52bde5ceef404b45b5336fc8d340731,0000000000000000000000000000000000000000..bf3d4f2d764cb14e6a2a2cfb9e8d659f981940c9
mode 100644,000000..100644
--- 1/qcsrc/common/playerstats.qh
--- /dev/null
+++ b/qcsrc/common/playerstats.qh
@@@ -1,81 -1,0 +1,81 @@@
- string PLAYERSTATS_ALIVETIME  = "alivetime";
- string PLAYERSTATS_AVGLATENCY = "avglatency";
- string PLAYERSTATS_WINS = "wins";
- string PLAYERSTATS_MATCHES = "matches";
- string PLAYERSTATS_JOINS = "joins";
- string PLAYERSTATS_SCOREBOARD_VALID = "scoreboardvalid";
- string PLAYERSTATS_RANK = "rank";
- string PLAYERSTATS_SCOREBOARD_POS = "scoreboardpos";
 +#ifdef SVQC
 +
 +// time the player was alive and kicking
- string PLAYERSTATS_TOTAL = "total-";
- string PLAYERSTATS_SCOREBOARD = "scoreboard-";
++const string PLAYERSTATS_ALIVETIME  = "alivetime";
++const string PLAYERSTATS_AVGLATENCY = "avglatency";
++const string PLAYERSTATS_WINS = "wins";
++const string PLAYERSTATS_MATCHES = "matches";
++const string PLAYERSTATS_JOINS = "joins";
++const string PLAYERSTATS_SCOREBOARD_VALID = "scoreboardvalid";
++const string PLAYERSTATS_RANK = "rank";
++const string PLAYERSTATS_SCOREBOARD_POS = "scoreboardpos";
 +
- string PLAYERSTATS_ACHIEVEMENT_KILL_SPREE_3 = "achievement-kill-spree-3";
- string PLAYERSTATS_ACHIEVEMENT_KILL_SPREE_5 = "achievement-kill-spree-5";
- string PLAYERSTATS_ACHIEVEMENT_KILL_SPREE_10 = "achievement-kill-spree-10";
- string PLAYERSTATS_ACHIEVEMENT_KILL_SPREE_15 = "achievement-kill-spree-15";
- string PLAYERSTATS_ACHIEVEMENT_KILL_SPREE_20 = "achievement-kill-spree-20";
- string PLAYERSTATS_ACHIEVEMENT_KILL_SPREE_25 = "achievement-kill-spree-25";
- string PLAYERSTATS_ACHIEVEMENT_KILL_SPREE_30 = "achievement-kill-spree-30";
- string PLAYERSTATS_ACHIEVEMENT_BOTLIKE = "achievement-botlike";
- string PLAYERSTATS_ACHIEVEMENT_FIRSTBLOOD = "achievement-firstblood";
- string PLAYERSTATS_ACHIEVEMENT_FIRSTVICTIM = "achievement-firstvictim";
++const string PLAYERSTATS_TOTAL = "total-";
++const string PLAYERSTATS_SCOREBOARD = "scoreboard-";
 +
++const string PLAYERSTATS_ACHIEVEMENT_KILL_SPREE_3 = "achievement-kill-spree-3";
++const string PLAYERSTATS_ACHIEVEMENT_KILL_SPREE_5 = "achievement-kill-spree-5";
++const string PLAYERSTATS_ACHIEVEMENT_KILL_SPREE_10 = "achievement-kill-spree-10";
++const string PLAYERSTATS_ACHIEVEMENT_KILL_SPREE_15 = "achievement-kill-spree-15";
++const string PLAYERSTATS_ACHIEVEMENT_KILL_SPREE_20 = "achievement-kill-spree-20";
++const string PLAYERSTATS_ACHIEVEMENT_KILL_SPREE_25 = "achievement-kill-spree-25";
++const string PLAYERSTATS_ACHIEVEMENT_KILL_SPREE_30 = "achievement-kill-spree-30";
++const string PLAYERSTATS_ACHIEVEMENT_BOTLIKE = "achievement-botlike";
++const string PLAYERSTATS_ACHIEVEMENT_FIRSTBLOOD = "achievement-firstblood";
++const string PLAYERSTATS_ACHIEVEMENT_FIRSTVICTIM = "achievement-firstvictim";
 +
 +// delay map switch until this is set
 +float playerstats_waitforme;
 +
 +// call at initialization
 +void PlayerStats_Init();
 +
 +// add a new player
 +void PlayerStats_AddPlayer(entity e);
 +
 +// add a new team
 +void PlayerStats_AddTeam(float t);
 +
 +// add a new event
 +void PlayerStats_AddEvent(string event_id);
 +
 +// call on each event to track, or at player disconnect OR match end for "global stuff"
 +float PlayerStats_Event(entity e, string event_id, float value);
 +
 +// add a team score
 +float PlayerStats_TeamScore(float t, string event_id, float value);
 +
 +// call at game over
 +void PlayerStats_Shutdown(); // send stats to the server
 +
 +void PlayerStats_Accuracy(entity p);
 +
 +// call this whenever a player leaves
 +void PlayerStats_AddGlobalInfo(entity p);
 +
 +// call this at the end of the match
 +void PlayerStats_EndMatch(float finished);
 +
 +#endif //SVQC
 +
 +
 +
 +
 +//// WIP -zykure /////////////////////////////////////////////////////
 +
 +
 +const string playerinfo_uri = "http://localhost:6543"; // FIXME
 +
 +string PlayerInfo_GetItem(entity e, string item_id);
 +string PlayerInfo_GetItemLocal(string item_id);
 +
 +void PlayerInfo_Init();
 +#ifdef SVQC
 +void PlayerInfo_Basic(entity p);
 +#endif
 +#ifdef MENUQC
 +void PlayerInfo_Details();
 +#endif
 +#ifdef CSQC
 +//void PlayerInfo_Details();
 +#endif

diff --cc qcsrc/common/util.qc
Simple merge

diff --cc qcsrc/common/util.qh
Simple merge

diff --cc qcsrc/menu/menu.qc
index 53972f9109e9f507ce5b369ca2b4dac65599d797,433b842778c945bc499c12948d5affcf52b9f182..8bc54d48041bc53de79f6f4bd74b64d2599d29bb
--- 1/qcsrc/menu/menu.qc
--- 2/qcsrc/menu/menu.qc
+++ b/qcsrc/menu/menu.qc
@@@ -89,16 -91,13 +91,15 @@@ void m_init(
                        m_hide();
                cvar_set("_menu_initialized", "1");
        }
 +
 +        PlayerInfo_Details();
  }
  
- float MENU_ASPECT = 1.25; // 1280x1024
- float MENU_MINHEIGHT = 600;
- float conwidth_s, conheight_s, realconwidth, realconheight, screenconwidth, screenconheight;
+ const float MENU_ASPECT = 1.25; // 1280x1024
+ 
  void draw_reset_cropped()
  {
-       draw_reset(screenconwidth, screenconheight, 0.5 * (realconwidth - screenconwidth), 0.5 * (realconheight - screenconheight));
+       draw_reset(conwidth, conheight, 0.5 * (realconwidth - conwidth), 0.5 * (realconheight - conheight));
  }
  void draw_reset_full()
  {

diff --cc qcsrc/server/cl_client.qc
index 95fc1a562f6f0920a67f820f8713f5716d7b670c,fac4314ca6e7b53c577b1182228f3ca612bc614e..cdd3592a789535a1eced4bb7589659c1afc4d02d
--- 1/qcsrc/server/cl_client.qc
--- 2/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@@ -167,10 -167,10 +167,10 @@@ void PutObserverInServer (void
        MUTATOR_CALLHOOK(MakePlayerObserver);
  
        Portal_ClearAll(self);
 -      
 +
        if(self.alivetime)
        {
-               if(!inWarmupStage)
+               if(!warmup_stage)
                        PlayerStats_Event(self, PLAYERSTATS_ALIVETIME, time - self.alivetime);
                self.alivetime = 0;
        }

diff --cc qcsrc/server/defs.qh
Simple merge

diff --cc qcsrc/server/miscfunctions.qc
Simple merge