Fix a SIGSEGV

Fix some log.Fatal calls
Update dependencies
2024-10-23 23:54:48 +01:00 · 2024-10-23 23:47:55 +01:00 · 2024-10-23 23:45:26 +01:00 · 2024-10-23 23:44:44 +01:00 · 2023-07-16 23:11:01 +01:00 · 2023-07-16 22:51:16 +01:00
30 changed files with 240 additions and 229 deletions
--- a/README.md
+++ b/README.md
@@ -184,3 +184,10 @@ $ ./scripts/convert-wav ./orig/Wav

 As with video playback, the ambition is to *eventually* remove this dependency
 and operate on the unmodified files instead.
+
+## Resources
+
+Here's a collection of links that I'm finding useful or otherwise interesting,
+and don't want to lose track of...
+
+* [Historical geocities modders](http://www.oocities.org/timessquare/galaxy/6777/)
--- a/cmd/loader/main.go
+++ b/cmd/loader/main.go
@@ -221,5 +221,8 @@ func loadIdx(idxPath string) {

 	for i, group := range idx.Groups {
 		log.Printf("Group %2d: %4d records, start sprite is %6d", i, len(group.Records), group.Spec.SpriteIdx)
+		for i, rec := range group.Records {
+			log.Printf("\t%3d: %#+v", i, rec)
+		}
 	}
 }
--- a/cmd/view-ani/main.go
+++ b/cmd/view-ani/main.go
@@ -7,7 +7,7 @@ import (
 	"math"
 	"os"

-	"github.com/hajimehoshi/ebiten"
+	"github.com/hajimehoshi/ebiten/v2"
 	"golang.org/x/image/colornames"

 	"code.ur.gs/lupine/ordoor/internal/assetstore"
@@ -100,7 +100,7 @@ func main() {
 func (e *env) Update(screenX, screenY int) error {
 	if e.step == 0 || e.lastState != e.state {

-		ani, err := e.assets.Animation(e.state.groupIdx, e.state.recIdx)
+		ani, err := e.assets.Animation(e.state.groupIdx, e.state.recIdx, 0) // FIXME: why 0?
 		if err != nil {
 			return err
 		}
@@ -131,7 +131,7 @@ func (e *env) Draw(screen *ebiten.Image) error {
 	if len(e.ani.Frames) > 0 {
 		sprite := e.ani.Frames[e.step/4%len(e.ani.Frames)]

-		return screen.DrawImage(sprite.Image, &ebiten.DrawImageOptions{GeoM: cam})
+		screen.DrawImage(sprite.Image, &ebiten.DrawImageOptions{GeoM: cam})
 	}

 	return nil
--- a/cmd/view-font/main.go
+++ b/cmd/view-font/main.go
@@ -7,7 +7,7 @@ import (
 	"math"
 	"os"

-	"github.com/hajimehoshi/ebiten"
+	"github.com/hajimehoshi/ebiten/v2"

 	"code.ur.gs/lupine/ordoor/internal/assetstore"
 	"code.ur.gs/lupine/ordoor/internal/config"
@@ -69,7 +69,7 @@ func main() {

 	win, err := ui.NewWindow(env, "View Font: "+*fontName, *winX, *winY)
 	if err != nil {
-		log.Fatal("Couldn't create window: %v", err)
+		log.Fatalf("Couldn't create window: %v", err)
 	}

 	win.OnMouseWheel(env.changeZoom)
@@ -103,9 +103,7 @@ func (e *env) Draw(screen *ebiten.Image) error {
 		op.GeoM.Translate(float64(xOff), 0)
 		op.GeoM.Scale(e.state.zoom, e.state.zoom) // apply current zoom factor

-		if err := screen.DrawImage(glyph.Image, op); err != nil {
-			return err
-		}
+		screen.DrawImage(glyph.Image, op)

 		xOff += glyph.Rect.Dx()
 	}
--- a/cmd/view-map/main.go
+++ b/cmd/view-map/main.go
@@ -6,7 +6,7 @@ import (
 	"math"
 	"os"

-	"github.com/hajimehoshi/ebiten"
+	"github.com/hajimehoshi/ebiten/v2"

 	"code.ur.gs/lupine/ordoor/internal/assetstore"
 	"code.ur.gs/lupine/ordoor/internal/config"
@@ -70,7 +70,7 @@ func main() {

 	win, err := ui.NewWindow(realEnv, "View Map "+*gameMap, *winX, *winY)
 	if err != nil {
-		log.Fatal("Couldn't create window: %v", err)
+		log.Fatalf("Couldn't create window: %v", err)
 	}

 	for i := 0; i <= 6; i++ {
--- a/cmd/view-menu/main.go
+++ b/cmd/view-menu/main.go
@@ -5,7 +5,7 @@ import (
 	"log"
 	"os"

-	"github.com/hajimehoshi/ebiten"
+	"github.com/hajimehoshi/ebiten/v2"

 	"code.ur.gs/lupine/ordoor/internal/assetstore"
 	"code.ur.gs/lupine/ordoor/internal/config"
@@ -58,7 +58,7 @@ func main() {

 	win, err := ui.NewWindow(driver, "View Menu: "+*menuName, *winX, *winY)
 	if err != nil {
-		log.Fatal("Couldn't create window: %v", err)
+		log.Fatalf("Couldn't create window: %v", err)
 	}

 	// Change the active dialogue
--- a/cmd/view-minimap/main.go
+++ b/cmd/view-minimap/main.go
@@ -10,7 +10,7 @@ import (
 	"path/filepath"
 	"time"

-	"github.com/hajimehoshi/ebiten"
+	"github.com/hajimehoshi/ebiten/v2"

 	"code.ur.gs/lupine/ordoor/internal/maps"
 	"code.ur.gs/lupine/ordoor/internal/sets"
@@ -76,7 +76,7 @@ func main() {

 	win, err := ui.NewWindow(env, "View Map "+*mapFile, *winX, *winY)
 	if err != nil {
-		log.Fatal("Couldn't create window: %v", err)
+		log.Fatalf("Couldn't create window: %v", err)
 	}

 	win.OnKeyUp(ebiten.KeyEnter, env.toggleAutoUpdate)
@@ -173,11 +173,7 @@ func (e *env) Update(screenX, screenY int) error {
 func (e *env) Draw(screen *ebiten.Image) error {
 	gameMap := e.gameMap
 	rect := gameMap.Rect()
-	imd, err := ebiten.NewImage(rect.Dx(), rect.Dy(), ebiten.FilterDefault)
-
-	if err != nil {
-		return err
-	}
+	imd := ebiten.NewImage(rect.Dx(), rect.Dy())

 	for y := int(rect.Min.Y); y < int(rect.Max.Y); y++ {
 		for x := int(rect.Min.X); x < int(rect.Max.X); x++ {
@@ -193,7 +189,9 @@ func (e *env) Draw(screen *ebiten.Image) error {
 	cam.Scale(e.state.zoom, e.state.zoom)                               // apply current zoom factor
 	cam.Rotate(0.785)                                                   // Apply isometric angle

-	return screen.DrawImage(imd, &ebiten.DrawImageOptions{GeoM: cam})
+	screen.DrawImage(imd, &ebiten.DrawImageOptions{GeoM: cam})
+
+	return nil
 }

 // Converts pixel coordinates to cell coordinates
--- a/cmd/view-obj/main.go
+++ b/cmd/view-obj/main.go
@@ -7,7 +7,7 @@ import (
 	"math"
 	"os"

-	"github.com/hajimehoshi/ebiten"
+	"github.com/hajimehoshi/ebiten/v2"

 	"code.ur.gs/lupine/ordoor/internal/assetstore"
 	"code.ur.gs/lupine/ordoor/internal/config"
@@ -136,7 +136,9 @@ func (e *env) Draw(screen *ebiten.Image) error {
 	cam.Translate(float64(e.state.origin.X), float64(e.state.origin.Y)) // Move to origin
 	cam.Scale(e.state.zoom, e.state.zoom)                               // apply current zoom factor

-	return screen.DrawImage(sprite.Image, &ebiten.DrawImageOptions{GeoM: cam})
+	screen.DrawImage(sprite.Image, &ebiten.DrawImageOptions{GeoM: cam})
+
+	return nil
 }

 func (e *env) changeSprite(by int) func() {
--- a/cmd/view-set/main.go
+++ b/cmd/view-set/main.go
@@ -7,7 +7,7 @@ import (
 	"math"
 	"os"

-	"github.com/hajimehoshi/ebiten"
+	"github.com/hajimehoshi/ebiten/v2"

 	"code.ur.gs/lupine/ordoor/internal/assetstore"
 	"code.ur.gs/lupine/ordoor/internal/config"
@@ -71,7 +71,7 @@ func main() {

 	win, err := ui.NewWindow(env, "View Set: "+*setName, *winX, *winY)
 	if err != nil {
-		log.Fatal("Couldn't create window: %v", err)
+		log.Fatalf("Couldn't create window: %v", err)
 	}

 	win.OnKeyUp(ebiten.KeyLeft, env.changeObjIdx(-1))
@@ -123,7 +123,9 @@ func (e *env) Draw(screen *ebiten.Image) error {

 	// TODO: centre the image

-	return screen.DrawImage(sprite.Image, &ebiten.DrawImageOptions{GeoM: cam})
+	screen.DrawImage(sprite.Image, &ebiten.DrawImageOptions{GeoM: cam})
+
+	return nil
 }

 func (e *env) changeObjIdx(by int) func() {
--- a/doc/formats/maps.md
+++ b/doc/formats/maps.md
@@ -610,11 +610,6 @@ ignoring it for now.
 thingies, and it, padding? Minus a bit? 0x50 is another non-null byte. Then
 it's all zeroes until one byte before the first name at 0xee.

-It's hard to say where the alignment should be at this point. We need to compare
-more characters with each other. Other notes...
-
-Characters are organised into Squads somehow.
-
 Individual cells seem to have a flag to say "We have a character in us", but not
 the number for the character themselves, so the coordinates must be in the
 per-character records also. There are several candidates for this.
@@ -645,8 +640,10 @@ suggested above:
 | 267    | 1    | Unknown |
 | 268    | 1    | Health  |
 | 269    | 495  | ??? |
-| 764    | 1(?) | Squad number? |
-| 765    | 927  | ??? |
+| 764    | 1(?) | Squad number |
+| 765    | 895  | ??? |
+| 1660   | 1?   | Orientation? Could also be `0x680`... |
+| 1661   | 31   | ??? |

 There's still a lot of bytes to dig through, but this allows me to load the
 character names from Chapter01 correctly, with the exception of record 57 which
@@ -654,10 +651,13 @@ just contains `\x02` and is then null-terminated all the way through - but maybe
 that's just a data thing.

 How about their types? `HasAction.dat` lists numbers for character types, and
-those show up immediately before the name. going from the character type to the
-animation group is not yet fully deciphered - captains mess up a direct
+those show up immediately before the name. Going from the character type to the
+animation group is not yet fully deciphered - squad leaders mess up a direct
 correlation - but a fixed offset table allows me to draw the characters \o/.
-Orientation is not yet deciphered, however.
+
+Putting 8 characters onto a map and orienting them in the compass points, we see
+numbers ranging from 0 to 7 at 0x67c and 0x680. Assuming this is the scheme
+used, north is value 1, northeast value 2, and northwest value 0.

 Given two characters of the same type, just in different locations, differing
 values are seen at:
--- a/go.mod
+++ b/go.mod
@@ -1,22 +1,33 @@
 module code.ur.gs/lupine/ordoor

-go 1.14
+go 1.22.0
+
+toolchain go1.23.2

 require (
-	github.com/BurntSushi/toml v0.3.1
+	github.com/BurntSushi/toml v1.4.0
 	github.com/emef/bitfield v0.0.0-20170503144143-7d3f8f823065
-	github.com/hajimehoshi/ebiten v1.11.1
-	github.com/jfreymuth/oggvorbis v1.0.1 // indirect
+	github.com/hajimehoshi/ebiten/v2 v2.8.2
 	github.com/kr/text v0.2.0 // indirect
-	github.com/lunixbochs/struc v0.0.0-20200521075829-a4cb8d33dbbe
+	github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40
 	github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
-	github.com/pkg/errors v0.9.1 // indirect
-	github.com/samuel/go-pcx v0.0.0-20180426214139-d9c017170db4
-	github.com/stretchr/testify v1.5.1
-	golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5 // indirect
-	golang.org/x/image v0.0.0-20200119044424-58c23975cae1
-	golang.org/x/mobile v0.0.0-20200329125638-4c31acba0007 // indirect
-	golang.org/x/sys v0.0.0-20200413165638-669c56c373c4 // indirect
-	gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
-	gopkg.in/restruct.v1 v1.0.0-20190323193435-3c2afb705f3c
+	github.com/samuel/go-pcx v0.0.0-20210515040514-6a5ce4d132f7
+	github.com/stretchr/testify v1.9.0
+	golang.org/x/image v0.21.0
+	golang.org/x/sys v0.26.0 // indirect
+	gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b // indirect
+)
+
+require (
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/ebitengine/gomobile v0.0.0-20241016134836-cc2e38a7c0ee // indirect
+	github.com/ebitengine/hideconsole v1.0.0 // indirect
+	github.com/ebitengine/oto/v3 v3.3.1 // indirect
+	github.com/ebitengine/purego v0.8.1 // indirect
+	github.com/jezek/xgb v1.1.1 // indirect
+	github.com/jfreymuth/oggvorbis v1.0.5 // indirect
+	github.com/jfreymuth/vorbis v1.0.2 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	golang.org/x/sync v0.8.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
--- a/go.sum
+++ b/go.sum
@@ -1,117 +1,48 @@
-dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
-github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
-github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
+github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0=
+github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/ebitengine/gomobile v0.0.0-20241016134836-cc2e38a7c0ee h1:YoNt0DHeZ92kjR78SfyUn1yEf7KnBypOFlFZO14cJ6w=
+github.com/ebitengine/gomobile v0.0.0-20241016134836-cc2e38a7c0ee/go.mod h1:ZDIonJlTRW7gahIn5dEXZtN4cM8Qwtlduob8cOCflmg=
+github.com/ebitengine/hideconsole v1.0.0 h1:5J4U0kXF+pv/DhiXt5/lTz0eO5ogJ1iXb8Yj1yReDqE=
+github.com/ebitengine/hideconsole v1.0.0/go.mod h1:hTTBTvVYWKBuxPr7peweneWdkUwEuHuB3C1R/ielR1A=
+github.com/ebitengine/oto/v3 v3.3.1 h1:d4McwGQuXOT0GL7bA5g9ZnaUEIEjQvG3hafzMy+T3qE=
+github.com/ebitengine/oto/v3 v3.3.1/go.mod h1:MZeb/lwoC4DCOdiTIxYezrURTw7EvK/yF863+tmBI+U=
+github.com/ebitengine/purego v0.8.1 h1:sdRKd6plj7KYW33EH5As6YKfe8m9zbN9JMrOjNVF/BE=
+github.com/ebitengine/purego v0.8.1/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
 github.com/emef/bitfield v0.0.0-20170503144143-7d3f8f823065 h1:7QVNyw2v9R1qOvbe9vfeVJWWKCSnd2Ap+8l8/CtG9LM=
 github.com/emef/bitfield v0.0.0-20170503144143-7d3f8f823065/go.mod h1:uN4GbWHfit2ByfOKQ4K6fuLy1/Os2eLynsIrDvjiDgM=
-github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72 h1:b+9H1GAsx5RsjvDFLoS5zkNBzIQMuVKUYQDmxU3N5XE=
-github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
-github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4 h1:WtGNWLvXpe6ZudgnXrq0barxBImvnnJoMEhXAzcbM0I=
-github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
-github.com/gofrs/flock v0.7.1 h1:DP+LD/t0njgoPBvT5MJLeliUIVQR03hiKR6vezdwHlc=
-github.com/gofrs/flock v0.7.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU=
-github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
-github.com/hajimehoshi/bitmapfont v1.2.0/go.mod h1:h9QrPk6Ktb2neObTlAbma6Ini1xgMjbJ3w7ysmD7IOU=
-github.com/hajimehoshi/ebiten v1.11.0-alpha.2.0.20200101150127-38815ba801a5 h1:hke9UdXY1YPfqjXG1bCSZnoVnfVBw9SzvmlrRn3dL3w=
-github.com/hajimehoshi/ebiten v1.11.0-alpha.2.0.20200101150127-38815ba801a5/go.mod h1:0SLvfr8iI2NxzpNB/olBM+dLN9Ur5a9szG13wOgQ0nQ=
-github.com/hajimehoshi/ebiten v1.11.0 h1:+pIxfzfVgRbHGM7wBAJtgzPiWiZopA7lyIKNQqc9amk=
-github.com/hajimehoshi/ebiten v1.11.0/go.mod h1:aDEhx0K9gSpXw3Cxf2hCXDxPSoF8vgjNqKxrZa/B4Dg=
-github.com/hajimehoshi/ebiten v1.11.1 h1:7gy2bHBDNtfTh3GlcUAilk3lNWW9fTLaP7iZAodS9F8=
-github.com/hajimehoshi/ebiten v1.11.1/go.mod h1:aDEhx0K9gSpXw3Cxf2hCXDxPSoF8vgjNqKxrZa/B4Dg=
-github.com/hajimehoshi/go-mp3 v0.2.1 h1:DH4ns3cPv39n3cs8MPcAlWqPeAwLCK8iNgqvg0QBWI8=
-github.com/hajimehoshi/go-mp3 v0.2.1/go.mod h1:Rr+2P46iH6PwTPVgSsEwBkon0CK5DxCAeX/Rp65DCTE=
-github.com/hajimehoshi/oto v0.3.4/go.mod h1:PgjqsBJff0efqL2nlMJidJgVJywLn6M4y8PI4TfeWfA=
-github.com/hajimehoshi/oto v0.5.4 h1:Dn+WcYeF310xqStKm0tnvoruYUV5Sce8+sfUaIvWGkE=
-github.com/hajimehoshi/oto v0.5.4/go.mod h1:0QXGEkbuJRohbJaxr7ZQSxnju7hEhseiPx2hrh6raOI=
-github.com/jakecoffman/cp v0.1.0/go.mod h1:a3xPx9N8RyFAACD644t2dj/nK4SuLg1v+jL61m2yVo4=
-github.com/jfreymuth/oggvorbis v1.0.0 h1:aOpiihGrFLXpsh2osOlEvTcg5/aluzGQeC7m3uYWOZ0=
-github.com/jfreymuth/oggvorbis v1.0.0/go.mod h1:abe6F9QRjuU9l+2jek3gj46lu40N4qlYxh2grqkLEDM=
-github.com/jfreymuth/oggvorbis v1.0.1 h1:NT0eXBgE2WHzu6RT/6zcb2H10Kxj6Fm3PccT0LE6bqw=
-github.com/jfreymuth/oggvorbis v1.0.1/go.mod h1:NqS+K+UXKje0FUYUPosyQ+XTVvjmVjps1aEZH1sumIk=
-github.com/jfreymuth/vorbis v1.0.0 h1:SmDf783s82lIjGZi8EGUUaS7YxPHgRj4ZXW/h7rUi7U=
-github.com/jfreymuth/vorbis v1.0.0/go.mod h1:8zy3lUAm9K/rJJk223RKy6vjCZTWC61NA2QD06bfOE0=
-github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/hajimehoshi/ebiten/v2 v2.8.2 h1:cvZ5d3LSVFzvcSZVGjTPyV43DzWzJWbwy1b+2V5zJPI=
+github.com/hajimehoshi/ebiten/v2 v2.8.2/go.mod h1:SXx/whkvpfsavGo6lvZykprerakl+8Uo1X8d2U5aAnA=
+github.com/jezek/xgb v1.1.1 h1:bE/r8ZZtSv7l9gk6nU0mYx51aXrvnyb44892TwSaqS4=
+github.com/jezek/xgb v1.1.1/go.mod h1:nrhwO0FX/enq75I7Y7G8iN1ubpSGZEiA3v9e9GyRFlk=
+github.com/jfreymuth/oggvorbis v1.0.5 h1:u+Ck+R0eLSRhgq8WTmffYnrVtSztJcYrl588DM4e3kQ=
+github.com/jfreymuth/oggvorbis v1.0.5/go.mod h1:1U4pqWmghcoVsCJJ4fRBKv9peUJMBHixthRlBeD6uII=
+github.com/jfreymuth/vorbis v1.0.2 h1:m1xH6+ZI4thH927pgKD8JOH4eaGRm18rEE9/0WKjvNE=
+github.com/jfreymuth/vorbis v1.0.2/go.mod h1:DoftRo4AznKnShRl1GxiTFCseHr4zR9BN3TWXyuzrqQ=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/lunixbochs/struc v0.0.0-20200521075829-a4cb8d33dbbe h1:ewr1srjRCmcQogPQ/NCx6XCk6LGVmsVCc9Y3vvPZj+Y=
-github.com/lunixbochs/struc v0.0.0-20200521075829-a4cb8d33dbbe/go.mod h1:vy1vK6wD6j7xX6O6hXe621WabdtNkou2h7uRtTfRMyg=
+github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40 h1:EnfXoSqDfSNJv0VBNqY/88RNnhSGYkrHaO0mmFGbVsc=
+github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40/go.mod h1:vy1vK6wD6j7xX6O6hXe621WabdtNkou2h7uRtTfRMyg=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
-github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/go.mod h1:4OwLy04Bl9Ef3GJJCoec+30X3LQs/0/m4HFRt/2LUSA=
-github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/samuel/go-pcx v0.0.0-20180426214139-d9c017170db4 h1:Y/KOCu+ZLB730PudefxfsKVjtI0m0RhvFk9a0l4O1+c=
-github.com/samuel/go-pcx v0.0.0-20180426214139-d9c017170db4/go.mod h1:qxuIawynlRhuaHowuXvd1xjyFWx87Ro4gkZlKRXtHnQ=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
-github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56 h1:estk1glOnSVeJ9tdEZZc5mAMDZk5lNJNyJ6DvrBkTEU=
-golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56/go.mod h1:JhuoJpWY28nO4Vef9tZUw9qufEGTyX1+7lmHxV5q5G4=
-golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5 h1:FR+oGxGfbQu1d+jglI3rCkjAjUnhRSZcUxr+DqlDLNo=
-golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw=
-golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
-golang.org/x/image v0.0.0-20190703141733-d6a02ce849c9/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8 h1:hVwzHzIUGRjiF7EcUjqNxk3NCfkPxbDKRdnNE1Rpg0U=
-golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/image v0.0.0-20200119044424-58c23975cae1 h1:5h3ngYt7+vXCDZCup/HkCQgW5XwmSvR/nA2JmJ0RErg=
-golang.org/x/image v0.0.0-20200119044424-58c23975cae1/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
-golang.org/x/mobile v0.0.0-20190415191353-3e0bab5405d6/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
-golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
-golang.org/x/mobile v0.0.0-20191025110607-73ccc5ba0426 h1:8RjY2wWN6kjy6JvJjDPT51tx4ht4+ldy/a5Yw0AyEr4=
-golang.org/x/mobile v0.0.0-20191025110607-73ccc5ba0426/go.mod h1:p895TfNkDgPEmEQrNiOtIl3j98d/tGU95djDj7NfyjQ=
-golang.org/x/mobile v0.0.0-20200222142934-3c8601c510d0/go.mod h1:skQtrUTUwhdJvXM/2KKJzY8pDgNr9I/FOMqDVRPBUS4=
-golang.org/x/mobile v0.0.0-20200329125638-4c31acba0007 h1:JxsyO7zPDWn1rBZW8FV5RFwCKqYeXnyaS/VQPLpXu6I=
-golang.org/x/mobile v0.0.0-20200329125638-4c31acba0007/go.mod h1:skQtrUTUwhdJvXM/2KKJzY8pDgNr9I/FOMqDVRPBUS4=
-golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
-golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
-golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
-golang.org/x/mod v0.1.1-0.20191209134235-331c550502dd/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190429190828-d89cdac9e872/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191026070338-33540a1f6037 h1:YyJpGZS1sBuBCzLAR1VEpK193GlqGZbnPFnPV/5Rsb4=
-golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200331124033-c3d80250170d h1:nc5K6ox/4lTFbMVSL9WRR81ixkcwXThoiF6yf+R9scA=
-golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200413165638-669c56c373c4 h1:opSr2sbRXk5X5/givKrrKj9HXxFpW2sdCiP8MJSKLQY=
-golang.org/x/sys v0.0.0-20200413165638-669c56c373c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190909214602-067311248421/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191026034945-b2104f82a97d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20200117012304-6edc0a871e69/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200117220505-0cba7a3a9ee9/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+github.com/samuel/go-pcx v0.0.0-20210515040514-6a5ce4d132f7 h1:WhAiClm3vGzSl2EWdFsCFBEu2jEhHGa8qGsz4iIEpRc=
+github.com/samuel/go-pcx v0.0.0-20210515040514-6a5ce4d132f7/go.mod h1:8ofl4LzpDayZKQZYbUyCDW41Y6lgVoO02ABp57OASxY=
+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
+github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+golang.org/x/image v0.21.0 h1:c5qV36ajHpdj4Qi0GnE0jUc/yuo33OLFaa0d+crTD5s=
+golang.org/x/image v0.21.0/go.mod h1:vUbsLavqK/W303ZroQQVKQ+Af3Yl6Uz1Ppu5J/cLz78=
+golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
+golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
+golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
-gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/restruct.v1 v1.0.0-20190323193435-3c2afb705f3c h1:7j7Yy/3gedviEts3jKY0bEruQkTFKh+8pDmEFaM6UBc=
-gopkg.in/restruct.v1 v1.0.0-20190323193435-3c2afb705f3c/go.mod h1:WJaLhyHHEQFOgwIxu/SJxvUHJA18glYsMETBTMIySTY=
-gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
-gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b h1:QRR6H1YWRnHb4Y/HeNFCTJLFVxaq6wH4YuVdsUOr75U=
+gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
--- a/internal/assetstore/ani.go
+++ b/internal/assetstore/ani.go
@@ -49,24 +49,37 @@ func (a *AssetStore) AnimationsObject() (*Object, error) {
 	return obj, nil
 }

-func (a *AssetStore) Animation(groupIdx, recIdx int) (*Animation, error) {
-	idx, err := a.AnimationsIndex()
+func (a *AssetStore) Animation(groupIdx int, recId int, compass int) (*Animation, error) {
+	realIdx, err := a.AnimationsIndex()
 	if err != nil {
 		return nil, err
 	}

+	// FIXME: are we using the right value if we need to make this change?
+	if compass == 0 {
+		compass = 8
+	}
+
 	obj, err := a.AnimationsObject()
 	if err != nil {
 		return nil, err
 	}

-	group := idx.Groups[groupIdx]
+	group := realIdx.Groups[groupIdx]
 	if group.Spec.Count == 0 {
 		return &Animation{}, nil
 	}

-	//	rec := group.Records[recIdx]
-	det := group.Details[recIdx]
+	var det *idx.Detail
+	for i, rec := range group.Records {
+		if /*int(rec.ActionID) == int(action) && */ int(rec.Compass) == compass {
+			det = &group.Details[i]
+		}
+	}
+
+	if det == nil {
+		return nil, fmt.Errorf("Couldn't find anim (%v %v %v)", groupIdx, recId, compass)
+	}

 	first := int(group.Spec.SpriteIdx) + int(det.FirstSprite)
 	last := int(group.Spec.SpriteIdx) + int(det.LastSprite)
@@ -80,7 +93,7 @@ func (a *AssetStore) Animation(groupIdx, recIdx int) (*Animation, error) {
 	return &Animation{Frames: sprites}, nil
 }

-func (a *AssetStore) CharacterAnimation(ctype data.CharacterType, action data.AnimAction) (*Animation, error) {
+func (a *AssetStore) CharacterAnimation(ctype data.CharacterType, action data.AnimAction, compass int) (*Animation, error) {
 	ha, err := a.HasAction()
 	if err != nil {
 		return nil, err
@@ -122,7 +135,5 @@ func (a *AssetStore) CharacterAnimation(ctype data.CharacterType, action data.An
 		return nil, fmt.Errorf("Unknown character type: %s", ctype)
 	}

-	rec := ha.Index(ctype, action)
-
-	return a.Animation(group, rec)
+	return a.Animation(group, int(action), compass)
 }
--- a/internal/assetstore/assetstore.go
+++ b/internal/assetstore/assetstore.go
@@ -8,7 +8,7 @@ import (
 	"path/filepath"
 	"strings"

-	"github.com/hajimehoshi/ebiten"
+	"github.com/hajimehoshi/ebiten/v2"

 	"code.ur.gs/lupine/ordoor/internal/config"
 	"code.ur.gs/lupine/ordoor/internal/data"
--- a/internal/assetstore/cursor.go
+++ b/internal/assetstore/cursor.go
@@ -3,7 +3,7 @@ package assetstore
 import (
 	"image"

-	"github.com/hajimehoshi/ebiten"
+	"github.com/hajimehoshi/ebiten/v2"
 )

 // These are just offsets into the Cursors.cur file
--- a/internal/assetstore/image.go
+++ b/internal/assetstore/image.go
@@ -4,7 +4,7 @@ import (
 	"image"
 	"os"

-	"github.com/hajimehoshi/ebiten"
+	"github.com/hajimehoshi/ebiten/v2"
 	_ "github.com/samuel/go-pcx/pcx" // PCX support
 )

@@ -32,10 +32,7 @@ func (a *AssetStore) Image(name string) (*ebiten.Image, error) {
 		return nil, err
 	}

-	img, err := ebiten.NewImageFromImage(rawImg, ebiten.FilterDefault)
-	if err != nil {
-		return nil, err
-	}
+	img := ebiten.NewImageFromImage(rawImg)

 	a.images[name] = img
 	return img, nil
--- a/internal/assetstore/map.go
+++ b/internal/assetstore/map.go
@@ -103,8 +103,8 @@ func (m *Map) SpritesForCell(x, y, z int) ([]*Sprite, error) {
 		sprites = append(sprites, sprite)
 	}
 	if chr := m.CharacterAt(x, y, z); chr != nil {
-		// Look up the correct animation, get the frame, boom
-		anim, err := m.assets.CharacterAnimation(chr.Type, data.AnimActionNone)
+		// Look up the correct animation, get the frame, boom shakalaka
+		anim, err := m.assets.CharacterAnimation(chr.Type, data.AnimActionNone, int(chr.Orientation))
 		if err != nil {
 			return nil, err
 		}
--- a/internal/assetstore/menu.go
+++ b/internal/assetstore/menu.go
@@ -3,7 +3,7 @@ package assetstore
 import (
 	"log"

-	"github.com/hajimehoshi/ebiten"
+	"github.com/hajimehoshi/ebiten/v2"

 	"code.ur.gs/lupine/ordoor/internal/menus"
 )
--- a/internal/assetstore/object.go
+++ b/internal/assetstore/object.go
@@ -7,7 +7,7 @@ import (
 	"path/filepath"
 	"strings"

-	"github.com/hajimehoshi/ebiten"
+	"github.com/hajimehoshi/ebiten/v2"

 	"code.ur.gs/lupine/ordoor/internal/data"
 )
@@ -117,10 +117,7 @@ func (o *Object) Sprite(idx int) (*Sprite, error) {
 	}

 	raw := o.raw.Sprites[idx]
-	img, err := ebiten.NewImageFromImage(raw.ToImage(o.assets.Palette), ebiten.FilterDefault)
-	if err != nil {
-		return nil, err
-	}
+	img := ebiten.NewImageFromImage(raw.ToImage(o.assets.Palette))

 	rect := image.Rect(
 		int(raw.XOffset),
--- a/internal/assetstore/sound.go
+++ b/internal/assetstore/sound.go
@@ -4,8 +4,8 @@ import (
 	"log"
 	"os"

-	"github.com/hajimehoshi/ebiten/audio"
-	"github.com/hajimehoshi/ebiten/audio/vorbis"
+	"github.com/hajimehoshi/ebiten/v2/audio"
+	"github.com/hajimehoshi/ebiten/v2/audio/vorbis"
 )

 type Sound struct {
@@ -57,7 +57,7 @@ func (s *Sound) InfinitePlayer() (*audio.Player, error) {
 		return nil, err
 	}

-	infinite := audio.NewInfiniteLoop(decoder, decoder.Size())
+	infinite := audio.NewInfiniteLoop(decoder, decoder.Length())

 	return audio.NewPlayer(audio.CurrentContext(), infinite)
 }
--- a/internal/data/has_action.go
+++ b/internal/data/has_action.go
@@ -35,7 +35,7 @@ const (
 	AnimActionRun              AnimAction = 14
 	AnimActionCrouch           AnimAction = 15
 	AnimActionStand            AnimAction = 16
-	AnimActionStandingRead     AnimAction = 17
+	AnimActionStandingReady    AnimAction = 17
 	AnimActionStandingUnready  AnimAction = 18
 	AnimActionCrouchingReady   AnimAction = 19
 	AnimActionCrouchingUnready AnimAction = 20
@@ -95,6 +95,45 @@ type HasAction struct {
 }

 var (
+	aActions = map[AnimAction]string{
+		AnimActionNone:             "None",
+		AnimActionAnim:             "Anim",
+		AnimActionWalk:             "Walk",
+		AnimActionExplosion:        "Explosion",
+		AnimActionProjectile:       "Projectile",
+		AnimActionSmoke:            "Smoke",
+		AnimActionStandingShoot:    "Standing Shoot",
+		AnimActionStandingDeath:    "Standing Death",
+		AnimActionPain:             "Pain",
+		AnimActionSpellFx1:         "Spell FX 1",
+		AnimActionSpellFx2:         "Spell FX 2",
+		AnimActionSpellFx3:         "Spell FX 3",
+		AnimActionSpellFx4:         "Spell FX 4",
+		AnimActionSpellFx5:         "Spell FX 5",
+		AnimActionRun:              "Run",
+		AnimActionCrouch:           "Crouch",
+		AnimActionStand:            "Stand",
+		AnimActionStandingReady:    "Standing Ready",
+		AnimActionStandingUnready:  "Standing Unready",
+		AnimActionCrouchingReady:   "Crouching Ready",
+		AnimActionCrouchingUnready: "Crouching Unready",
+		AnimActionCrouchingShoot:   "Crouching Shoot",
+		AnimActionStandingGrenade:  "Standing Grenade",
+		AnimActionCrouchingGrenade: "Crouching Grenade",
+		AnimActionDrawMelee:        "Draw Melee",
+		AnimActionSlash:            "Slash",
+		AnimActionStab:             "Stab",
+		AnimActionBlown:            "Blown",
+		AnimActionCrouchingDeath:   "Crouching Death",
+		AnimActionJump:             "Jump",
+		AnimActionHeal:             "Heal",
+		AnimActionTechWork:         "Tech Work",
+		AnimActionCast:             "Cast",
+		AnimActionShoot:            "Shoot",
+		AnimActionDeath:            "Death",
+		AnimActionFromWarp:         "From Warp",
+	}
+
 	cTypes = map[CharacterType]string{
 		CharacterTypeTactical:        "Tactical",
 		CharacterTypeAssault:         "Assault",
@@ -122,6 +161,14 @@ var (
 	}
 )

+func (a AnimAction) String() string {
+	if str, ok := aActions[a]; ok {
+		return str
+	}
+
+	return "Unknown Action"
+}
+
 func (c CharacterType) String() string {
 	if str, ok := cTypes[c]; ok {
 		return str
--- a/internal/flow/flow.go
+++ b/internal/flow/flow.go
@@ -6,8 +6,8 @@ import (
 	"log"
 	"strings"

-	"github.com/hajimehoshi/ebiten"
-	"github.com/hajimehoshi/ebiten/inpututil"
+	"github.com/hajimehoshi/ebiten/v2"
+	"github.com/hajimehoshi/ebiten/v2/inpututil"

 	"code.ur.gs/lupine/ordoor/internal/assetstore"
 	"code.ur.gs/lupine/ordoor/internal/config"
--- a/internal/maps/maps.go
+++ b/internal/maps/maps.go
@@ -124,7 +124,9 @@ type Character struct {
 	XPos        int    `struc:"byte"`
 	Unknown7    []byte `struc:"[317]byte"`
 	SquadNumber byte   `struc:"byte"`
-	Unknown8    []byte `struc:"[927]byte"`
+	Unknown8    []byte `struc:"[895]byte"`
+	Orientation byte   `struc:"byte"`
+	Unknown9    []byte `struc:"[31]byte"`
 	// TODO: each character may have a fixed number of subrecords for inventory
 }

--- a/internal/ordoor/ordoor.go
+++ b/internal/ordoor/ordoor.go
@@ -7,10 +7,11 @@ package ordoor
 import (
 	"fmt"
 	"log"
+	"sync"
 	"time"

-	"github.com/hajimehoshi/ebiten"
-	"github.com/hajimehoshi/ebiten/audio"
+	"github.com/hajimehoshi/ebiten/v2"
+	"github.com/hajimehoshi/ebiten/v2/audio"

 	"code.ur.gs/lupine/ordoor/internal/assetstore"
 	"code.ur.gs/lupine/ordoor/internal/config"
@@ -28,7 +29,8 @@ type Ordoor struct {
 	win    *ui.Window

 	// Relevant to interface state
-	flow *flow.Flow
+	flow     *flow.Flow
+	flowOnce sync.Once

 	// FIXME: should be put inside flow
 	// If this is set, we display it instead of flow
@@ -61,9 +63,7 @@ func Run(configFile string, overrideX, overrideY int) error {
 		}
 	}

-	if _, err := audio.NewContext(48000); err != nil {
-		return fmt.Errorf("Failed to set up audio context: %v", err)
-	}
+	_ = audio.NewContext(48000)

 	ordoor := &Ordoor{
 		assets: assets,
@@ -180,6 +180,7 @@ func (o *Ordoor) Update(screenX, screenY int) error {
 }

 func (o *Ordoor) Draw(screen *ebiten.Image) error {
+
 	if pic := o.pic; pic != nil {
 		// Scale the picture to the screen and draw it
 		scaleX := float64(screen.Bounds().Dx()) / float64(pic.Bounds().Dx())
@@ -188,10 +189,15 @@ func (o *Ordoor) Draw(screen *ebiten.Image) error {
 		do := &ebiten.DrawImageOptions{}
 		do.GeoM.Scale(scaleX, scaleY)

-		return screen.DrawImage(pic, do)
+		screen.DrawImage(pic, do)
+		return nil
 	}

-	return o.flow.Draw(screen)
+	if o.flow != nil {
+		return o.flow.Draw(screen)
+	}
+
+	return nil // Draw() may be called before Update()
 }

 func (o *Ordoor) Cursor() (*ebiten.Image, *ebiten.DrawImageOptions, error) {
--- a/internal/scenario/draw.go
+++ b/internal/scenario/draw.go
@@ -5,8 +5,8 @@ import (
 	"image"
 	"sort"

-	"github.com/hajimehoshi/ebiten"
-	"github.com/hajimehoshi/ebiten/ebitenutil"
+	"github.com/hajimehoshi/ebiten/v2"
+	"github.com/hajimehoshi/ebiten/v2/ebitenutil"
 )

 type CartPt struct {
@@ -118,9 +118,7 @@ func (s *Scenario) Draw(screen *ebiten.Image) error {
 	op.GeoM.Translate(float64(spr.Rect.Min.X), float64(spr.Rect.Min.Y))
 	op.GeoM.Scale(s.Zoom, s.Zoom)

-	if err := screen.DrawImage(spr.Image, &op); err != nil {
-		return err
-	}
+	screen.DrawImage(spr.Image, &op)

 	x1, y1 := geo.Apply(0, 0)
 	ebitenutil.DebugPrintAt(
@@ -187,9 +185,7 @@ func (s *Scenario) renderCell(x, y, z int, screen *ebiten.Image, counter *int) e
 		// Zoom has to come last
 		op.GeoM.Scale(s.Zoom, s.Zoom)

-		if err := screen.DrawImage(spr.Image, &op); err != nil {
-			return err
-		}
+		screen.DrawImage(spr.Image, &op)
 	}

 	return nil
--- a/internal/ui/animation.go
+++ b/internal/ui/animation.go
@@ -1,7 +1,7 @@
 package ui

 import (
-	"github.com/hajimehoshi/ebiten"
+	"github.com/hajimehoshi/ebiten/v2"
 )

 var (
--- a/internal/ui/driver.go
+++ b/internal/ui/driver.go
@@ -5,8 +5,8 @@ import (
 	"image"
 	"runtime/debug"

-	"github.com/hajimehoshi/ebiten"
-	"github.com/hajimehoshi/ebiten/ebitenutil"
+	"github.com/hajimehoshi/ebiten/v2"
+	"github.com/hajimehoshi/ebiten/v2/ebitenutil"

 	"code.ur.gs/lupine/ordoor/internal/assetstore"
 )
@@ -137,9 +137,7 @@ func (d *Driver) Draw(screen *ebiten.Image) error {
 			do.GeoM = d.orig2native
 			do.GeoM.Translate(x, y)

-			if err := screen.DrawImage(region.image, &do); err != nil {
-				return err
-			}
+			screen.DrawImage(region.image, &do)
 		}
 	}

--- a/internal/ui/interfaces.go
+++ b/internal/ui/interfaces.go
@@ -3,7 +3,7 @@ package ui
 import (
 	"image"

-	"github.com/hajimehoshi/ebiten"
+	"github.com/hajimehoshi/ebiten/v2"
 )

 type region struct {
--- a/internal/ui/noninteractive.go
+++ b/internal/ui/noninteractive.go
@@ -320,14 +320,20 @@ func (l *label) regions(tick int) []region {
 	pt := l.pos()

 	for _, r := range l.str {
-		glyph, err := l.font.Glyph(r)
-		if err != nil {
-			log.Printf("FIXME: ignoring misssing glyph %v", r)
-			continue
+		var sprite *assetstore.Sprite
+		if glyph, err := l.font.Glyph(r); err != nil {
+			if glyph, err := l.font.Glyph('?'); err != nil {
+				log.Printf("FIXME: ignoring glyph %v", r)
+				continue
+			} else {
+				sprite = glyph
+			}
+		} else {
+			sprite = glyph
 		}

-		out = append(out, oneRegion(pt, glyph.Image)...)
-		pt.X += glyph.Rect.Dx()
+		out = append(out, oneRegion(pt, sprite.Image)...)
+		pt.X += sprite.Rect.Dx()
 	}

 	return out
--- a/internal/ui/window.go
+++ b/internal/ui/window.go
@@ -8,9 +8,9 @@ import (
 	"runtime/debug"
 	"runtime/pprof"

-	"github.com/hajimehoshi/ebiten"
-	"github.com/hajimehoshi/ebiten/ebitenutil"
-	"github.com/hajimehoshi/ebiten/inpututil"
+	"github.com/hajimehoshi/ebiten/v2"
+	"github.com/hajimehoshi/ebiten/v2/ebitenutil"
+	"github.com/hajimehoshi/ebiten/v2/inpututil"
 )

 type Game interface {
@@ -53,8 +53,6 @@ type Window struct {
 //
 // ebiten assumes a single window, so only call this once...
 func NewWindow(game Game, title string, xRes int, yRes int) (*Window, error) {
-	ebiten.SetRunnableInBackground(true)
-
 	return &Window{
 		Title:    title,
 		debug:    true,
@@ -109,10 +107,12 @@ func (w *Window) drawCursor(screen *ebiten.Image) error {

 	ebiten.SetCursorMode(ebiten.CursorModeHidden)

-	return screen.DrawImage(cursor, op)
+	screen.DrawImage(cursor, op)
+
+	return nil
 }

-func (w *Window) Update(screen *ebiten.Image) (outErr error) {
+func (w *Window) Update() (outErr error) {
 	// Ebiten does not like it if we panic inside its main loop
 	defer func() {
 		if panicErr := recover(); panicErr != nil {
@@ -124,7 +124,8 @@ func (w *Window) Update(screen *ebiten.Image) (outErr error) {
 		}
 	}()

-	if err := w.game.Update(screen.Size()); err != nil {
+	// FIXME: remove need for update generally
+	if err := w.game.Update(w.xRes, w.yRes); err != nil {
 		return err
 	}

@@ -157,13 +158,11 @@ func (w *Window) Update(screen *ebiten.Image) (outErr error) {
 		}
 	}

-	if ebiten.IsDrawingSkipped() {
-		return nil
-	}
+	return nil
+}

-	if err := w.game.Draw(screen); err != nil {
-		return err
-	}
+func (w *Window) Draw(screen *ebiten.Image) {
+	w.game.Draw(screen)

 	if w.debug {
 		// Draw FPS, etc, to the screen
@@ -172,7 +171,7 @@ func (w *Window) Update(screen *ebiten.Image) (outErr error) {
 	}

 	// Draw the cursor last
-	return w.drawCursor(screen)
+	w.drawCursor(screen)
 }

 // TODO: a stop or other cancellation mechanism
Author	SHA1	Message	Date
Nick Thomas	55c2232e08	Fix a SIGSEGV	2024-10-23 23:54:48 +01:00
Nick Thomas	ac4675fa2c	Fix some log.Fatal calls	2024-10-23 23:47:55 +01:00
Nick Thomas	5f7654d267	Update dependencies	2024-10-23 23:45:26 +01:00
Nick Thomas	89888ce004	Stringify AnimAction	2024-10-23 23:44:44 +01:00
Nick Thomas	16767da6f1	Bump a few more dependencies	2023-07-16 23:11:01 +01:00
Nick Thomas	c5b80ed8bc	Bump ebiten	2023-07-16 22:51:16 +01:00
Nick Thomas	891edecc60	Update dependencies	2023-01-17 22:10:46 +00:00
Nick Thomas	85979834c8	Update ebiten and golang	2021-10-23 22:44:39 +01:00
Nick Thomas	96dbb297cd	Bump ebiten	2021-03-01 22:26:45 +00:00
Nick Thomas	92fa0fc5d6	UNTESTED: ebiten v2	2020-11-21 19:27:09 +00:00
Nick Thomas	c5e6abb798	First attempt at character orientation	2020-06-13 23:10:21 +01:00
Nick Thomas	5df050b4ef	Substitute unknown glyphs	2020-06-13 18:23:50 +01:00