1 files changed, 19 insertions, 9 deletions
diff --git a/internal/game/object_def.go b/internal/game/object_def.go
index e27aeb0..6cf2464 100644
--- a/internal/game/object_def.go
+++ b/internal/game/object_def.go
@@ -4,30 +4,40 @@ import "thehouseoficarus/internal/object"
 
 // resolveObjectDef returns the ObjectDef for a room object instance. File
 // objects (the common case) resolve through the cached object store with no
-// disk I/O on a hit, and a store miss is just a map lookup; only inline objects
+// disk I/O on a hit, and a store miss is just a map lookup; only local objects
 // — which never live in the store — fall through to a freshly-read room, so
 // they keep live-edit semantics without slowing file-object lookups. defID is
-// the ObjState DefID (a normalized name for inline objects, a file id
+// the ObjState DefID (a normalized name for local objects, a file id
 // otherwise).
 //
 // Use this from display or generic-handling sites. Sites that look up a
 // specific interactable behavior (gather/use-station/safespot/steal/etc.) may
-// call ObjectStore.Load directly: inline objects are guaranteed non-interactable
+// call ObjectStore.Load directly: local objects are guaranteed non-interactable
 // and simply fall through those sites' existing error guards.
-func (g *Game) resolveObjectDef(roomID int, defID string) (*object.ObjectDef, error) {
+func (g *Game) resolveObjectDef(roomID int, defID string) (*object.ObjectDef, bool, error) {
 	def, err := g.ObjectStore.Load(defID)
 	if err == nil {
-		return def, nil
+		if room, rerr := g.World.LoadRoom(roomID); rerr == nil {
+			for i := range room.Objects {
+				ro := &room.Objects[i]
+				if ro.Local == nil && ro.ID == defID && ro.HiddenOverride {
+					copy := *def
+					copy.Hidden = true
+					return &copy, false, nil
+				}
+			}
+		}
+		return def, false, nil
 	}
 	if room, rerr := g.World.LoadRoom(roomID); rerr == nil {
 		for i := range room.Objects {
 			ro := &room.Objects[i]
-			if ro.Inline != nil && ro.ID == defID {
-				d := *ro.Inline
+			if ro.Local != nil && ro.ID == defID {
+				d := *ro.Local
 				d.ID = defID
-				return &d, nil
+				return &d, true, nil
 			}
 		}
 	}
-	return nil, err
+	return nil, false, err
 }