Flummi/amxmodx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix various issues.

Browse Source
This commit is contained in:
Arkshine 2014-08-01 22:08:45 +02:00
parent bbc83291ef
commit 4ab559ceef
1 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
amxmodx/format.cpp
View File

@ -659,10 +659,16 @@ reswitch:
CHECK_ARGS(0); CHECK_ARGS(0);
cell *addr = get_amxaddr(amx, params[arg]); cell *addr = get_amxaddr(amx, params[arg]);
char buffer[255]; char buffer[255];
if (*addr >= 1 && *addr <= gpGlobals->maxClients) if (*addr)
{ {
CPlayer *player = GET_PLAYER_POINTER_I(*addr); CPlayer *player = NULL;
if (!player->ingame)
if (*addr >= 1 && *addr <= gpGlobals->maxClients)
{
player = GET_PLAYER_POINTER_I(*addr);
}
if (!player || !player->initialized)
{ {
LogError(amx, AMX_ERR_NATIVE, "Client index %d is invalid", *addr); LogError(amx, AMX_ERR_NATIVE, "Client index %d is invalid", *addr);
return 0; return 0;
@ -682,7 +688,7 @@ reswitch:
UTIL_Format(buffer, sizeof(buffer), "Console<0><Console><Console>"); UTIL_Format(buffer, sizeof(buffer), "Console<0><Console><Console>");
} }
AddString(&buf_p, llen, (const char*)&buffer, width, prec); AddString(&buf_p, llen, buffer, width, prec);
arg++; arg++;
break; break;
} }
@ -690,24 +696,29 @@ reswitch:
{ {
CHECK_ARGS(0); CHECK_ARGS(0);
cell *addr = get_amxaddr(amx, params[arg]); cell *addr = get_amxaddr(amx, params[arg]);
char name[32] = "Console"; const char *name = "Console";
if (*addr >= 1 && *addr <= gpGlobals->maxClients) if (*addr)
{ {
CPlayer *player = GET_PLAYER_POINTER_I(*addr); CPlayer *player = NULL;
if (player->ingame) if (*addr >= 1 && *addr <= gpGlobals->maxClients)
{ {
strncopy(name, player->name.c_str(), sizeof(name)); player = GET_PLAYER_POINTER_I(*addr);
AddString(&buf_p, llen, (const char*)&name, width, prec);
arg++;
break;
} }
if (!player || !player->initialized)
{
LogError(amx, AMX_ERR_NATIVE, "Client index %d is invalid", *addr);
return 0;
}
name = player->name.c_str();
} }
LogError(amx, AMX_ERR_NATIVE, "Client index %d is invalid", *addr); AddString(&buf_p, llen, name, width, prec);
return 0; arg++;
break;
} }
case '%': case '%':
*buf_p++ = static_cast<D>(ch); *buf_p++ = static_cast<D>(ch);