From d823e5f524403e5c278d3c863e93bac4b1d8d2ce Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Wed, 6 Apr 2022 00:51:18 +0100 Subject: Fix some egregious and sloppy mistakes Thanks Aciidz and Bill for spotting these. Lesson (ostensibly) learned: Don't program while sleep-deprived! --- src/fixes.c | 4 ++-- src/gameinfo.c | 3 ++- src/sst.c | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/fixes.c b/src/fixes.c index e0dd6f1..eeac1c3 100644 --- a/src/fixes.c +++ b/src/fixes.c @@ -85,9 +85,9 @@ void fixes_apply(void) { // something...). if (GAMETYPE_MATCHES(L4D2x)) { struct con_var *v = con_findvar("mat_queue_mode"); - if (v && (v->parent->base.flags & CON_ARCHIVE)) { + if (v && !(v->parent->base.flags & CON_ARCHIVE)) { // not already fixed v->parent->base.flags = v->parent->base.flags - & ~(CON_DEVONLY | CON_HIDDEN) | CON_ARCHIVE; + & ~(CON_HIDDEN | CON_DEVONLY) | CON_ARCHIVE; v->parent->hasmax = true; v->parent->maxval = 0; } } diff --git a/src/gameinfo.c b/src/gameinfo.c index 31752a1..6d4ddd5 100644 --- a/src/gameinfo.c +++ b/src/gameinfo.c @@ -52,8 +52,9 @@ static char title[64] = {0}; const os_char *gameinfo_bindir = bindir; const os_char *gameinfo_gamedir #ifdef _WIN32 - = gamedir; // on linux, the pointer gets directly set in gameinfo_init() + = gamedir // on linux, the pointer gets directly set in gameinfo_init() #endif +; const os_char *gameinfo_clientlib = clientlib; const os_char *gameinfo_serverlib = serverlib; const char *gameinfo_title = title; diff --git a/src/sst.c b/src/sst.c index e9aa972..0a31796 100644 --- a/src/sst.c +++ b/src/sst.c @@ -306,7 +306,7 @@ static void do_unload(void) { struct CPlugin **plugins = pluginhandler->plugins.m.mem; int n = pluginhandler->plugins.sz; for (struct CPlugin **pp = plugins; pp - plugins < n; ++pp) { - if ((*pp)->theplugin = (void *)&plugin_obj) { + if ((*pp)->theplugin == (void *)&plugin_obj) { // see comment in CPlugin above. setting this to the real handle // right before the engine tries to unload us allows it to // actually unload us instead of just doing nothing. -- cgit v1.2.3