Commit graph

400 commits

Author SHA1 Message Date
Jason S. Ninneman
ff6a816e5f Handle word type and raw strings. 2017-07-14 09:18:55 -07:00
Jason S. Ninneman
820737fb80 Use vocab IDs along side packed words. 2017-07-14 09:18:24 -07:00
Aaron Traas
e696fed6db Prompt and taunt you after 3rd and final death
Fixed a bug where you'd not be asked about whether to be resurrected a
final time. Now you are.
2017-07-13 21:52:27 -04:00
NHOrus
49d9ef1bee No spk remains in the code base 2017-07-13 21:52:27 -04:00
NHOrus
03b2f1c86e Removed unused code, reindented 2017-07-13 21:52:27 -04:00
Jason S. Ninneman
50efa22849 Express word type with an enum instead of magic numbers.
* Make a cleaner function for getting vocab metadata.
* Get rid of magic numbers.
* Purge get_vocab_id().
* Abolish the *_WORD() macros.
* Add FIXME comment on some ugliness.
2017-07-12 10:35:00 -07:00
Jason S. Ninneman
b5e8eec80e Replace tests on packed words with tests on strings. 2017-07-11 23:14:38 +00:00
Eric S. Raymond
3a722da650 Minor coverage inclusion. 2017-07-11 11:57:46 -04:00
Eric S. Raymond
00cf2a9373 Comment polishing. 2017-07-11 04:15:57 -04:00
Eric S. Raymond
de3be760b6 Comment polishing. 2017-07-11 03:43:37 -04:00
Eric S. Raymond
96950869c6 Reindent. 2017-07-11 03:26:00 -04:00
Aaron Traas
12b2ff74f6 Cleanups and clarifications in do_command() 2017-07-10 17:43:59 -04:00
Aaron Traas
9056fa7a2c Eliminated another label 2017-07-10 17:35:24 -04:00
Aaron Traas
18ec2f79b0 Eliminated a label 2017-07-10 17:23:20 -04:00
Aaron Traas
4d7858d333 Cleaned up do_command() a little 2017-07-10 17:21:09 -04:00
Aaron Traas
b29f56f595 Isolate command input processing, got rid of label "Laction" 2017-07-10 16:30:51 -04:00
Aaron Traas
7c610a120d refactored fallback_handler() to use command_t, isolating from side effects 2017-07-10 16:09:18 -04:00
Eric S. Raymond
859663b14b Documentation polishing. 2017-07-09 07:03:26 -04:00
NHOrus
53cb12b4d0 Bound the sizes of strcpy. 2017-07-08 15:16:21 -04:00
NHOrus
e09ba7244d Minor deduplication 2017-07-08 19:59:50 +03:00
NHOrus
d739c111d7 Restructure quips for invalid movements. 2017-07-08 19:59:50 +03:00
NHOrus
386ca2b8d2 Restructure lightcheck 2017-07-08 19:59:50 +03:00
Eric S. Raymond
7d690e0b95 Set game.newloc when reincarnated. Fixes a bug. 2017-07-08 11:34:09 -04:00
NHOrus
5af8fb18f0 Prevent access beyond boundaries of array on fallthrough 2017-07-07 23:15:54 +03:00
Eric S. Raymond
1cbc3d827b Eliminate magic numbers from C side of condition handling. 2017-07-07 15:01:25 -04:00
Eric S. Raymond
2bdf9e2803 Purge magic numbers from C side of destination handling. 2017-07-07 11:04:18 -04:00
NHOrus
e619c41048 Don't forget to ask important questions when removing restore of saves 2017-07-07 17:58:42 +03:00
NHOrus
0042d641dc Plugged all memory leaks.
Now all tests pass under ASan or Valgrind.
2017-07-07 12:07:52 +03:00
NHOrus
ef97d579ea Don't zero stuff twice 2017-07-07 11:18:02 +03:00
NHOrus
d51da9d0b8 Magic Number Elimination 2017-07-07 10:04:26 +03:00
Jason S. Ninneman
0e540429b0 Working but unpolished refactor of bigwords(). 2017-07-05 14:02:52 -07:00
NHOrus
40ff648431 Moved state_change to misc.c to start using it in main.c, too 2017-07-05 20:23:34 +03:00
NHOrus
8613f0b3d9 Magic number elimination
Special state/locations for game.fixd object array
2017-07-05 07:56:36 +03:00
Eric S. Raymond
c48c330883 Magic-number elimination in the olover/alcove pasage code.
Wuth this change, the location table becomes order-independent (I think).
2017-07-04 22:57:34 -04:00
Eric S. Raymond
abf820bb5c Magic-number elimination. 2017-07-04 14:40:10 -04:00
Eric S. Raymond
f37a413524 Magic-number elimination. 2017-07-04 14:15:20 -04:00
Eric S. Raymond
a8ac2f477a Abstract out some state arithmetic. 2017-07-04 13:41:12 -04:00
Jason S. Ninneman
4f78dfea24 Begin replacing tests on strings with tests on vocab IDs. 2017-07-03 18:21:25 -07:00
Eric S. Raymond
a768555312 Use the raw buffer in tr command structure for editing.
This fixes some minor bugs. Unknown words are no longer truncated
nor uppercased on echo.
2017-07-03 12:52:28 -04:00
Eric S. Raymond
f03bde268e Refactor tokenization to save raw tokens and use static buffer space...
...rather than dynamic storage.

As a side effect, this seems to have fixed a very ninor bug in the processing
of the bare word 'nothing'.  But I don't know where the bug was.  Not happy.
2017-07-03 08:53:10 -04:00
Eric S. Raymond
eba8015059 Magic-number elimination. 2017-07-03 07:14:15 -04:00
Eric S. Raymond
7740b163c8 playermove() never returns false; simplify accordingly 2017-07-03 06:10:52 -04:00
NHOrus
63152e6714 Broke all logical or into multiline statement to show lcov's lies
Results are weird, some things that need to be checked aren't and
at least my local lcov doesn't show them as unchecked
2017-07-03 07:20:37 +03:00
NHOrus
38970a1c98 Unspk'd pour command 2017-07-03 06:12:19 +03:00
Eric S. Raymond
e712f4c0e0 Magic-number elimination. 2017-07-02 14:47:21 -04:00
Jason S. Ninneman
6af38a92f6 Eliminate the global game.blklin. 2017-07-02 10:37:10 -07:00
Eric S. Raymond
346bcf9458 Magic-number elimination. 2017-07-02 13:22:50 -04:00
Aaron Traas
7eaefce61d Moved application settings to settings_t struct
Since logfp, oldstyle, and prompt were application settings, rather than
have them all as global vars, move them to a single global var, seperate
from game state, as they aren't, technically, game state, but are
application settings.
2017-07-02 12:52:17 -04:00
NHOrus
a5478639b6 Capture wonkyness of extinguishing urn 2017-07-02 10:16:13 -04:00
Aaron Traas
3d3cd4ba39 Localize scope for restore file pointer in main. 2017-07-02 02:28:58 -04:00