Make some Wages of War sprites displayable

This commit is contained in:
2020-06-01 01:43:03 +01:00
parent 4358951e15
commit 5c869fc33c
2 changed files with 6 additions and 2 deletions

View File

@@ -42,7 +42,7 @@ func (a *AssetStore) Object(name string) (*Object, error) {
} }
log.Printf("Loading object %v", name) log.Printf("Loading object %v", name)
filename, err := a.lookup(name, "obj", "Obj") filename, err := a.lookup(name, "obj", "Obj", "spr")
if err != nil { if err != nil {
return nil, err return nil, err
} }

View File

@@ -28,8 +28,12 @@ type SpriteHeader struct {
func (s SpriteHeader) Check(expectedSize uint32) error { func (s SpriteHeader) Check(expectedSize uint32) error {
if s.Padding1 != 0 || s.Padding2 != 0 { if s.Padding1 != 0 || s.Padding2 != 0 {
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) 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 // TODO: WarHammer.ani sets Unknown1 to this for all 188,286 sprites. I am
// very interested in seeing if there are any others // very interested in seeing if there are any others