From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Mon, 16 Jan 2012 19:54:53 +0000 (+0200)
Subject: Merge branch 'master' into mirceakitsune/damage_effects
X-Git-Tag: xonotic-v0.6.0~110^2^2~9
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=48a9eb74e54b8e703797522a2591c65d19596915;p=xonotic%2Fxonotic-data.pk3dir.git

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

48a9eb74e54b8e703797522a2591c65d19596915
diff --cc qcsrc/common/util.qc
index 9e4bdf7e7,09a58c099..1930d7c6f
--- a/qcsrc/common/util.qc
+++ b/qcsrc/common/util.qc
@@@ -2213,18 -2213,22 +2213,38 @@@ float ReadApproxPastTime(
  }
  #endif
  
 +#ifndef MENUQC
 +.float skeleton_bones_index;
 +void Skeleton_SetBones(entity e)
 +{
 +	// set skeleton_bones to the total number of bones on the model
 +	if(e.skeleton_bones_index == e.modelindex)
 +		return; // same model, nothing to update
 +
 +	float skelindex;
 +	skelindex = skel_create(e.modelindex);
 +	e.skeleton_bones = skel_get_numbones(skelindex);
 +	skel_delete(skelindex);
 +	e.skeleton_bones_index = e.modelindex;
 +}
 +#endif
++
+ string to_execute_next_frame;
+ void execute_next_frame()
+ {
+ 	if(to_execute_next_frame)
+ 	{
+ 		localcmd("\n", to_execute_next_frame, "\n");
+ 		strunzone(to_execute_next_frame);
+ 		to_execute_next_frame = string_null;
+ 	}
+ }
+ void queue_to_execute_next_frame(string s)
+ {
+ 	if(to_execute_next_frame)
+ 	{
+ 		s = strcat(s, "\n", to_execute_next_frame);
+ 		strunzone(to_execute_next_frame);
+ 	}
+ 	to_execute_next_frame = strzone(s);
+ }