From: Alexander Monakov Date: Thu, 30 Dec 2010 23:39:43 +0000 (+0300) Subject: Add bits as last arg to DECLARE_ANIM X-Git-Url: https://git.jsancho.org/?a=commitdiff_plain;h=42bdd021a9276a99a9ae09722d02e36bd3da8e77;p=lugaru.git Add bits as last arg to DECLARE_ANIM --- diff --git a/Source/Animation.cpp b/Source/Animation.cpp index a01b9ea..4e5a65f 100644 --- a/Source/Animation.cpp +++ b/Source/Animation.cpp @@ -30,7 +30,7 @@ struct animation_data_elt }; static animation_data_elt animation_data[animation_count] = { -#define DECLARE_ANIM(id, file, height, attack) {file, height, attack}, +#define DECLARE_ANIM(id, file, height, attack, ...) {file, height, attack}, #include "Animation.def" #undef DECLARE_ANIM }; diff --git a/Source/Animation.def b/Source/Animation.def index 5128682..9726a80 100644 --- a/Source/Animation.def +++ b/Source/Animation.def @@ -33,137 +33,137 @@ DECLARE_ANIM_BIT(ab_walljump) #endif #ifdef DECLARE_ANIM -DECLARE_ANIM(runanim, "Run", middleheight, neutral) -DECLARE_ANIM(bounceidleanim, "Idle", middleheight, neutral) -DECLARE_ANIM(stopanim, "Stop", middleheight, neutral) -DECLARE_ANIM(jumpupanim, "JumpUp", highheight, neutral) -DECLARE_ANIM(jumpdownanim, "JumpDown", highheight, neutral) -DECLARE_ANIM(landanim, "Landing", lowheight, neutral) -DECLARE_ANIM(landhardanim, "Landhard", lowheight, neutral) -DECLARE_ANIM(climbanim, "Climb", lowheight, neutral) -DECLARE_ANIM(hanganim, "Hangon", lowheight, neutral) -DECLARE_ANIM(spinkickanim, "SpinKick", middleheight, normalattack) -DECLARE_ANIM(getupfromfrontanim, "GetUpFromFront", lowheight, neutral) -DECLARE_ANIM(getupfrombackanim, "GetUpFromBack", lowheight, neutral) -DECLARE_ANIM(crouchanim, "Crouch", lowheight, neutral) -DECLARE_ANIM(sneakanim, "Sneak", lowheight, neutral) -DECLARE_ANIM(rollanim, "Roll", lowheight, neutral) -DECLARE_ANIM(flipanim, "Flip", highheight, neutral) -DECLARE_ANIM(frontflipanim, "Flip", highheight, neutral) -DECLARE_ANIM(spinkickreversedanim, "SpinKickCaught", middleheight, reversed) -DECLARE_ANIM(spinkickreversalanim, "SpinKickCatch", middleheight, reversal) -DECLARE_ANIM(lowkickanim, "lowkick", middleheight, normalattack) -DECLARE_ANIM(sweepanim, "sweep", lowheight, normalattack) -DECLARE_ANIM(sweepreversedanim, "SweepCaught", lowheight, reversed) -DECLARE_ANIM(sweepreversalanim, "SweepCatch", middleheight, reversal) -DECLARE_ANIM(rabbitkickanim, "RabbitKick", middleheight, normalattack) -DECLARE_ANIM(rabbitkickreversedanim, "RabbitKickCaught", middleheight, reversed) -DECLARE_ANIM(rabbitkickreversalanim, "RabbitKickCatch", lowheight, reversal) -DECLARE_ANIM(upunchanim, "Upunch", middleheight, normalattack) -DECLARE_ANIM(staggerbackhighanim, "Staggerbackhigh", middleheight, neutral) -DECLARE_ANIM(upunchreversedanim, "UpunchCaught", middleheight, reversed) -DECLARE_ANIM(upunchreversalanim, "UpunchCatch", middleheight, reversal) -DECLARE_ANIM(hurtidleanim, "Hurtidle", middleheight, neutral) -DECLARE_ANIM(backhandspringanim, "Backhandspring", middleheight, neutral) -DECLARE_ANIM(fightidleanim, "Fightidle", middleheight, neutral) -DECLARE_ANIM(walkanim, "Walk", middleheight, neutral) -DECLARE_ANIM(fightsidestep, "Fightsidestep", middleheight, neutral) -DECLARE_ANIM(killanim, "Kill", middleheight, normalattack) -DECLARE_ANIM(sneakattackanim, "Sneakattack", middleheight, reversal) -DECLARE_ANIM(sneakattackedanim, "Sneakattacked", middleheight, reversed) -DECLARE_ANIM(drawrightanim, "drawright", middleheight, neutral) -DECLARE_ANIM(knifeslashstartanim, "slashstart", middleheight, normalattack) -DECLARE_ANIM(crouchdrawrightanim, "crouchdrawright", lowheight, neutral) -DECLARE_ANIM(crouchstabanim, "crouchstab", lowheight, normalattack) -DECLARE_ANIM(knifefollowanim, "slashfollow", middleheight, reversal) -DECLARE_ANIM(knifefollowedanim, "slashfollowed", middleheight, reversed) -DECLARE_ANIM(knifethrowanim, "knifethrow", middleheight, normalattack) -DECLARE_ANIM(removeknifeanim, "removeknife", middleheight, neutral) -DECLARE_ANIM(crouchremoveknifeanim, "crouchremoveknife", lowheight, neutral) -DECLARE_ANIM(jumpreversedanim, "JumpCaught", middleheight, reversed) -DECLARE_ANIM(jumpreversalanim, "JumpCatch", middleheight, reversal) -DECLARE_ANIM(staggerbackhardanim, "Staggerbackhard", middleheight, neutral) -DECLARE_ANIM(dropkickanim, "Dropkick", middleheight, normalattack) -DECLARE_ANIM(winduppunchanim, "Winduppunch", middleheight, normalattack) -DECLARE_ANIM(winduppunchblockedanim, "Winduppunchblocked", middleheight, normalattack) -DECLARE_ANIM(blockhighleftanim, "Blockhighleft", middleheight, normalattack) -DECLARE_ANIM(blockhighleftstrikeanim, "Blockhighleftstrike", middleheight, normalattack) -DECLARE_ANIM(backflipanim, "Backflip", highheight, neutral) -DECLARE_ANIM(walljumpbackanim, "Walljumpback", highheight, neutral) -DECLARE_ANIM(walljumpfrontanim, "Walljumpfront", highheight, neutral) -DECLARE_ANIM(rightflipanim, "Rightflip", highheight, neutral) -DECLARE_ANIM(walljumprightanim, "Walljumpright", highheight, neutral) -DECLARE_ANIM(leftflipanim, "Leftflip", highheight, neutral) -DECLARE_ANIM(walljumpleftanim, "Walljumpleft", highheight, neutral) -DECLARE_ANIM(walljumprightkickanim, "Walljumprightkick", highheight, neutral) -DECLARE_ANIM(walljumpleftkickanim, "Walljumpleftkick", highheight, neutral) -DECLARE_ANIM(knifefightidleanim, "Knifefightidle", middleheight, neutral) -DECLARE_ANIM(knifesneakattackanim, "Knifesneakattack", middleheight, reversal) -DECLARE_ANIM(knifesneakattackedanim, "Knifesneakattacked", middleheight, reversed) -DECLARE_ANIM(swordfightidleanim, "swordfightidle", middleheight, neutral) -DECLARE_ANIM(drawleftanim, "drawleft", middleheight, neutral) -DECLARE_ANIM(swordslashanim, "swordslash", middleheight, normalattack) -DECLARE_ANIM(swordgroundstabanim, "swordgroundstab", lowheight, normalattack) -DECLARE_ANIM(dodgebackanim, "dodgeback", middleheight, neutral) -DECLARE_ANIM(swordsneakattackanim, "Swordsneakattack", middleheight, reversal) -DECLARE_ANIM(swordsneakattackedanim, "Swordsneakattacked", middleheight, reversed) -DECLARE_ANIM(swordslashreversedanim, "swordslashCaught", middleheight, reversed) -DECLARE_ANIM(swordslashreversalanim, "swordslashCatch", middleheight, reversal) -DECLARE_ANIM(knifeslashreversedanim, "knifeslashCaught", middleheight, reversed) -DECLARE_ANIM(knifeslashreversalanim, "knifeslashCatch", middleheight, reversal) -DECLARE_ANIM(swordfightidlebothanim, "swordfightidleboth", middleheight, neutral) -DECLARE_ANIM(swordslashparryanim, "sworduprightparry", middleheight, normalattack) -DECLARE_ANIM(swordslashparriedanim, "swordslashparried", middleheight, normalattack) -DECLARE_ANIM(wolfidle, "Wolfidle", middleheight, neutral) -DECLARE_ANIM(wolfcrouchanim, "Wolfcrouch", lowheight, neutral) -DECLARE_ANIM(wolflandanim, "Wolflanding", lowheight, neutral) -DECLARE_ANIM(wolflandhardanim, "Wolflandhard", lowheight, neutral) -DECLARE_ANIM(wolfrunanim, "Wolfrun", middleheight, neutral) -DECLARE_ANIM(wolfrunninganim, "Wolfrunning", middleheight, neutral) -DECLARE_ANIM(rabbitrunninganim, "Rabbitrunning", middleheight, neutral) -DECLARE_ANIM(wolfstopanim, "Wolfstop", middleheight, neutral) -DECLARE_ANIM(rabbittackleanim, "Rabbittackle", middleheight, neutral) -DECLARE_ANIM(rabbittacklinganim, "Rabbittackling", middleheight, reversal) -DECLARE_ANIM(rabbittackledbackanim, "Rabbittackledback", middleheight, reversed) -DECLARE_ANIM(rabbittackledfrontanim, "Rabbittackledfront", middleheight, reversed) -DECLARE_ANIM(wolfslapanim, "Wolfslap", middleheight, normalattack) -DECLARE_ANIM(staffhitanim, "StaffHit", middleheight, normalattack) -DECLARE_ANIM(staffgroundsmashanim, "StaffGroundSmash", lowheight, normalattack) -DECLARE_ANIM(staffspinhitanim, "Spinwhack", middleheight, normalattack) -DECLARE_ANIM(staffhitreversedanim, "StaffHitCaught", middleheight, reversed) -DECLARE_ANIM(staffhitreversalanim, "StaffHitCatch", middleheight, reversal) -DECLARE_ANIM(staffspinhitreversedanim, "SpinWhackCaught", middleheight, reversed) -DECLARE_ANIM(staffspinhitreversalanim, "SpinWhackCatch", middleheight, reversal) -DECLARE_ANIM(sitanim, "Sit", lowheight, neutral) -DECLARE_ANIM(sleepanim, "Sleep", lowheight, neutral) -DECLARE_ANIM(talkidleanim, "TalkIdle", middleheight, neutral) -DECLARE_ANIM(sitwallanim, "Dying", lowheight, neutral) -DECLARE_ANIM(dead1anim, "Dead1", lowheight, neutral) -DECLARE_ANIM(dead2anim, "Dead2", lowheight, neutral) -DECLARE_ANIM(dead3anim, "Dead3", lowheight, neutral) -DECLARE_ANIM(dead4anim, "Dead4", lowheight, neutral) +DECLARE_ANIM(runanim, "Run", middleheight, neutral, 0) +DECLARE_ANIM(bounceidleanim, "Idle", middleheight, neutral, 0) +DECLARE_ANIM(stopanim, "Stop", middleheight, neutral, 0) +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(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(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(spinkickreversedanim, "SpinKickCaught", middleheight, reversed, 0) +DECLARE_ANIM(spinkickreversalanim, "SpinKickCatch", middleheight, reversal, 0) +DECLARE_ANIM(lowkickanim, "lowkick", middleheight, normalattack, 0) +DECLARE_ANIM(sweepanim, "sweep", lowheight, normalattack, 0) +DECLARE_ANIM(sweepreversedanim, "SweepCaught", lowheight, reversed, 0) +DECLARE_ANIM(sweepreversalanim, "SweepCatch", middleheight, reversal, 0) +DECLARE_ANIM(rabbitkickanim, "RabbitKick", middleheight, normalattack, 0) +DECLARE_ANIM(rabbitkickreversedanim, "RabbitKickCaught", middleheight, reversed, 0) +DECLARE_ANIM(rabbitkickreversalanim, "RabbitKickCatch", lowheight, reversal, 0) +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(backhandspringanim, "Backhandspring", middleheight, neutral, 0) +DECLARE_ANIM(fightidleanim, "Fightidle", middleheight, neutral, 0) +DECLARE_ANIM(walkanim, "Walk", middleheight, neutral, 0) +DECLARE_ANIM(fightsidestep, "Fightsidestep", middleheight, neutral, 0) +DECLARE_ANIM(killanim, "Kill", middleheight, normalattack, 0) +DECLARE_ANIM(sneakattackanim, "Sneakattack", middleheight, reversal, 0) +DECLARE_ANIM(sneakattackedanim, "Sneakattacked", middleheight, reversed, 0) +DECLARE_ANIM(drawrightanim, "drawright", middleheight, neutral, 0) +DECLARE_ANIM(knifeslashstartanim, "slashstart", middleheight, normalattack, 0) +DECLARE_ANIM(crouchdrawrightanim, "crouchdrawright", lowheight, neutral, 0) +DECLARE_ANIM(crouchstabanim, "crouchstab", lowheight, normalattack, 0) +DECLARE_ANIM(knifefollowanim, "slashfollow", middleheight, reversal, 0) +DECLARE_ANIM(knifefollowedanim, "slashfollowed", middleheight, reversed, 0) +DECLARE_ANIM(knifethrowanim, "knifethrow", middleheight, normalattack, 0) +DECLARE_ANIM(removeknifeanim, "removeknife", middleheight, neutral, 0) +DECLARE_ANIM(crouchremoveknifeanim, "crouchremoveknife", lowheight, neutral, 0) +DECLARE_ANIM(jumpreversedanim, "JumpCaught", middleheight, reversed, 0) +DECLARE_ANIM(jumpreversalanim, "JumpCatch", middleheight, reversal, 0) +DECLARE_ANIM(staggerbackhardanim, "Staggerbackhard", middleheight, neutral, 0) +DECLARE_ANIM(dropkickanim, "Dropkick", middleheight, normalattack, 0) +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(knifefightidleanim, "Knifefightidle", middleheight, neutral, 0) +DECLARE_ANIM(knifesneakattackanim, "Knifesneakattack", middleheight, reversal, 0) +DECLARE_ANIM(knifesneakattackedanim, "Knifesneakattacked", middleheight, reversed, 0) +DECLARE_ANIM(swordfightidleanim, "swordfightidle", middleheight, neutral, 0) +DECLARE_ANIM(drawleftanim, "drawleft", middleheight, neutral, 0) +DECLARE_ANIM(swordslashanim, "swordslash", middleheight, normalattack, 0) +DECLARE_ANIM(swordgroundstabanim, "swordgroundstab", lowheight, normalattack, 0) +DECLARE_ANIM(dodgebackanim, "dodgeback", middleheight, neutral, 0) +DECLARE_ANIM(swordsneakattackanim, "Swordsneakattack", middleheight, reversal, 0) +DECLARE_ANIM(swordsneakattackedanim, "Swordsneakattacked", middleheight, reversed, 0) +DECLARE_ANIM(swordslashreversedanim, "swordslashCaught", middleheight, reversed, 0) +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(swordslashparryanim, "sworduprightparry", middleheight, normalattack, 0) +DECLARE_ANIM(swordslashparriedanim, "swordslashparried", middleheight, normalattack, 0) +DECLARE_ANIM(wolfidle, "Wolfidle", middleheight, neutral, 0) +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(rabbittackleanim, "Rabbittackle", middleheight, neutral, 0) +DECLARE_ANIM(rabbittacklinganim, "Rabbittackling", middleheight, reversal, 0) +DECLARE_ANIM(rabbittackledbackanim, "Rabbittackledback", middleheight, reversed, 0) +DECLARE_ANIM(rabbittackledfrontanim, "Rabbittackledfront", middleheight, reversed, 0) +DECLARE_ANIM(wolfslapanim, "Wolfslap", middleheight, normalattack, 0) +DECLARE_ANIM(staffhitanim, "StaffHit", middleheight, normalattack, 0) +DECLARE_ANIM(staffgroundsmashanim, "StaffGroundSmash", lowheight, normalattack, 0) +DECLARE_ANIM(staffspinhitanim, "Spinwhack", middleheight, normalattack, 0) +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(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(loadable_anim_end, "", 0, 0) +DECLARE_ANIM(loadable_anim_end, "", 0, 0, 0) /* Not implemented. */ -DECLARE_ANIM(rabbittacklereversal, "", 0, 0) -DECLARE_ANIM(rabbittacklereversed, "", 0, 0) -DECLARE_ANIM(sworddisarmanim, "", 0, 0) -DECLARE_ANIM(swordslashleftanim, "", 0, 0) -DECLARE_ANIM(swordslashrightanim, "", 0, 0) -DECLARE_ANIM(swordstabanim, "", 0, 0) -DECLARE_ANIM(wolfbashanim, "", 0, 0) -DECLARE_ANIM(wolfclawanim, "", 0, 0) -DECLARE_ANIM(wolffightidle, "", 0, 0) -DECLARE_ANIM(wolfhurtidle, "", 0, 0) -DECLARE_ANIM(wolfsneakanim, "", 0, 0) -DECLARE_ANIM(wolfswordidle, "", 0, 0) -DECLARE_ANIM(wolftackleanim, "", 0, 0) -DECLARE_ANIM(wolftackledbacanim, "", 0, 0) -DECLARE_ANIM(wolftackledfrontanim, "", 0, 0) -DECLARE_ANIM(wolftacklereversal, "", 0, 0) -DECLARE_ANIM(wolftacklereversed, "", 0, 0) -DECLARE_ANIM(wolftacklinganim, "", 0, 0) +DECLARE_ANIM(rabbittacklereversal, "", 0, 0, 0) +DECLARE_ANIM(rabbittacklereversed, "", 0, 0, 0) +DECLARE_ANIM(sworddisarmanim, "", 0, 0, 0) +DECLARE_ANIM(swordslashleftanim, "", 0, 0, 0) +DECLARE_ANIM(swordslashrightanim, "", 0, 0, 0) +DECLARE_ANIM(swordstabanim, "", 0, 0, 0) +DECLARE_ANIM(wolfbashanim, "", 0, 0, 0) +DECLARE_ANIM(wolfclawanim, "", 0, 0, 0) +DECLARE_ANIM(wolffightidle, "", 0, 0, 0) +DECLARE_ANIM(wolfhurtidle, "", 0, 0, 0) +DECLARE_ANIM(wolfsneakanim, "", 0, 0, 0) +DECLARE_ANIM(wolfswordidle, "", 0, 0, 0) +DECLARE_ANIM(wolftackleanim, "", 0, 0, 0) +DECLARE_ANIM(wolftackledbacanim, "", 0, 0, 0) +DECLARE_ANIM(wolftackledfrontanim, "", 0, 0, 0) +DECLARE_ANIM(wolftacklereversal, "", 0, 0, 0) +DECLARE_ANIM(wolftacklereversed, "", 0, 0, 0) +DECLARE_ANIM(wolftacklinganim, "", 0, 0, 0) -DECLARE_ANIM(tempanim, "", 0, 0) +DECLARE_ANIM(tempanim, "", 0, 0, 0) #endif diff --git a/Source/Animation.h b/Source/Animation.h index b292813..0720426 100644 --- a/Source/Animation.h +++ b/Source/Animation.h @@ -32,7 +32,7 @@ enum anim_height_type { enum animation_types { -#define DECLARE_ANIM(id, file, height, attack) id, +#define DECLARE_ANIM(id, ...) id, #include "Animation.def" #undef DECLARE_ANIM animation_count