From 8f661598bc9bdc91c64d1ad99bf0933acfa492ee Mon Sep 17 00:00:00 2001 From: "Eric S. Raymond" Date: Wed, 7 Jun 2017 08:39:12 -0400 Subject: [PATCH] Yet more OBJ localization. --- actions2.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/actions2.c b/actions2.c index 64695e0..bd1de2c 100644 --- a/actions2.c +++ b/actions2.c @@ -24,7 +24,7 @@ L9011: if(game.fixed[OBJ] != 0) return(2011); K=OBJ; OBJ=BOTTLE; if(HERE(BOTTLE) && LIQ(0) == K) goto L9017; - if(TOTING(BOTTLE) && game.prop[BOTTLE] == 1) return(fill()); + if(TOTING(BOTTLE) && game.prop[BOTTLE] == 1) return(fill(OBJ)); if(game.prop[BOTTLE] != 1)SPK=105; if(!TOTING(BOTTLE))SPK=104; return(2011); @@ -311,11 +311,11 @@ L9216: SPK=14; /* Fill. Bottle or urn must be empty, and liquid available. (Vase is nasty.) */ -int fill() { - if(OBJ == VASE) goto L9222; - if(OBJ == URN) goto L9224; - if(OBJ != 0 && OBJ != BOTTLE) return(2011); - if(OBJ == 0 && !HERE(BOTTLE)) return(8000); +int fill(long obj) { + if(obj == VASE) goto L9222; + if(obj == URN) goto L9224; + if(obj != 0 && obj != BOTTLE) return(2011); + if(obj == 0 && !HERE(BOTTLE)) return(8000); SPK=107; if(LIQLOC(game.loc) == 0)SPK=106; if(HERE(URN) && game.prop[URN] != 0)SPK=214; -- 2.31.1