All include files should be semicolon-correct now

This commit is contained in:
Scott Ehlert 2007-08-10 04:52:12 +00:00
parent 62c41fbd03
commit e6663991a7
31 changed files with 435 additions and 443 deletions

View File

@ -171,14 +171,14 @@ enum {
print_console,
print_chat,
print_center,
}
};
/* Destination types for engclient_print() */
enum {
engprint_console = 0,
engprint_center,
engprint_chat,
}
};
/* Render for set_user_rendering() */
enum {
@ -188,7 +188,7 @@ enum {
kRenderGlow, /* src*a+dest -- No Z buffer checks */
kRenderTransAlpha, /* src*srca+dest*(1-srca) */
kRenderTransAdd, /* src*a+dest */
}
};
/* Fx for set_user_rendering() */
enum {
@ -213,14 +213,14 @@ enum {
kRenderFxExplode, /* Scale up really big! */
kRenderFxGlowShell, /* Glowing Shell */
kRenderFxClampMinScale, /* Keep this sprite from getting very small (SPRITES only!) */
}
};
/* Type for force_unmodified() */
enum {
force_exactfile = 0, /* File on client must exactly match server's file */
force_model_samebounds, /* For model files only, the geometry must fit in the same bbox */
force_model_specifybounds, /* For model files only, the geometry must fit in the specified bbox */
}
};
/* Status for get_module() */
enum {

View File

@ -18,92 +18,92 @@
#endif
stock Entvars_Get_Int(iIndex, iVariable)
return entity_get_int(iIndex, iVariable)
return entity_get_int(iIndex, iVariable);
stock Entvars_Set_Int(iIndex, iVariable, iNewValue)
return entity_set_int(iIndex, iVariable, iNewValue)
return entity_set_int(iIndex, iVariable, iNewValue);
stock Float:Entvars_Get_Float(iIndex, iVariable)
return entity_get_float(iIndex, iVariable)
return entity_get_float(iIndex, iVariable);
stock Entvars_Set_Float(iIndex, iVariable, Float:fNewValue)
return entity_set_float(iIndex, iVariable, fNewValue)
return entity_set_float(iIndex, iVariable, fNewValue);
stock Entvars_Get_Vector(iIndex, iVariable, Float:vRetVector[3])
return entity_get_vector(iIndex, iVariable, vRetVector)
return entity_get_vector(iIndex, iVariable, vRetVector);
stock Entvars_Set_Vector(iIndex, iVariable, Float:vNewVector[3])
return entity_set_vector(iIndex, iVariable, vNewVector)
return entity_set_vector(iIndex, iVariable, vNewVector);
stock Entvars_Get_Edict(iIndex, iVariable)
return entity_get_edict(iIndex, iVariable)
return entity_get_edict(iIndex, iVariable);
stock Entvars_Set_Edict(iIndex, iVariable, iNewIndex)
return entity_set_edict(iIndex, iVariable, iNewIndex)
return entity_set_edict(iIndex, iVariable, iNewIndex);
stock Entvars_Get_String(iIndex, iVariable, szReturnValue[], iReturnLen)
return entity_get_string(iIndex, iVariable, szReturnValue, iReturnLen)
return entity_get_string(iIndex, iVariable, szReturnValue, iReturnLen);
stock Entvars_Set_String(iIndex, iVariable, szNewValue[])
return entity_set_string(iIndex, iVariable, szNewValue)
return entity_set_string(iIndex, iVariable, szNewValue);
stock Entvars_Get_Byte(iIndex, iVariable)
return entity_get_byte(iIndex, iVariable)
return entity_get_byte(iIndex, iVariable);
stock Entvars_Set_Byte(iIndex, iVariable, iNewValue)
return entity_set_byte(iIndex, iVariable, iNewValue)
return entity_set_byte(iIndex, iVariable, iNewValue);
stock CreateEntity(szClassname[])
return create_entity(szClassname)
return create_entity(szClassname);
stock ENT_SetModel(iIndex, szModel[])
return entity_set_model(iIndex, szModel)
return entity_set_model(iIndex, szModel);
stock ENT_SetOrigin(iIndex, Float:fNewOrigin[3])
return entity_set_origin(iIndex, fNewOrigin)
return entity_set_origin(iIndex, fNewOrigin);
stock FindEntity(iIndex, szValue[])
return find_ent_by_class(iIndex, szValue)
return find_ent_by_class(iIndex, szValue);
stock RemoveEntity(iIndex)
return remove_entity(iIndex)
return remove_entity(iIndex);
stock TraceLn(iIgnoreEnt, Float:fStart[3], Float:fEnd[3], Float:vReturn[3])
return trace_line(iIgnoreEnt, fStart, fEnd, vReturn)
return trace_line(iIgnoreEnt, fStart, fEnd, vReturn);
stock TraceNormal(iIgnoreEnt, Float:fStart[3], Float:fEnd[3], Float:vReturn[3])
return trace_normal(iIgnoreEnt, fStart, fEnd, vReturn)
return trace_normal(iIgnoreEnt, fStart, fEnd, vReturn);
stock VecToAngles(Float:fVector[3], Float:vReturn[3])
return vector_to_angle(fVector, vReturn)
return vector_to_angle(fVector, vReturn);
stock Float:VecLength(Float:vVector[3])
return vector_length(vVector)
return vector_length(vVector);
stock Float:VecDist(Float:vVector[3], Float:vVector2[3])
return vector_distance(vVector, vVector2)
return vector_distance(vVector, vVector2);
stock MessageBlock(iMessage, iMessageFlags)
return set_msg_block(iMessage, iMessageFlags)
return set_msg_block(iMessage, iMessageFlags);
stock GetMessageBlock(iMessage)
return get_msg_block(iMessage)
return get_msg_block(iMessage);
stock Float:HLTime()
return halflife_time()
return halflife_time();
stock FakeTouch(iToucher, iTouched)
return fake_touch(iToucher, iTouched)
return fake_touch(iToucher, iTouched);
stock AttachView(iIndex, iTargetIndex)
return attach_view(iIndex, iTargetIndex)
return attach_view(iIndex, iTargetIndex);
stock SetView(iIndex, ViewType)
return set_view(iIndex, ViewType)
return set_view(iIndex, ViewType);
stock SetSpeak(iIndex, iSpeakFlags)
return set_speak(iIndex, iSpeakFlags)
return set_speak(iIndex, iSpeakFlags);
forward vexd_pfntouch(pToucher, pTouched)
forward vexd_pfntouch(pToucher, pTouched);
forward ServerFrame()
forward ServerFrame();

View File

@ -20,7 +20,7 @@
#include <fun>
#include <maths>
stock AMX_VERSION[] = "1.76-BC"
stock AMX_VERSION[] = "1.76-BC";
#define ADMIN_PERMBAN ADMIN_BAN //AMX Mod admin flag for permanent ban
#define ADMIN_UNBAN ADMIN_BAN //AMX Mod admin flag for unbanning
@ -307,12 +307,12 @@ stock is_module_running(const module[])
stock is_plugin_running(const plugin[])
{
new status[8]
new id, filename[1], name[1], version[1], author[1]
new status[8];
new id, filename[1], name[1], version[1], author[1];
id = is_plugin_loaded(plugin)
id = is_plugin_loaded(plugin);
get_plugin(id, filename, 0, name, 0, version, 0, author, 0, status, 7)
get_plugin(id, filename, 0, name, 0, version, 0, author, 0, status, 7);
return strcmp(status, "running") == 0 ? id + 1 : 0
return strcmp(status, "running") == 0 ? id + 1 : 0;
}

View File

@ -16,70 +16,70 @@
stock Float:fabs(Float:value)
{
return floatabs(value)
return floatabs(value);
}
stock Float:asin(Float:value)
{
return floatasin(value, radian)
return floatasin(value, radian);
}
stock Float:sin(Float:value)
{
return floatsin(value, radian)
return floatsin(value, radian);
}
stock Float:sinh(Float:value)
{
return floatsinh(value, radian)
return floatsinh(value, radian);
}
stock Float:acos(Float:value)
{
return floatacos(value, radian)
return floatacos(value, radian);
}
stock Float:cos(Float:value)
{
return floatcos(value, radian)
return floatcos(value, radian);
}
stock Float:cosh(Float:value)
{
return floatcosh(value, radian)
return floatcosh(value, radian);
}
stock Float:atan(Float:value)
{
return floatatan(value, radian)
return floatatan(value, radian);
}
stock Float:atan2(Float:value1, Float:value2)
{
return floatatan2(value1, value2, radian)
return floatatan2(value1, value2, radian);
}
stock Float:tan(Float:value)
{
return floattan(value, radian)
return floattan(value, radian);
}
stock Float:tanh(Float:value)
{
return floattanh(value, radian)
return floattanh(value, radian);
}
stock Float:fsqroot(Float:value)
{
return floatsqroot(value)
return floatsqroot(value);
}
stock Float:fpower(Float:value, Float:exponent)
{
return floatpower(value, exponent)
return floatpower(value, exponent);
}
stock Float:flog(Float:value, Float:base=10.0)
{
return floatlog(value, base)
return floatlog(value, base);
}

View File

@ -23,9 +23,9 @@ native translate(const string[], destid=-1, forcelang=-1);
stock _T(const string[], destid=-1, forcelang=-1)
{
new TranslationResult[2] = {0, 0}
TranslationResult[0] = translate(string, destid, forcelang)
return TranslationResult
new TranslationResult[2] = {0, 0};
TranslationResult[0] = translate(string, destid, forcelang);
return TranslationResult;
}
stock load_translations(const file[])

View File

@ -15,30 +15,30 @@
/* Gets the velocity of an entity */
stock get_entity_velocity(index, velocity[3]) {
new Float:vector[3]
entity_get_vector(index, EV_VEC_velocity, vector)
FVecIVec(vector, velocity)
new Float:vector[3];
entity_get_vector(index, EV_VEC_velocity, vector);
FVecIVec(vector, velocity);
}
/* Sets the velocity of an entity */
stock set_entity_velocity(index, velocity[3]) {
new Float:vector[3]
IVecFVec(velocity, vector)
entity_set_vector(index, EV_VEC_velocity, vector)
new Float:vector[3];
IVecFVec(velocity, vector);
entity_set_vector(index, EV_VEC_velocity, vector);
}
/* Gets the origin of an entity */
stock get_entity_origin(index, origin[3]) {
new Float:vector[3]
entity_get_vector(index, EV_VEC_origin, vector)
FVecIVec(vector, origin)
new Float:vector[3];
entity_get_vector(index, EV_VEC_origin, vector);
FVecIVec(vector, origin);
}
/* Sets the origin of an entity */
stock set_entity_origin(index, origin[3]) {
new Float:vector[3]
IVecFVec(origin, vector)
entity_set_vector(index, EV_VEC_origin, vector)
new Float:vector[3];
IVecFVec(origin, vector);
entity_set_vector(index, EV_VEC_origin, vector);
}
/* Get the index of the grenade belonging to index.
@ -51,16 +51,16 @@ stock set_entity_origin(index, origin[3]) {
* FLASHBANG = "models/w_flashbang.mdl"
* SMOKEGRENADE = "models/w_smokegrenade.mdl" */
stock get_grenade_index(index, model[], len, grenadeindex = 0) {
new entfind = grenadeindex
new entowner = index
new entfind = grenadeindex;
new entowner = index;
for (;;) {
entfind = find_ent_by_class(entfind, "grenade")
entfind = find_ent_by_class(entfind, "grenade");
if (entfind && is_valid_ent(entfind)) {
if (entity_get_edict(entFind, EV_ENT_owner) == entowner) {
entity_get_string(entfind, EV_SZ_model, model)
return entfind
entity_get_string(entfind, EV_SZ_model, model);
return entfind;
}
}
else {
@ -79,7 +79,7 @@ enum {
classname = 0,
target,
targetname
}
};
#if !defined _vexd_bcompat_included
/* Find an entity ID from start_from_ent id (use 0 to start from
@ -87,10 +87,10 @@ enum {
* "targetname", value is the name you are searching for */
stock find_entity(start_from_ent, category, value[]) {
switch (category) {
case target: return find_ent_by_target(start_from_ent, value)
case targetname: return find_ent_by_tname(start_from_ent, value)
case target: return find_ent_by_target(start_from_ent, value);
case targetname: return find_ent_by_tname(start_from_ent, value);
}
return find_ent_by_class(start_from_ent, value)
return find_ent_by_class(start_from_ent, value);
}
#endif

View File

@ -41,4 +41,4 @@ native tickcount(&granularity=0);
stock abs(x)
{
return x > 0 ? x : -x;
}
}

View File

@ -65,4 +65,4 @@ native xmod_get_maxweapons();
/* Returns stats array size */
native xmod_get_stats_size();
/************* Shared Natives End ********************************/
/************* Shared Natives End ********************************/

View File

@ -31,14 +31,14 @@ enum Sql
{
SQL_FAILED=0,
SQL_OK
}
};
enum Result
{
RESULT_FAILED=-1,
RESULT_NONE,
RESULT_OK
}
};
/* This will return a number equal to or below 0 on failure.
* If it does fail, the error will be mirrored in dbi_error()

View File

@ -50,14 +50,14 @@ enum {
PS_PRONE,
PS_PRONEDEPLOY,
PS_DEPLOY,
}
};
/* info types for dod_get_map_info native */
enum {
MI_ALLIES_TEAM = 0,
MI_ALLIES_PARAS,
MI_AXIS_PARAS,
}
};
/* DoD weapons */
enum {
@ -133,4 +133,3 @@ enum {
DODC_PIAT,
//DODC_BRIT_MORTAR,
};

View File

@ -60,4 +60,3 @@ native get_stats(index,stats[9],bodyhits[8],name[],len);
/* Returns number of all entries in stats. */
native get_statsnum();

View File

@ -28,7 +28,7 @@ enum {
XMF_DAMAGE = 0,
XMF_DEATH,
XMF_SCORE,
}
};
/* Use this function to register forwards */
native register_statsfwd(ftype);

