commit 21bcebf312e41a3b831c22f72bfd0e94368484e4
Merge: 9eaf5ccf 5f7bfef2
Author:     Simon Howard <fraggle@soulsphere.org>
AuthorDate: Fri Oct 18 12:50:18 2019 -0400
Commit:     GitHub <noreply@github.com>
CommitDate: Fri Oct 18 12:50:18 2019 -0400

    Merge pull request #1205 from SmileTheory/chocolate-v12

    Doom 1.2 demo support

 src/doom/d_main.c   | 20 +++++++++++++++++---
 src/doom/g_game.c   | 51 ++++++++++++++++++++++++++++++++++++---------------
 src/doom/hu_stuff.c |  2 +-
 src/doom/m_menu.c   |  2 +-
 src/doom/p_enemy.c  | 29 ++++++++++++++++++++++-------
 src/doom/p_floor.c  |  3 ++-
 src/doom/p_inter.c  | 28 ++++++++++++++++++----------
 src/doom/p_map.c    |  3 ++-
 src/doom/p_sight.c  | 46 +++++++++++++++++++++++++++++++++++++++++++++-
 src/doom/p_spec.c   | 44 ++++++++++++++++++++++++++++----------------
 src/doom/s_sound.c  |  3 ++-
 src/doom/st_lib.c   |  7 +++++--
 src/doom/st_stuff.c | 18 +++++++++++++++++-
 src/doom/wi_stuff.c |  7 +++++--
 14 files changed, 201 insertions(+), 62 deletions(-)