summaryrefslogtreecommitdiff
path: root/src/strife/g_game.c
diff options
context:
space:
mode:
authorJames Haley2010-09-22 18:10:40 +0000
committerJames Haley2010-09-22 18:10:40 +0000
commitd57be3f239cc500bb600c6b9f932ae742dc2b8c7 (patch)
tree60d9ebcb660e35ba9c707395945848c63cdb3e61 /src/strife/g_game.c
parent8bbfd5b68a289ddf933f78d369606f1f22dd91c6 (diff)
downloadchocolate-doom-d57be3f239cc500bb600c6b9f932ae742dc2b8c7.tar.gz
chocolate-doom-d57be3f239cc500bb600c6b9f932ae742dc2b8c7.tar.bz2
chocolate-doom-d57be3f239cc500bb600c6b9f932ae742dc2b8c7.zip
Added linetype 180 to P_ShootSpecialLine and vetted other line types.
Removed episode parameter from G_DeferedInitNew, started work on the "Name Your Character" menu, and adjusted the temporary code in M_ChooseSkill so that the game starts in Tarnhill rather than in the Sanctuary. Subversion-branch: /branches/strife-branch Subversion-revision: 2131
Diffstat (limited to 'src/strife/g_game.c')
-rw-r--r--src/strife/g_game.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/strife/g_game.c b/src/strife/g_game.c
index 3c456e4b..c443830f 100644
--- a/src/strife/g_game.c
+++ b/src/strife/g_game.c
@@ -1730,22 +1730,22 @@ void G_DoSaveGame (void)
//
-// G_InitNew
-// Can be called by the startup code or the menu task,
-// consoleplayer, displayplayer, playeringame[] should be set.
-//
skill_t d_skill;
int d_episode;
int d_map;
-
-void
-G_DeferedInitNew
-( skill_t skill,
- int episode,
- int map)
+
+//
+// G_DeferedInitNew
+//
+// Can be called by the startup code or the menu task,
+// consoleplayer, displayplayer, playeringame[] should be set.
+//
+// haleyjd 09/22/10: [STRIFE] Removed episode parameter
+//
+void G_DeferedInitNew(skill_t skill, int map)
{
d_skill = skill;
- d_episode = episode;
+ d_episode = 1; // STRIFE-TODO: no such thing as episodes.
d_map = map;
gameaction = ga_newgame;
}