archives/open-adventure
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1672 commits 2 branches 24 tags 3.2 MiB
Commit graph

465 commits

Author SHA1 Message Date
NHOrus
d48504f22f Untangling variable reuse 2017-06-29 21:35:44 +03:00
NHOrus
bf2fa227f0 Unshadowed k2 into k3 in main.c 
Reindented everything
 2017-06-29 20:11:53 +03:00
Eric S. Raymond
2b8b1b0130 Comment polishing. 2017-06-29 12:18:55 -04:00
Jason S. Ninneman
1ee0e5c7b0 Finish newdb -> dungeon renaming. 2017-06-29 08:54:55 -07:00
Jason S. Ninneman
83fb64b5a8 Jettison MAKEWD(), GETTXT(), vocab(), GETIN(), and the old db compiler. 2017-06-29 08:54:35 -07:00
Eric S. Raymond
d43854f0f6 Simplify conditional evaluation when processing travel opcodes. 2017-06-29 08:46:29 -04:00
Jason S. Ninneman
50435465a6 Completely wire vocab words in YAML to the code. 
This massive patch:
* Finishes working all the vocab words into YAML structures.
* Adds vocab ID generator functions.
* Redoes the input-getting system, removing the need for GETIN(),
  GETTXT(), etc.
* Changes advent<->ascii mapping to avoid the special 'shift'
  character.
* Works around some bad behavior in the dragon attack logic.
* Handles the reservoir magic word without changing the database
  contents.
 2017-06-29 01:59:37 -07:00
Eric S. Raymond
9d918edeaa Eliminate some promiscuous variable reuse. 
This was making the opcode-conditional evaluation logic much more
difficult to read than it needed to be.
 2017-06-28 21:06:36 -04:00
Eric S. Raymond
7281c39807 Improve documentation if the *most* obscure span of code. 2017-06-28 20:24:29 -04:00
Eric S. Raymond
b5260417dd Magic-number elimination. 2017-06-28 17:07:15 -04:00
Aaron Traas
6521d49c07 Test coverage: make LCOV ignore bug() and all calls to BUG() 
In theory, these should be unreachable, so they shouldn't be covered
with testing.
 2017-06-28 13:23:34 -04:00
Aaron Traas
94aca03203 Test coverage: make LCOV ignore sig_handler and OOM check 2017-06-28 13:23:34 -04:00
Eric S. Raymond
f5719f1aba Magic-number elimination. 2017-06-28 11:45:53 -04:00
Eric S. Raymond
ceb5c27218 Comment polishing. 2017-06-28 10:51:47 -04:00
Eric S. Raymond
27bc9f3bd2 De-macroize references to travel opcode fields we won't unpack further. 2017-06-28 09:21:41 -04:00
Eric S. Raymond
aace0b1359 More macro abstraction of the travel opcodes. 2017-06-28 08:26:36 -04:00
Eric S. Raymond
fb35c34171 After splitting out the stop field, nothing ever negates a travel opcode... 
...so all those labs() calls can go away.
 2017-06-27 22:15:22 -04:00
Eric S. Raymond
8560122f01 Break travel opcodes into a two-element structure. 2017-06-27 22:11:58 -04:00
Eric S. Raymond
d53f125555 All travel[] references are now wrapped in extractor/predicate macros. 
This is a step toward pulling the magic numbers apart into data structures
so there will be fewer magic numbers in the code.
 2017-06-27 21:55:29 -04:00
Eric S. Raymond
f6cd34f778 Begin abstracting out the magic properties of travel-array opcodes. 2017-06-27 21:46:07 -04:00
Eric S. Raymond
d891b883b9 Minor refactoring step. 2017-06-27 19:44:20 -04:00
Eric S. Raymond
894b3de949 Travel tables are all done from YAML now. 
Leaves only Section 4 from asventure.text still relevant.
 2017-06-27 16:11:13 -04:00
Jason S. Ninneman
7dc8839249 Abolish VOCWRD(). 
Action word mnemonics are now enums from adventure.yaml.
 2017-06-26 22:07:24 -07:00
