Skip to content

Commit 50eff9f

Browse files
authored
Merge pull request #3593 from Alceris/explodhitpause
fix: Fix explod ignorehitpause bugs
2 parents f414b56 + 039d630 commit 50eff9f

2 files changed

Lines changed: 7 additions & 11 deletions

File tree

src/compiler.go

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7838,7 +7838,7 @@ func (c *Compiler) stateBlock(line *string, bl *StateBlock, root bool,
78387838
c.token = "helper"
78397839
}
78407840
if ok {
7841-
scname := c.token
7841+
//scname := c.token
78427842
c.scan(line)
78437843
if err := c.needToken("{"); err != nil {
78447844
return err
@@ -7862,12 +7862,6 @@ func (c *Compiler) stateBlock(line *string, bl *StateBlock, root bool,
78627862
return err
78637863
}
78647864
}
7865-
if scname == "explod" || scname == "modifyexplod" {
7866-
if err := c.paramValue(is, sc, "ignorehitpause",
7867-
explod_ignorehitpause, VT_Bool, 1, false); err != nil {
7868-
return err
7869-
}
7870-
}
78717865
if sctrl, err := scf(is, sc, -1); err != nil {
78727866
return err
78737867
} else {

src/compiler_functions.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1085,8 +1085,9 @@ func (c *Compiler) explod(is IniSection, sc *StateControllerBase,
10851085
if err := c.explodInterpolate(is, sc); err != nil {
10861086
return err
10871087
}
1088-
if ihp == 0 {
1089-
sc.add(explod_ignorehitpause, sc.iToExp(0))
1088+
if err := c.paramValue(is, sc, "ignorehitpause",
1089+
explod_ignorehitpause, VT_Bool, 1, false); err != nil {
1090+
return err
10901091
}
10911092
return nil
10921093
})
@@ -1158,8 +1159,9 @@ func (c *Compiler) modifyExplod(is IniSection, sc *StateControllerBase,
11581159
explod_interpolation, VT_Bool, 1, false); err != nil {
11591160
return err
11601161
}
1161-
if ihp == 0 {
1162-
sc.add(explod_ignorehitpause, sc.iToExp(0))
1162+
if err := c.paramValue(is, sc, "ignorehitpause",
1163+
explod_ignorehitpause, VT_Bool, 1, false); err != nil {
1164+
return err
11631165
}
11641166
return nil
11651167
})

0 commit comments

Comments
 (0)