open-adventure.git
6 years agoMinor refactor - create an equality function to simplify skip logic.
Eric S. Raymond [Sat, 1 Jul 2017 18:03:01 +0000 (14:03 -0400)]
Minor refactor - create an equality function to simplify skip logic.

6 years agoNever write the input prompt to log files. 183/head
Jason S. Ninneman [Sat, 1 Jul 2017 18:03:20 +0000 (11:03 -0700)]
Never write the input prompt to log files.

6 years agoForther break apart the magic enconding of travel arrays.
Eric S. Raymond [Sat, 1 Jul 2017 16:51:12 +0000 (12:51 -0400)]
Forther break apart the magic enconding of travel arrays.

6 years agoRemove debris from a misclick.
Eric S. Raymond [Sat, 1 Jul 2017 16:40:12 +0000 (12:40 -0400)]
Remove debris from a misclick.

6 years agoIgnore l g z i under oldstyle.
Eric S. Raymond [Sat, 1 Jul 2017 16:34:44 +0000 (12:34 -0400)]
Ignore l g z i under oldstyle.

6 years agoChange state of vase 182/head
NHOrus [Sat, 1 Jul 2017 15:23:51 +0000 (18:23 +0300)]
Change state of vase
Clear temporary save where it needs to be cleared instead of random places

6 years agoDo not compare state to magic numbers
NHOrus [Sat, 1 Jul 2017 15:12:25 +0000 (18:12 +0300)]
Do not compare state to magic numbers

6 years agoLittle more less magic in dragon state
NHOrus [Sat, 1 Jul 2017 14:44:58 +0000 (17:44 +0300)]
Little more less magic in dragon state

6 years agoDocumentation polishing.
Eric S. Raymond [Sat, 1 Jul 2017 15:01:06 +0000 (11:01 -0400)]
Documentation polishing.

6 years agoEnsure libedit is installed for the pipeline jobs. 181/head
Jason S. Ninneman [Sat, 1 Jul 2017 14:29:53 +0000 (07:29 -0700)]
Ensure libedit is installed for the pipeline jobs.

6 years agoAttempt to unbreak pipeline.
Jason S. Ninneman [Sat, 1 Jul 2017 14:27:37 +0000 (07:27 -0700)]
Attempt to unbreak pipeline.

6 years agoJettison the -s option. 180/head
Jason S. Ninneman [Sat, 1 Jul 2017 14:22:12 +0000 (07:22 -0700)]
Jettison the -s option.

It's no longer needed since libedit doesn't have the 'paste bug'.

6 years agoRemove the linenoise submodule.
Jason S. Ninneman [Sat, 1 Jul 2017 14:17:35 +0000 (07:17 -0700)]
Remove the linenoise submodule.

6 years agoMove most build instructions into INSTALL.adoc.
Jason S. Ninneman [Sat, 1 Jul 2017 14:14:27 +0000 (07:14 -0700)]
Move most build instructions into INSTALL.adoc.

6 years agoUpdate documentation about the libedit conversion.
Jason S. Ninneman [Sat, 1 Jul 2017 13:59:39 +0000 (06:59 -0700)]
Update documentation about the libedit conversion.

6 years agoReplace linenoise with libedit in code and build.
Jason S. Ninneman [Sat, 1 Jul 2017 13:51:00 +0000 (06:51 -0700)]
Replace linenoise with libedit in code and build.

6 years agoMagic-number elimination for dragon and rug.
Eric S. Raymond [Sat, 1 Jul 2017 13:58:45 +0000 (09:58 -0400)]
Magic-number elimination for dragon and rug.

6 years agoReindend, compile out all save stuff 179/head
NHOrus [Sat, 1 Jul 2017 13:46:51 +0000 (16:46 +0300)]
Reindend, compile out all save stuff

6 years agoPut stuff back in init, C-style
NHOrus [Sat, 1 Jul 2017 13:45:42 +0000 (16:45 +0300)]
Put stuff back in init, C-style

6 years agoApply DEMOTE_WORD(). 178/head
Jason S. Ninneman [Sat, 1 Jul 2017 13:21:37 +0000 (06:21 -0700)]
Apply DEMOTE_WORD().

6 years agoMagic-number and state-arithmetic removal.
Eric S. Raymond [Sat, 1 Jul 2017 13:21:04 +0000 (09:21 -0400)]
Magic-number and state-arithmetic removal.

