Skip to content

Commit

Permalink
Fix typo
Browse files Browse the repository at this point in the history
  • Loading branch information
scrawl committed Feb 5, 2014
1 parent 7cf2239 commit 5ee105c
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion apps/openmw/mwmechanics/aicombat.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ namespace MWMechanics
float rangeMelee;
float rangeCloseUp;
bool distantCombat = false;
if (weaptype==WeapType_BowAndArrow || weaptype==WeapType_Crossbow || weaptype==WeapType_ThowWeapon)
if (weaptype==WeapType_BowAndArrow || weaptype==WeapType_Crossbow || weaptype==WeapType_Thrown)
{
rangeMelee = 1000; // TODO: should depend on archer skill
rangeCloseUp = 0; //doesn't needed when attacking from distance
Expand Down
6 changes: 3 additions & 3 deletions apps/openmw/mwmechanics/character.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ static const struct WeaponInfo {
{ WeapType_TwoWide, "2w", "weapontwowide" },
{ WeapType_BowAndArrow, "1h", "bowandarrow" },
{ WeapType_Crossbow, "crossbow", "crossbow" },
{ WeapType_ThowWeapon, "1h", "throwweapon" },
{ WeapType_Thrown, "1h", "throwweapon" },
{ WeapType_PickProbe, "1h", "pickprobe" },
{ WeapType_Spell, "spell", "spellcast" },
};
Expand Down Expand Up @@ -380,7 +380,7 @@ MWWorld::ContainerStoreIterator getActiveWeapon(CreatureStats &stats, MWWorld::I
*weaptype = WeapType_Crossbow;
break;
case ESM::Weapon::MarksmanThrown:
*weaptype = WeapType_ThowWeapon;
*weaptype = WeapType_Thrown;
break;
}
}
Expand Down Expand Up @@ -709,7 +709,7 @@ bool CharacterController::updateWeaponState()
else
{
if(mWeaponType == WeapType_Crossbow || mWeaponType == WeapType_BowAndArrow ||
mWeaponType == WeapType_ThowWeapon)
mWeaponType == WeapType_Thrown)
mAttackType = "shoot";
else
{
Expand Down
2 changes: 1 addition & 1 deletion apps/openmw/mwmechanics/character.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ enum WeaponType {
WeapType_TwoWide,
WeapType_BowAndArrow,
WeapType_Crossbow,
WeapType_ThowWeapon,
WeapType_Thrown,
WeapType_PickProbe,

WeapType_Spell
Expand Down

0 comments on commit 5ee105c

Please sign in to comment.