summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
author/dev/humancontroller <devhc@example.com>2015-06-08 14:44:02 +0200
committer/dev/humancontroller <devhc@example.com>2017-03-09 13:51:09 +0100
commitdca9be87a196b1933b37f79838afa9e9adc68019 (patch)
tree932f10b6e51776d46a843a5d8dc1815835360c31 /src
parent9624217d3e62fef17b96db14995198172f16c51e (diff)
remove remnants of UI_OLD_API_VERSION
Diffstat (limited to 'src')
-rw-r--r--src/client/cl_ui.c19
1 files changed, 6 insertions, 13 deletions
diff --git a/src/client/cl_ui.c b/src/client/cl_ui.c
index f122067f..dad0156a 100644
--- a/src/client/cl_ui.c
+++ b/src/client/cl_ui.c
@@ -1058,8 +1058,6 @@ void CL_ShutdownUI( void ) {
CL_InitUI
====================
*/
-#define UI_OLD_API_VERSION 4
-
void CL_InitUI( void ) {
int v;
vmInterpret_t interpret;
@@ -1082,11 +1080,7 @@ void CL_InitUI( void ) {
// sanity check
v = VM_Call( uivm, UI_GETAPIVERSION );
- if (v == UI_OLD_API_VERSION) {
- // init for this gamestate
- VM_Call( uivm, UI_INIT, (clc.state >= CA_AUTHORIZING && clc.state < CA_ACTIVE));
- }
- else if (v != UI_API_VERSION) {
+ if ( v != UI_API_VERSION ) {
// Free uivm now, so UI_SHUTDOWN doesn't get called later.
VM_Free( uivm );
uivm = NULL;
@@ -1094,13 +1088,12 @@ void CL_InitUI( void ) {
Com_Error( ERR_DROP, "User Interface is version %d, expected %d", v, UI_API_VERSION );
cls.uiStarted = qfalse;
}
- else {
- // init for this gamestate
- VM_Call( uivm, UI_INIT, (clc.state >= CA_AUTHORIZING && clc.state < CA_ACTIVE) );
- // show where the ui folder was loaded from
- Cmd_ExecuteString( "which ui/\n" );
- }
+ // init for this gamestate
+ VM_Call( uivm, UI_INIT, ( clc.state >= CA_AUTHORIZING && clc.state < CA_ACTIVE ) );
+
+ // show where the ui folder was loaded from
+ Cmd_ExecuteString( "which ui/\n" );
clc.newsString[ 0 ] = '\0';
}