6 years agoAdd a DEMOTE_WORD() macro. 177/head
Jason S. Ninneman [Sat, 1 Jul 2017 13:18:24 +0000 (06:18 -0700)]
Add a DEMOTE_WORD() macro.

6 years agoInterim magic number replacement.
Jason S. Ninneman [Sat, 1 Jul 2017 13:15:54 +0000 (06:15 -0700)]
Interim magic number replacement.

6 years agoMove PRNG initialization to simplify cheat.c
Eric S. Raymond [Sat, 1 Jul 2017 12:59:45 +0000 (08:59 -0400)]
Move PRNG initialization to simplify cheat.c

6 years agoSpread documentation from init.c It was empty without anything to document. Reindente...
NHOrus [Sat, 1 Jul 2017 11:36:54 +0000 (14:36 +0300)]
Spread documentation from init.c It was empty without anything to document. Reindented, too

6 years agoCut initialize in favor of implicit/default initialization where possible
NHOrus [Sat, 1 Jul 2017 11:21:07 +0000 (14:21 +0300)]
Cut initialize in favor of implicit/default initialization where possible

6 years agoPutting cleanup in the right place, too 175/head
NHOrus [Sat, 1 Jul 2017 08:50:49 +0000 (11:50 +0300)]
Putting cleanup in the right place, too

6 years agoFix make debug check
NHOrus [Sat, 1 Jul 2017 07:51:13 +0000 (10:51 +0300)]
Fix make debug check

6 years agoWithout IGNORE, -Wunused-result throws a warning on fread(2).
Eric S. Raymond [Sat, 1 Jul 2017 12:35:05 +0000 (08:35 -0400)]
Without IGNORE, -Wunused-result throws a warning on fread(2).

I've seen it happen on fwrite(2) as well; wrapping that as well in
case some compiler decides to be finicky.

6 years agoMagic-number elimination.
Eric S. Raymond [Sat, 1 Jul 2017 05:59:06 +0000 (01:59 -0400)]
Magic-number elimination.

6 years agoTest modification for little more coverage
NHOrus [Fri, 30 Jun 2017 23:44:00 +0000 (02:44 +0300)]
Test modification for little more coverage

6 years agoStop leaking memory
NHOrus [Fri, 30 Jun 2017 23:13:30 +0000 (02:13 +0300)]
Stop leaking memory

6 years agoVarious cleanups. 173/head
Jason S. Ninneman [Fri, 30 Jun 2017 20:51:03 +0000 (13:51 -0700)]
Various cleanups.

* Remove disused macro.
* GCC doesn't seem to mind if IGNORE() is left off.
* Enumify phase codes.
* Use EXIT_* macros in all exit() calls.
* How did this even work without extern?
* Give advent.h a much-needed makeover.
* Use the chomp indicator in YAML string blocks to avoid code ugliness.

6 years agoError message when you make if without retrieving git modules yet 172/head
Aaron Traas [Fri, 30 Jun 2017 19:56:46 +0000 (15:56 -0400)]
Error message when you make if without retrieving git modules yet

6 years agoUse YAML block-literal syntax to avoid wrapped lines.
Eric S. Raymond [Fri, 30 Jun 2017 20:19:02 +0000 (16:19 -0400)]
Use YAML block-literal syntax to avoid wrapped lines.

In vspeak(), andle text with extra trailing \n.

6 years agoThe bugtype enum doesn't need explicit numbers. 171/head
Jason S. Ninneman [Fri, 30 Jun 2017 18:26:11 +0000 (11:26 -0700)]
The bugtype enum doesn't need explicit numbers.

6 years agoPlugged little linenoise memory leaks. 170/head
NHOrus [Fri, 30 Jun 2017 18:30:01 +0000 (21:30 +0300)]
Plugged little linenoise memory leaks.

6 years agoImplement and document %V escape so version only needs to be set once.
Eric S. Raymond [Fri, 30 Jun 2017 18:35:18 +0000 (14:35 -0400)]
Implement and document %V escape so version only needs to be set once.

6 years agoRemove disused function definitions. 169/head
Jason S. Ninneman [Fri, 30 Jun 2017 18:08:54 +0000 (11:08 -0700)]
Remove disused function definitions.

