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

Various pev issues fixed am41542

Browse Source
This commit is contained in:
Scott Ehlert 2006-07-17 20:01:11 +00:00
parent 2dc3f2bec9
commit db3beb9b98
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dlls/fakemeta/pev.cpp
View File

@ -40,6 +40,7 @@ void initialze_offsets()
DO_OFFSET(bInDuck); DO_OFFSET(bInDuck);
DO_OFFSET(flTimeStepSound); DO_OFFSET(flTimeStepSound);
DO_OFFSET(flSwimTime); DO_OFFSET(flSwimTime);
DO_OFFSET(flDuckTime);
DO_OFFSET(iStepLeft); DO_OFFSET(iStepLeft);
DO_OFFSET(gamestate); DO_OFFSET(gamestate);
DO_OFFSET(oldbuttons); DO_OFFSET(oldbuttons);
@ -110,6 +111,7 @@ void initialze_offsets()
DO_OFFSET(oldorigin); DO_OFFSET(oldorigin);
DO_OFFSET(velocity); DO_OFFSET(velocity);
DO_OFFSET(basevelocity); DO_OFFSET(basevelocity);
DO_OFFSET(clbasevelocity);
DO_OFFSET(movedir); DO_OFFSET(movedir);
DO_OFFSET(angles); DO_OFFSET(angles);
DO_OFFSET(avelocity); DO_OFFSET(avelocity);
@ -138,6 +140,7 @@ void initialze_offsets()
DO_OFFSET_R(blending_1, blending, 1); DO_OFFSET_R(blending_1, blending, 1);
DO_OFFSET_R(pev_weaponmodel2, weaponmodel, 0); DO_OFFSET_R(pev_weaponmodel2, weaponmodel, 0);
DO_OFFSET_R(pev_viewmodel2, viewmodel, 0); DO_OFFSET_R(pev_viewmodel2, viewmodel, 0);
DO_OFFSET(pContainingEntity);
} }
#define EDICT_OFFS(v,o) ((char *)v + o) #define EDICT_OFFS(v,o) ((char *)v + o)
@ -220,10 +223,11 @@ static cell AMX_NATIVE_CALL amx_pev(AMX *amx,cell *params)
rets.b = *(byte *)EDICT_OFFS(v, offs); rets.b = *(byte *)EDICT_OFFS(v, offs);
ValType = Ret_Int; ValType = Ret_Int;
} else if ( (iSwitch > pev_string_start && iSwitch < pev_string_end) } else if ( (iSwitch > pev_string_start && iSwitch < pev_string_end)
|| (iSwitch > pev_string2_begin && iSwitch < pev_absolute_end) ) { || (iSwitch > pev_string2_begin && iSwitch < pev_string2_end) ) {
rets.s = *(string_t *)EDICT_OFFS(v, offs); rets.s = *(string_t *)EDICT_OFFS(v, offs);
ValType = Ret_String; ValType = Ret_String;
} else if (iSwitch > pev_edict_start && iSwitch < pev_edict_end) { } else if ( (iSwitch > pev_edict_start && iSwitch < pev_edict_end)
|| (iSwitch > pev_edict2_start && iSwitch < pev_absolute_end) ) {
edict_t *e = *(edict_t **)EDICT_OFFS(v, offs); edict_t *e = *(edict_t **)EDICT_OFFS(v, offs);
rets.i = ENTINDEX(e); rets.i = ENTINDEX(e);
ValType = Ret_Int; ValType = Ret_Int;
@ -343,12 +347,13 @@ static cell AMX_NATIVE_CALL amx_set_pev(AMX *amx, cell *params)
} else if (iSwitch > pev_float_start && iSwitch < pev_float_end) { } else if (iSwitch > pev_float_start && iSwitch < pev_float_end) {
*(float *)EDICT_OFFS(v, offs) = (float)amx_ctof(blah[0]); *(float *)EDICT_OFFS(v, offs) = (float)amx_ctof(blah[0]);
} else if ( (iSwitch > pev_string_start && iSwitch < pev_string_end) } else if ( (iSwitch > pev_string_start && iSwitch < pev_string_end)
|| (iSwitch > pev_string2_begin && iSwitch < pev_absolute_end) ) { || (iSwitch > pev_string2_begin && iSwitch < pev_string2_end) ) {
int len; int len;
char *string = MF_GetAmxString(amx, params[3], 0, &len); char *string = MF_GetAmxString(amx, params[3], 0, &len);
string_t value = ALLOC_STRING(string); string_t value = ALLOC_STRING(string);
*(string_t *)EDICT_OFFS(v, offs) = value; *(string_t *)EDICT_OFFS(v, offs) = value;
} else if (iSwitch > pev_edict_start && iSwitch < pev_edict_end) { } else if ( (iSwitch > pev_edict_start && iSwitch < pev_edict_end)
|| (iSwitch > pev_edict2_start && iSwitch < pev_absolute_end) ) {
edict_t *e = INDEXENT((int)*blah); edict_t *e = INDEXENT((int)*blah);
*(edict_t **)EDICT_OFFS(v, offs) = e; *(edict_t **)EDICT_OFFS(v, offs) = e;
} else if (iSwitch > pev_vecarray_start && iSwitch < pev_vecarray_end) { } else if (iSwitch > pev_vecarray_start && iSwitch < pev_vecarray_end) {

5
dlls/fakemeta/pev.h
View File

@ -148,7 +148,10 @@ enum pev_pointers
pev_string2_begin, /* anything after here are string corrections */ pev_string2_begin, /* anything after here are string corrections */
pev_weaponmodel2, pev_weaponmodel2,
pev_viewmodel2, pev_viewmodel2,
pev_absolute_end, pev_string2_end,
pev_edict2_start, /* edict corrections */
pContainingEntity,
pev_absolute_end
}; };
void initialze_offsets(); void initialze_offsets();

3
plugins/include/fakemeta_const.inc
View File

@ -331,6 +331,9 @@ enum {
pev_string2_begin, /* anything after here are string corrections */ pev_string2_begin, /* anything after here are string corrections */
pev_weaponmodel2, pev_weaponmodel2,
pev_viewmodel2, pev_viewmodel2,
pev_string2_end,
pev_edict2_start, /* edict corrections */
pev_pContainingEntity,
pev_absolute_end pev_absolute_end
}; };