diff --git a/amxmodx/CMisc.cpp b/amxmodx/CMisc.cpp index fbe977fc..f47e5575 100755 --- a/amxmodx/CMisc.cpp +++ b/amxmodx/CMisc.cpp @@ -39,7 +39,6 @@ void CPlayer::Init( edict_t* e , int i ) pEdict = e; initialized = false; ingame = false; - bot = false; authorized = false; current = 0; @@ -59,7 +58,6 @@ void CPlayer::Disconnect() { ingame = false; initialized = false; authorized = false; - bot = 0; } void CPlayer::PutInServer() { @@ -70,7 +68,6 @@ bool CPlayer::Connect(const char* connectname,const char* ipaddress) { name.assign(connectname); ip.assign(ipaddress); time = gpGlobals->time; - bot = IsBot(); death_killer = 0; memset(flags,0,sizeof(flags)); memset(weapons,0,sizeof(weapons)); diff --git a/amxmodx/CMisc.h b/amxmodx/CMisc.h index 45e88b4d..3184b178 100755 --- a/amxmodx/CMisc.h +++ b/amxmodx/CMisc.h @@ -74,7 +74,6 @@ public: bool initialized; bool ingame; - bool bot; bool authorized; float time; diff --git a/amxmodx/amxmodx.cpp b/amxmodx/amxmodx.cpp index a35aab73..bbc73b7f 100755 --- a/amxmodx/amxmodx.cpp +++ b/amxmodx/amxmodx.cpp @@ -158,7 +158,7 @@ static cell AMX_NATIVE_CALL console_cmd(AMX *amx, cell *params) /* 2 param */ } else{ CPlayer* pPlayer = GET_PLAYER_POINTER_I(index); - if ( !pPlayer->bot && pPlayer->initialized ) CLIENT_COMMAND(pPlayer->pEdict, cmd ); + if ( !pPlayer->IsBot() && pPlayer->initialized ) CLIENT_COMMAND(pPlayer->pEdict, cmd ); } return len; @@ -399,7 +399,7 @@ static cell AMX_NATIVE_CALL is_user_bot(AMX *amx, cell *params) /* 1 param */ int index = params[1]; if (index<1||index>gpGlobals->maxClients) return 0; - return (GET_PLAYER_POINTER_I(index)->bot ? 1 : 0); + return (GET_PLAYER_POINTER_I(index)->IsBot() ? 1 : 0); } @@ -1140,7 +1140,7 @@ static cell AMX_NATIVE_CALL client_cmd(AMX *amx, cell *params) /* 2 param */ if (params[1] == 0) { for(int i = 1; i <= gpGlobals->maxClients; ++i){ CPlayer* pPlayer = GET_PLAYER_POINTER_I(i); - if (!pPlayer->bot && pPlayer->initialized /*&& pPlayer->ingame*/ ) + if (!pPlayer->IsBot() && pPlayer->initialized /*&& pPlayer->ingame*/ ) CLIENT_COMMAND(pPlayer->pEdict, cmd ); } } @@ -1151,7 +1151,7 @@ static cell AMX_NATIVE_CALL client_cmd(AMX *amx, cell *params) /* 2 param */ return 0; } CPlayer* pPlayer = GET_PLAYER_POINTER_I(index); - if ( !pPlayer->bot && pPlayer->initialized /*&& pPlayer->ingame*/ ) + if ( !pPlayer->IsBot() && pPlayer->initialized /*&& pPlayer->ingame*/ ) CLIENT_COMMAND(pPlayer->pEdict, cmd ); } return len; @@ -1503,7 +1503,7 @@ static cell AMX_NATIVE_CALL get_players(AMX *amx, cell *params) /* 4 param */ if (pPlayer->ingame){ if (pPlayer->IsAlive() ? (flags & 2) : (flags & 1)) continue; - if (pPlayer->bot ? (flags & 4) : (flags & 8)) + if (pPlayer->IsBot() ? (flags & 4) : (flags & 8)) continue; if ((flags & 16) && (pPlayer->teamId != team) ) continue; @@ -1547,7 +1547,7 @@ static cell AMX_NATIVE_CALL find_player(AMX *amx, cell *params) /* 1 param */ if (pPlayer->ingame){ if (pPlayer->IsAlive()?(flags&64):(flags&32)) continue; - if (pPlayer->bot?(flags&128):(flags&256)) + if (pPlayer->IsBot()?(flags&128):(flags&256)) continue; if (flags&1){ if (flags&2048) { diff --git a/amxmodx/meta_api.cpp b/amxmodx/meta_api.cpp index 12853679..ebcbde85 100755 --- a/amxmodx/meta_api.cpp +++ b/amxmodx/meta_api.cpp @@ -524,7 +524,7 @@ void C_ServerDeactivate_Post() { BOOL C_ClientConnect_Post( edict_t *pEntity, const char *pszName, const char *pszAddress, char szRejectReason[ 128 ] ){ CPlayer* pPlayer = GET_PLAYER_POINTER(pEntity); - if (!pPlayer->bot) { + if (!pPlayer->IsBot()) { bool a = pPlayer->Connect(pszName,pszAddress); @@ -556,7 +556,7 @@ void C_ClientDisconnect( edict_t *pEntity ) { void C_ClientPutInServer_Post( edict_t *pEntity ) { CPlayer *pPlayer = GET_PLAYER_POINTER(pEntity); - if (!pPlayer->bot) { + if (!pPlayer->IsBot()) { pPlayer->PutInServer(); ++g_players_num;