mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-30 09:36:43 +00:00
Code Issues Releases Wiki Activity

Removed unneeded temp variables.

Browse source 
Corrected case of function names.
This commit is contained in:
dteviot 2015-08-09 14:18:55 +12:00
parent 50ddcd1953
commit 038851420d
2 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -199,13 +199,9 @@ namespace MWMechanics
//Update every frame //Update every frame
storage.updateCombatMove(duration); storage.updateCombatMove(duration);
MWMechanics::Movement& movement = storage.mMovement; updateActorsMovement(actor, storage.mMovement);
UpdateActorsMovement(actor, movement);
storage.updateAttack(characterController); storage.updateAttack(characterController);
storage.mActionCooldown -= duration;
float& actionCooldown = storage.mActionCooldown;
actionCooldown -= duration;
float& timerReact = storage.mTimerReact; float& timerReact = storage.mTimerReact;
if(timerReact < REACTION_INTERVAL) if(timerReact < REACTION_INTERVAL)
@ -503,7 +499,7 @@ namespace MWMechanics
return false; return false;
} }
void AiCombat::UpdateActorsMovement(const MWWorld::Ptr& actor, MWMechanics::Movement& desiredMovement) void AiCombat::updateActorsMovement(const MWWorld::Ptr& actor, MWMechanics::Movement& desiredMovement)
{ {
MWMechanics::Movement& actorMovementSettings = actor.getClass().getMovementSettings(actor); MWMechanics::Movement& actorMovementSettings = actor.getClass().getMovementSettings(actor);
if (mPathFinder.isPathConstructed()) if (mPathFinder.isPathConstructed())
@ -522,12 +518,12 @@ namespace MWMechanics
else else
{ {
actorMovementSettings = desiredMovement; actorMovementSettings = desiredMovement;
RotateActorOnAxis(actor, 2, actorMovementSettings, desiredMovement); rotateActorOnAxis(actor, 2, actorMovementSettings, desiredMovement);
RotateActorOnAxis(actor, 0, actorMovementSettings, desiredMovement); rotateActorOnAxis(actor, 0, actorMovementSettings, desiredMovement);
} }
} }
void AiCombat::RotateActorOnAxis(const MWWorld::Ptr& actor, int axis, void AiCombat::rotateActorOnAxis(const MWWorld::Ptr& actor, int axis,
MWMechanics::Movement& actorMovementSettings, MWMechanics::Movement& desiredMovement) MWMechanics::Movement& actorMovementSettings, MWMechanics::Movement& desiredMovement)
{ {
actorMovementSettings.mRotation[axis] = 0; actorMovementSettings.mRotation[axis] = 0;

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

@ -65,8 +65,8 @@ namespace MWMechanics
AiCombatStorage& storage, MWWorld::Ptr target); AiCombatStorage& storage, MWWorld::Ptr target);
/// Transfer desired movement (from AiCombatStorage) to Actor /// Transfer desired movement (from AiCombatStorage) to Actor
void UpdateActorsMovement(const MWWorld::Ptr& actor, MWMechanics::Movement& movement); void updateActorsMovement(const MWWorld::Ptr& actor, MWMechanics::Movement& movement);
void RotateActorOnAxis(const MWWorld::Ptr& actor, int axis, void rotateActorOnAxis(const MWWorld::Ptr& actor, int axis,
MWMechanics::Movement& actorMovementSettings, MWMechanics::Movement& desiredMovement); MWMechanics::Movement& actorMovementSettings, MWMechanics::Movement& desiredMovement);
}; };