Merge pull request #2557 from RakieI/newstuff

fix: anim/spritePlayerNo crashing unsafely and not working for explods

Author: K4thos

src/bytecode.go

@@ -4187,6 +4187,18 @@ func getRedirectedChar(c *Char, sc StateControllerBase, redirectID byte, scname
 	return crun
 }
 
+func validatePlayerNo(c *Char, pn int, pname, scname string) bool {
+	valid := pn >= 0 &&
+	         pn < len(sys.chars) &&
+	         len(sys.chars[pn]) > 0 &&
+	         sys.chars[pn][0] != nil
+	if !valid {
+		sys.appendToConsole(c.warn() + fmt.Sprintf("Invalid %s for %s: %v", pname, scname, pn+1))
+		return false
+	}
+	return true
+}
+
 type stateDef StateControllerBase
 
 const (
@@ -4851,16 +4863,14 @@ func (sc changeAnim) Run(c *Char, _ []int32) bool {
 			}
 		case changeAnim_animplayerno:
 			pn := int(exp[0].evalI(c)) - 1
-			if pn < 0 || sys.chars[pn][0] == nil {
-				return false
+			if validatePlayerNo(c, pn, "animPlayerNo", "changeAnim") {
+				animPN = pn
 			}
-			animPN = pn
 		case changeAnim_spriteplayerno:
 			pn := int(exp[0].evalI(c)) - 1
-			if pn < 0 || sys.chars[pn][0] == nil {
-				return false
+			if validatePlayerNo(c, pn, "spritePlayerNo", "changeAnim") {
+				spritePN = pn
 			}
-			spritePN = pn
 		case changeAnim_readplayerid:
 			if read := sys.playerID(exp[0].evalI(c)); read != nil {
 				rpid = read.playerNo
@@ -5569,16 +5579,14 @@ func (sc explod) Run(c *Char, _ []int32) bool {
 			e.setAnim(e.animNo, apn, spn, ffx)
 		case explod_animplayerno:
 			pn := int(exp[0].evalI(c)) - 1
-			if pn < 0 || sys.chars[pn][0] == nil {
-				return false
+			if validatePlayerNo(c, pn, "animPlayerNo", "Explod") {
+				animPN = pn
 			}
-			animPN = pn
 		case explod_spriteplayerno:
 			pn := int(exp[0].evalI(c)) - 1
-			if pn < 0 || sys.chars[pn][0] == nil {
-				return false
+			if validatePlayerNo(c, pn, "spritePlayerNo", "Explod") {
+				spritePN = pn
 			}
-			spritePN = pn
 		case explod_ownpal:
 			e.ownpal = exp[0].evalB(c)
 		case explod_remappal:
@@ -5915,16 +5923,14 @@ func (sc modifyExplod) Run(c *Char, _ []int32) bool {
 			}
 		case explod_animplayerno:
 			pn := int(exp[0].evalI(c)) - 1
-			if pn < 0 || sys.chars[pn][0] == nil {
-				return false
+			if validatePlayerNo(c, pn, "animPlayerNo", "modifyExplod") {
+				animPN = pn
 			}
-			animPN = pn
 		case explod_spriteplayerno:
 			pn := int(exp[0].evalI(c)) - 1
-			if pn < 0 || sys.chars[pn][0] == nil {
-				return false
+			if validatePlayerNo(c, pn, "spritePlayerNo", "modifyExplod") {
+				spritePN = pn
 			}
-			spritePN = pn
 		case explod_remappal:
 			rp[0] = exp[0].evalI(c)
 			if len(exp) > 1 {

src/compiler_functions.go

@@ -976,6 +976,14 @@ func (c *Compiler) explod(is IniSection, sc *StateControllerBase,
 			explod_redirectid, VT_Int, 1, false); err != nil {
 			return err
 		}
+		if err := c.paramValue(is, sc, "animplayerno",
+			explod_animplayerno, VT_Int, 1, false); err != nil {
+			return err
+		}
+		if err := c.paramValue(is, sc, "spriteplayerno",
+			explod_spriteplayerno, VT_Int, 1, false); err != nil {
+			return err
+		}
 		if err := c.stateParam(is, "anim", false, func(data string) error {
 			prefix := c.getDataPrefix(&data, false)
 			return c.scAdd(sc, explod_anim, data, VT_Int, 1,
@@ -998,14 +1006,6 @@ func (c *Compiler) explod(is IniSection, sc *StateControllerBase,
 			explod_animelemtime, VT_Int, 1, false); err != nil {
 			return err
 		}
-		if err := c.paramValue(is, sc, "animplayerno",
-			explod_animplayerno, VT_Int, 1, false); err != nil {
-			return err
-		}
-		if err := c.paramValue(is, sc, "spriteplayerno",
-			explod_spriteplayerno, VT_Int, 1, false); err != nil {
-			return err
-		}
 		if err := c.paramValue(is, sc, "animfreeze",
 			explod_animfreeze, VT_Bool, 1, false); err != nil {
 			return err
@@ -1055,6 +1055,14 @@ func (c *Compiler) modifyExplod(is IniSection, sc *StateControllerBase,
 		if err := c.explodSub(is, sc); err != nil {
 			return err
 		}
+		if err := c.paramValue(is, sc, "animplayerno",
+			explod_animplayerno, VT_Int, 1, false); err != nil {
+			return err
+		}
+		if err := c.paramValue(is, sc, "spriteplayerno",
+			explod_spriteplayerno, VT_Int, 1, false); err != nil {
+			return err
+		}
 		if err := c.stateParam(is, "anim", false, func(data string) error {
 			prefix := c.getDataPrefix(&data, false)
 			return c.scAdd(sc, explod_anim, data, VT_Int, 1,
@@ -1070,14 +1078,6 @@ func (c *Compiler) modifyExplod(is IniSection, sc *StateControllerBase,
 			explod_animelemtime, VT_Int, 1, false); err != nil {
 			return err
 		}
-		if err := c.paramValue(is, sc, "animplayerno",
-			explod_animplayerno, VT_Int, 1, false); err != nil {
-			return err
-		}
-		if err := c.paramValue(is, sc, "spriteplayerno",
-			explod_spriteplayerno, VT_Int, 1, false); err != nil {
-			return err
-		}
 		if err := c.paramValue(is, sc, "animfreeze",
 			explod_animfreeze, VT_Bool, 1, false); err != nil {
 			return err