From f1c1fbadf7f1e861c1386f51ef225421cbd5557e Mon Sep 17 00:00:00 2001 From: Tom Hicks Date: Thu, 12 Oct 2006 13:27:42 -0400 Subject: [PATCH] ~Tom --- src/x11.cpp | 8 ++++++++ src/x11.h | 1 + 2 files changed, 9 insertions(+) diff --git a/src/x11.cpp b/src/x11.cpp index dd85e81..09b033f 100644 --- a/src/x11.cpp +++ b/src/x11.cpp @@ -50,6 +50,14 @@ #include "main.h" #include "version.h" +void InitControls(OpenArena::EventManager* em) +{ + if (!level.LoadConfig("my.cfg")) + { + level.LoadConfig(); + } +} + void InitControls() { if (!level.LoadConfig("my.cfg")) diff --git a/src/x11.h b/src/x11.h index baa3b5e..38b08a4 100644 --- a/src/x11.h +++ b/src/x11.h @@ -39,6 +39,7 @@ void ResizeGLScene(GLsizei width, GLsizei height); void HandleConsoleKeyPress(OpenArena::Keys key); int DrawGLScene(); void InitControls(); +void InitControls(OpenArena::EventManager* em); int InitGL(GLvoid); void RT();