diff options
Diffstat (limited to 'internal/game/cmd_move.go')
| -rw-r--r-- | internal/game/cmd_move.go | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/internal/game/cmd_move.go b/internal/game/cmd_move.go index a1b492e..4bf227c 100644 --- a/internal/game/cmd_move.go +++ b/internal/game/cmd_move.go @@ -7,6 +7,7 @@ import ( "thehouseoficarus/internal/engine" "thehouseoficarus/internal/item" "thehouseoficarus/internal/net" + "thehouseoficarus/internal/object" "thehouseoficarus/internal/player" ) @@ -245,9 +246,15 @@ func (g *Game) seedRoomObjects(roomID int) { } g.World.EnsureObjectStates(roomID, ids) for _, obj := range room.Objects { - def, err := g.ObjectStore.Load(obj.ID) - if err != nil { - continue + var def *object.ObjectDef + if obj.Inline != nil { + def = obj.Inline + } else { + var err error + def, err = g.ObjectStore.Load(obj.ID) + if err != nil { + continue + } } g.World.SetObjName(roomID, obj.ID, def.Name) if len(def.Aliases) > 0 { |