This commit is contained in:
Steve Dudenhoeffer 2004-09-10 18:43:37 +00:00
parent 2573c9c4d2
commit 4d34270ee9
3 changed files with 5 additions and 5 deletions

View File

@ -10,10 +10,10 @@ void CPlayer::PreThink()
bot=true; bot=true;
} }
if (olddeadflag && pev->deadflag == 0 && SpawnForward != -1) if (olddeadflag && pev->deadflag == 0 && SpawnForward != -1)
MF_ExecuteForward(SpawnForward,index); MF_ExecuteForward(SpawnForward,index());
if (oldteam != pev->team && TeamForward != -1) if (oldteam != pev->team && TeamForward != -1)
MF_ExecuteForward(TeamForward,index,pev->team,oldteam); MF_ExecuteForward(TeamForward,index(),pev->team,oldteam);
int tClass = GetClass(); int tClass = GetClass();
if (tClass != iclass) if (tClass != iclass)
@ -43,7 +43,7 @@ void CPlayer::PostThink_Post()
void CPlayer::ChangeClass(int newclass) void CPlayer::ChangeClass(int newclass)
{ {
if (ChangeclassForward != -1) if (ChangeclassForward != -1)
MF_ExecuteForward(ChangeclassForward, index, newclass, iclass, oldimpulse); MF_ExecuteForward(ChangeclassForward, index(), newclass, iclass, oldimpulse);
iclass=newclass; iclass=newclass;
} }

View File

@ -21,7 +21,7 @@ public:
int oldimpulse; // Store the previous impulse. int oldimpulse; // Store the previous impulse.
int olddeadflag; int olddeadflag;
int oldteam; int oldteam;
int index; int index() { return ENTINDEX(pev->pContainingEntity); };
bool connected; bool connected;
REAL fov; REAL fov;

View File

@ -86,7 +86,7 @@ void ServerActivate(edict_t *pEdictList, int edictCount, int clientMax)
player_edicts[i]=pEdictList + i; player_edicts[i]=pEdictList + i;
CPlayer *player = GET_PLAYER_I(i); CPlayer *player = GET_PLAYER_I(i);
player->edict=pEdictList + i; player->edict=pEdictList + i;
player->index=i; //player->index=i;
player->pev=&player->edict->v; player->pev=&player->edict->v;
player->oldimpulse=0; player->oldimpulse=0;
player->Reset(); player->Reset();