6 years agoRemove more disused macros.
Jason S. Ninneman [Fri, 30 Jun 2017 18:05:37 +0000 (11:05 -0700)]
Remove more disused macros.

6 years agoRemove some disused stuff.
Jason S. Ninneman [Fri, 30 Jun 2017 17:56:38 +0000 (10:56 -0700)]
Remove some disused stuff.

6 years agoMagic-number elimination.
Eric S. Raymond [Fri, 30 Jun 2017 17:30:49 +0000 (13:30 -0400)]
Magic-number elimination.

6 years agoRemoved line as redundant
NHOrus [Fri, 30 Jun 2017 17:03:18 +0000 (20:03 +0300)]
Removed line as redundant

As of 8675c4facd154b9 lines 612-613 in main.c unreachable due to earlier
dispatch at line 1132 that redirects all find/inventory verbs into actions.c
Message NEARBY fires from YAML link to those verbs.
Also, reduced signature of playermove() to motion only.

6 years agoLess magical numbers.
Eric S. Raymond [Fri, 30 Jun 2017 16:10:26 +0000 (12:10 -0400)]
Less magical numbers.

6 years agoImprove test coverage.
Eric S. Raymond [Fri, 30 Jun 2017 16:05:38 +0000 (12:05 -0400)]
Improve test coverage.

6 years agoMagic-number ellimination, contiguity warnings, cleanup.
Eric S. Raymond [Fri, 30 Jun 2017 15:58:17 +0000 (11:58 -0400)]
Magic-number ellimination, contiguity warnings, cleanup.

6 years agoTests for misc and main 166/head
NHOrus [Fri, 30 Jun 2017 15:30:19 +0000 (18:30 +0300)]
Tests for misc and main

6 years agoRemove gaps from arbitrary_messages, there are no more number sependencies.
Eric S. Raymond [Fri, 30 Jun 2017 15:25:46 +0000 (11:25 -0400)]
Remove gaps from arbitrary_messages, there are no more number sependencies.

Some spans within the list may still rely on contiguity.

6 years agoFixed previous test, added nibble more 165/head
NHOrus [Fri, 30 Jun 2017 14:56:59 +0000 (17:56 +0300)]
Fixed previous test, added nibble more

6 years agoMagic-number elimination.
Eric S. Raymond [Fri, 30 Jun 2017 15:03:57 +0000 (11:03 -0400)]
Magic-number elimination.

6 years agoFix date typo.
Eric S. Raymond [Fri, 30 Jun 2017 14:46:59 +0000 (10:46 -0400)]
Fix date typo.

6 years agoLast one test case 164/head
NHOrus [Fri, 30 Jun 2017 09:27:11 +0000 (12:27 +0300)]
Last one test case

6 years agoSome more easy tests
NHOrus [Fri, 30 Jun 2017 08:31:18 +0000 (11:31 +0300)]
Some more easy tests

6 years agoUpdate illformed.chk for current YAML. 1.1
Eric S. Raymond [Thu, 29 Jun 2017 22:27:14 +0000 (18:27 -0400)]
Update illformed.chk for current YAML.

6 years agoDeduce version from NEWS.
Eric S. Raymond [Thu, 29 Jun 2017 22:25:45 +0000 (18:25 -0400)]
Deduce version from NEWS.

6 years agoUpdate NEWS.
Eric S. Raymond [Thu, 29 Jun 2017 21:54:30 +0000 (17:54 -0400)]
Update NEWS.

6 years agoImplement 'version' command.
Eric S. Raymond [Thu, 29 Jun 2017 21:52:26 +0000 (17:52 -0400)]
Implement 'version' command.

6 years agoTest coverage -- fix regression 163/head
Aaron Traas [Thu, 29 Jun 2017 21:22:00 +0000 (17:22 -0400)]
Test coverage -- fix regression

6 years agoTest coverage - add lots more coverage from actions.c 162/head
Aaron Traas [Thu, 29 Jun 2017 20:40:21 +0000 (16:40 -0400)]
Test coverage - add lots more coverage from actions.c

6 years agoNot the best idea to try to rewach Don Woods for help any more.
Eric S. Raymond [Thu, 29 Jun 2017 20:59:27 +0000 (16:59 -0400)]
Not the best idea to try to rewach Don Woods for help any more.

