Merge pull request #2861 from rakieldev/newstuff

refactor: migrate AIR indices to int32

Author: K4thos

src/anim.go

@@ -9,10 +9,10 @@ import (
 // AnimFrame holds frame data, used in animation tables.
 type AnimFrame struct {
 	Time      int32
-	Group     uint16
-	Number    uint16
-	Xoffset   int16
-	Yoffset   int16
+	Group     int32
+	Number    int32
+	Xoffset   int32
+	Yoffset   int32
 	TransType TransType
 	SrcAlpha  byte
 	DstAlpha  byte
@@ -28,7 +28,7 @@ type AnimFrame struct {
 func newAnimFrame() *AnimFrame {
 	return &AnimFrame{
 		Time:      -1,
-		Group:     0xFFFF,
+		Group:     -1,
 		TransType: TT_none,
 		SrcAlpha:  255,
 		DstAlpha:  0,
@@ -51,10 +51,10 @@ func ReadAnimFrame(line string) *AnimFrame {
 
 	// Read required parameters
 	af := newAnimFrame()
-	af.Group = uint16(Atoi(ary[0]))
-	af.Number = uint16(Atoi(ary[1]))
-	af.Xoffset = int16(Atoi(ary[2]))
-	af.Yoffset = int16(Atoi(ary[3]))
+	af.Group = int32(Atoi(ary[0]))
+	af.Number = int32(Atoi(ary[1]))
+	af.Xoffset = int32(Atoi(ary[2]))
+	af.Yoffset = int32(Atoi(ary[3]))
 	af.Time = Atoi(ary[4])
 
 	// Read H and V flags
@@ -551,7 +551,11 @@ func (a *Animation) UpdateSprite() {
 				group, number = mn[0], mn[1]
 			}
 		}
-		a.spr = a.sff.GetSprite(group, number)
+		if group >= 0 && number >= 0 {
+			a.spr = a.sff.GetSprite(uint16(group), uint16(number))
+		} else {
+			a.spr = nil
+		}
 	}
 	a.newframe, a.drawidx = false, a.curelem
 
@@ -1725,7 +1729,10 @@ func CopyAnim(a *Anim) *Anim {
 	newAnim.anim.interpolate_scale = a.anim.interpolate_scale
 	// Copy all valid sprites safely
 	for _, c := range a.anim.frames {
-		key := [...]uint16{c.Group, c.Number}
+		if c.Group < 0 || c.Number < 0 {
+			continue // skip empty frames
+		}
+		key := [...]uint16{uint16(c.Group), uint16(c.Number)}
 		src, ok := srcSff.sprites[key]
 		if !ok || src == nil {
 			continue
@@ -1804,24 +1811,24 @@ func (a *Anim) ResetFrames() {
 	a.anim.Reset()
 }
 
-type PreloadedAnims map[[2]uint16]*Animation
+type PreloadedAnims map[[2]int32]*Animation
 
 func NewPreloadedAnims() PreloadedAnims {
-	return PreloadedAnims(make(map[[2]uint16]*Animation))
+	return PreloadedAnims(make(map[[2]int32]*Animation))
 }
 
-func (pa PreloadedAnims) get(grp, idx uint16) *Animation {
-	a := pa[[...]uint16{grp, idx}]
+func (pa PreloadedAnims) get(grp, idx int32) *Animation {
+	a := pa[[...]int32{grp, idx}]
 	if a == nil {
-		return a
+		return nil
 	}
 	ret := &Animation{}
 	*ret = *a
 	return ret
 }
 
 func (pa PreloadedAnims) addAnim(anim *Animation, no int32) {
-	pa[[...]uint16{uint16(no), 0xFFFF}] = anim
+	pa[[...]int32{no, -1}] = anim
 }
 
 func (pa PreloadedAnims) addSprite(sff *Sff, grp, idx uint16) {
@@ -1831,9 +1838,9 @@ func (pa PreloadedAnims) addSprite(sff *Sff, grp, idx uint16) {
 	anim := newAnimation(sff, &sff.palList)
 	anim.mask = 0
 	af := newAnimFrame()
-	af.Group, af.Number = grp, idx
+	af.Group, af.Number = int32(grp), int32(idx)
 	anim.frames = append(anim.frames, *af)
-	pa[[...]uint16{grp, idx}] = anim
+	pa[[...]int32{int32(grp), int32(idx)}] = anim
 }
 
 func (pa PreloadedAnims) updateSff(sff *Sff) {

src/bytecode.go

@@ -11258,8 +11258,7 @@ func (sc remapSprite) Run(c *Char, _ []int32) bool {
 	if crun == nil {
 		return false
 	}
-	nullSpr := uint16(0xFFFF)
-	src := [...]uint16{nullSpr, nullSpr}
+	src := [...]int32{-1, -1}
 
 	StateControllerBase(sc).run(c, func(paramID byte, exp []BytecodeExp) bool {
 		switch paramID {
@@ -11270,14 +11269,14 @@ func (sc remapSprite) Run(c *Char, _ []int32) bool {
 		case remapSprite_preset:
 			crun.remapSpritePreset(string(*(*[]byte)(unsafe.Pointer(&exp[0]))))
 		case remapSprite_source:
-			src[0] = uint16(exp[0].evalI(c))
+			src[0] = int32(exp[0].evalI(c))
 			if len(exp) > 1 {
-				src[1] = uint16(exp[1].evalI(c))
+				src[1] = int32(exp[1].evalI(c))
 			}
 		case remapSprite_dest:
-			dst := [...]uint16{uint16(exp[0].evalI(c)), nullSpr}
+			dst := [...]int32{int32(exp[0].evalI(c)), -1}
 			if len(exp) > 1 {
-				dst[1] = uint16(exp[1].evalI(c))
+				dst[1] = int32(exp[1].evalI(c))
 			}
 			crun.remapSprite(src, dst)
 		}
@@ -13556,8 +13555,8 @@ func (sc modifyStageBG) Run(c *Char, _ []int32) bool {
 				eachBg(func(bg *backGround) {
 					if bg._type == BG_Normal {
 						bg.anim.frames = []AnimFrame{*newAnimFrame()}
-						bg.anim.frames[0].Group = I32ToU16(gr)
-						bg.anim.frames[0].Number = I32ToU16(im)
+						bg.anim.frames[0].Group = gr
+						bg.anim.frames[0].Number = im
 					}
 				})
 			case modifyStageBG_start_x:

src/char.go

@@ -3637,10 +3637,12 @@ func (c *Char) load(def string) error {
 							if len(k) == 2 {
 								var v [2]int32
 								is.ReadI32(key, &v[0], &v[1])
-								if _, ok := gi.remapPreset[subname][uint16(Atoi(k[0]))]; !ok {
-									gi.remapPreset[subname][uint16(Atoi(k[0]))] = make(RemapTable)
+								g0 := int32(Atoi(k[0]))
+								n0 := int32(Atoi(k[1]))
+								if _, ok := gi.remapPreset[subname][g0]; !ok {
+									gi.remapPreset[subname][g0] = make(RemapTable)
 								}
-								gi.remapPreset[subname][uint16(Atoi(k[0]))][uint16(Atoi(k[1]))] = [...]uint16{uint16(v[0]), uint16(v[1])}
+								gi.remapPreset[subname][g0][n0] = v
 							}
 						}
 					}
@@ -8399,25 +8401,24 @@ func (c *Char) drawPal() [2]int32 {
 	return c.getDrawPal(palMap[0])
 }
 
-type RemapTable map[uint16][2]uint16
-type RemapPreset map[uint16]RemapTable
+type RemapTable map[int32][2]int32
+type RemapPreset map[int32]RemapTable
 
-func (c *Char) remapSprite(src [2]uint16, dst [2]uint16) {
-	nullSpr := uint16(0xFFFF)
-	if src[0] == nullSpr || src[1] == nullSpr || dst[0] == nullSpr || dst[1] == nullSpr {
+func (c *Char) remapSprite(src [2]int32, dst [2]int32) {
+	if src[0] == -1 || src[1] == -1 || dst[0] == -1 || dst[1] == -1 {
 		return
 	}
 	if _, ok := c.remapSpr[src[0]]; !ok {
 		c.remapSpr[src[0]] = make(RemapTable)
 	}
-	c.remapSpr[src[0]][src[1]] = [...]uint16{dst[0], dst[1]}
+	c.remapSpr[src[0]][src[1]] = [...]int32{dst[0], dst[1]}
 }
 
 func (c *Char) remapSpritePreset(preset string) {
 	if _, ok := c.gi().remapPreset[preset]; !ok {
 		return
 	}
-	var src, dst [2]uint16
+	var src, dst [2]int32
 	for src[0] = range c.gi().remapPreset[preset] {
 		for src[1], dst = range c.gi().remapPreset[preset][src[0]] {
 			c.remapSprite(src, dst)

src/common.go

@@ -1118,7 +1118,7 @@ func (al *AnimLayout) Read(pre string, is IniSection, at AnimationTable, ln int1
 	var g, n int32
 	if is.ReadI32(pre+"spr", &g, &n) {
 		al.anim.frames = []AnimFrame{*newAnimFrame()}
-		al.anim.frames[0].Group, al.anim.frames[0].Number = I32ToU16(g), I32ToU16(n)
+		al.anim.frames[0].Group, al.anim.frames[0].Number = g, n
 		al.anim.mask = 0
 		al.lay = *newLayout(ln)
 	}

src/lifebar.go

@@ -1649,18 +1649,18 @@ func readLifeBarFace(pre string, is IniSection, sff *Sff, at AnimationTable) *Li
 
 func (fa *LifeBarFace) step(ref int, far *LifeBarFace) {
 	refChar := sys.chars[ref][0]
-	group, number := uint16(fa.face_spr[0]), uint16(fa.face_spr[1])
+	group, number := fa.face_spr[0], fa.face_spr[1]
 	if refChar != nil && refChar.anim != nil {
 		if mg, ok := refChar.anim.remap[group]; ok {
 			if mn, ok := mg[number]; ok {
 				group, number = mn[0], mn[1]
 			}
 		}
 	}
-	if far.old_spr[0] != int32(group) || far.old_spr[1] != int32(number) ||
+	if far.old_spr[0] != group || far.old_spr[1] != number ||
 		far.old_pal[0] != sys.cgi[ref].remappedpal[0] || far.old_pal[1] != sys.cgi[ref].remappedpal[1] {
-		far.face = sys.cgi[ref].sff.getOwnPalSprite(group, number, &sys.cgi[ref].palettedata.palList)
-		far.old_spr = [...]int32{int32(group), int32(number)}
+		far.face = sys.cgi[ref].sff.getOwnPalSprite(uint16(group), uint16(number), &sys.cgi[ref].palettedata.palList)
+		far.old_spr = [...]int32{group, number}
 		far.old_pal = [...]int32{sys.cgi[ref].remappedpal[0], sys.cgi[ref].remappedpal[1]}
 	}
 	fa.bg.Action()

src/script.go

@@ -288,7 +288,7 @@ func systemScriptInit(l *lua.LState) {
 		return 2
 	})
 	luaRegister(l, "animGetPreloadedCharData", func(l *lua.LState) int {
-		if anim := sys.sel.GetChar(int(numArg(l, 1))).anims.get(uint16(numArg(l, 2)), uint16(numArg(l, 3))); anim != nil {
+		if anim := sys.sel.GetChar(int(numArg(l, 1))).anims.get(int32(numArg(l, 2)), int32(numArg(l, 3))); anim != nil {
 			pfx := newPalFX()
 			pfx.clear()
 			pfx.time = -1
@@ -303,7 +303,7 @@ func systemScriptInit(l *lua.LState) {
 		return 0
 	})
 	luaRegister(l, "animGetPreloadedStageData", func(l *lua.LState) int {
-		if anim := sys.sel.GetStage(int(numArg(l, 1))).anims.get(uint16(numArg(l, 2)), uint16(numArg(l, 3))); anim != nil {
+		if anim := sys.sel.GetStage(int(numArg(l, 1))).anims.get(int32(numArg(l, 2)), int32(numArg(l, 3))); anim != nil {
 			pfx := newPalFX()
 			pfx.clear()
 			pfx.time = -1
@@ -796,7 +796,10 @@ func systemScriptInit(l *lua.LState) {
 			copyAnim := CopyAnim(a)
 			char := sys.sel.GetChar(int(numArg(l, 2)))
 			for _, c := range copyAnim.anim.frames {
-				spr, ok := copyAnim.anim.sff.sprites[[...]uint16{c.Group, c.Number}]
+				if c.Group < 0 || c.Number < 0 {
+					continue
+				}
+				spr, ok := copyAnim.anim.sff.sprites[[2]uint16{uint16(c.Group), uint16(c.Number)}]
 				if !ok || spr == nil {
 					continue
 				}

src/stage.go

@@ -299,8 +299,7 @@ func readBackGround(is IniSection, link *backGround,
 			var g, n int32
 			if is.readI32ForStage("spriteno", &g, &n) {
 				bg.anim.frames = []AnimFrame{*newAnimFrame()}
-				bg.anim.frames[0].Group, bg.anim.frames[0].Number =
-					I32ToU16(g), I32ToU16(n)
+				bg.anim.frames[0].Group, bg.anim.frames[0].Number = g, n
 			}
 			if is.ReadI32("mask", &tmp) {
 				if tmp != 0 {
@@ -413,10 +412,13 @@ func readBackGround(is IniSection, link *backGround,
 		is.ReadI32("tilespacing", &bg.anim.tile.xspacing, &bg.anim.tile.yspacing)
 		//bg.anim.tile.yspacing = bg.anim.tile.xspacing
 		if bg.actionno < 0 && len(bg.anim.frames) > 0 {
-			if spr := sff.GetSprite(
-				bg.anim.frames[0].Group, bg.anim.frames[0].Number); spr != nil {
-				bg.anim.tile.xspacing += int32(spr.Size[0])
-				bg.anim.tile.yspacing += int32(spr.Size[1])
+			group := bg.anim.frames[0].Group
+			number := bg.anim.frames[0].Number
+			if group >= 0 && number >= 0 {
+				if spr := sff.GetSprite(uint16(group), uint16(number)); spr != nil {
+					bg.anim.tile.xspacing += int32(spr.Size[0])
+					bg.anim.tile.yspacing += int32(spr.Size[1])
+				}
 			}
 		} else {
 			if bg.anim.tile.xspacing == 0 {

src/system.go

@@ -3608,7 +3608,10 @@ func (s *Select) addChar(defLine string) {
 				if animation := at.get(v_anim); animation != nil {
 					sc.anims.addAnim(animation, v_anim)
 					for _, fr := range animation.frames {
-						listSpr[[2]uint16{fr.Group, fr.Number}] = true
+						if fr.Group < 0 || fr.Number < 0 {
+							continue
+						}
+						listSpr[[2]uint16{uint16(fr.Group), uint16(fr.Number)}] = true
 					}
 				}
 			}
@@ -3861,7 +3864,9 @@ func (s *Select) AddStage(def string) error {
 			if anim := at.get(v); anim != nil {
 				ss.anims.addAnim(anim, v)
 				for _, fr := range anim.frames {
-					listSpr[[...]uint16{fr.Group, fr.Number}] = true
+					if fr.Group >= 0 && fr.Number >= 0 {
+						listSpr[[2]uint16{uint16(fr.Group), uint16(fr.Number)}] = true
+					}
 				}
 			}
 		}