Skip to content

Commit cad257e

Browse files
authored
Merge pull request #3511 from Alceris/ignorereversaldef
refactor: Rename MissOnReversalDef to IgnoreReversalDef
2 parents b2d36c2 + 22b4c72 commit cad257e

3 files changed

Lines changed: 8 additions & 8 deletions

File tree

src/bytecode.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7305,7 +7305,7 @@ const (
73057305
hitDef_stand_friction
73067306
hitDef_crouch_friction
73077307
hitDef_keepstate
7308-
hitDef_missonreversaldef
7308+
hitDef_ignorereversaldef
73097309
hitDef_last = iota + afterImage_last + 1 - 1
73107310
hitDef_redirectid
73117311
)
@@ -7683,8 +7683,8 @@ func (sc hitDef) runSub(c *Char, hd *HitDef, paramID byte, exp []BytecodeExp) {
76837683
hd.CrouchFriction = exp[0].evalF(c)
76847684
case hitDef_keepstate:
76857685
hd.KeepState = exp[0].evalB(c)
7686-
case hitDef_missonreversaldef:
7687-
hd.MissOnReversalDef = Btoi(exp[0].evalB(c))
7686+
case hitDef_ignorereversaldef:
7687+
hd.IgnoreReversalDef = Btoi(exp[0].evalB(c))
76887688
default:
76897689
if isPalFXParam(paramID) {
76907690
palFX(sc).runSub(c, &hd.palfx, paramID, exp)

src/char.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -681,7 +681,7 @@ type HitDef struct {
681681
StandFriction float32
682682
CrouchFriction float32
683683
KeepState bool
684-
MissOnReversalDef int32
684+
IgnoreReversalDef int32
685685
}
686686

687687
func (hd *HitDef) reset(c *Char, proj *Projectile) {
@@ -806,7 +806,7 @@ func (hd *HitDef) reset(c *Char, proj *Projectile) {
806806
StandFriction: float32(math.NaN()),
807807
CrouchFriction: float32(math.NaN()),
808808
KeepState: false,
809-
MissOnReversalDef: 0,
809+
IgnoreReversalDef: 0,
810810

811811
reversal_guardflag: IErr,
812812
reversal_guardflag_not: IErr,
@@ -10151,7 +10151,7 @@ func (c *Char) attrCheck(getter *Char, ghd *HitDef, gstyp StateType) bool {
1015110151

1015210152
// ReversalDef vs HitDef attributes check
1015310153
if ghd.reversal_attr > 0 {
10154-
if c.hitdef.MissOnReversalDef > 0 {
10154+
if c.hitdef.IgnoreReversalDef > 0 {
1015510155
return false
1015610156
}
1015710157
// Check HitDef validity

src/compiler_functions.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2255,8 +2255,8 @@ func (c *Compiler) hitDefSub(is IniSection, sc *StateControllerBase) error {
22552255
hitDef_crouch_friction, VT_Float, 1, false); err != nil {
22562256
return err
22572257
}
2258-
if err := c.paramValue(is, sc, "missonreversaldef",
2259-
hitDef_missonreversaldef, VT_Bool, 1, false); err != nil {
2258+
if err := c.paramValue(is, sc, "ignorereversaldef",
2259+
hitDef_ignorereversaldef, VT_Bool, 1, false); err != nil {
22602260
return err
22612261
}
22622262

0 commit comments

Comments
 (0)