From: Mario <mario@smbclan.net>
Date: Thu, 21 Jul 2016 16:21:06 +0000 (+1000)
Subject: Merge branch 'master' into Mario/showspecs
X-Git-Tag: xonotic-v0.8.2~750^2~5
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=c6ebaefab2aca7df4648dac3ccdd4b52de45d0ed

Merge branch 'master' into Mario/showspecs
---

c6ebaefab2aca7df4648dac3ccdd4b52de45d0ed
diff --cc qcsrc/client/main.qh
index 65aad3e9f6,15362aad33..bc6b5afec0
--- a/qcsrc/client/main.qh
+++ b/qcsrc/client/main.qh
@@@ -140,10 -140,8 +140,13 @@@ float g_trueaim_minrange
  
  float hud;
  float view_quality;
 +
 +int num_spectators;
 +const int MAX_SPECTATORS = 7;
 +int spectatorlist[MAX_SPECTATORS];
 +
  int framecount;
  .float health;
+ 
+ float GetSpeedUnitFactor(int speed_unit);
+ string GetSpeedUnit(int speed_unit);