6 years agoTypo fix.
Eric S. Raymond [Thu, 29 Jun 2017 20:46:36 +0000 (16:46 -0400)]
Typo fix.

6 years agoAdd Aaron Traas to credits.
Eric S. Raymond [Thu, 29 Jun 2017 20:44:01 +0000 (16:44 -0400)]
Add Aaron Traas to credits.

6 years agoStart another round of magic_number removal, this time for motions.
Eric S. Raymond [Thu, 29 Jun 2017 20:41:49 +0000 (16:41 -0400)]
Start another round of magic_number removal, this time for motions.

6 years agoDocumentation and comment cleanup.
Aaron Traas [Thu, 29 Jun 2017 20:37:07 +0000 (16:37 -0400)]
Documentation and comment cleanup.

Also, renove uused enums.

6 years ago'd' had a collision; 'drop' vs ;down'. Remove from 'drop' synonyms.
Eric S. Raymond [Thu, 29 Jun 2017 20:28:20 +0000 (16:28 -0400)]
'd' had a collision; 'drop' vs ;down'. Remove from 'drop' synonyms.

6 years agoDocumentation polishing and minor test improvements.
Eric S. Raymond [Thu, 29 Jun 2017 20:25:55 +0000 (16:25 -0400)]
Documentation polishing and minor test improvements.

6 years agoBreaking one-line conditionals 160/head
NHOrus [Thu, 29 Jun 2017 19:51:30 +0000 (22:51 +0300)]
Breaking one-line conditionals

6 years agoRe-indented.
Eric S. Raymond [Thu, 29 Jun 2017 19:45:59 +0000 (15:45 -0400)]
Re-indented.

6 years agoClean out the now-disused vocabulary structure.
Jason S. Ninneman [Thu, 29 Jun 2017 18:20:36 +0000 (11:20 -0700)]
Clean out the now-disused vocabulary structure.

6 years agoUpdated documentation
Aaron Traas [Thu, 29 Jun 2017 19:13:11 +0000 (15:13 -0400)]
Updated documentation

6 years agoCleanup test case
Aaron Traas [Thu, 29 Jun 2017 16:54:07 +0000 (12:54 -0400)]
Cleanup test case

6 years agoCoverage - Die while closing after lamp dim
Aaron Traas [Thu, 29 Jun 2017 16:28:46 +0000 (12:28 -0400)]
Coverage - Die while closing after lamp dim

6 years agok2 is dead 157/head
NHOrus [Thu, 29 Jun 2017 18:13:53 +0000 (21:13 +0300)]
k2 is dead

6 years agoUntangling variable reuse
NHOrus [Thu, 29 Jun 2017 18:08:09 +0000 (21:08 +0300)]
Untangling variable reuse

6 years agoSeparate debugging of linenoise 156/head
NHOrus [Thu, 29 Jun 2017 17:23:39 +0000 (20:23 +0300)]
Separate debugging of linenoise

6 years agoFix an OB1 bug in allocation.
Eric S. Raymond [Thu, 29 Jun 2017 17:43:36 +0000 (13:43 -0400)]
Fix an OB1 bug in allocation.

6 years agoUnshadowed k2 into k3 in main.c 155/head
NHOrus [Thu, 29 Jun 2017 17:11:53 +0000 (20:11 +0300)]
Unshadowed k2 into k3 in main.c
Reindented everything

6 years agoUpstream linenoise rebased their project. 154/head
Jason S. Ninneman [Thu, 29 Jun 2017 16:34:23 +0000 (09:34 -0700)]
Upstream linenoise rebased their project.

6 years agoTransition to YAML is done, adventure.text and travel.py can go away.
Eric S. Raymond [Thu, 29 Jun 2017 16:21:50 +0000 (12:21 -0400)]
Transition to YAML is done, adventure.text and travel.py can go away.

6 years agoComment polishing.
Eric S. Raymond [Thu, 29 Jun 2017 16:18:55 +0000 (12:18 -0400)]
Comment polishing.

6 years agoFinish newdb -> dungeon renaming. 153/head
Jason S. Ninneman [Thu, 29 Jun 2017 15:49:12 +0000 (08:49 -0700)]
Finish newdb -> dungeon renaming.

