From ff36dff18f30cab559a34b4b08214c3ab87491dd Mon Sep 17 00:00:00 2001 From: "Eric S. Raymond" Date: Wed, 7 Jun 2017 21:26:45 -0400 Subject: [PATCH] Attempt to repair GitLab build breakage. --- advent.h | 1 + main.c | 2 +- misc.c | 28 +++++++++++++--------------- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/advent.h b/advent.h index 36cf345..2cc2daa 100644 --- a/advent.h +++ b/advent.h @@ -9,6 +9,7 @@ #define DALTLC 18 /* alternate dwarf location; low room */ #define MINTRS 50 #define MAXTRS 79 +#define MAXPARMS 25 typedef struct lcg_state { diff --git a/main.c b/main.c index 28f1712..03990db 100644 --- a/main.c +++ b/main.c @@ -14,7 +14,7 @@ struct game_t game; -long LNLENG, LNPOSN, PARMS[26]; +long LNLENG, LNPOSN, PARMS[MAXPARMS+1]; char rawbuf[LINESIZE], INLINE[LINESIZE+1], MAP1[129], MAP2[129]; long AMBER, ATTACK, AXE, BACK, BATTER, BEAR, BIRD, BLOOD, diff --git a/misc.c b/misc.c index e452be2..b3d8874 100644 --- a/misc.c +++ b/misc.c @@ -521,12 +521,9 @@ void MOVE(long object, long where) long from; if (object > NOBJECTS) - goto L1; - from=game.place[object]; - goto L2; -L1: - from=game.fixed[object-NOBJECTS]; -L2: + from=game.fixed[object-NOBJECTS]; + else + from=game.place[object]; if (from > 0 && from <= 300) CARRY(object,from); DROP(object,where); @@ -570,16 +567,17 @@ void DROP(long object, long where) * game.holdng if the object was being toted. */ { if (object > NOBJECTS) - goto L1; - if (game.place[object] == -1) - game.holdng=game.holdng-1; - game.place[object]=where; - goto L2; -L1: game.fixed[object-NOBJECTS]=where; -L2: if (where <= 0) + game.fixed[object-NOBJECTS] = where; + else + { + if (game.place[object] == -1) + --game.holdng; + game.place[object] = where; + } + if (where <= 0) return; - game.link[object]=game.atloc[where]; - game.atloc[where]=object; + game.link[object] = game.atloc[where]; + game.atloc[where] = object; } long ATDWRF(long where) -- 2.31.1