X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FAnimation.def;h=30f24509d583fbd9eee9af65c917b3770e05daa1;hb=1aef858f5ecb3dc8fd816e0155635371ed3632f2;hp=160e1585decc1aafe7ebbdf2a38225369cfe739a;hpb=fcdac6a36d47d719a12f3db7a7f0a0ae59e47ef7;p=lugaru.git

diff --git a/Source/Animation.def b/Source/Animation.def
index 160e158..30f2450 100644
--- a/Source/Animation.def
+++ b/Source/Animation.def
@@ -33,23 +33,23 @@ DECLARE_ANIM_BIT(ab_walljump)
 #endif
 
 #ifdef DECLARE_ANIM
-DECLARE_ANIM(runanim, "Run", middleheight, neutral, 0)
+DECLARE_ANIM(runanim, "Run", middleheight, neutral, ab_run)
 DECLARE_ANIM(bounceidleanim, "Idle", middleheight, neutral, ab_idle)
-DECLARE_ANIM(stopanim, "Stop", middleheight, neutral, 0)
+DECLARE_ANIM(stopanim, "Stop", middleheight, neutral, ab_stop)
 DECLARE_ANIM(jumpupanim, "JumpUp", highheight, neutral, 0)
 DECLARE_ANIM(jumpdownanim, "JumpDown", highheight, neutral, 0)
-DECLARE_ANIM(landanim, "Landing", lowheight, neutral, 0)
-DECLARE_ANIM(landhardanim, "Landhard", lowheight, neutral, 0)
+DECLARE_ANIM(landanim, "Landing", lowheight, neutral, ab_land)
+DECLARE_ANIM(landhardanim, "Landhard", lowheight, neutral, ab_landhard)
 DECLARE_ANIM(climbanim, "Climb", lowheight, neutral, 0)
 DECLARE_ANIM(hanganim, "Hangon", lowheight, neutral, 0)
 DECLARE_ANIM(spinkickanim, "SpinKick", middleheight, normalattack, 0)
 DECLARE_ANIM(getupfromfrontanim, "GetUpFromFront", lowheight, neutral, 0)
 DECLARE_ANIM(getupfrombackanim, "GetUpFromBack", lowheight, neutral, 0)
-DECLARE_ANIM(crouchanim, "Crouch", lowheight, neutral, 0)
+DECLARE_ANIM(crouchanim, "Crouch", lowheight, neutral, ab_crouch)
 DECLARE_ANIM(sneakanim, "Sneak", lowheight, neutral, 0)
 DECLARE_ANIM(rollanim, "Roll", lowheight, neutral, 0)
-DECLARE_ANIM(flipanim, "Flip", highheight, neutral, 0)
-DECLARE_ANIM(frontflipanim, "Flip", highheight, neutral, 0)
+DECLARE_ANIM(flipanim, "Flip", highheight, neutral, ab_flip)
+DECLARE_ANIM(frontflipanim, "Flip", highheight, neutral, ab_flip)
 DECLARE_ANIM(spinkickreversedanim, "SpinKickCaught", middleheight, reversed, 0)
 DECLARE_ANIM(spinkickreversalanim, "SpinKickCatch", middleheight, reversal, 0)
 DECLARE_ANIM(lowkickanim, "lowkick", middleheight, normalattack, 0)
@@ -88,15 +88,15 @@ DECLARE_ANIM(winduppunchanim, "Winduppunch", middleheight, normalattack, 0)
 DECLARE_ANIM(winduppunchblockedanim, "Winduppunchblocked", middleheight, normalattack, 0)
 DECLARE_ANIM(blockhighleftanim, "Blockhighleft", middleheight, normalattack, 0)
 DECLARE_ANIM(blockhighleftstrikeanim, "Blockhighleftstrike", middleheight, normalattack, 0)
