Commit graph

60 commits

Author SHA1 Message Date
Eric S. Raymond
7f7f49b739 Switch fully over to YAML generation of condition bits. COND is gone. 2017-06-22 17:28:39 -04:00
Jason S. Ninneman
79ffdb36f0 Switch to 0-indexing for hint handling code. 2017-06-21 10:26:23 -07:00
Jason S. Ninneman
c8f6ff3701 Abolish HNTMAX and HNTSIZ in favor of HINT_COUNT.
This change necessitated include guards on newdb.h.
2017-06-21 10:25:12 -07:00
Jason S. Ninneman
1e59d6b476 Clean out some disused variables. 2017-06-20 19:26:55 -04:00
Eric S. Raymond
a678b68b39 Mostly confine assumptions about what token_t is to misc.c
The token_t things like WD* are presently longs and will someday be
char[6].  By introducing some trivial functions - wordeq(),
wordempty(), and wordclear() - we mostly hide the difference.

All runtime knowledge about packing now lives only in misc.c and the
list of magic WORD_* defines in advent.h.  Outside this, literals are
now accessed through #define names that could expand to either longs
or strings.

Still to be done: WD* values are sometiimes compated to zero in
ways implying they can be negative. Must figure out wat thus means.
2017-06-19 17:21:45 -04:00
Eric S. Raymond
87961483a2 Concentrate all magic-number values for packed-string constants in one place. 2017-06-19 16:53:55 -04:00
NHOrus
e9aff2568f Even less magic 2017-06-19 20:18:20 +03:00
Jason S. Ninneman
06e8d5a83e Abolish MAXDIE in favor of maximum_deaths. 2017-06-18 20:02:03 -07:00
Eric S. Raymond
fa9b6d317f No longer restricted to 6-character FORTRAN identifiers. 2017-06-18 21:17:57 -04:00
Eric S. Raymond
b3057f038b Re-format to consistent indent style with "make indent". 2017-06-18 06:18:51 -04:00
NHOrus
32fdd08d9b Little cleanup of variable names 2017-06-17 17:48:12 +03:00
Eric S. Raymond
a57d93ce35 Magic-number elimination. 2017-06-16 07:00:57 -04:00
Eric S. Raymond
1896e0f886 Use symbolic shortnames for locations. 2017-06-15 10:31:26 -04:00
NHOrus
f1f7cfd4e9 Localizing variables 2017-06-15 16:16:21 +03:00
Eric S. Raymond
e5f9c4fbea Use LOC_* constants for locations. Clean up some ARB_* constants. 2017-06-15 08:49:47 -04:00
Jason S. Ninneman
1322a347ae Put the long and short location descriptions into a 'locations' data structure.
They're renamed 'small' and 'big' to avoid colliding with C reserved words.
2017-06-14 16:45:49 -07:00
Eric S. Raymond
a3c14ba077 Abolish setup check, there's no possibility of restart.
Note, this silently breaks old saves.
2017-06-13 10:20:15 -04:00
Jason S. Ninneman
15ff262d17 More retrofitting. 2017-06-11 15:42:25 -07:00
Eric S. Raymond
46cd836df0 Abolish funcs.h. 2017-06-08 04:25:20 -04:00
Eric S. Raymond
ed80d6dd2f Move MAXDIE computation to dungeonmaker. 2017-06-07 15:33:22 -04:00
Eric S. Raymond
16d90e4c28 init.c is now real C. 2017-06-07 15:12:21 -04:00
Eric S. Raymond
78f606c879 Goto elimination. 2017-06-07 14:26:46 -04:00
Eric S. Raymond
14fee6b979 Eliminate globals. 2017-06-07 14:03:33 -04:00
Eric S. Raymond
2deb1b9f7f Localize TK. 2017-06-07 10:38:18 -04:00
Eric S. Raymond
8a256a6e37 Narrow the scope of IGO. 2017-06-07 10:33:38 -04:00
Eric S. Raymond
2d95c3f4f5 Finish moving state arrays into game structure block. 2017-06-07 07:10:07 -04:00
Eric S. Raymond
0b02763bf0 More collecting of globals. 2017-06-07 06:38:40 -04:00
Eric S. Raymond
c1f1f2f79f Magic-number cleanup. 2017-06-07 06:24:18 -04:00
Eric S. Raymond
461575ef4c Bite the bullet - size siymbols have to be shared.
Otherwise we end up duplicating magic sizes and tey can drift apart.
2017-06-07 05:45:51 -04:00
Eric S. Raymond
7f4cff1188 Bring SETUP variable into game state block
Saved separately because the kogic around this variable looks
a bit dubious and may need review.
2017-06-07 05:24:48 -04:00
Eric S. Raymond
dda636bbc1 Pull more globals into the game state block. 2017-06-07 05:10:20 -04:00
Eric S. Raymond
91ad0185ff Move more globals into the game state block. 2017-06-07 01:12:49 -04:00
Eric S. Raymond
62ee15c892 Pack more globals into the game block structure. 2017-06-07 00:41:51 -04:00
Eric S. Raymond
bb78ca96ce Capture clock variables into the game-state block. 2017-06-07 00:15:31 -04:00
Eric S. Raymond
07c0020a7a First step in game state encapsulation: the dwarf & pirate locations. 2017-06-06 21:34:11 -04:00
Eric S. Raymond
3b8122ae3a Magic-number elimination. 2017-06-06 21:06:16 -04:00
Eric S. Raymond
978168523a Magic-number elimination. 2017-06-06 11:12:00 -04:00
Eric S. Raymond
fd10d380df Abstract out NOBJECTS (formerly magic number 100). 2017-06-06 10:44:25 -04:00
Eric S. Raymond
4d6078d8a8 Replace homebrew IABS() with C kubrary labs(3). 2017-06-06 09:21:46 -04:00
Eric S. Raymond
d402e09411 Header consolidation - main.h, misc.h, and share.h merge to advent.h.
For a project this small size with a small type ontology, it's better
C style to have one header where all the assumptions about types and
structures are immediately visible.

