X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fanimdecide.qh;h=9dc7cf7dbd0dd6273a655cb938f185e383c7d6e2;hb=79f8e8d5cfdd67d25f574bebec19d0a6f31eb20a;hp=3f6815fe1f523ac902c257a3dd7460a6ecd135f5;hpb=ba0988ca930f50286f8cf3b6c114ebc6584964af;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/animdecide.qh b/qcsrc/common/animdecide.qh index 3f6815fe1..9dc7cf7db 100644 --- a/qcsrc/common/animdecide.qh +++ b/qcsrc/common/animdecide.qh @@ -1,61 +1,6 @@ #ifndef ANIMDECIDE_H #define ANIMDECIDE_H -#if defined(CSQC) - #include "util-pre.qh" - #include "../client/sys-pre.qh" - #include "../dpdefs/csprogsdefs.qc" - #include "../client/sys-post.qh" - #include "../client/Defs.qc" - #include "../dpdefs/keycodes.qc" - #include "constants.qh" - #include "stats.qh" - #include "../warpzonelib/anglestransform.qh" - #include "../warpzonelib/mathlib.qh" - #include "../warpzonelib/common.qh" - #include "../warpzonelib/client.qh" - #include "playerstats.qh" - #include "teams.qh" - #include "util.qh" - #include "nades.qh" - #include "buffs.qh" - #include "test.qh" - #include "counting.qh" - #include "weapons/weapons.qh" - #include "mapinfo.qh" - #include "command/markup.qh" - #include "command/rpn.qh" - #include "command/generic.qh" - #include "command/shared_defs.qh" - #include "urllib.qh" -#elif defined(MENUQC) -#elif defined(SVQC) - #include "util-pre.qh" - #include "../server/sys-pre.qh" - #include "../dpdefs/progsdefs.qc" - #include "../dpdefs/dpextensions.qc" - #include "../server/sys-post.qh" - #include "../warpzonelib/anglestransform.qh" - #include "../warpzonelib/mathlib.qh" - #include "../warpzonelib/common.qh" - #include "../warpzonelib/util_server.qh" - #include "../warpzonelib/server.qh" - #include "constants.qh" - #include "stats.qh" - #include "teams.qh" - #include "util.qh" - #include "nades.qh" - #include "buffs.qh" - #include "test.qh" - #include "counting.qh" - #include "urllib.qh" - #include "command/markup.qh" - #include "command/rpn.qh" - #include "command/generic.qh" - #include "command/shared_defs.qh" - #include "net_notice.qh" -#endif - // must be called at least once to initialize, or when modelindex is changed void animdecide_load_if_needed(entity e); @@ -80,7 +25,7 @@ void animdecide_setframes(entity e, bool support_blending, .int fld_frame, .int .float anim_upper_implicit_time; // explicit anim states (networked) -void animdecide_setstate(entity e, float newstate, float restart); +void animdecide_setstate(entity e, int newstate, float restart); const int ANIMSTATE_DEAD1 = 1; // base frames: die1 const int ANIMSTATE_DEAD2 = 2; // base frames: die2 const int ANIMSTATE_DUCK = 4; // turns walk into duckwalk, jump into duckjump, etc. @@ -103,4 +48,4 @@ 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 \ No newline at end of file +#endif