6 years agonewdungeon.py is now make_dungeon.py.
Jason S. Ninneman [Thu, 29 Jun 2017 15:45:47 +0000 (08:45 -0700)]
newdungeon.py is now make_dungeon.py.

newdb.[ch] is now dungeon.[ch].

6 years agoRemove MAPLIN(). Fold common.[ch] into other files and remove them.
Jason S. Ninneman [Thu, 29 Jun 2017 15:41:32 +0000 (08:41 -0700)]
Remove MAPLIN(). Fold common.[ch] into other files and remove them.

6 years agoJettison MAKEWD(), GETTXT(), vocab(), GETIN(), and the old db compiler.
Jason S. Ninneman [Thu, 29 Jun 2017 15:35:48 +0000 (08:35 -0700)]
Jettison MAKEWD(), GETTXT(), vocab(), GETIN(), and the old db compiler.

6 years agoCoverage - Test going back when you can't. 152/head
Aaron Traas [Thu, 29 Jun 2017 14:57:34 +0000 (10:57 -0400)]
Coverage - Test going back when you can't.

6 years agoFixed automated testing
Aaron Traas [Wed, 28 Jun 2017 19:04:38 +0000 (15:04 -0400)]
Fixed automated testing

6 years agoAdd make target for coverage
Aaron Traas [Wed, 28 Jun 2017 18:35:17 +0000 (14:35 -0400)]
Add make target for coverage

6 years agoSimplify conditional evaluation when processing travel opcodes.
Eric S. Raymond [Thu, 29 Jun 2017 12:46:29 +0000 (08:46 -0400)]
Simplify conditional evaluation when processing travel opcodes.

6 years agoAddress GitLab issue #16: `make dist` produces incomplete tarball
Eric S. Raymond [Thu, 29 Jun 2017 11:05:11 +0000 (07:05 -0400)]
Address GitLab issue #16: `make dist` produces incomplete tarball

6 years agoCompletely wire vocab words in YAML to the code. 151/head
Jason S. Ninneman [Wed, 28 Jun 2017 16:35:55 +0000 (09:35 -0700)]
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.

6 years agoEliminate some promiscuous variable reuse.
Eric S. Raymond [Thu, 29 Jun 2017 01:06:36 +0000 (21:06 -0400)]
Eliminate some promiscuous variable reuse.

This was making the opcode-conditional evaluation logic much more
difficult to read than it needed to be.

6 years agoImprove documentation if the *most* obscure span of code.
Eric S. Raymond [Thu, 29 Jun 2017 00:24:29 +0000 (20:24 -0400)]
Improve documentation if the *most* obscure span of code.

6 years agoMake clean now removes cheat binary
Aaron Traas [Wed, 28 Jun 2017 17:52:04 +0000 (13:52 -0400)]
Make clean now removes cheat binary

6 years agoMore magic-number removal.
Eric S. Raymond [Wed, 28 Jun 2017 21:29:33 +0000 (17:29 -0400)]
More magic-number removal.

6 years agoMagic-number elimination.
Eric S. Raymond [Wed, 28 Jun 2017 21:07:15 +0000 (17:07 -0400)]
Magic-number elimination.

6 years agoImplement and document state-changes messages in YAML.
Eric S. Raymond [Wed, 28 Jun 2017 20:14:23 +0000 (16:14 -0400)]
Implement and document state-changes messages in YAML.

Examples at the lamp and grate.  This is a way to pull strings out of
arbitrary_messages and make them part of the object definition.

6 years agoSome more linter warnings
NHOrus [Wed, 28 Jun 2017 17:40:46 +0000 (20:40 +0300)]
Some more linter warnings

6 years agoRemoved advent.info and added to .gitignore 148/head
Aaron Traas [Wed, 28 Jun 2017 17:41:53 +0000 (13:41 -0400)]
Removed advent.info and added to .gitignore

advent.info is a generated file. No need to keep it in the repo.

6 years agoTest coverage: make LCOV ignore code unreachable without interactive shell
Aaron Traas [Wed, 28 Jun 2017 16:25:59 +0000 (12:25 -0400)]
Test coverage: make LCOV ignore code unreachable without interactive shell

6 years agoTest coverage: make LCOV ignore bug() and all calls to BUG()
Aaron Traas [Wed, 28 Jun 2017 16:21:05 +0000 (12:21 -0400)]
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.