This is a first step towards turning all that global state into a handful
of structures - probably just two, one saveable as a binary game state.
2017-06-02 15:06:33 -04:00
Eric S. Raymond
5ae76995d2 Simplify build: nested makefiles considered harmful. 2017-05-29 01:33:59 -04:00
Jason S. Ninneman
f0528b0ded Move database compilation out into its own tool (for now). 2017-05-28 21:46:54 -07:00
Jason S. Ninneman
df46df6979 Factor out handling of variables populated from the database.
This reorganization is a first step toward handling database compilation separately.
2017-05-28 15:42:05 -07:00
Jason S. Ninneman
2270c6ad12 Just say no to encrypting internal state. 2017-05-26 10:21:19 -07:00
Eric S. Raymond
484ca4e9fd Revert structurization changes, they broke database compilation...
...bug showing only if adventure.data was absent.  We'll need to sneak up
on this more carefully.
2017-05-24 00:17:19 -04:00
Eric S. Raymond
f9eb6383f1 Revert a variable name previously changed to be out of the way.
Also, make output from replays easier to interpret by adding prompts.
2017-05-23 22:29:24 -04:00
Eric S. Raymond
f72141fbe3 More structurization. 2017-05-23 20:59:21 -04:00
Eric S. Raymond
c3add5c206 More global-to-structure moves. 2017-05-23 20:22:35 -04:00
Eric S. Raymond
fa1f859162 Move more globals into the state structure. 2017-05-23 19:40:34 -04:00
Eric S. Raymond
42189d79d7 Begin gathering saveable game state into a structure. Not yet complete.
No logic changes.  A bunch of globals turn into fields (with the same names
except for lowercasing) in struct game_t.

Eventually this will allow drastic simplification of the save/load logic.
2017-05-23 18:47:04 -04:00