From 7d3ebce7d190b6d078dccdd3877a8c3561851859 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Sat, 31 Jan 2009 22:46:34 -0500 Subject: [PATCH 1/3] Fixed sm_sql_addgroup not working (bug 3578, r=liam). --- plugins/sql-admin-manager.sp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/sql-admin-manager.sp b/plugins/sql-admin-manager.sp index 9b085847..563abfc9 100644 --- a/plugins/sql-admin-manager.sp +++ b/plugins/sql-admin-manager.sp @@ -606,7 +606,7 @@ public Action:Command_AddGroup(client, args) { if (args < 2) { - ReplyToCommand(client, "[SM] Usage: sm_sql_addgroup [immunity]"); + ReplyToCommand(client, "[SM] Usage: sm_sql_addgroup [immunity]"); return Plugin_Handled; } @@ -660,8 +660,8 @@ public Action:Command_AddGroup(client, args) Format(query, sizeof(query), "INSERT INTO sm_groups (flags, name, immunity_level) VALUES ('%s', '%s', '%d')", - safe_name, safe_flags, + safe_name, immunity); if (!SQL_FastQuery(db, query)) From 50e1c5ba1f405cb8705565bd2a8f670c61e5f929 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Sat, 31 Jan 2009 23:42:35 -0500 Subject: [PATCH 2/3] Database fallback for clientprefs is now more "intelligent" (bug 3564, r=pred). --- extensions/clientprefs/extension.cpp | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/extensions/clientprefs/extension.cpp b/extensions/clientprefs/extension.cpp index 14801b34..0aa17c78 100644 --- a/extensions/clientprefs/extension.cpp +++ b/extensions/clientprefs/extension.cpp @@ -46,6 +46,7 @@ CookieTypeHandler g_CookieTypeHandler; HandleType_t g_CookieIterator = 0; CookieIteratorHandler g_CookieIteratorHandler; DbDriver g_DriverType; +static const DatabaseInfo *storage_local = NULL; bool ClientPrefs::SDK_OnLoad(char *error, size_t maxlength, bool late) { @@ -58,6 +59,20 @@ bool ClientPrefs::SDK_OnLoad(char *error, size_t maxlength, bool late) { DBInfo = dbi->FindDatabaseConf("default"); + if (DBInfo == NULL || + (strcmp(DBInfo->host, "localhost") == 0 && + strcmp(DBInfo->database, "sourcemod") == 0 && + strcmp(DBInfo->user, "root") == 0 && + strcmp(DBInfo->pass, "") == 0 && + strcmp(DBInfo->driver, "") == 0)) + { + storage_local = dbi->FindDatabaseConf("storage-local"); + if (DBInfo == NULL) + { + DBInfo = storage_local; + } + } + if (DBInfo == NULL) { snprintf(error, maxlength, "Could not find \"clientprefs\" or \"default\" database configs"); @@ -176,6 +191,14 @@ void ClientPrefs::DatabaseConnect() Database = Driver->Connect(DBInfo, true, error, sizeof(error)); + if (Database == NULL && + DBInfo != storage_local && + storage_local != NULL) + { + DBInfo = storage_local; + Database = Driver->Connect(DBInfo, true, error, sizeof(error)); + } + if (Database == NULL) { g_pSM->LogError(myself, error); From 94303ea9a0d890dd73e8ca757b8bd88dca8479ac Mon Sep 17 00:00:00 2001 From: "mr.e.unk@gmail.com" Date: Sun, 1 Feb 2009 02:09:15 -0500 Subject: [PATCH 3/3] Fixed nextmap trigger showing wrong output with end-of-map voting disabled and sm_trigger_show set to zero (bug 3597, r=pred). --- plugins/basetriggers.sp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/basetriggers.sp b/plugins/basetriggers.sp index 912552af..3f2a6b03 100644 --- a/plugins/basetriggers.sp +++ b/plugins/basetriggers.sp @@ -288,7 +288,7 @@ public Action:Command_Say(client, args) } else { - if (mapchooser && !HasEndOfMapVoteFinished()) + if (mapchooser && EndOfMapVoteEnabled() && !HasEndOfMapVoteFinished()) { PrintToChat(client, "[SM] %t", "Pending Vote"); }