-DECLARE_ANIM(backflipanim, "Backflip", highheight, neutral, 0)
-DECLARE_ANIM(walljumpbackanim, "Walljumpback", highheight, neutral, 0)
-DECLARE_ANIM(walljumpfrontanim, "Walljumpfront", highheight, neutral, 0)
-DECLARE_ANIM(rightflipanim, "Rightflip", highheight, neutral, 0)
-DECLARE_ANIM(walljumprightanim, "Walljumpright", highheight, neutral, 0)
-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(backflipanim, "Backflip", highheight, neutral, ab_flip)
+DECLARE_ANIM(walljumpbackanim, "Walljumpback", highheight, neutral, ab_walljump)
+DECLARE_ANIM(walljumpfrontanim, "Walljumpfront", highheight, neutral, ab_walljump)
+DECLARE_ANIM(rightflipanim, "Rightflip", highheight, neutral, ab_flip)
+DECLARE_ANIM(walljumprightanim, "Walljumpright", highheight, neutral, ab_walljump)
+DECLARE_ANIM(leftflipanim, "Leftflip", highheight, neutral, ab_flip)
+DECLARE_ANIM(walljumpleftanim, "Walljumpleft", highheight, neutral, ab_walljump)
+DECLARE_ANIM(walljumprightkickanim, "Walljumprightkick", highheight, neutral, ab_flip)
+DECLARE_ANIM(walljumpleftkickanim, "Walljumpleftkick", highheight, neutral, ab_flip)
 DECLARE_ANIM(knifefightidleanim, "Knifefightidle", middleheight, neutral, ab_idle)
 DECLARE_ANIM(knifesneakattackanim, "Knifesneakattack", middleheight, reversal, 0)
 DECLARE_ANIM(knifesneakattackedanim, "Knifesneakattacked", middleheight, reversed, 0)
@@ -115,13 +115,13 @@ DECLARE_ANIM(swordfightidlebothanim, "swordfightidleboth", middleheight, neutral
 DECLARE_ANIM(swordslashparryanim, "sworduprightparry", middleheight, normalattack, 0)
 DECLARE_ANIM(swordslashparriedanim, "swordslashparried", middleheight, normalattack, 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)
-DECLARE_ANIM(wolfrunanim, "Wolfrun", middleheight, neutral, 0)
-DECLARE_ANIM(wolfrunninganim, "Wolfrunning", middleheight, neutral, 0)
-DECLARE_ANIM(rabbitrunninganim, "Rabbitrunning", middleheight, neutral, 0)
-DECLARE_ANIM(wolfstopanim, "Wolfstop", middleheight, neutral, 0)
+DECLARE_ANIM(wolfcrouchanim, "Wolfcrouch", lowheight, neutral, ab_crouch)
+DECLARE_ANIM(wolflandanim, "Wolflanding", lowheight, neutral, ab_land)
+DECLARE_ANIM(wolflandhardanim, "Wolflandhard", lowheight, neutral, ab_landhard)
+DECLARE_ANIM(wolfrunanim, "Wolfrun", middleheight, neutral, ab_run)
+DECLARE_ANIM(wolfrunninganim, "Wolfrunning", middleheight, neutral, ab_run)
+DECLARE_ANIM(rabbitrunninganim, "Rabbitrunning", middleheight, neutral, ab_run)
+DECLARE_ANIM(wolfstopanim, "Wolfstop", middleheight, neutral, ab_stop)
 DECLARE_ANIM(rabbittackleanim, "Rabbittackle", middleheight, neutral, 0)
 DECLARE_ANIM(rabbittacklinganim, "Rabbittackling", middleheight, reversal, 0)
 DECLARE_ANIM(rabbittackledbackanim, "Rabbittackledback", middleheight, reversed, 0)
@@ -135,13 +135,13 @@ 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, ab_idle | ab_sit)
-DECLARE_ANIM(sleepanim, "Sleep", lowheight, neutral, ab_idle)
+DECLARE_ANIM(sleepanim, "Sleep", lowheight, neutral, ab_idle | ab_sleep)
 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)
-DECLARE_ANIM(dead4anim, "Dead4", lowheight, neutral, 0)
+DECLARE_ANIM(dead1anim, "Dead1", lowheight, neutral, ab_sleep)
+DECLARE_ANIM(dead2anim, "Dead2", lowheight, neutral, ab_sleep)
+DECLARE_ANIM(dead3anim, "Dead3", lowheight, neutral, ab_sleep)
+DECLARE_ANIM(dead4anim, "Dead4", lowheight, neutral, ab_sleep)
 
 DECLARE_ANIM(loadable_anim_end, "", 0, 0, 0)