From 64897f132e6651a5c52c822ff8452c9f3e9e032b Mon Sep 17 00:00:00 2001 From: "Eric S. Raymond" Date: Fri, 9 Jun 2017 11:53:02 -0400 Subject: [PATCH] Abolish global variable I. --- actions.c | 13 +++++++------ advent.h | 2 +- main.c | 30 +++++++++++++++--------------- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/actions.c b/actions.c index 8ddd369..1031d8e 100644 --- a/actions.c +++ b/actions.c @@ -780,6 +780,7 @@ static int suspendresume(FILE *input, bool resume) /* Suspend and resume */ { int kk; + long i; if (!resume) { /* Suspend. Offer to save things in a file, but charging * some points (so can't win by using saved games to retry @@ -810,8 +811,8 @@ static int suspendresume(FILE *input, bool resume) * for I/O. All the SAV* functions can be scrapped. */ - DATIME(&I,&K); - K=I+650*K; + DATIME(&i,&K); + K=i+650*K; SAVWRD(kk,K); K=VRSION; SAVWRD(0,K); @@ -892,8 +893,8 @@ static int throw(FILE *cmdin, long verb, long obj) } if (obj != AXE) return(discard(obj, false)); - I=ATDWRF(game.loc); - if (I <= 0) { + int i=ATDWRF(game.loc); + if (i <= 0) { if (AT(DRAGON) && game.prop[DRAGON] == 0) { SPK=152; return throw_support(SPK); @@ -922,8 +923,8 @@ static int throw(FILE *cmdin, long verb, long obj) SPK=48; return throw_support(SPK); } - game.dseen[I]=false; - game.dloc[I]=0; + game.dseen[i]=false; + game.dloc[i]=0; SPK=47; game.dkill=game.dkill+1; if (game.dkill == 1)SPK=149; diff --git a/advent.h b/advent.h index 6b2fac3..82cf7ce 100644 --- a/advent.h +++ b/advent.h @@ -179,5 +179,5 @@ extern long AMBER, ATTACK, AXE, BACK, BATTER, BEAR, STEPS, STICK, STREAM, THROW, TRIDNT, TROLL, TROLL2, URN, VASE, VEND, VOLCAN, WATER; /* everything else */ -extern long I, K, SPK, WD1, WD1X, WD2, WD2X; +extern long K, SPK, WD1, WD1X, WD2, WD2X; diff --git a/main.c b/main.c index 835632a..ab09c86 100644 --- a/main.c +++ b/main.c @@ -28,7 +28,7 @@ long AMBER, AXE, BACK, BATTER, BEAR, BIRD, BLOOD, RUBY, RUG, SAPPH, SAY, SIGN, SNAKE, STEPS, STREAM, THROW, TRIDNT, TROLL, TROLL2, URN, VASE, VEND, VOLCAN, WATER; -long I, K, SPK, WD1, WD1X, WD2, WD2X; +long K, SPK, WD1, WD1X, WD2, WD2X; FILE *logfp; bool oldstyle = false; @@ -505,9 +505,9 @@ L2001: if(TOTING(BEAR))RSPEAK(141); if(DARK(0)) goto L2012; game.abbrev[game.loc]=game.abbrev[game.loc]+1; - I=game.atloc[game.loc]; -L2004: if(I == 0) goto L2012; - obj=I; + i=game.atloc[game.loc]; +L2004: if(i == 0) goto L2012; + obj=i; if(obj > NOBJECTS)obj=obj-NOBJECTS; if(obj == STEPS && TOTING(NUGGET)) goto L2008; if(game.prop[obj] >= 0) goto L2006; @@ -529,7 +529,7 @@ L2004: if(I == 0) goto L2012; L2006: KK=game.prop[obj]; if(obj == STEPS && game.loc == game.fixed[STEPS])KK=1; PSPEAK(obj,KK); -L2008: I=game.link[I]; +L2008: i=game.link[i]; goto L2004; L2009: K=54; @@ -621,11 +621,11 @@ L2620: if(WD1 == MAKEWD(23051920)) { RSPEAK(276); } L2630: - I=VOCAB(WD1,-1); - if(I == -1) + i=VOCAB(WD1,-1); + if(i == -1) goto L3000; - K=MOD(I,1000); - KQ=I/1000+1; + K=MOD(i,1000); + KQ=i/1000+1; switch (KQ-1) { case 0: goto L8; case 1: goto L5000; case 2: goto L4000; case 3: goto L2010; } BUG(22); @@ -647,11 +647,11 @@ L3000: SETPRM(1,WD1,WD1X); /* Verb and object analysis moved to separate module. */ -L4000: I=4000; VERB=K; goto Laction; -L4090: I=4090; goto Laction; -L5000: I=5000; obj = K; +L4000: i=4000; VERB=K; goto Laction; +L4090: i=4090; goto Laction; +L5000: i=5000; obj = K; Laction: - switch (action(cmdin, I, VERB, obj)) { + switch (action(cmdin, i, VERB, obj)) { case 2: return true; case 8: goto L8; case 2000: goto L2000; @@ -951,8 +951,8 @@ L11000: game.prop[BOTTLE]=PUT(BOTTLE,115,1); /* Leave the grate with normal (non-negative) property. Reuse sign. */ - I=PUT(GRATE,116,0); - I=PUT(SIGN,116,0); + PUT(GRATE,116,0); + PUT(SIGN,116,0); OBJTXT[SIGN]=OBJTXT[SIGN]+1; game.prop[SNAKE]=PUT(SNAKE,116,1); game.prop[BIRD]=PUT(BIRD,116,1); -- 2.31.1