View File

@ -61,7 +61,7 @@ enum {
EV_INT_button,
EV_INT_impulse,
EV_INT_deadflag,
}
};
/* Float */
enum {
@ -102,7 +102,7 @@ enum {
EV_FL_fuser2,
EV_FL_fuser3,
EV_FL_fuser4,
}
};
/* Vector */
enum {
@ -129,7 +129,7 @@ enum {
EV_VEC_vuser2,
EV_VEC_vuser3,
EV_VEC_vuser4,
}
};
/* Edict */
enum {
@ -144,7 +144,7 @@ enum {
EV_ENT_euser2,
EV_ENT_euser3,
EV_ENT_euser4,
}
};
/* String */
enum {
@ -161,7 +161,7 @@ enum {
EV_SZ_noise3,
EV_SZ_viewmodel,
EV_SZ_weaponmodel,
}
};
/* Byte */
enum {
@ -171,7 +171,7 @@ enum {
EV_BYTE_controller4,
EV_BYTE_blending1,
EV_BYTE_blending2,
}
};
#if defined _jghg_enums
#endinput
@ -220,7 +220,7 @@ enum {
// Void (not supported)
GL_pSaveData
}
};
enum
{

View File

@ -251,4 +251,3 @@ stock IsInWorld( ent )
return 1;
}

