Merge pull request #329 from qlli/main

fix: Unify Die behavior of initial / cloned sprite #314

sprite.go

@@ -485,30 +485,22 @@ func (p *Sprite) OnTurning__1(onTurning func()) {
 	})
 }
 
-func (p *Sprite) Die() { // prototype sprite can't be destroyed, but can die
+func (p *Sprite) Die() {
 	aniName := p.getStateAnimName(StateDie)
 	p.SetDying()
 	if ani, ok := p.animations[aniName]; ok {
 		p.goAnimate(aniName, ani)
 	}
-	if p.isCloned_ {
-		p.doDestroy()
-	} else {
-		p.Hide()
-	}
-}
 
-func (p *Sprite) Destroy() { // delete this clone
-	if p.isCloned_ {
-		p.doDestroy()
-	}
+	p.Destroy()
 }
 
-func (p *Sprite) doDestroy() {
+func (p *Sprite) Destroy() { // destroy sprite, whether prototype or cloned
 	if debugInstr {
 		log.Println("Destroy", p.name)
 	}
-	p.doStopSay()
+
+	p.Hide()
 	p.doDeleteClone()
 	p.g.removeShape(p)
 	p.Stop(ThisSprite)
@@ -517,6 +509,16 @@ func (p *Sprite) doDestroy() {
 	}
 }
 
+// delete only cloned sprite, no effect on prototype sprite.
+// Add this interface, to match Scratch.
+func (p *Sprite) DeleteThisClone() {
+	if !p.isCloned_ {
+		return
+	}
+
+	p.Destroy()
+}
+
 func (p *Sprite) Hide() {
 	if debugInstr {
 		log.Println("Hide", p.name)