foxygit / doom Log in 
commit 535b4edd143ceeae870e9c13cdac65ce17e2be48
Merge: 833d8a83 e0eb9592
Author:     Fabian Greffrath <fabian@greffrath.com>
AuthorDate: Mon Mar 30 18:13:10 2015 +0200
Commit:     Fabian Greffrath <fabian@greffrath.com>
CommitDate: Mon Mar 30 18:13:10 2015 +0200

    Merge pull request #523 from chocolate-doom/hexndemo

    Add support for the Hexen 4 Level Demo Version

 src/hexen/a_action.c |  6 +++---
 src/hexen/am_map.c   | 16 ++++++++--------
 src/hexen/ct_chat.c  |  6 +++---
 src/hexen/d_net.c    |  6 +++---
 src/hexen/g_game.c   | 33 ++++++++++++++++++++-------------
 src/hexen/h2_main.c  | 48 ++++++++++++++++++++++++++++++++++++++++++++++--
 src/hexen/h2def.h    |  1 +
 src/hexen/in_lude.c  | 12 ++++++------
 src/hexen/mn_menu.c  |  2 ++
 src/hexen/p_acs.c    |  4 ++--
 src/hexen/p_enemy.c  |  6 +++---
 src/hexen/p_inter.c  |  6 ++++++
 src/hexen/p_mobj.c   |  6 +++---
 src/hexen/p_setup.c  | 14 ++++++++++----
 src/hexen/p_switch.c | 23 ++++++++++++++++++++++-
 src/hexen/p_tick.c   |  2 +-
 src/hexen/p_user.c   |  4 ++--
 src/hexen/r_draw.c   |  4 ++--
 src/hexen/r_things.c |  4 ++--
 src/hexen/sb_bar.c   | 36 ++++++++++++++++++++++++++++++++----
 src/hexen/sv_save.c  | 28 ++++++++++++++--------------
 21 files changed, 191 insertions(+), 76 deletions(-)