View File

@ -63,7 +63,7 @@ native set_pev(_index,_value,any:...);
* @param _value The pev field to set - MUST be a string field.
* @param _string The string handle, retrieved from places like AllocString.
*/
native set_pev_string(_index, _value, _string)
native set_pev_string(_index, _value, _string);
/**
@ -221,19 +221,19 @@ native copy_infokey_buffer(infoBuffer, out[], maxlen);
*
* @param entity The entity id to lookup.
* @param name The sequence name to lookup, case insensitive. ("JUMP" would match "jump")
* @param framerate The framerate of the sequence, if found.
* @param loops Whether or not the sequence loops.
* @param framerate The framerate of the sequence, if found.
* @param loops Whether or not the sequence loops.
* @param groundspeed The groundspeed setting of the sequence.
* @return -1 on failed lookup, the sequence number on successful lookup.
*/
native lookup_sequence(entity, const name[], &Float:framerate = 0.0, &bool:loops = false, &Float:groundspeed = 0.0)
native lookup_sequence(entity, const name[], &Float:framerate = 0.0, &bool:loops = false, &Float:groundspeed = 0.0);
/**
* Sets a bone controller with the specified value.
*
* @param entity The entity id to set the value on.
* @param controller Which controller to set (0 through 3).
* @param value The value to set it to.
* @param value The value to set it to.
* @return The percentage that the controller is extended (0.0 through 1.0)
*/
native Float:set_controller(entity, controller, Float:value)
native Float:set_controller(entity, controller, Float:value);

