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

undid some stuff

Browse Source
This commit is contained in:
David Anderson 2004-03-23 13:25:59 +00:00
parent 1b0cc63b5b
commit 6d58afcedb
1 changed files with 16 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
dlls/engine/meta_api.cpp
View File

@ -421,6 +421,8 @@ static cell AMX_NATIVE_CALL set_offset_float(AMX *amx, cell *params)
{ {
int index = params[1]; int index = params[1];
int off = params[2]; int off = params[2];
float fNewValue = *(float *)((void *)&params[3]);
if (index < 1 || index > gpGlobals->maxEntities) { if (index < 1 || index > gpGlobals->maxEntities) {
AMX_RAISEERROR(amx, AMX_ERR_NATIVE); AMX_RAISEERROR(amx, AMX_ERR_NATIVE);
@ -432,8 +434,8 @@ static cell AMX_NATIVE_CALL set_offset_float(AMX *amx, cell *params)
#ifndef __linux__ #ifndef __linux__
off -= 5; off -= 5;
#endif #endif
*((float *)pEnt->pvPrivateData + off) = *(float *)((void *)&params[3]); *((float *)Player->pvPrivateData + off) = fNewValue;
return 1; return 1;
} }
@ -450,10 +452,11 @@ static cell AMX_NATIVE_CALL get_offset_short(AMX *amx, cell *params)
return 0; return 0;
} }
/*if (!is_PlayerOn[index]) { //!!!1111 don't uncomment jghg or I will pull my hair out
if (!is_PlayerOn[index]) {
AMX_RAISEERROR(amx, AMX_ERR_NATIVE); AMX_RAISEERROR(amx, AMX_ERR_NATIVE);
return 0; return 0;
}*/ }
edict_t *pEnt = INDEXENT(index); edict_t *pEnt = INDEXENT(index);
@ -477,10 +480,11 @@ static cell AMX_NATIVE_CALL get_offset(AMX *amx, cell *params)
return 0; return 0;
} }
/*if (!is_PlayerOn[index]) { //jghg comment this out again and I bite you
if (!is_PlayerOn[index]) {
AMX_RAISEERROR(amx, AMX_ERR_NATIVE); AMX_RAISEERROR(amx, AMX_ERR_NATIVE);
return 0; return 0;
}*/ }
edict_t *pEnt = INDEXENT(index); edict_t *pEnt = INDEXENT(index);
@ -504,10 +508,11 @@ static cell AMX_NATIVE_CALL get_offset_float(AMX *amx, cell *params)
return 0; return 0;
} }
/*if (!is_PlayerOn[index]) { //jghg comment this out again and I bite you
if (!is_PlayerOn[index]) {
AMX_RAISEERROR(amx, AMX_ERR_NATIVE); AMX_RAISEERROR(amx, AMX_ERR_NATIVE);
return 0; return 0;
}*/ }
edict_t *pEnt = INDEXENT(index); edict_t *pEnt = INDEXENT(index);
@ -515,10 +520,10 @@ static cell AMX_NATIVE_CALL get_offset_float(AMX *amx, cell *params)
off -= 5; off -= 5;
#endif #endif
//retVal = ((float)*((float *)pEnt->pvPrivateData + off)); //no jghg this actually works!
retVal = ((float)*((float *)pEnt->pvPrivateData + off));
//return *(cell*)((void *)&retVal); return *(cell*)((void *)&retVal);
return *((float *)pEnt->pvPrivateData + off);
} }
//is an entity valid? //is an entity valid?
@ -2018,47 +2023,6 @@ static cell AMX_NATIVE_CALL find_ent_by_owner(AMX *amx, cell *params) // native
return 0; return 0;
} }
// FindEntityByOwner (BAILOPAN)
// Works like FindEntity except only returns by owner.
// Searches by classname.
/*static cell AMX_NATIVE_CALL find_ent_by_owner(AMX *amx, cell *params) {
int iStartEnt = params[1];
int iEntOwner = params[3];
int iLengthSearchStrn;
char *szValue = AMX_GET_STRING(amx, params[2], iLengthSearchStrn);
edict_t *pStartEnt;
if(iStartEnt == -1) {
pStartEnt = NULL;
} else {
pStartEnt = INDEXENT(iStartEnt);
if(FNullEnt(pStartEnt)) { // Impossible to have this line. Sending in starting ent of 0 must be possible if FIND_ENTITY_BY_STRING should work properly below...
return 0;
}
}
int checkEnt = ENTINDEX(FIND_ENTITY_BY_STRING(pStartEnt, "classname", szValue));
int iOwner = -1;
while ((checkEnt && FNullEnt(checkEnt)) && (iOwner!=-1)) { // Err..? iOwner != -1 ? you just inited it to -1??
iOwner = ENTINDEX(pStartEnt->v.owner);
if (iOwner == iEntOwner) {
return checkEnt;
} else {
pStartEnt = INDEXENT(checkEnt);
checkEnt = ENTINDEX(FIND_ENTITY_BY_STRING(pStartEnt, "classname", szValue));
}
}
if(!checkEnt || FNullEnt(checkEnt) || (iOwner == -1)) {
return 0;
}
return checkEnt;
}*/
//returns current number of entities in game (BAILOPAN) //returns current number of entities in game (BAILOPAN)
static cell AMX_NATIVE_CALL entity_count(AMX *amx, cell *params) static cell AMX_NATIVE_CALL entity_count(AMX *amx, cell *params)
{ {