Make include directives work in .mnu files
This commit is contained in:
@@ -51,12 +51,12 @@ func registerInvokeButton(d *Driver, r *menus.Record) error {
|
||||
}
|
||||
|
||||
func registerMainButton(d *Driver, r *menus.Record) error {
|
||||
sprites, err := d.menu.Sprites(r.Share, 3) // base, pressed, disabled
|
||||
sprites, err := d.menu.Sprites(r.ObjectIdx, r.Share, 3) // base, pressed, disabled
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
hovers, err := d.menu.Images(r.SpriteId[0], r.DrawType)
|
||||
hovers, err := d.menu.Images(r.ObjectIdx, r.SpriteId[0], r.DrawType)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -81,7 +81,7 @@ func registerMainButton(d *Driver, r *menus.Record) error {
|
||||
}
|
||||
|
||||
func registerDoorHotspot(d *Driver, r *menus.Record) error {
|
||||
sprites, err := d.menu.Sprites(r.Share, 2) // base, pressed
|
||||
sprites, err := d.menu.Sprites(r.ObjectIdx, r.Share, 2) // base, pressed
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -104,7 +104,7 @@ func registerDoorHotspot(d *Driver, r *menus.Record) error {
|
||||
}
|
||||
|
||||
func registerButton(d *Driver, r *menus.Record, spriteId int) (*button, error) {
|
||||
sprites, err := d.menu.Sprites(spriteId, 3) // base, pressed, disabled
|
||||
sprites, err := d.menu.Sprites(r.ObjectIdx, spriteId, 3) // base, pressed, disabled
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
Reference in New Issue
Block a user