Skip to content

Commit 88c673d

Browse files
committed
Merge branch 'luadoc' into 'master'
Fix minor documentation errors See merge request OpenMW/openmw!4595
2 parents 057c85b + e5e21ee commit 88c673d

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

files/lua_api/openmw/self.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
-- @field [parent=#ActorControls] #boolean run true - run, false - walk
4646
-- @field [parent=#ActorControls] #boolean sneak If true - sneak
4747
-- @field [parent=#ActorControls] #boolean jump If true - initiate a jump
48-
-- @field [parent=#ActorControls] #ATTACK_TYPE use Activates the readied weapon/spell according to a provided value. For weapons, keeping this value modified will charge the attack until set to @{#ATTACK_TYPE.NoAttack}. If an @#ATTACK_TYPE} not appropriate for a currently equipped weapon provided - an appropriate @{#ATTACK_TYPE} will be used instead.
48+
-- @field [parent=#ActorControls] #ATTACK_TYPE use Activates the readied weapon/spell according to a provided value. For weapons, keeping this value modified will charge the attack until set to @{#ATTACK_TYPE.NoAttack}. If an @{#ATTACK_TYPE} not appropriate for a currently equipped weapon provided - an appropriate @{#ATTACK_TYPE} will be used instead.
4949

5050
---
5151
-- Enables or disables standard AI (enabled by default).

files/lua_api/openmw/types.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -1123,7 +1123,7 @@
11231123
-- @field #string id The record ID of the NPC
11241124
-- @field #string name
11251125
-- @field #string race
1126-
-- @field #string class Name of the NPC's class (e. g. Acrobat)
1126+
-- @field #string class ID of the NPC's class (e.g. acrobat)
11271127
-- @field #string model Path to the model associated with this NPC, used for animations.
11281128
-- @field #string mwscript MWScript on this NPC (can be nil)
11291129
-- @field #string hair Path to the hair body part model

0 commit comments

Comments
 (0)