Merge branch 'TimePath/modules'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / lib / csqcmodel / cl_model.qh

diff --git a/qcsrc/lib/csqcmodel/cl_model.qh b/qcsrc/lib/csqcmodel/cl_model.qh
index 1f9d23b4dbec0d60141838685cf5d11b30f1f305..b5d9f8bd361fff927dc54f70a5632300a64d4360 100644 (file)
--- a/qcsrc/lib/csqcmodel/cl_model.qh
+++ b/qcsrc/lib/csqcmodel/cl_model.qh
@@ -19,8 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  */
-#ifndef LIB_CSQCMODEL_CL_MODEL_H
-#define LIB_CSQCMODEL_CL_MODEL_H
+#pragma once
 
 #include "common.qh"
 
@@ -40,14 +39,13 @@ entity CSQCModel_server2csqc(int i);
 
 // this is exported for custom frame animation code. Use with care.
 // to update frames, first call this:
-void CSQCModel_InterpolateAnimation_2To4_PreNote(int sf);
-void CSQCModel_InterpolateAnimation_1To2_PreNote(int sf);
+void CSQCModel_InterpolateAnimation_2To4_PreNote(entity this, int sf);
+void CSQCModel_InterpolateAnimation_1To2_PreNote(entity this, int sf);
 // then update frame, frame1time (and possibly frame2, frame2time, lerpfrac)
 // if set_times is not set, caller is responsible for frame1time, frame2time, csqcmodel_lerpfractime!
-void CSQCModel_InterpolateAnimation_2To4_Note(int sf, float set_times);
-void CSQCModel_InterpolateAnimation_1To2_Note(int sf, float set_times);
+void CSQCModel_InterpolateAnimation_2To4_Note(entity this, int sf, float set_times);
+void CSQCModel_InterpolateAnimation_1To2_Note(entity this, int sf, float set_times);
 // to retrieve animation state, call this
-void CSQCModel_InterpolateAnimation_2To4_Do();
-void CSQCModel_InterpolateAnimation_1To2_Do();
+void CSQCModel_InterpolateAnimation_2To4_Do(entity this);
+void CSQCModel_InterpolateAnimation_1To2_Do(entity this);
 // will overwrite lerpfrac, lerpfrac3, lerpfrac4, and possibly clear frame*time if they are undisplayed according to lerpfracs
-#endif