From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Thu, 17 Feb 2011 14:32:47 +0000 (+0200)
Subject: Merge branch 'master' into mirceakitsune/universal_reload_system
X-Git-Tag: xonotic-v0.5.0~309^2~7^2~15
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bc91f7dc48927953480bdc9622973c7de075fb5f;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into mirceakitsune/universal_reload_system

Conflicts:
	qcsrc/common/constants.qh
---

bc91f7dc48927953480bdc9622973c7de075fb5f
diff --cc qcsrc/common/constants.qh
index da8cfaac1,60633f574..b8c4f4469
--- a/qcsrc/common/constants.qh
+++ b/qcsrc/common/constants.qh
@@@ -307,12 -308,13 +307,14 @@@ const float STAT_FUEL = 44
  const float STAT_NB_METERSTART = 45;
  const float STAT_SHOTORG = 46; // compressShotOrigin
  const float STAT_LEADLIMIT = 47;
 -const float STAT_BULLETS_LOADED = 48;
 -const float STAT_NEX_CHARGE = 49;
 -const float STAT_LAST_PICKUP = 50;
 -const float STAT_HUD = 51;
 -const float STAT_NEX_CHARGEPOOL = 52;
 -const float STAT_HIT_TIME = 53;
 -const float STAT_TYPEHIT_TIME = 54;
 +const float STAT_WEAPON_CLIPLOAD = 48;
 +const float STAT_WEAPON_CLIPSIZE = 49;
 +const float STAT_NEX_CHARGE = 50;
 +const float STAT_LAST_PICKUP = 51;
 +const float STAT_HUD = 52;
 +const float STAT_NEX_CHARGEPOOL = 53;
++const float STAT_HIT_TIME = 54;
++const float STAT_TYPEHIT_TIME = 55;
  
  // see DP source, quakedef.h
  const float STAT_MOVEVARS_AIRSPEEDLIMIT_NONQW = 222;
diff --cc qcsrc/server/g_world.qc
index ffbc58e32,268743b41..57d0071d2
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@@ -823,9 -823,10 +823,11 @@@ void spawnfunc_worldspawn (void
  	addstat(STAT_FUEL, AS_INT, ammo_fuel);
  	addstat(STAT_SHOTORG, AS_INT, stat_shotorg);
  	addstat(STAT_LEADLIMIT, AS_FLOAT, stat_leadlimit);
 -	addstat(STAT_BULLETS_LOADED, AS_INT, sniperrifle_bulletcounter);
 +	addstat(STAT_WEAPON_CLIPLOAD, AS_INT, clip_load);
 +	addstat(STAT_WEAPON_CLIPSIZE, AS_INT, clip_size);
  	addstat(STAT_LAST_PICKUP, AS_FLOAT, last_pickup);
+ 	addstat(STAT_HIT_TIME, AS_FLOAT, hit_time);
+ 	addstat(STAT_TYPEHIT_TIME, AS_FLOAT, typehit_time);
  
  	addstat(STAT_NEX_CHARGE, AS_FLOAT, nex_charge);
  	addstat(STAT_NEX_CHARGEPOOL, AS_FLOAT, nex_chargepool_ammo);