From 00ad7cdd3d05d09a43bda972c823fdc440feabb9 Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Thu, 24 Mar 2022 02:06:28 +0000 Subject: Clean up gameinfo_init() and other random stuff - Just ask the engine for the game directory instead of doing the stupid argv sniffing hacks from the early days of trying to get the damn thing working. - Also add some other path variables, functions and whatnot, and do some other minor tidying up. - Also also, another damn copyright year, somebody please help me. Unfortunate negative effect off this change: con_init() no longer reports the game name, because it has to happen before gameinfo_init(). I've decided I don't really care, though. --- src/con_.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'src/con_.c') diff --git a/src/con_.c b/src/con_.c index ab1cd1e..925eafb 100644 --- a/src/con_.c +++ b/src/con_.c @@ -23,7 +23,6 @@ #include "abi.h" #include "con_.h" #include "extmalloc.h" -#include "gameinfo.h" #include "gametype.h" #include "mem.h" #include "os.h" @@ -427,9 +426,6 @@ bool con_init(void *(*f)(const char *, int *), int plugin_ver) { // (which for some other reason also has some vtable changes) if (VCALL(_con_iface, FindVar, "avatarbasemodel")) { _gametype_tag |= _gametype_tag_L4DS; - // stupid hack: gameinfo.txt still just says Left 4 Dead 2 but - // this is _not_ Left 4 Dead 2, dammit - gameinfo_title = "Left 4 Dead: Survivors"; } else { _gametype_tag |= _gametype_tag_L4D2; @@ -441,8 +437,7 @@ bool con_init(void *(*f)(const char *, int *), int plugin_ver) { _gametype_tag |= _gametype_tag_L4D1; } else { - con_warn("sst: error: game \"%s\" is unsupported (using " - "VEngineCvar007)\n", gameinfo_title); + con_warn("sst: error: game is unsupported (using VEngineCvar007)\n"); ifacever = 7; goto e; } @@ -478,7 +473,6 @@ warnoe: con_warn("sst: error: old engine console support is not implemented\n"); e: con_msg("\n\n"); con_msg("-- Please include ALL of the following if asking for help:\n"); con_msg("-- plugin: " LONGNAME " v" VERSION "\n"); - con_msg("-- game: %s\n", gameinfo_title); con_msg("-- interfaces: %d/%d\n", plugin_ver, ifacever); con_msg("\n\n"); return false; -- cgit v1.2.3