From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sat, 14 Jan 2012 10:22:29 +0000 (+0200)
Subject: Merge branch 'master' into mirceakitsune/damage_effects
X-Git-Tag: xonotic-v0.6.0~110^2^2~25
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=365bcf446f6fcee37715b550147b549bd5f8955f;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into mirceakitsune/damage_effects
---

365bcf446f6fcee37715b550147b549bd5f8955f
diff --cc qcsrc/common/util.qh
index 436299c51,4b0526815..5fd35b805
--- a/qcsrc/common/util.qh
+++ b/qcsrc/common/util.qh
@@@ -291,7 -291,9 +291,13 @@@ float InterpretBoolean(string input)
  // generic shutdown handler
  void Shutdown();
  
 +#ifndef MENUQC
 +// loops through the tags of model v using counter tagnum
 +#define FOR_EACH_TAG(v) float tagnum; for(tagnum = 1, gettaginfo(v, tagnum);; tagnum++, gettaginfo(v, tagnum)) if not(gettaginfo_name) break; else
 +#endif
+ #ifdef SVQC
+ void WriteApproxPastTime(float dst, float t);
+ #endif
+ #ifdef CSQC
+ float ReadApproxPastTime();
+ #endif