From d57be3f239cc500bb600c6b9f932ae742dc2b8c7 Mon Sep 17 00:00:00 2001
From: James Haley
Date: Wed, 22 Sep 2010 18:10:40 +0000
Subject: 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
---
 src/strife/g_game.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'src/strife/g_game.c')

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
@@ -1729,23 +1729,23 @@ 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; 
 } 
-- 
cgit v1.2.3