From 642c76daeab0e340c11c56a7c78ccfa421acaca3 Mon Sep 17 00:00:00 2001 From: tkarrass Date: Mon, 8 Feb 2016 23:30:20 +0100 Subject: [PATCH] Fix layer 0 bug --- data/level.go | 6 ++++-- levels/locoworld/Manifest.json | 8 ++++++++ levels/locoworld/overlay/1.frame | 4 ++++ 3 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 levels/locoworld/overlay/1.frame diff --git a/data/level.go b/data/level.go index 5b8866f..b556da8 100644 --- a/data/level.go +++ b/data/level.go @@ -69,7 +69,7 @@ func (lvl *Level) Height() int { for _, l := range lvl.Layers { for _, f := range l.Frames { if (len(f) + l.V) > max { - max = len(f) + max = len(f) + l.V } } } @@ -164,7 +164,9 @@ func (lvl *Level) GetFrame(o, w, maxW, frameNo int) (ret *Frame) { lW := layer.Width() if !layer.Repeat { lW += maxW - off += maxW + if layer.D != 0 { + off += maxW + } } for off < 0 { diff --git a/levels/locoworld/Manifest.json b/levels/locoworld/Manifest.json index 195982d..d28917c 100644 --- a/levels/locoworld/Manifest.json +++ b/levels/locoworld/Manifest.json @@ -31,6 +31,14 @@ "Speed": 2, "Repeat": true, "Transparent": " " + }, + "overlay": { + "Z-Index": 10, + "Direction": 0, + "Speed": 0, + "Repeat": false, + "V-Offset": 25, + "Transparent" : " " } } } diff --git a/levels/locoworld/overlay/1.frame b/levels/locoworld/overlay/1.frame new file mode 100644 index 0000000..432e65b --- /dev/null +++ b/levels/locoworld/overlay/1.frame @@ -0,0 +1,4 @@ + .___________________. + | | + | gosl demo lvl | + |_________________|