mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-04-30 17:41:23 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'lgro/aicombat'

Browse source
This commit is contained in:
Marc Zinnschlag 2014-07-22 08:06:24 +02:00
commit ccf672630f
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw/mwmechanics/aicombat.cpp
View file

@ -265,7 +265,7 @@ namespace MWMechanics
const ESM::Weapon *weapon = NULL; const ESM::Weapon *weapon = NULL;
MWMechanics::WeaponType weaptype; MWMechanics::WeaponType weaptype;
float weapRange; float weapRange = 1.0f;
actorClass.getCreatureStats(actor).setMovementFlag(CreatureStats::Flag_Run, true); actorClass.getCreatureStats(actor).setMovementFlag(CreatureStats::Flag_Run, true);
@ -300,7 +300,7 @@ namespace MWMechanics
else //is creature else //is creature
{ {
weaptype = WeapType_HandToHand; //doesn't matter, should only reflect if it is melee or distant weapon weaptype = WeapType_HandToHand; //doesn't matter, should only reflect if it is melee or distant weapon
weapRange = 150; //TODO: use true attack range (the same problem in Creature::hit) weapRange = 150.0f; //TODO: use true attack range (the same problem in Creature::hit)
} }
float rangeAttack; float rangeAttack;