Jason S. Ninneman
f9edfc5151 Reexpress the motion words in adventure.yaml. 2017-06-26 22:22:51 -04:00
Jason S. Ninneman
6ac098170c Use enums for object number mnemonics instead of VOCWRD() calls. 2017-06-26 11:27:27 -07:00
Jason S. Ninneman
2fac8d1aef object_descriptions[] is now objects[]. 2017-06-26 09:43:11 -07:00
Eric S. Raymond
fe46e5ab0c Squash a compiler warning. 2017-06-26 12:15:55 -04:00
Eric S. Raymond
d612b0e6ca Change the name of the KEY array to avoid an upcoming macro clash. 2017-06-26 10:44:19 -04:00
Eric S. Raymond
59243cf8bc Take FORTRANish upper-case function names to C-style lowercase... 
...except for a few we're planning to get rid of.  This will avoid some
upcoming collisions with macros defined from YAML.
 2017-06-26 10:19:33 -04:00
Eric S. Raymond
e424588682 Unsnarl the motion code some more. 2017-06-25 20:50:41 -04:00
Eric S. Raymond
0c54875118 Begin toounsnarl the way the TRAVEL array is used. 2017-06-25 19:22:46 -04:00
Eric S. Raymond
6d571c18b8 Magic-number elimination. 2017-06-25 19:22:46 -04:00
Eric S. Raymond
8a6e6aae7d Fully subsume section 7 into YAML. 2017-06-24 20:28:22 -04:00
Eric S. Raymond
c3a2816821 Replace magic MINTRS/MAXTRS with a treasure attribute in YAML. 2017-06-24 10:47:59 -04:00
Eric S. Raymond
985137d9c7 Rationalize names of structure array sizes. 
Everything that camn be #define become one, in all caps to signify that
it's a constant.
 2017-06-24 09:55:32 -04:00
Eric S. Raymond
0c2803638f Correct buggy behavior of sign in endgame. Add a test for this. 2017-06-24 09:30:15 -04:00
Eric S. Raymond
3a93b2b5f0 Elimination of OBJSND. 2017-06-24 09:08:48 -04:00
Eric S. Raymond
ea70341cfe Eliminate setting of OBJTXT sell for oyster - OBJTXT is now static. 
A necessary step towards getting rid of it.
 2017-06-23 15:50:15 -04:00
Eric S. Raymond
ecff53d3a8 Name the lamp, grate, and bird states. 2017-06-23 14:59:32 -04:00
Eric S. Raymond
2848494a01 Proof of cobcept for state defines. 
It is now possible in the YAML to declare defines for all state values
associated with an object.  This are visible in the C code and can be used
to replace magic numbers.
 2017-06-23 14:07:44 -04:00
Eric S. Raymond
7f7f49b739 Switch fully over to YAML generation of condition bits. COND is gone. 2017-06-22 17:28:39 -04:00
Eric S. Raymond
9c7c23b75a Improve namespace hygiene. 2017-06-22 08:58:11 -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
Peje Nilsson
deb61e3dcd Replace SETPRM/[PR]SPEAK with variadic [pr]speak 
Rename/rewrite old speak to vspeak and take a va_list
Add new speak that takes variadic parameters

Remove SETPRM & PARMS[]
 2017-06-21 13:14:53 -04:00
Eric S. Raymond
ddb0df85b3 YAMLify section 11 (hints). 2017-06-21 11:22:18 -04:00
Eric S. Raymond
9437ccca36 WD* globals abolished. They're now members of the command block. 2017-06-20 20:06:32 -04:00
Jason S. Ninneman
9714c9fc2a Fix another ob1 error. 2017-06-20 19:26:55 -04:00
Jason S. Ninneman
1e59d6b476 Clean out some disused variables. 2017-06-20 19:26:55 -04:00
Jason S. Ninneman
acc07e1287 Fix off-by-one error. 2017-06-20 19:26:55 -04:00