From 576ac0570d22e068a4e21472d54ab42165daf95d Mon Sep 17 00:00:00 2001
From: Nick Thomas <me@ur.gs>
Date: Fri, 20 Mar 2020 00:02:27 +0000
Subject: [PATCH] Better logging

---
 internal/assetstore/map.go    | 7 +++++--
 internal/assetstore/object.go | 5 +++++
 internal/assetstore/set.go    | 2 ++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/internal/assetstore/map.go b/internal/assetstore/map.go
index 10d954c..0df3023 100644
--- a/internal/assetstore/map.go
+++ b/internal/assetstore/map.go
@@ -1,8 +1,10 @@
 package assetstore
 
 import (
-	"github.com/hajimehoshi/ebiten"
 	"image"
+	"log"
+
+	"github.com/hajimehoshi/ebiten"
 
 	"code.ur.gs/lupine/ordoor/internal/maps"
 )
@@ -22,6 +24,7 @@ func (a *AssetStore) Map(name string) (*Map, error) {
 	if m, ok := a.maps[name]; ok {
 		return m, nil
 	}
+	log.Printf("Loading map %v", name)
 
 	mapFile, err := a.lookup(name, "map", "Maps", "MultiMaps")
 	if err != nil {
@@ -67,7 +70,7 @@ func (m *Map) ImagesForCell(x, y, z int) ([]*ebiten.Image, error) {
 	cell := m.raw.At(x, y, z)
 	images := make([]*ebiten.Image, 0, 4)
 
-	for _, ref := range []maps.ObjRef{cell.Surface, cell.Center, cell.Left, cell.Right} {
+	for _, ref := range []maps.ObjRef{cell.Surface, cell.Right, cell.Left, cell.Center} {
 		if !ref.IsActive() {
 			continue
 		}
diff --git a/internal/assetstore/object.go b/internal/assetstore/object.go
index e6d20c8..b894805 100644
--- a/internal/assetstore/object.go
+++ b/internal/assetstore/object.go
@@ -1,6 +1,8 @@
 package assetstore
 
 import (
+	"log"
+
 	"github.com/hajimehoshi/ebiten"
 
 	"code.ur.gs/lupine/ordoor/internal/data"
@@ -19,6 +21,7 @@ func (a *AssetStore) Object(name string) (*Object, error) {
 	if obj, ok := a.objs[name]; ok {
 		return obj, nil
 	}
+	log.Printf("Loading object %v", name)
 
 	filename, err := a.lookup(name, "obj", "Obj")
 	if err != nil {
@@ -29,6 +32,7 @@ func (a *AssetStore) Object(name string) (*Object, error) {
 	if err != nil {
 		return nil, err
 	}
+	raw.Name = name
 
 	obj := &Object{
 		assets: a,
@@ -45,6 +49,7 @@ func (o *Object) Image(idx int) (*ebiten.Image, error) {
 	if img := o.images[idx]; img != nil {
 		return img, nil
 	}
+	log.Printf("Loading sprite %v %v", o.raw.Name, idx)
 
 	if o.raw.Sprites[idx] == nil {
 		if err := o.raw.LoadSprite(idx); err != nil {
diff --git a/internal/assetstore/set.go b/internal/assetstore/set.go
index 5fd0090..d8df7fc 100644
--- a/internal/assetstore/set.go
+++ b/internal/assetstore/set.go
@@ -2,6 +2,7 @@ package assetstore
 
 import (
 	"errors"
+	"log"
 
 	"code.ur.gs/lupine/ordoor/internal/sets"
 )
@@ -29,6 +30,7 @@ func (a *AssetStore) Set(name string) (*Set, error) {
 	if set, ok := a.sets[name]; ok {
 		return set, nil
 	}
+	log.Printf("Loading set %v", name)
 
 	filename, err := a.lookup(name, "set", "Sets")
 	if err != nil {