Properly ordering startup code.

Rinnegatamante · Mar 24, 2018 · 9068e35 · 9068e35
1 parent d0ea673
commit 9068e35
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/client/cl_main.c b/client/cl_main.c
@@ -1802,6 +1802,8 @@ void CL_Init (void)
 
 	Con_Init ();
 	S_Init ();	// sound must be initialized after window is created
+	Com_Printf("CDAudio_Init called");
+	CDAudio_Init ();
 	VID_Init ();
 
 	V_Init ();
@@ -1813,8 +1815,6 @@ void CL_Init (void)
 	Com_Printf("SCR_Init called");
 	SCR_Init ();
 	cls.disable_screen = true;	// don't draw yet
-	Com_Printf("CDAudio_Init called");
-	CDAudio_Init ();
 	Com_Printf("CL_InitLocal called");
 	CL_InitLocal ();
 	Com_Printf("IN_Init called");

diff --git a/psp2/glimp_psp2.c b/psp2/glimp_psp2.c
@@ -96,6 +96,8 @@ void GLimp_Shutdown( void )
 */
 int GLimp_Init( void *hinstance, void *wndproc )
 {
+	vglInit(0x800000);
+	vglUseVram(GL_TRUE);
 	gl_config.allow_cds = true;
 	return true;
 }

diff --git a/psp2/sys_psp2.c b/psp2/sys_psp2.c
@@ -414,7 +414,6 @@ extern void IN_StopRumble();
 //=============================================================================
 int quake_main (unsigned int argc, void* argv){
 	int	time, oldtime, newtime;
-	vglInit(0x800000);
 	Qcommon_Init (argc, argv);
 
 	oldtime = Sys_Milliseconds ();