1.1 --- a/extensions/clientprefs/extension.cpp	Sun Feb 01 02:35:19 2009 -0500
     1.2 +++ b/extensions/clientprefs/extension.cpp	Sun Feb 01 02:37:00 2009 -0500
     1.3 @@ -46,6 +46,7 @@
     1.4  HandleType_t g_CookieIterator = 0;
     1.5  CookieIteratorHandler g_CookieIteratorHandler;
     1.6  DbDriver g_DriverType;
     1.7 +static const DatabaseInfo *storage_local = NULL;
     1.8  
     1.9  bool ClientPrefs::SDK_OnLoad(char *error, size_t maxlength, bool late)
    1.10  {
    1.11 @@ -58,6 +59,20 @@
    1.12  	{
    1.13  		DBInfo = dbi->FindDatabaseConf("default");
    1.14  
    1.15 +		if (DBInfo == NULL ||
    1.16 +			(strcmp(DBInfo->host, "localhost") == 0 &&
    1.17 +			 strcmp(DBInfo->database, "sourcemod") == 0 && 
    1.18 +			 strcmp(DBInfo->user, "root") == 0 &&
    1.19 +			 strcmp(DBInfo->pass, "") == 0 &&
    1.20 +			 strcmp(DBInfo->driver, "") == 0))
    1.21 +		{
    1.22 +			storage_local = dbi->FindDatabaseConf("storage-local");
    1.23 +			if (DBInfo == NULL)
    1.24 +			{
    1.25 +				DBInfo = storage_local;
    1.26 +			}
    1.27 +		}
    1.28 +
    1.29  		if (DBInfo == NULL)
    1.30  		{
    1.31  			snprintf(error, maxlength, "Could not find \"clientprefs\" or \"default\" database configs");
    1.32 @@ -176,6 +191,14 @@
    1.33  
    1.34  	Database = Driver->Connect(DBInfo, true, error, sizeof(error));
    1.35  
    1.36 +	if (Database == NULL &&
    1.37 +		DBInfo != storage_local &&
    1.38 +		storage_local != NULL)
    1.39 +	{
    1.40 +		DBInfo = storage_local;
    1.41 +		Database = Driver->Connect(DBInfo, true, error, sizeof(error));
    1.42 +	}
    1.43 +
    1.44  	if (Database == NULL)
    1.45  	{
    1.46  		g_pSM->LogError(myself, error);

     2.1 --- a/plugins/basetriggers.sp	Sun Feb 01 02:35:19 2009 -0500
     2.2 +++ b/plugins/basetriggers.sp	Sun Feb 01 02:37:00 2009 -0500
     2.3 @@ -299,7 +299,7 @@
     2.4  		}
     2.5  		else
     2.6  		{
     2.7 -			if (mapchooser && !HasEndOfMapVoteFinished())
     2.8 +			if (mapchooser && EndOfMapVoteEnabled() && !HasEndOfMapVoteFinished())
     2.9  			{
    2.10  				PrintToChat(client, "[SM] %t", "Pending Vote");			
    2.11  			}

     3.1 --- a/plugins/sql-admin-manager.sp	Sun Feb 01 02:35:19 2009 -0500
     3.2 +++ b/plugins/sql-admin-manager.sp	Sun Feb 01 02:37:00 2009 -0500
     3.3 @@ -606,7 +606,7 @@
     3.4  {
     3.5  	if (args < 2)
     3.6  	{
     3.7 -		ReplyToCommand(client, "[SM] Usage: sm_sql_addgroup <flags> <name> [immunity]");
     3.8 +		ReplyToCommand(client, "[SM] Usage: sm_sql_addgroup <name> <flags> [immunity]");
     3.9  		return Plugin_Handled;
    3.10  	}
    3.11  
    3.12 @@ -660,8 +660,8 @@
    3.13  	Format(query, 
    3.14  		sizeof(query),
    3.15  		"INSERT INTO sm_groups (flags, name, immunity_level) VALUES ('%s', '%s', '%d')",
    3.16 +		safe_flags,
    3.17  		safe_name,
    3.18 -		safe_flags,
    3.19  		immunity);
    3.20  	
    3.21  	if (!SQL_FastQuery(db, query))