clean up dynamite box and fix (#1265)

planet/Objects.ocd/Items.ocd/Tools.ocd/DynamiteBox.ocd/Fuse.ocd/DefCore.txt

@@ -3,5 +3,4 @@ id=Fuse
 Version=6,0
 Category=C4D_StaticBack
 Vertices=2
-Picture=0,0,64,64
 Line=1

planet/Objects.ocd/Items.ocd/Tools.ocd/DynamiteBox.ocd/Fuse.ocd/Script.c

@@ -76,8 +76,10 @@ func FxIntFusingTimer()
 		speed -= Distance(fuse_x, fuse_y, target_x, target_y);
 		if( (fuse_vertex == 0 && fuse_dir == -1) || (fuse_vertex == GetVertexNum()-1 && fuse_dir == +1))
 		{
-			fuse_call->~OnFuseFinished(this);
-			if (fuse_call) RemoveObject();
+			if (fuse_call)
+				fuse_call->~OnFuseFinished(this);
+			if (fuse_call) 
+				RemoveObject();
 			return -1;
 		}
 		fuse_x = GetVertex(fuse_vertex, 0)*10;

planet/Objects.ocd/Items.ocd/Tools.ocd/DynamiteBox.ocd/Igniter.ocd/DefCore.txt

@@ -10,6 +10,6 @@ VertexY=1,5
 VertexFriction=120,120,120
 Value=15
 Mass=15
-Picture=4,0,21,21
+Picture=0,0,64,64
 Rotate=1
 Float=1

planet/Objects.ocd/Items.ocd/Tools.ocd/DynamiteBox.ocd/Script.c

@@ -63,7 +63,7 @@ public func ControlUse(object clonk, int x, int y)
 	{
 		var pos = clonk->GetItemPos(this);
 		ChangeDef(Igniter);
-		SetGraphics("0", Fuse, 1, GFXOV_MODE_Picture);
+		SetGraphics("Picture", Igniter, 1, GFXOV_MODE_Picture);
 		clonk->UpdateAttach();
 		clonk->OnSlotFull(pos);
 	}
@@ -80,7 +80,7 @@ private func UpdatePicture()
 	SetGraphics(Format("%d", iCount), Icon_Number, 12, GFXOV_MODE_Picture);
 	SetObjDrawTransform(s, 0, xoffs, 0, s, yoffs, 12);
 
-	SetGraphics(Format("%d", iCount), Fuse, 1, GFXOV_MODE_Picture);
+	SetGraphics(Format("%d", 6 - iCount), DynamiteBox, 1, GFXOV_MODE_Picture);
 }
 
 local fWarning;

planet/Tutorial.ocf/Tutorial02.ocs/Script.c

@@ -29,7 +29,7 @@ protected func Initialize()
 	CreateObjectAbove(Fuse, 255, 675, NO_OWNER)->Connect(dyn4, dyn5);
 	var igniter = CreateObjectAbove(Igniter, 110, 710, NO_OWNER);
 	CreateObjectAbove(Fuse, 240, 685, NO_OWNER)->Connect(dyn5, igniter);
-	igniter->SetGraphics("0", Fuse, 1, GFXOV_MODE_Picture);
+	igniter->SetGraphics("Picture", Igniter, 1, GFXOV_MODE_Picture);
 	
 	// Miner's hut and chest with catapult stuff.
 	//var hut = CreateObjectAbove(WoodenCabin, 570, 740, NO_OWNER);