File diff suppressed because it is too large Load Diff

View File

@ -19,13 +19,13 @@ enum floatround_method {
floatround_floor,
floatround_ceil,
floatround_tozero
}
};
enum anglemode {
radian = 0,
degrees,
grades
}
};
/* Convert an integer into a floating point value */
native Float:float(value);

View File

@ -98,7 +98,7 @@ enum
ARG_COORD, /* float */
ARG_STRING, /* string */
ARG_ENTITY, /* int */
}
};
/* Temp entity message types for message_begin() */
#define TE_BEAMPOINTS 0 // Beam effect between two points

View File

@ -82,7 +82,7 @@ native ns_get_user_team(id, buff[], len);
* @param ah Whether to only display the message on clients who have the cvar "cl_autohelp" set to 1.
* @noreturn
*/
native ns_popup(target, const szMsg[180], ah=0)
native ns_popup(target, const szMsg[180], ah=0);
/**
* Sets a player model. Omit the second parameter to return to default

View File

@ -259,7 +259,5 @@ stock get_res(id)
stock get_class(id)
return ns_get_class(id);
stock is_combat()
return ns_is_combat();

View File

@ -24,7 +24,7 @@ enum NSGameplay
NSGame_Unknown, /**< Can find the gameplay entity, but can't
determine gameplay type. */
}
};
// entity pev->iuser4 fields
enum {
@ -78,8 +78,7 @@ enum {
MASK_SELECTABLE = 268435456, // ???
MASK_PARASITED = 536870912, // Parasite flag
MASK_SENSORY_NEARBY = 1073741824 // Sensory chamber in range
}
};
enum {
@ -96,7 +95,7 @@ enum {
CLASS_GESTATE,
CLASS_DEAD,
CLASS_NOTEAM
}
};
enum {
WEAPON_NONE = 0,
@ -131,14 +130,14 @@ enum {
WEAPON_STOMP,
WEAPON_DEVOUR,
WEAPON_MAX
}
};
enum {
HIVETRAIT_NONE = 0,
HIVETRAIT_DC = 92,
HIVETRAIT_SC = 93,
HIVETRAIT_MC = 94
}
};
enum NSPS_VelShape
{
@ -146,8 +145,7 @@ enum NSPS_VelShape
NSPS_VS_BOX,
NSPS_VS_SPHERE,
NSPS_VS_BLOB
}
};
/* Genshape used in ns_set_ps_genshape
* NOTE: The following are in the ns.ps file but
@ -169,7 +167,7 @@ enum NSPS_GenShape
NSPS_GS_DISC,
NSPS_GS_RECTANGLE,
NSPS_GS_NONE
}
};
enum NSPS_RenderMode
{
NSPS_R_NORMAL = 0,
@ -178,7 +176,7 @@ enum NSPS_RenderMode
NSPS_R_GLOW,
NSPS_R_TRANSALPHA,
NSPS_R_ADDITIVE
}
};
enum NSPS_Flags
{
NSPS_FL_START_ON = 1,
@ -191,4 +189,4 @@ enum NSPS_Flags
NSPS_FL_COLLIDE = 256,
NSPS_FL_HI_DETAIL = 512,
NSPS_FL_FACE_UP = 1024
}
};

View File

@ -131,4 +131,4 @@ native regex_substr(Regex:id, str_id, buffer[], maxLen);
*
* @note Do not use the handle again after freeing it!
*/
native regex_free(&Regex:id);
native regex_free(&Regex:id);

