UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #246 from alliedmodders/bot-admins

Browse Source 
Fix regression causing "BOT" to no longer be valid in adminsys for Steam identities (r=asherkin).
This commit is contained in:
Nicholas Hastings 2015-01-17 16:15:14 -05:00
commit 324d52bf2b
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/logic/AdminCache.cpp
View File

@ -39,6 +39,7 @@
#include "AdminCache.h" #include "AdminCache.h"
#include "Translator.h" #include "Translator.h"
#include "common_logic.h" #include "common_logic.h"
#include "stringutil.h"
#define LEVEL_STATE_NONE 0 #define LEVEL_STATE_NONE 0
#define LEVEL_STATE_LEVELS 1 #define LEVEL_STATE_LEVELS 1
@ -1063,22 +1064,29 @@ bool AdminCache::GetMethodIndex(const char *name, unsigned int *_index)
bool AdminCache::GetUnifiedSteamIdentity(const char *ident, char *out, size_t maxlen) bool AdminCache::GetUnifiedSteamIdentity(const char *ident, char *out, size_t maxlen)
{ {
int len = strlen(ident); int len = strlen(ident);
/* If the id was a steam id strip off the STEAM_*: part */ if (!strcmp(ident, "BOT"))
if (len >= 11 && !strncmp(ident, "STEAM_", 6) && ident[8] != '_')
{ {
// non-bot/lan Steam2 Id // Bots
strncopy(out, ident, maxlen);
return true;
}
else if (len >= 11 && !strncmp(ident, "STEAM_", 6) && ident[8] != '_')
{
// non-bot/lan Steam2 Id, strip off the STEAM_* part
snprintf(out, maxlen, "%s", &ident[8]); snprintf(out, maxlen, "%s", &ident[8]);
return true; return true;
} }
else if (len >= 7 && !strncmp(ident, "[U:", 3) && ident[len-1] == ']') else if (len >= 7 && !strncmp(ident, "[U:", 3) && ident[len-1] == ']')
{ {
// Steam3 Id // Steam3 Id, replicate the Steam2 Post-"STEAM_" part
uint32_t accountId = strtoul(&ident[5], nullptr, 10); uint32_t accountId = strtoul(&ident[5], nullptr, 10);
snprintf(out, maxlen, "%u:%u", accountId & 1, accountId >> 1); snprintf(out, maxlen, "%u:%u", accountId & 1, accountId >> 1);
return true; return true;
} }
else else
{ {
// 64-bit CSteamID, replicate the Steam2 Post-"STEAM_" part
// some constants from steamclientpublic.h // some constants from steamclientpublic.h
static const uint32_t k_EAccountTypeIndividual = 1; static const uint32_t k_EAccountTypeIndividual = 1;
static const int k_EUniverseInvalid = 0; static const int k_EUniverseInvalid = 0;