diff options
| author | Samuel Villareal | 2010-09-13 02:16:43 +0000 |
|---|---|---|
| committer | Samuel Villareal | 2010-09-13 02:16:43 +0000 |
| commit | fe1629972adbd40f9e33a514879aea06450e97e1 (patch) | |
| tree | 0e9ed4cab6c5cfab5ab519a61d4dffea4dd5b4cd /src/strife/g_game.c | |
| parent | 0e024ec2a2f064f8c76c6df71d107840198988de (diff) | |
| download | chocolate-doom-fe1629972adbd40f9e33a514879aea06450e97e1.tar.gz chocolate-doom-fe1629972adbd40f9e33a514879aea06450e97e1.tar.bz2 chocolate-doom-fe1629972adbd40f9e33a514879aea06450e97e1.zip | |
+ P_DamageMobj mapped out
+ Fixed crash in G_DoReborn
Subversion-branch: /branches/strife-branch
Subversion-revision: 2080
Diffstat (limited to 'src/strife/g_game.c')
| -rw-r--r-- | src/strife/g_game.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/strife/g_game.c b/src/strife/g_game.c index c36dea4f..64aef350 100644 --- a/src/strife/g_game.c +++ b/src/strife/g_game.c @@ -1215,7 +1215,7 @@ void G_PlayerReborn (int player) int allegiance; killcount = players[player].killcount; - allegiance = players[player].mo->miscdata; + allegiance = players[player].allegiance; memcpy(frags,players[player].frags,sizeof(frags)); @@ -1234,7 +1234,7 @@ void G_PlayerReborn (int player) p->weaponowned[wp_fist] = true; // villsa [STRIFE] default to fists p->cheats |= CF_AUTOHEALTH; // villsa [STRIFE] p->killcount = killcount; - p->mo->miscdata = allegiance; // villsa [STRIFE] + p->allegiance = allegiance; // villsa [STRIFE] p->centerview = true; // villsa [STRIFE] for(i = 0; i < NUMAMMO; i++) |