View File

@ -13,4 +13,4 @@
#define AMXX_VERSION 1.80
#define AMXX_VERSION_NUM 180
stock const AMXX_VERSION_STR[] = "1.8.0.3398"
stock const AMXX_VERSION_STR[] = "1.8.0.3398";

View File

@ -13,4 +13,4 @@
#define AMXX_VERSION $PMAJOR$.$PMINOR$$PREVISION$
#define AMXX_VERSION_NUM $PMAJOR$$PMINOR$$PREVISION$
stock const AMXX_VERSION_STR[] = "$PMAJOR$.$PMINOR$.$PREVISION$.$GLOBAL_BUILD$"
stock const AMXX_VERSION_STR[] = "$PMAJOR$.$PMINOR$.$PREVISION$.$GLOBAL_BUILD$";

View File

@ -53,4 +53,3 @@ native get_stats(index,stats[8],bodyhits[8],name[],len);
/* Returns number of all entries in stats. */
native get_statsnum();

View File

@ -27,7 +27,7 @@
enum {
XMF_DAMAGE = 0,
XMF_DEATH,
}
};
/* Use this function to register forwards */
native register_statsfwd( ftype );

View File

@ -18,7 +18,7 @@ enum
timeunit_hours,
timeunit_days,
timeunit_weeks,
}
};
// seconds are in each time unit
#define SECONDS_IN_MINUTE 60

View File

@ -91,7 +91,7 @@ enum {
TSW_SKNIFE,
TSW_KUNG_FU,
TSW_TKNIFE,
}
};
/*
valid tsweaponid in TS_GiveWeapon

View File

@ -18,7 +18,7 @@
enum {
XMF_DAMAGE = 0,
XMF_DEATH,
}
};
#if AMXX_VERSION_NUM >= 175
#pragma reqlib tsfun

View File

@ -26,7 +26,7 @@
enum {
XMF_DAMAGE = 0,
XMF_DEATH,
}
};
/* Use this function to register forwards
* DEPRECATED

View File

@ -17,10 +17,10 @@
native get_vaultdata(const key[], data[] = "", len = 0);
/* Sets a data under given key. */
native set_vaultdata(const key[], const data[] = "" );
native set_vaultdata(const key[], const data[] = "");
/* Removes a key from vault.*/
native remove_vaultdata(const key[]);
/* Checks if a key exists in the vault.*/
native vaultdata_exists(const key[]);
native vaultdata_exists(const key[]);