Added get_orig_retval for retrieving the original return value of an engine function

Reformatted comments in fakemeta include files so they look a bit neater
This commit is contained in:
Scott Ehlert 2006-04-17 16:59:37 +00:00
parent 82a739a95e
commit b57c752b1c
3 changed files with 243 additions and 232 deletions

View File

@ -52,6 +52,15 @@ native unregister_forward(_forwardType, registerId, post=0);
/* Returns data for metamod */ /* Returns data for metamod */
native forward_return(type,{Float,Sql,Result,_}:...); native forward_return(type,{Float,Sql,Result,_}:...);
/* Returns the original return value of an engine function.
* This is only valid in forwards that were registered as post.
*
* get_orig_retval() - no params, retrieves integer return value
* get_orig_retval(&Float:value) - retrieves float return value by reference
* get_orig_retval(value[], len) - retrives string return value
*/
native get_orig_retval({Float,_}:...)
native engfunc(type,{Float,Sql,Result,_}:...); native engfunc(type,{Float,Sql,Result,_}:...);
native dllfunc(type,{Float,Sql,Result,_}:...); native dllfunc(type,{Float,Sql,Result,_}:...);

View File

@ -51,8 +51,9 @@ enum {
EngFunc_DropToFloor, // int ) (edict_t *e); EngFunc_DropToFloor, // int ) (edict_t *e);
EngFunc_WalkMove, // int ) (edict_t *ent, float yaw, float dist, int iMode); EngFunc_WalkMove, // int ) (edict_t *ent, float yaw, float dist, int iMode);
EngFunc_SetOrigin, // void ) (edict_t *e, const float *rgflOrigin); EngFunc_SetOrigin, // void ) (edict_t *e, const float *rgflOrigin);
EngFunc_EmitSound, // void ) (edict_t *entity, int channel, const char *sample, /*int*/float volume, float attenuation, int fFlags, int pitch); EngFunc_EmitSound, // void ) (edict_t *entity, int channel, const char *sample, float volume, float attenuation, int fFlags, int pitch);
EngFunc_EmitAmbientSound, // void ) (edict_t *entity, float *pos, const char *samp, float vol, float attenuation, int fFlags, int pitch); EngFunc_EmitAmbientSound, // void ) (edict_t *entity, float *pos, const char *samp, float vol, float attenuation, int fFlags, int pitch);
//With 1.71 you can pass an optional TraceLine ptr for trace natives //With 1.71 you can pass an optional TraceLine ptr for trace natives
// it can be 0, for meaning "global tr handle" (for get/set_tr2), or // it can be 0, for meaning "global tr handle" (for get/set_tr2), or
// it can be any other TR handle (such as one from a TR hook) // it can be any other TR handle (such as one from a TR hook)
@ -63,6 +64,7 @@ enum {
EngFunc_TraceModel, // void ) (const float *v1, const float *v2, int hullNumber, edict_t *pent, TraceResult *ptr); EngFunc_TraceModel, // void ) (const float *v1, const float *v2, int hullNumber, edict_t *pent, TraceResult *ptr);
EngFunc_TraceTexture, // const char *) (edict_t *pTextureEntity, const float *v1, const float *v2 ); EngFunc_TraceTexture, // const char *) (edict_t *pTextureEntity, const float *v1, const float *v2 );
EngFunc_TraceSphere, // void ) (const float *v1, const float *v2, int fNoMonsters, float radius, edict_t *pentToSkip, TraceResult *ptr); EngFunc_TraceSphere, // void ) (const float *v1, const float *v2, int fNoMonsters, float radius, edict_t *pentToSkip, TraceResult *ptr);
EngFunc_GetAimVector, // void ) (edict_t *ent, float speed, float *rgflReturn); EngFunc_GetAimVector, // void ) (edict_t *ent, float speed, float *rgflReturn);
EngFunc_ParticleEffect, // void ) (const float *org, const float *dir, float color, float count); EngFunc_ParticleEffect, // void ) (const float *org, const float *dir, float color, float count);
EngFunc_LightStyle, // void ) (int style, char *val); EngFunc_LightStyle, // void ) (int style, char *val);
@ -91,18 +93,18 @@ enum {
EngFunc_GetPhysicsInfoString, // const char *) (const edict_t *pClient); EngFunc_GetPhysicsInfoString, // const char *) (const edict_t *pClient);
EngFunc_PrecacheEvent, // unsigned short) (int type, const char*psz); EngFunc_PrecacheEvent, // unsigned short) (int type, const char*psz);
EngFunc_PlaybackEvent, // void ) (int flags, const edict_t *pInvoker, unsigned short eventindex, float delay, float *origin, float *angles, float fparam1, float fparam2, int iparam1, int iparam2, int bparam1, int bparam2); EngFunc_PlaybackEvent, // void ) (int flags, const edict_t *pInvoker, unsigned short eventindex, float delay, float *origin, float *angles, float fparam1, float fparam2, int iparam1, int iparam2, int bparam1, int bparam2);
EngFunc_CheckVisibility, //) ( const edict_t *entity, unsigned char *pset ); EngFunc_CheckVisibility, // int ) (const edict_t *entity, unsigned char *pset);
EngFunc_GetCurrentPlayer, //) ( void ); EngFunc_GetCurrentPlayer, // int ) ( void );
EngFunc_CanSkipPlayer, //) ( const edict_t *player ); EngFunc_CanSkipPlayer, // int ) (const edict_t *player);
EngFunc_SetGroupMask, //) ( int mask, int op ); EngFunc_SetGroupMask, // void ) (int mask, int op);
EngFunc_GetClientListening, // bool (int iReceiver, int iSender) EngFunc_GetClientListening, // bool ) (int iReceiver, int iSender)
EngFunc_SetClientListening, // bool (int iReceiver, int iSender, bool Listen) EngFunc_SetClientListening, // bool ) (int iReceiver, int iSender, bool Listen)
EngFunc_MessageBegin, // void (int msg_dest, int msg_type, const float *pOrigin, edict_t *ed) EngFunc_MessageBegin, // void ) (int msg_dest, int msg_type, const float *pOrigin, edict_t *ed)
EngFunc_WriteCoord, // void (float) EngFunc_WriteCoord, // void ) (float flValue)
EngFunc_WriteAngle, // void (float) EngFunc_WriteAngle, // void ) (float flValue)
EngFunc_InfoKeyValue, // char*) (char *infobuffer, char *key); EngFunc_InfoKeyValue, // char*) (char *infobuffer, char *key);
EngFunc_SetKeyValue, // void ) (char *infobuffer, char *key, char *value); EngFunc_SetKeyValue, // void ) (char *infobuffer, char *key, char *value);
EngFunc_SetClientKeyValue // void ) (int clientIndex, char *infobuffer, char *key, char *value); EngFunc_SetClientKeyValue, // void ) (int clientIndex, char *infobuffer, char *key, char *value);
}; };
/* Used with dllfunc() /* Used with dllfunc()
@ -136,6 +138,7 @@ enum
DLLFunc_ParmsChangeLevel, // void ) ( void ); DLLFunc_ParmsChangeLevel, // void ) ( void );
// Returns string describing current .dll. E.g., TeamFotrress 2, Half-Life // Returns string describing current .dll. E.g., TeamFotrress 2, Half-Life
// This also gets called when the server is queried for information (for example, by a server browser tool)
DLLFunc_GetGameDescription, // const char *) ( void ); DLLFunc_GetGameDescription, // const char *) ( void );
// Spectator funcs // Spectator funcs
@ -153,11 +156,11 @@ enum
DLLFunc_GetHullBounds, // int ) (int hullnumber, float *mins, float *maxs); DLLFunc_GetHullBounds, // int ) (int hullnumber, float *mins, float *maxs);
// Create baselines for certain "unplaced" items. // Create baselines for certain "unplaced" items.
DLLFunc_CreateInstancedBaseline, // void ) ( void ); DLLFunc_CreateInstancedBaselines, // void ) ( void );
DLLFunc_pfnAllowLagCompensation, // int ) ( void ); DLLFunc_pfnAllowLagCompensation, // int ) ( void );
// I know this does not fit with DLLFUNC(), but I dont want another native just for it. // I know this does not fit with DLLFUNC(), but I dont want another native just for it.
MetaFunc_CallGameEntity, // bool (plid_t plid, const char *entStr,entvars_t *pev); MetaFunc_CallGameEntity, // bool ) (plid_t plid, const char *entStr,entvars_t *pev);
DLLFunc_ClientUserInfoChanged // void (idplayer) DLLFunc_ClientUserInfoChanged // void ) (idplayer)
}; };
enum { enum {
@ -360,141 +363,140 @@ enum
/* Used with register_forward() /* Used with register_forward()
*/ */
enum { enum {
FM_PrecacheModel = 1, // done FM_PrecacheModel = 1,
FM_PrecacheSound, // done FM_PrecacheSound,
FM_SetModel, // done FM_SetModel,
FM_ModelIndex, // done FM_ModelIndex,
FM_ModelFrames, // done FM_ModelFrames,
FM_SetSize, // done FM_SetSize,
FM_ChangeLevel, // done FM_ChangeLevel,
FM_VecToYaw, // done FM_VecToYaw,
FM_VecToAngles, // done FM_VecToAngles,
FM_MoveToOrigin, // done FM_MoveToOrigin,
FM_ChangeYaw, // done FM_ChangeYaw,
FM_ChangePitch, // done FM_ChangePitch,
FM_FindEntityByString, // done FM_FindEntityByString,
FM_GetEntityIllum, // done FM_GetEntityIllum,
FM_FindEntityInSphere, // done FM_FindEntityInSphere,
FM_FindClientInPVS, // done FM_FindClientInPVS,
FM_EntitiesInPVS, // done FM_EntitiesInPVS,
FM_MakeVectors, // done FM_MakeVectors,
FM_AngleVectors, // done FM_AngleVectors,
FM_CreateEntity, // done FM_CreateEntity,
FM_RemoveEntity, // done FM_RemoveEntity,
FM_CreateNamedEntity, // done FM_CreateNamedEntity,
FM_MakeStatic, // done FM_MakeStatic,
FM_EntIsOnFloor, // done FM_EntIsOnFloor,
FM_DropToFloor, // done FM_DropToFloor,
FM_WalkMove, // int ) (edict_t *ent, float yaw, float dist, int iMode); -- does't work as of 0.20 RC2 FM_WalkMove,
FM_SetOrigin, // done FM_SetOrigin,
FM_EmitSound, // done FM_EmitSound,
FM_EmitAmbientSound, // done FM_EmitAmbientSound,
FM_TraceLine, // void ) (const float *v1, const float *v2, int fNoMonsters, edict_t *pentToSkip, TraceResult *ptr); -- does't work as of 0.20 RC2 FM_TraceLine,
FM_TraceToss, // void ) (edict_t* pent, edict_t* pentToIgnore, TraceResult *ptr); -- does't work as of 0.20 RC2 FM_TraceToss,
FM_TraceMonsterHull, // int ) (edict_t *pEdict, const float *v1, const float *v2, int fNoMonsters, edict_t *pentToSkip, TraceResult *ptr); -- does't work as of 0.20 RC2 FM_TraceMonsterHull,
FM_TraceHull, // void ) (const float *v1, const float *v2, int fNoMonsters, int hullNumber, edict_t *pentToSkip, TraceResult *ptr); -- does't work as of 0.20 RC2 FM_TraceHull,
FM_TraceModel, // void ) (const float *v1, const float *v2, int hullNumber, edict_t *pent, TraceResult *ptr); -- does't work as of 0.20 RC2 FM_TraceModel,
FM_TraceTexture, // const char *) (edict_t *pTextureEntity, const float *v1, const float *v2 ); -- does't work as of 0.20 RC2 FM_TraceTexture,
FM_TraceSphere, // void ) (const float *v1, const float *v2, int fNoMonsters, float radius, edict_t *pentToSkip, TraceResult *ptr); -- does't work as of 0.20 RC2 FM_TraceSphere,
FM_GetAimVector, // done FM_GetAimVector,
FM_ParticleEffect, // done FM_ParticleEffect,
FM_LightStyle, // done FM_LightStyle,
FM_DecalIndex, // done FM_DecalIndex,
FM_PointContents, // done FM_PointContents,
FM_MessageBegin, // done FM_MessageBegin,
FM_MessageEnd, // done FM_MessageEnd,
FM_WriteByte, // done FM_WriteByte,
FM_WriteChar, // done FM_WriteChar,
FM_WriteShort, // done FM_WriteShort,
FM_WriteLong, // done FM_WriteLong,
FM_WriteAngle, // done FM_WriteAngle,
FM_WriteCoord, // done FM_WriteCoord,
FM_WriteString, // done FM_WriteString,
FM_WriteEntity, // done FM_WriteEntity,
FM_CVarGetFloat, // done FM_CVarGetFloat,
FM_CVarGetString, // done FM_CVarGetString,
FM_CVarSetFloat, // done FM_CVarSetFloat,
FM_CVarSetString, // done FM_CVarSetString,
FM_FreeEntPrivateData, // done FM_FreeEntPrivateData,
FM_SzFromIndex, // done FM_SzFromIndex,
FM_AllocString, // done FM_AllocString,
FM_RegUserMsg, // done FM_RegUserMsg,
FM_AnimationAutomove, // done FM_AnimationAutomove,
FM_GetBonePosition, // void ) (const edict_t* pEdict, int iBone, float *rgflOrigin, float *rgflAngles ); -- does't work as of 0.20 RC2 FM_GetBonePosition,
FM_GetAttachment, // void ) (const edict_t *pEdict, int iAttachment, float *rgflOrigin, float *rgflAngles ); -- does't work as of 0.20 RC2 FM_GetAttachment,
FM_SetView, // done FM_SetView,
FM_Time, // done FM_Time,
FM_CrosshairAngle, // done FM_CrosshairAngle,
FM_FadeClientVolume, // done FM_FadeClientVolume,
FM_SetClientMaxspeed, // done FM_SetClientMaxspeed,
FM_CreateFakeClient, // done FM_CreateFakeClient,
FM_RunPlayerMove, // void ) (edict_t *fakeclient, const float *viewangles, float forwardmove, float sidemove, float upmove, unsigned short buttons, byte impulse, byte msec ); -- does't work as of 0.20 RC2 FM_RunPlayerMove,
FM_NumberOfEntities, // done FM_NumberOfEntities,
FM_StaticDecal, // done FM_StaticDecal,
FM_PrecacheGeneric, // done FM_PrecacheGeneric,
FM_BuildSoundMsg, // void ) (edict_t *entity, int channel, const char *sample, /*int*/float volume, float attenuation, int fFlags, int pitch, int msg_dest, int msg_type, const float *pOrigin, edict_t *ed); -- does't work as of 0.20 RC2 FM_BuildSoundMsg,
FM_GetPhysicsKeyValue, // done FM_GetPhysicsKeyValue,
FM_SetPhysicsKeyValue, // done FM_SetPhysicsKeyValue,
FM_GetPhysicsInfoString,// done FM_GetPhysicsInfoString,
FM_PrecacheEvent, // done FM_PrecacheEvent,
FM_PlaybackEvent, // done FM_PlaybackEvent,
FM_CheckVisibility, //) ( FM_CheckVisibility,
FM_GetCurrentPlayer, // done FM_GetCurrentPlayer,
FM_CanSkipPlayer, // done FM_CanSkipPlayer,
FM_SetGroupMask, //done FM_SetGroupMask,
FM_Voice_GetClientListening, // done FM_Voice_GetClientListening,
FM_Voice_SetClientListening, // done FM_Voice_SetClientListening,
FM_InfoKeyValue, // done FM_InfoKeyValue,
FM_SetKeyValue, // done FM_SetKeyValue,
FM_SetClientKeyValue, // done FM_SetClientKeyValue,
FM_GetPlayerAuthId, // done FM_GetPlayerAuthId,
FM_GetPlayerWONId, // done FM_GetPlayerWONId,
FM_IsMapValid, // done FM_IsMapValid,
FM_Spawn,
FM_Think,
FM_Use,
FM_Touch,
FM_Blocked,
FM_KeyValue,
FM_SetAbsBox,
FM_ClientConnect,
FM_Spawn, // done FM_ClientDisconnect,
FM_Think, // done FM_ClientKill,
FM_Use, // done FM_ClientPutInServer,
FM_Touch, // done FM_ClientCommand,
FM_Blocked, // done
FM_KeyValue, // void ) ( edict_t *pentKeyvalue, KeyValueData *pkvd ); -- does't work as of 0.20 RC2
FM_SetAbsBox, // done
FM_ClientConnect, // done
FM_ClientDisconnect, // done FM_ServerDeactivate,
FM_ClientKill, // done
FM_ClientPutInServer, // done
FM_ClientCommand, // done
FM_ServerDeactivate, // done FM_PlayerPreThink,
FM_PlayerPostThink,
FM_PlayerPreThink, // done FM_StartFrame,
FM_PlayerPostThink, // done FM_ParmsNewLevel,
FM_ParmsChangeLevel,
FM_StartFrame, // done
FM_ParmsNewLevel, // done
FM_ParmsChangeLevel, // done
// Returns string describing current .dll. E.g., TeamFotrress 2, Half-Life // Returns string describing current .dll. E.g., TeamFotrress 2, Half-Life
FM_GetGameDescription, // done // This also gets called when the server is queried for information (for example, by a server browser tool)
FM_GetGameDescription,
// Spectator funcs // Spectator funcs
FM_SpectatorConnect, // done FM_SpectatorConnect,
FM_SpectatorDisconnect, // done FM_SpectatorDisconnect,
FM_SpectatorThink, // done FM_SpectatorThink,
// Notify game .dll that engine is going to shut down. Allows mod authors to set a breakpoint. // Notify game .dll that engine is going to shut down. Allows mod authors to set a breakpoint.
FM_Sys_Error, // done FM_Sys_Error,
FM_PM_FindTextureType, // done FM_PM_FindTextureType,
FM_RegisterEncoders, // done FM_RegisterEncoders,
// Enumerates player hulls. Returns 0 if the hull number doesn't exist, 1 otherwise
// Create baselines for certain "unplaced" items. // Create baselines for certain "unplaced" items.
FM_CreateInstancedBaseline, // done FM_CreateInstancedBaselines,
FM_AllowLagCompensation, // done
FM_AlertMessage, //done (at_type, message[]) FM_AllowLagCompensation,
FM_AlertMessage,
// NEW_DLL_FUNCTIONS: // NEW_DLL_FUNCTIONS:
FM_OnFreeEntPrivateData, FM_OnFreeEntPrivateData,

View File

@ -241,8 +241,8 @@ stock DF_RegisterEncoders()
stock DF_GetHullBounds(hullnumber, Float:mins[3], Float:maxs[3]) stock DF_GetHullBounds(hullnumber, Float:mins[3], Float:maxs[3])
return dllfunc(DLLFunc_GetHullBounds, hullnumber, mins, maxs) return dllfunc(DLLFunc_GetHullBounds, hullnumber, mins, maxs)
stock DF_CreateInstancedBaseline() stock DF_CreateInstancedBaselines()
return dllfunc(DLLFunc_CreateInstancedBaseline) return dllfunc(DLLFunc_CreateInstancedBaselines)
stock DF_pfnAllowLagCompensation() stock DF_pfnAllowLagCompensation()
return dllfunc(DLLFunc_pfnAllowLagCompensation) return dllfunc(DLLFunc_pfnAllowLagCompensation)
stock DF_MetaFunc_CallGameEntity(const STRING[], const ENTITY) stock DF_MetaFunc_CallGameEntity(const STRING[], const ENTITY)