From: Mircea Kitsune Date: Sat, 14 Jan 2012 14:41:08 +0000 (+0200) Subject: Clean my last commits X-Git-Tag: xonotic-v0.6.0~110^2^2~11 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d8f4ce425c0f14b80916c6c263809557e842df7a;p=xonotic%2Fxonotic-data.pk3dir.git Clean my last commits --- diff --git a/qcsrc/common/util.qc b/qcsrc/common/util.qc index 0d07c9140..534eca15c 100644 --- a/qcsrc/common/util.qc +++ b/qcsrc/common/util.qc @@ -2214,17 +2214,17 @@ float ReadApproxPastTime() #endif #ifndef MENUQC -.float skeletonmodelindex; // used to check if model has changed +.float skeletonmodelindex; // used to check if the model has changed float Update_Skeleton(entity e) { - // updates the skeleton if needed, and returns the total number of bones + // updates the fake skeleton if needed, and returns the total number of bones if(e.skeletonmodelindex != e.modelindex) { - if(e.qc_skeletonindex) - skel_delete(e.qc_skeletonindex); - e.qc_skeletonindex = skel_create(e.modelindex); + if(e.fake_skeletonindex) + skel_delete(e.fake_skeletonindex); + e.fake_skeletonindex = skel_create(e.modelindex); e.skeletonmodelindex = e.modelindex; } - return skel_get_numbones(e.qc_skeletonindex); + return skel_get_numbones(e.fake_skeletonindex); } #endif diff --git a/qcsrc/common/util.qh b/qcsrc/common/util.qh index d940833e5..cdaf27c73 100644 --- a/qcsrc/common/util.qh +++ b/qcsrc/common/util.qh @@ -292,7 +292,7 @@ float InterpretBoolean(string input); void Shutdown(); #ifndef MENUQC -.float qc_skeletonindex; // maintains a separate skeleton for checking, different than skeletonindex +.float fake_skeletonindex; // maintains a fake skeleton for property checking without affecting the actual mesh float Update_Skeleton(entity e); // loops through the tags of model v using counter tagnum #define FOR_EACH_TAG(v) float tagnum, tags; tags = Update_Skeleton(v); for(tagnum = 0; tagnum < tags; tagnum++, gettaginfo(v, tagnum))