X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fanimdecide.qh;h=bfbba7cb80b5ebb7a32988175e40878390deb773;hp=39ca54ff2f7783514755385f4e3af49b557d54c9;hb=HEAD;hpb=7f5ad47610dc8b5580cc96ae961a57cca96e6975 diff --git a/qcsrc/common/animdecide.qh b/qcsrc/common/animdecide.qh index 39ca54ff2f..bfbba7cb80 100644 --- a/qcsrc/common/animdecide.qh +++ b/qcsrc/common/animdecide.qh @@ -1,5 +1,4 @@ -#ifndef ANIMDECIDE_H -#define ANIMDECIDE_H +#pragma once // must be called at least once to initialize, or when modelindex is changed void animdecide_load_if_needed(entity e); @@ -9,7 +8,7 @@ void animdecide_setimplicitstate(entity e, float onground); void animdecide_setframes(entity e, bool support_blending, .int fld_frame, .int fld_frame1time, .int fld_frame2, .int fld_frame2time); CLASS(Animation, Object) - ATTRIB(Animation, m_framenames, string, string_null) + ATTRIB(Animation, m_framenames, string); STATIC_METHOD(Animation, getframe, int(Animation this, int mdlidx)) { FOREACH_WORD(this.m_framenames, true, { @@ -17,7 +16,7 @@ CLASS(Animation, Object) if (f != -1) return f; }); #ifdef CSQC - LOG_DEBUGF("Missing animation for %s: %s\n", modelnameforindex(mdlidx), this.registered_id); + LOG_DEBUGF("Missing animation for %s: %s", modelnameforindex(mdlidx), this.registered_id); #endif return -1; } @@ -25,7 +24,8 @@ ENDCLASS(Animation) REGISTRY(Animations, BITS(8)) REGISTER_REGISTRY(Animations) -#define Animations_from(id) _Animations_from(id, NULL) + +REGISTRY_DEFINE_GET(Animations, NULL) #define WriteAnimation(to, it) WriteRegistered(Animations, to, it) #define ReadAnimation() ReadRegistered(Animations) #define REGISTER_ANIMATION(id, framenames) \ @@ -145,4 +145,3 @@ const int ANIMACTION_PAIN2 = 3; // pain const int ANIMACTION_SHOOT = 4; // shoot const int ANIMACTION_TAUNT = 5; // taunt const int ANIMACTION_MELEE = 6; // melee -#endif