diff --git a/internal/assetstore/object.go b/internal/assetstore/object.go index da10fa6..be79b87 100644 --- a/internal/assetstore/object.go +++ b/internal/assetstore/object.go @@ -42,7 +42,7 @@ func (a *AssetStore) Object(name string) (*Object, error) { } log.Printf("Loading object %v", name) - filename, err := a.lookup(name, "obj", "Obj") + filename, err := a.lookup(name, "obj", "Obj", "spr") if err != nil { return nil, err } diff --git a/internal/data/object.go b/internal/data/object.go index dfffe66..f03efdd 100644 --- a/internal/data/object.go +++ b/internal/data/object.go @@ -28,7 +28,11 @@ type SpriteHeader struct { func (s SpriteHeader) Check(expectedSize uint32) error { if s.Padding1 != 0 || s.Padding2 != 0 { - return fmt.Errorf("Sprite header padding contains unknown values: %d %d", s.Padding1, s.Padding2) + if s.Padding1 == 271 && s.Padding2 == 0 { + log.Printf("Sprite header padding matches FIXME value") + } else { + return fmt.Errorf("Sprite header padding contains unknown values: %d %d", s.Padding1, s.Padding2) + } } // TODO: WarHammer.ani sets Unknown1 to this for all 188,286 sprites. I am