krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

Fix typo

Browse source
This commit is contained in:
scrawl 2014-02-04 03:55:40 +01:00
parent 7cf22391a5
commit 5ee105c812
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -168,7 +168,7 @@ namespace MWMechanics
float rangeMelee; float rangeMelee;
float rangeCloseUp; float rangeCloseUp;
bool distantCombat = false; 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 rangeMelee = 1000; // TODO: should depend on archer skill
rangeCloseUp = 0; //doesn't needed when attacking from distance rangeCloseUp = 0; //doesn't needed when attacking from distance

6
apps/openmw/mwmechanics/character.cpp
View file

@ -119,7 +119,7 @@ static const struct WeaponInfo {
{ WeapType_TwoWide, "2w", "weapontwowide" }, { WeapType_TwoWide, "2w", "weapontwowide" },
{ WeapType_BowAndArrow, "1h", "bowandarrow" }, { WeapType_BowAndArrow, "1h", "bowandarrow" },
{ WeapType_Crossbow, "crossbow", "crossbow" }, { WeapType_Crossbow, "crossbow", "crossbow" },
{ WeapType_ThowWeapon, "1h", "throwweapon" }, { WeapType_Thrown, "1h", "throwweapon" },
{ WeapType_PickProbe, "1h", "pickprobe" }, { WeapType_PickProbe, "1h", "pickprobe" },
{ WeapType_Spell, "spell", "spellcast" }, { WeapType_Spell, "spell", "spellcast" },
}; };
@ -380,7 +380,7 @@ MWWorld::ContainerStoreIterator getActiveWeapon(CreatureStats &stats, MWWorld::I
*weaptype = WeapType_Crossbow; *weaptype = WeapType_Crossbow;
break; break;
case ESM::Weapon::MarksmanThrown: case ESM::Weapon::MarksmanThrown:
*weaptype = WeapType_ThowWeapon; *weaptype = WeapType_Thrown;
break; break;
} }
} }
@ -709,7 +709,7 @@ bool CharacterController::updateWeaponState()
else else
{ {
if(mWeaponType == WeapType_Crossbow || mWeaponType == WeapType_BowAndArrow || if(mWeaponType == WeapType_Crossbow || mWeaponType == WeapType_BowAndArrow ||
mWeaponType == WeapType_ThowWeapon) mWeaponType == WeapType_Thrown)
mAttackType = "shoot"; mAttackType = "shoot";
else else
{ {

2
apps/openmw/mwmechanics/character.hpp
View file

@ -106,7 +106,7 @@ enum WeaponType {
WeapType_TwoWide, WeapType_TwoWide,
WeapType_BowAndArrow, WeapType_BowAndArrow,
WeapType_Crossbow, WeapType_Crossbow,
WeapType_ThowWeapon, WeapType_Thrown,
WeapType_PickProbe, WeapType_PickProbe,
WeapType_Spell WeapType_Spell