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/doom/d_main.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'src/doom')

diff --git a/src/doom/d_main.c b/src/doom/d_main.c
index 419e871c..91224e88 100644
--- a/src/doom/d_main.c
+++ b/src/doom/d_main.c
@@ -60,6 +60,8 @@
 #include "m_menu.h"
 #include "p_saveg.h"
 
+#include "i_endoom.h"
+#include "i_joystick.h"
 #include "i_system.h"
 #include "i_timer.h"
 #include "i_video.h"
@@ -346,7 +348,10 @@ void D_BindVariables(void)
 {
     int i;
 
-    I_BindVariables();
+    I_BindVideoVariables();
+    I_BindJoystickVariables();
+    I_BindSoundVariables();
+
     M_BindBaseControls();
 #ifdef FEATURE_MULTIPLAYER
     NET_BindVariables();
@@ -1674,7 +1679,9 @@ void D_DoomMain (void)
     P_Init ();
 
     printf (DEH_String("I_Init: Setting up machine state.\n"));
-    I_Init ();
+    I_CheckIsScreensaver();
+    I_InitTimer();
+    I_InitJoystick();
 
 #ifdef FEATURE_MULTIPLAYER
     printf ("NET_Init: Initialise network subsystem.\n");
-- 
cgit v1.2.3