mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-02-04 19:04:08 +00:00
Code Issues Releases Wiki Activity

Replace magic animlayer numbers with an enum (cosmetical change only)

Browse source
This commit is contained in:
fgenesis 2012-05-14 15:48:01 +02:00
parent a8c951672b
commit 05af5dfe21
2 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Aquaria/Avatar.cpp
View file

@ -44,8 +44,6 @@ bool lastJumpOutFromWaterBubble = false;
bool useSpiritDistance = true; bool useSpiritDistance = true;
bool inSpiritWorld = false; bool inSpiritWorld = false;
const int LAYER_FLOURISH = 3;
const float MULT_DMG_CRABCOSTUME = 0.75; const float MULT_DMG_CRABCOSTUME = 0.75;
const float MULT_DMG_FISHFORM = 1.5; const float MULT_DMG_FISHFORM = 1.5;
const float MULT_DMG_SEAHORSEARMOR = 0.6; const float MULT_DMG_SEAHORSEARMOR = 0.6;
@ -134,9 +132,6 @@ bool _isUnderWater;
//HRECORD avatarRecord = 0; //HRECORD avatarRecord = 0;
#define ANIMLAYER_OVERRIDE 4
#define ANIMLAYER_UPPERBODYIDLE 6
#define ANIMLAYER_HEADOVERRIDE 7
Vector Target::getWorldPosition() Vector Target::getWorldPosition()
{ {
@ -843,7 +838,7 @@ void Avatar::startFlourish()
flourishTimer.start(fanim->getAnimationLength()-0.2f); flourishTimer.start(fanim->getAnimationLength()-0.2f);
flourishPowerTimer.start(fanim->getAnimationLength()*0.5f); flourishPowerTimer.start(fanim->getAnimationLength()*0.5f);
} }
skeletalSprite.transitionAnimate(anim, 0.1, 0, LAYER_FLOURISH); skeletalSprite.transitionAnimate(anim, 0.1, 0, ANIMLAYER_FLOURISH);
flourish = true; flourish = true;
float rotz = rotationOffset.z; float rotz = rotationOffset.z;
@ -2688,7 +2683,7 @@ bool Avatar::fireAtNearestValidEntity(const std::string &shot)
skeletalSprite.transitionAnimate("fireBlast", 0.1, 0, 5); skeletalSprite.transitionAnimate("fireBlast", 0.1, 0, ANIMLAYER_ARMOVERRIDE);
s->position = p; s->position = p;
//s->damageType = dt; //s->damageType = dt;
/* /*
@ -2918,7 +2913,7 @@ void Avatar::formAbility(int ability)
else else
doShock("EnergyTendril"); doShock("EnergyTendril");
if (!state.lockedToWall) if (!state.lockedToWall)
skeletalSprite.animate("energyChargeAttack", 0, 6); skeletalSprite.animate("energyChargeAttack", 0, ANIMLAYER_UPPERBODYIDLE);
/* /*
if (core->afterEffectManager) if (core->afterEffectManager)
@ -3311,7 +3306,7 @@ void Avatar::doShock(const std::string &shotName)
int thits = getNumShots(); int thits = getNumShots();
/* /*
if (skeletalSprite.getAnimationLayer(LAYER_FLOURISH)->getCurrentAnimation()) if (skeletalSprite.getAnimationLayer(ANIMLAYER_FLOURISH)->getCurrentAnimation())
{ {
thits = maxTendrilHits; thits = maxTendrilHits;
} }
@ -8889,7 +8884,7 @@ void Avatar::onUpdate(float dt)
std::ostringstream os; std::ostringstream os;
os << "swimExtra-" << anim; os << "swimExtra-" << anim;
skeletalSprite.transitionAnimate(os.str(), 0.5, 0, 6); skeletalSprite.transitionAnimate(os.str(), 0.5, 0, ANIMLAYER_UPPERBODYIDLE);
} }
} }
} }

10
Aquaria/Avatar.h
View file

@ -59,6 +59,16 @@ enum EnableInputType
AVATARINPUT_MAX AVATARINPUT_MAX
}; };
enum AvatarAnimLayers
{
ANIMLAYER_FLOURISH = 3,
ANIMLAYER_OVERRIDE = 4,
ANIMLAYER_ARMOVERRIDE = 5,
ANIMLAYER_UPPERBODYIDLE = 6,
ANIMLAYER_HEADOVERRIDE = 7,
ANIMLAYER_MAX
};
class SongIconParticle : public Quad class SongIconParticle : public Quad
{ {
public: public: