From ae18d8c4b6f7f918aa5ec496ca32899793cbe41e Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Fri, 21 Nov 2008 18:03:06 +0000
Subject: Move setup/ into src/ and merge with main codebase. Remove duplicated
 code. Split out I_Endoom to separate i_endoom.c file.

Subversion-branch: /branches/raven-branch
Subversion-revision: 1384
---
 src/heretic/d_main.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'src/heretic')

diff --git a/src/heretic/d_main.c b/src/heretic/d_main.c
index 2ac92b44..b8edd430 100644
--- a/src/heretic/d_main.c
+++ b/src/heretic/d_main.c
@@ -34,7 +34,11 @@
 #include "ct_chat.h"
 #include "doomdef.h"
 #include "d_iwad.h"
+#include "i_endoom.h"
+#include "i_joystick.h"
+#include "i_sound.h"
 #include "i_system.h"
+#include "i_timer.h"
 #include "i_video.h"
 #include "m_argv.h"
 #include "m_config.h"
@@ -744,7 +748,9 @@ void D_BindVariables(void)
     extern int snd_Channels;
     int i;
 
-    I_BindVariables();
+    I_BindVideoVariables();
+    I_BindJoystickVariables();
+    I_BindSoundVariables();
     M_BindBaseControls();
     M_BindHereticControls();
 
@@ -975,7 +981,9 @@ void D_DoomMain(void)
     IncThermo();
 
     tprintf("I_Init: Setting up machine state.\n", 1);
-    I_Init();
+    I_CheckIsScreensaver();
+    I_InitTimer();
+    I_InitJoystick();
     IncThermo();
 
     tprintf("S_Init: Setting up sound.\n", 1);
-- 
cgit v1.2.3