diff options
author | Simon Howard | 2012-12-24 00:03:41 +0000 |
---|---|---|
committer | Simon Howard | 2012-12-24 00:03:41 +0000 |
commit | f1934e990d7c6d8034650fa09b8a175b542330ba (patch) | |
tree | 2f7a6c1079f98ab9f3a54a6d6354fc7675e4c39e /src/doom/g_game.c | |
parent | ea5b5f171623740a74f1b2bef80527c044373502 (diff) | |
parent | adbfa3216cf3ef6f71cc5b6b22c25a04ae737212 (diff) | |
download | chocolate-doom-f1934e990d7c6d8034650fa09b8a175b542330ba.tar.gz chocolate-doom-f1934e990d7c6d8034650fa09b8a175b542330ba.tar.bz2 chocolate-doom-f1934e990d7c6d8034650fa09b8a175b542330ba.zip |
Merge from trunk.
Subversion-branch: /branches/v2-branch
Subversion-revision: 2553
Diffstat (limited to 'src/doom/g_game.c')
-rw-r--r-- | src/doom/g_game.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/doom/g_game.c b/src/doom/g_game.c index f4b64271..554fe542 100644 --- a/src/doom/g_game.c +++ b/src/doom/g_game.c @@ -1010,16 +1010,10 @@ void G_Ticker (void) // Called by the game initialization functions. // void G_InitPlayer (int player) -{ - player_t* p; - - // set up the saved info - p = &players[player]; - - // clear everything else to defaults +{ + // clear everything else to defaults G_PlayerReborn (player); - -} +} |