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

Reverted last changes

Browse Source
This commit is contained in:
Pavol Marko 2004-12-22 18:19:51 +00:00
parent 2b4ed9cc27
commit b4ad89e6ef
4 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
amxmodx/CMisc.cpp
View File

@ -39,6 +39,7 @@ void CPlayer::Init( edict_t* e , int i )
pEdict = e; pEdict = e;
initialized = false; initialized = false;
ingame = false; ingame = false;
bot = false;
authorized = false; authorized = false;
current = 0; current = 0;
@ -58,6 +59,7 @@ void CPlayer::Disconnect() {
ingame = false; ingame = false;
initialized = false; initialized = false;
authorized = false; authorized = false;
bot = 0;
} }
void CPlayer::PutInServer() { void CPlayer::PutInServer() {
@ -68,6 +70,7 @@ bool CPlayer::Connect(const char* connectname,const char* ipaddress) {
name.assign(connectname); name.assign(connectname);
ip.assign(ipaddress); ip.assign(ipaddress);
time = gpGlobals->time; time = gpGlobals->time;
bot = IsBot();
death_killer = 0; death_killer = 0;
memset(flags,0,sizeof(flags)); memset(flags,0,sizeof(flags));
memset(weapons,0,sizeof(weapons)); memset(weapons,0,sizeof(weapons));

1
amxmodx/CMisc.h
View File

@ -74,6 +74,7 @@ public:
bool initialized; bool initialized;
bool ingame; bool ingame;
bool bot;
bool authorized; bool authorized;
float time; float time;

12
amxmodx/amxmodx.cpp
View File

@ -158,7 +158,7 @@ static cell AMX_NATIVE_CALL console_cmd(AMX *amx, cell *params) /* 2 param */
} }
else{ else{
CPlayer* pPlayer = GET_PLAYER_POINTER_I(index); CPlayer* pPlayer = GET_PLAYER_POINTER_I(index);
if ( !pPlayer->IsBot() && pPlayer->initialized ) CLIENT_COMMAND(pPlayer->pEdict, cmd ); if ( !pPlayer->bot && pPlayer->initialized ) CLIENT_COMMAND(pPlayer->pEdict, cmd );
} }
return len; return len;
@ -399,7 +399,7 @@ static cell AMX_NATIVE_CALL is_user_bot(AMX *amx, cell *params) /* 1 param */
int index = params[1]; int index = params[1];
if (index<1||index>gpGlobals->maxClients) if (index<1||index>gpGlobals->maxClients)
return 0; return 0;
return (GET_PLAYER_POINTER_I(index)->IsBot() ? 1 : 0); return (GET_PLAYER_POINTER_I(index)->bot ? 1 : 0);
} }
@ -1140,7 +1140,7 @@ static cell AMX_NATIVE_CALL client_cmd(AMX *amx, cell *params) /* 2 param */
if (params[1] == 0) { if (params[1] == 0) {
for(int i = 1; i <= gpGlobals->maxClients; ++i){ for(int i = 1; i <= gpGlobals->maxClients; ++i){
CPlayer* pPlayer = GET_PLAYER_POINTER_I(i); CPlayer* pPlayer = GET_PLAYER_POINTER_I(i);
if (!pPlayer->IsBot() && pPlayer->initialized /*&& pPlayer->ingame*/ ) if (!pPlayer->bot && pPlayer->initialized /*&& pPlayer->ingame*/ )
CLIENT_COMMAND(pPlayer->pEdict, cmd ); CLIENT_COMMAND(pPlayer->pEdict, cmd );
} }
} }
@ -1151,7 +1151,7 @@ static cell AMX_NATIVE_CALL client_cmd(AMX *amx, cell *params) /* 2 param */
return 0; return 0;
} }
CPlayer* pPlayer = GET_PLAYER_POINTER_I(index); CPlayer* pPlayer = GET_PLAYER_POINTER_I(index);
if ( !pPlayer->IsBot() && pPlayer->initialized /*&& pPlayer->ingame*/ ) if ( !pPlayer->bot && pPlayer->initialized /*&& pPlayer->ingame*/ )
CLIENT_COMMAND(pPlayer->pEdict, cmd ); CLIENT_COMMAND(pPlayer->pEdict, cmd );
} }
return len; return len;
@ -1503,7 +1503,7 @@ static cell AMX_NATIVE_CALL get_players(AMX *amx, cell *params) /* 4 param */
if (pPlayer->ingame){ if (pPlayer->ingame){
if (pPlayer->IsAlive() ? (flags & 2) : (flags & 1)) if (pPlayer->IsAlive() ? (flags & 2) : (flags & 1))
continue; continue;
if (pPlayer->IsBot() ? (flags & 4) : (flags & 8)) if (pPlayer->bot ? (flags & 4) : (flags & 8))
continue; continue;
if ((flags & 16) && (pPlayer->teamId != team) ) if ((flags & 16) && (pPlayer->teamId != team) )
continue; continue;
@ -1547,7 +1547,7 @@ static cell AMX_NATIVE_CALL find_player(AMX *amx, cell *params) /* 1 param */
if (pPlayer->ingame){ if (pPlayer->ingame){
if (pPlayer->IsAlive()?(flags&64):(flags&32)) if (pPlayer->IsAlive()?(flags&64):(flags&32))
continue; continue;
if (pPlayer->IsBot()?(flags&128):(flags&256)) if (pPlayer->bot?(flags&128):(flags&256))
continue; continue;
if (flags&1){ if (flags&1){
if (flags&2048) { if (flags&2048) {

10
amxmodx/meta_api.cpp
View File

@ -524,7 +524,7 @@ void C_ServerDeactivate_Post() {
BOOL C_ClientConnect_Post( edict_t *pEntity, const char *pszName, const char *pszAddress, char szRejectReason[ 128 ] ){ BOOL C_ClientConnect_Post( edict_t *pEntity, const char *pszName, const char *pszAddress, char szRejectReason[ 128 ] ){
CPlayer* pPlayer = GET_PLAYER_POINTER(pEntity); CPlayer* pPlayer = GET_PLAYER_POINTER(pEntity);
if (!pPlayer->IsBot()) { if (!pPlayer->bot) {
bool a = pPlayer->Connect(pszName,pszAddress); bool a = pPlayer->Connect(pszName,pszAddress);
@ -554,14 +554,9 @@ void C_ClientDisconnect( edict_t *pEntity ) {
RETURN_META(MRES_IGNORED); RETURN_META(MRES_IGNORED);
} }
void C_ClientDisconnect_Post(edict_t *pEntity)
{
pEntity->v.flags &= ~FL_FAKECLIENT;
}
void C_ClientPutInServer_Post( edict_t *pEntity ) { void C_ClientPutInServer_Post( edict_t *pEntity ) {
CPlayer *pPlayer = GET_PLAYER_POINTER(pEntity); CPlayer *pPlayer = GET_PLAYER_POINTER(pEntity);
if (!pPlayer->IsBot()) { if (!pPlayer->bot) {
pPlayer->PutInServer(); pPlayer->PutInServer();
++g_players_num; ++g_players_num;
@ -1235,7 +1230,6 @@ C_DLLEXPORT int GetEntityAPI2_Post( DLL_FUNCTIONS *pFunctionTable, int *interfac
gFunctionTable_Post.pfnClientUserInfoChanged = C_ClientUserInfoChanged_Post; gFunctionTable_Post.pfnClientUserInfoChanged = C_ClientUserInfoChanged_Post;
gFunctionTable_Post.pfnServerActivate = C_ServerActivate_Post; gFunctionTable_Post.pfnServerActivate = C_ServerActivate_Post;
gFunctionTable_Post.pfnClientConnect = C_ClientConnect_Post; gFunctionTable_Post.pfnClientConnect = C_ClientConnect_Post;
gFunctionTable_Post.pfnClientDisconnect = C_ClientDisconnect_Post;
gFunctionTable_Post.pfnStartFrame = C_StartFrame_Post; gFunctionTable_Post.pfnStartFrame = C_StartFrame_Post;
gFunctionTable_Post.pfnServerDeactivate = C_ServerDeactivate_Post; gFunctionTable_Post.pfnServerDeactivate = C_ServerDeactivate_Post;