aboutsummaryrefslogtreecommitdiff
path: root/internal/game/cmd_move.go
diff options
context:
space:
mode:
Diffstat (limited to 'internal/game/cmd_move.go')
-rw-r--r--internal/game/cmd_move.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/internal/game/cmd_move.go b/internal/game/cmd_move.go
index 4bf227c..54c94c4 100644
--- a/internal/game/cmd_move.go
+++ b/internal/game/cmd_move.go
@@ -31,7 +31,7 @@ func (g *Game) doMove(sess *net.Session, dir string, multiplier float64) {
return
}
- if exitDef.Condition != nil && !g.checkCondition(sess, exitDef.Condition) {
+ if !p.GodMode && exitDef.Condition != nil && !g.checkCondition(sess, exitDef.Condition) {
msg := exitDef.BlockedMessage
if msg == "" {
msg = fmt.Sprintf("The way %s is blocked.", exitDir)
@@ -247,8 +247,8 @@ func (g *Game) seedRoomObjects(roomID int) {
g.World.EnsureObjectStates(roomID, ids)
for _, obj := range room.Objects {
var def *object.ObjectDef
- if obj.Inline != nil {
- def = obj.Inline
+ if obj.Local != nil {
+ def = obj.Local
} else {
var err error
def, err = g.ObjectStore.Load(obj.ID)