Merge pull request #140 from xushiwei/gop

reload bugfix: sprite.dying state

game.go

@@ -423,6 +423,7 @@ func (p *Game) loadSprite(sprite Spriter, name string, gamer reflect.Value) erro
 	//
 	// init sprite (field 0)
 	vSpr := reflect.ValueOf(sprite).Elem()
+	vSpr.Set(reflect.Zero(vSpr.Type()))
 	base := vSpr.Field(0).Addr().Interface().(*Sprite)
 	base.init(baseDir, p, name, &conf, gamer, p.getSharedImgs())
 	p.shapes[name] = sprite

sprite.go

@@ -384,7 +384,7 @@ func (p *Sprite) OnTurning__1(onTurning func()) {
 	})
 }
 
-func (p *Sprite) Die() { // prototype sprite can't be destoryed, but can die
+func (p *Sprite) Die() { // prototype sprite can't be destroyed, but can die
 	const aniName = "die"
 	p.SetDying()
 	if ani, ok := p.animations[aniName]; ok {

test/Reloadable/Monkey.spx

@@ -1,38 +1,35 @@
+func turnOrStep(where int) {
+	if int(heading) != where {
+		turnTo where
+	} else {
+		step 10
+	}
+}
+
 onStart => {
 	for {
 		wait 0.5
 		println "Hello spx"
 	}
 }
 
+onClick => {
+	say "You killed me!", 1
+	die
+}
+
 onKey KeyUp, => {
-	turnTo Up
+	turnOrStep Up
 }
 
 onKey KeyRight, => {
-	turnTo Right
+	turnOrStep Right
 }
 
 onKey KeyDown, => {
-	turnTo Down
+	turnOrStep Down
 }
 
 onKey KeyLeft, => {
-	turnTo Left
-}
-
-onKey KeyA, => {
-	turn Left
-}
-
-onKey KeyD, => {
-	turn Right
-}
-
-onKey KeyW, => {
-	turn -90
-}
-
-onKey KeyX, => {
-	turn 90
+	turnOrStep Left
 }

test/Reloadable/Monkey2.spx

@@ -3,3 +3,11 @@ onStart => {
 		turnTo Mouse
 	}
 }
+
+onStart => {
+	for {
+		if touching("Monkey") {
+			say "You touch me!", 1
+		}
+	}
+}

test/Reloadable/res/ch-2.json

@@ -7,6 +7,12 @@
   ],
   "costumeIndex": 0,
   "zorder": [
+    {
+      "type": "sprite",
+      "target": "Monkey",
+      "x": 0,
+      "y": 50
+    },
     {
       "type": "sprite",
       "target": "Monkey2",