diff options
| author | Simon Howard | 2005-10-17 20:27:05 +0000 |
|---|---|---|
| committer | Simon Howard | 2005-10-17 20:27:05 +0000 |
| commit | 4dc1ca199d444314dfeada9bf159a538edc50414 (patch) | |
| tree | 9b2673b278b34332f92ec780efb25ebb47b9f35c /src/g_game.c | |
| parent | eb11f9bfbb35c9ea3f8c9bf4e238168c8254d131 (diff) | |
| download | chocolate-doom-4dc1ca199d444314dfeada9bf159a538edc50414.tar.gz chocolate-doom-4dc1ca199d444314dfeada9bf159a538edc50414.tar.bz2 chocolate-doom-4dc1ca199d444314dfeada9bf159a538edc50414.zip | |
Start of Dehacked 'Misc' section support. Initial Health+Bullets,
and bfg cells/shot are supported.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 206
Diffstat (limited to 'src/g_game.c')
| -rw-r--r-- | src/g_game.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/g_game.c b/src/g_game.c index a4e32d02..91b86991 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -1,7 +1,7 @@ // Emacs style mode select -*- C++ -*- //----------------------------------------------------------------------------- // -// $Id: g_game.c 204 2005-10-16 20:55:50Z fraggle $ +// $Id: g_game.c 206 2005-10-17 20:27:05Z fraggle $ // // Copyright(C) 1993-1996 Id Software, Inc. // Copyright(C) 2005 Simon Howard @@ -22,6 +22,10 @@ // 02111-1307, USA. // // $Log$ +// Revision 1.16 2005/10/17 20:27:05 fraggle +// Start of Dehacked 'Misc' section support. Initial Health+Bullets, +// and bfg cells/shot are supported. +// // Revision 1.15 2005/10/16 20:55:50 fraggle // Fix the '-cdrom' command-line option. // @@ -85,7 +89,7 @@ static const char -rcsid[] = "$Id: g_game.c 204 2005-10-16 20:55:50Z fraggle $"; +rcsid[] = "$Id: g_game.c 206 2005-10-17 20:27:05Z fraggle $"; #include <string.h> #include <stdlib.h> @@ -94,6 +98,7 @@ rcsid[] = "$Id: g_game.c 204 2005-10-16 20:55:50Z fraggle $"; #include "doomstat.h" #include "deh_main.h" +#include "deh_misc.h" #include "z_zone.h" #include "f_finale.h" @@ -924,11 +929,11 @@ void G_PlayerReborn (int player) p->usedown = p->attackdown = true; // don't do anything immediately p->playerstate = PST_LIVE; - p->health = MAXHEALTH; + p->health = deh_initial_health; // Use dehacked value p->readyweapon = p->pendingweapon = wp_pistol; p->weaponowned[wp_fist] = true; p->weaponowned[wp_pistol] = true; - p->ammo[am_clip] = 50; + p->ammo[am_clip] = deh_initial_bullets; for (i=0 ; i<NUMAMMO ; i++) p->maxammo[i] = maxammo[i]; |