Structurize locatiuon info.

[open-adventure.git] / actions.c

diff --git a/actions.c b/actions.c
index 06149d3574a06aee97fa237cda54885ddbcfe8ee..4a86f019737d8c1fd75c362782e606831adf502e 100644 (file)
--- a/actions.c
+++ b/actions.c
@@ -303,11 +303,11 @@ static phase_codes_t vcarry(verb_t verb, obj_t obj)
 {
     if (obj == INTRANSITIVE) {
         /*  Carry, no object given yet.  OK if only one object present. */
-        if (game.atloc[game.loc] == NO_OBJECT ||
-            game.link[game.atloc[game.loc]] != 0 ||
+        if (game.locs[game.loc].atloc == NO_OBJECT ||
+            game.link[game.locs[game.loc].atloc] != 0 ||
             atdwrf(game.loc) > 0)
             return GO_UNKNOWN;
-        obj = game.atloc[game.loc];
+        obj = game.locs[game.loc].atloc;
     }
 
     if (TOTING(obj)) {