X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FAnimation.def;h=160e1585decc1aafe7ebbdf2a38225369cfe739a;hb=fcdac6a36d47d719a12f3db7a7f0a0ae59e47ef7;hp=9726a80ed6e0c8b6aedbe26029ed9f8178235945;hpb=42bdd021a9276a99a9ae09722d02e36bd3da8e77;p=lugaru.git

diff --git a/Source/Animation.def b/Source/Animation.def
index 9726a80..160e158 100644
--- a/Source/Animation.def
+++ b/Source/Animation.def
@@ -34,7 +34,7 @@ DECLARE_ANIM_BIT(ab_walljump)
 
 #ifdef DECLARE_ANIM
 DECLARE_ANIM(runanim, "Run", middleheight, neutral, 0)
-DECLARE_ANIM(bounceidleanim, "Idle", middleheight, neutral, 0)
+DECLARE_ANIM(bounceidleanim, "Idle", middleheight, neutral, ab_idle)
 DECLARE_ANIM(stopanim, "Stop", middleheight, neutral, 0)
 DECLARE_ANIM(jumpupanim, "JumpUp", highheight, neutral, 0)
 DECLARE_ANIM(jumpdownanim, "JumpDown", highheight, neutral, 0)
@@ -63,11 +63,11 @@ DECLARE_ANIM(upunchanim, "Upunch", middleheight, normalattack, 0)
 DECLARE_ANIM(staggerbackhighanim, "Staggerbackhigh", middleheight, neutral, 0)
 DECLARE_ANIM(upunchreversedanim, "UpunchCaught", middleheight, reversed, 0)
 DECLARE_ANIM(upunchreversalanim, "UpunchCatch", middleheight, reversal, 0)
-DECLARE_ANIM(hurtidleanim, "Hurtidle", middleheight, neutral, 0)
+DECLARE_ANIM(hurtidleanim, "Hurtidle", middleheight, neutral, ab_idle)
 DECLARE_ANIM(backhandspringanim, "Backhandspring", middleheight, neutral, 0)
-DECLARE_ANIM(fightidleanim, "Fightidle", middleheight, neutral, 0)
+DECLARE_ANIM(fightidleanim, "Fightidle", middleheight, neutral, ab_idle)
 DECLARE_ANIM(walkanim, "Walk", middleheight, neutral, 0)
-DECLARE_ANIM(fightsidestep, "Fightsidestep", middleheight, neutral, 0)
+DECLARE_ANIM(fightsidestep, "Fightsidestep", middleheight, neutral, ab_idle)
 DECLARE_ANIM(killanim, "Kill", middleheight, normalattack, 0)
 DECLARE_ANIM(sneakattackanim, "Sneakattack", middleheight, reversal, 0)
 DECLARE_ANIM(sneakattackedanim, "Sneakattacked", middleheight, reversed, 0)
@@ -97,10 +97,10 @@ DECLARE_ANIM(leftflipanim, "Leftflip", highheight, neutral, 0)
 DECLARE_ANIM(walljumpleftanim, "Walljumpleft", highheight, neutral, 0)
 DECLARE_ANIM(walljumprightkickanim, "Walljumprightkick", highheight, neutral, 0)
 DECLARE_ANIM(walljumpleftkickanim, "Walljumpleftkick", highheight, neutral, 0)
-DECLARE_ANIM(knifefightidleanim, "Knifefightidle", middleheight, neutral, 0)
+DECLARE_ANIM(knifefightidleanim, "Knifefightidle", middleheight, neutral, ab_idle)
 DECLARE_ANIM(knifesneakattackanim, "Knifesneakattack", middleheight, reversal, 0)
 DECLARE_ANIM(knifesneakattackedanim, "Knifesneakattacked", middleheight, reversed, 0)
-DECLARE_ANIM(swordfightidleanim, "swordfightidle", middleheight, neutral, 0)
+DECLARE_ANIM(swordfightidleanim, "swordfightidle", middleheight, neutral, ab_idle)
 DECLARE_ANIM(drawleftanim, "drawleft", middleheight, neutral, 0)
 DECLARE_ANIM(swordslashanim, "swordslash", middleheight, normalattack, 0)
 DECLARE_ANIM(swordgroundstabanim, "swordgroundstab", lowheight, normalattack, 0)
@@ -111,10 +111,10 @@ DECLARE_ANIM(swordslashreversedanim, "swordslashCaught", middleheight, reversed,
 DECLARE_ANIM(swordslashreversalanim, "swordslashCatch", middleheight, reversal, 0)
 DECLARE_ANIM(knifeslashreversedanim, "knifeslashCaught", middleheight, reversed, 0)
 DECLARE_ANIM(knifeslashreversalanim, "knifeslashCatch", middleheight, reversal, 0)
-DECLARE_ANIM(swordfightidlebothanim, "swordfightidleboth", middleheight, neutral, 0)
+DECLARE_ANIM(swordfightidlebothanim, "swordfightidleboth", middleheight, neutral, ab_idle)
 DECLARE_ANIM(swordslashparryanim, "sworduprightparry", middleheight, normalattack, 0)
 DECLARE_ANIM(swordslashparriedanim, "swordslashparried", middleheight, normalattack, 0)
-DECLARE_ANIM(wolfidle, "Wolfidle", middleheight, neutral, 0)
+DECLARE_ANIM(wolfidle, "Wolfidle", middleheight, neutral, ab_idle)
 DECLARE_ANIM(wolfcrouchanim, "Wolfcrouch", lowheight, neutral, 0)
 DECLARE_ANIM(wolflandanim, "Wolflanding", lowheight, neutral, 0)
 DECLARE_ANIM(wolflandhardanim, "Wolflandhard", lowheight, neutral, 0)
@@ -134,10 +134,10 @@ DECLARE_ANIM(staffhitreversedanim, "StaffHitCaught", middleheight, reversed, 0)
 DECLARE_ANIM(staffhitreversalanim, "StaffHitCatch", middleheight, reversal, 0)
 DECLARE_ANIM(staffspinhitreversedanim, "SpinWhackCaught", middleheight, reversed, 0)
 DECLARE_ANIM(staffspinhitreversalanim, "SpinWhackCatch", middleheight, reversal, 0)
-DECLARE_ANIM(sitanim, "Sit", lowheight, neutral, 0)
-DECLARE_ANIM(sleepanim, "Sleep", lowheight, neutral, 0)
-DECLARE_ANIM(talkidleanim, "TalkIdle", middleheight, neutral, 0)
-DECLARE_ANIM(sitwallanim, "Dying", lowheight, neutral, 0)
+DECLARE_ANIM(sitanim, "Sit", lowheight, neutral, ab_idle | ab_sit)
+DECLARE_ANIM(sleepanim, "Sleep", lowheight, neutral, ab_idle)
+DECLARE_ANIM(talkidleanim, "TalkIdle", middleheight, neutral, ab_idle)
+DECLARE_ANIM(sitwallanim, "Dying", lowheight, neutral, ab_sit)
 DECLARE_ANIM(dead1anim, "Dead1", lowheight, neutral, 0)
 DECLARE_ANIM(dead2anim, "Dead2", lowheight, neutral, 0)
 DECLARE_ANIM(dead3anim, "Dead3", lowheight, neutral, 0)