projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactor specials[] to have strings instead of enum references.
[open-adventure.git]
/
main.c
diff --git
a/main.c
b/main.c
index 0a5ce3d3bdd7e655ca70ece55792366924d60def..c2fee21fc7216c1ade5addf7871c22d2818d31bf 100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-45,7
+45,6
@@
static void sig_handler(int signo)
* MAIN PROGRAM
*
* Adventure (rev 2: 20 treasures)
* MAIN PROGRAM
*
* Adventure (rev 2: 20 treasures)
-Here's what we think. *
* History: Original idea & 5-treasure version (adventures) by Willie Crowther
* 15-treasure version (adventure) by Don Woods, April-June 1977
* 20-treasure version (rev 2) by Don Woods, August 1978
* History: Original idea & 5-treasure version (adventures) by Willie Crowther
* 15-treasure version (adventure) by Don Woods, April-June 1977
* 20-treasure version (rev 2) by Don Woods, August 1978
@@
-492,6
+491,13
@@
static void croak(void)
}
}
}
}
+static bool traveleq(long a, long b)
+/* Are two travel entries equal for purposes of skip after failed condition? */
+{
+ return (travel[a].cond == travel[b].cond)
+ && (travel[a].dest == travel[b].dest);
+}
+
/* Given the current location in "game.loc", and a motion verb number in
* "motion", put the new location in "game.newloc". The current loc is saved
* in "game.oldloc" in case he wants to retreat. The current
/* Given the current location in "game.loc", and a motion verb number in
* "motion", put the new location in "game.newloc". The current loc is saved
* in "game.oldloc" in case he wants to retreat. The current
@@
-629,7
+635,7
@@
static bool playermove( int motion)
BUG(CONDITIONAL_TRAVEL_ENTRY_WITH_NO_ALTERATION); // LCOV_EXCL_LINE
++te_tmp;
} while
BUG(CONDITIONAL_TRAVEL_ENTRY_WITH_NO_ALTERATION); // LCOV_EXCL_LINE
++te_tmp;
} while
-
(T_HIGH(travel[travel_entry]) == T_HIGH(travel[te_tmp]
));
+
(traveleq(travel_entry, te_tmp
));
travel_entry = te_tmp;
}
travel_entry = te_tmp;
}
@@
-671,7
+677,7
@@
static bool playermove( int motion)
BUG(CONDITIONAL_TRAVEL_ENTRY_WITH_NO_ALTERATION); // LCOV_EXCL_LINE
++te_tmp;
} while
BUG(CONDITIONAL_TRAVEL_ENTRY_WITH_NO_ALTERATION); // LCOV_EXCL_LINE
++te_tmp;
} while
-
(T_HIGH(travel[travel_entry]) == T_HIGH(travel[te_tmp]
));
+
(traveleq(travel_entry, te_tmp
));
travel_entry = te_tmp;
continue; /* goto L12 */
case 3:
travel_entry = te_tmp;
continue; /* goto L12 */
case 3:
@@
-1131,7
+1137,7
@@
Lookup:
command.verb = kmod;
break;
case 3:
command.verb = kmod;
break;
case 3:
-
r
speak(specials[kmod].message);
+ speak(specials[kmod].message);
goto L2012;
default:
BUG(VOCABULARY_TYPE_N_OVER_1000_NOT_BETWEEN_0_AND_3); // LCOV_EXCL_LINE
goto L2012;
default:
BUG(VOCABULARY_TYPE_N_OVER_1000_NOT_BETWEEN_0_AND_3); // LCOV_EXCL_LINE