Compare commits
1 Commits
amxmodx-1.
...
amxmodx-1.
Author | SHA1 | Date | |
---|---|---|---|
7e6cc572cf |
@ -542,27 +542,14 @@ static cell AMX_NATIVE_CALL is_user_hltv(AMX *amx, cell *params) /* 1 param */
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
extern bool g_bmod_tfc;
|
|
||||||
static cell AMX_NATIVE_CALL is_user_alive(AMX *amx, cell *params) /* 1 param */
|
static cell AMX_NATIVE_CALL is_user_alive(AMX *amx, cell *params) /* 1 param */
|
||||||
{
|
{
|
||||||
int index = params[1];
|
int index = params[1];
|
||||||
|
|
||||||
if (index < 1 || index > gpGlobals->maxClients)
|
if (index < 1 || index > gpGlobals->maxClients)
|
||||||
{
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
|
||||||
|
|
||||||
CPlayer* pPlayer = GET_PLAYER_POINTER_I(index);
|
CPlayer* pPlayer = GET_PLAYER_POINTER_I(index);
|
||||||
|
|
||||||
if (g_bmod_tfc)
|
|
||||||
{
|
|
||||||
edict_t *e = pPlayer->pEdict;
|
|
||||||
if (e->v.flags & FL_SPECTATOR ||
|
|
||||||
(!e->v.team || !e->v.playerclass))
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return ((pPlayer->ingame && pPlayer->IsAlive()) ? 1 : 0);
|
return ((pPlayer->ingame && pPlayer->IsAlive()) ? 1 : 0);
|
||||||
}
|
}
|
||||||
|
@ -73,7 +73,7 @@
|
|||||||
|
|
||||||
#define AMXXLOG_Log g_log.Log
|
#define AMXXLOG_Log g_log.Log
|
||||||
#define AMXXLOG_Error g_log.LogError
|
#define AMXXLOG_Error g_log.LogError
|
||||||
#define AMX_VERSION "1.76a"
|
#define AMX_VERSION "1.76"
|
||||||
|
|
||||||
extern AMX_NATIVE_INFO core_Natives[];
|
extern AMX_NATIVE_INFO core_Natives[];
|
||||||
extern AMX_NATIVE_INFO time_Natives[];
|
extern AMX_NATIVE_INFO time_Natives[];
|
||||||
|
@ -96,7 +96,6 @@ String g_log_dir;
|
|||||||
String g_mod_name;
|
String g_mod_name;
|
||||||
XVars g_xvars;
|
XVars g_xvars;
|
||||||
|
|
||||||
bool g_bmod_tfc;
|
|
||||||
bool g_bmod_cstrike;
|
bool g_bmod_cstrike;
|
||||||
bool g_bmod_dod;
|
bool g_bmod_dod;
|
||||||
bool g_dontprecache;
|
bool g_dontprecache;
|
||||||
@ -316,20 +315,6 @@ const char* get_localinfo(const char* name, const char* def)
|
|||||||
return b;
|
return b;
|
||||||
}
|
}
|
||||||
|
|
||||||
const char* get_localinfo_r(const char *name, const char *def, char buffer[], size_t maxlength)
|
|
||||||
{
|
|
||||||
const char* b = LOCALINFO((char*)name);
|
|
||||||
|
|
||||||
if (b == 0 || *b == 0)
|
|
||||||
{
|
|
||||||
SET_LOCALINFO((char*)name, (char*)(b = def));
|
|
||||||
}
|
|
||||||
|
|
||||||
snprintf(buffer, maxlength, "%s", b);
|
|
||||||
|
|
||||||
return buffer;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Very first point at map load
|
// Very first point at map load
|
||||||
// Load AMX modules for new native functions
|
// Load AMX modules for new native functions
|
||||||
// Initialize AMX stuff and load it's plugins from plugins.ini list
|
// Initialize AMX stuff and load it's plugins from plugins.ini list
|
||||||
@ -382,17 +367,14 @@ int C_Spawn(edict_t *pent)
|
|||||||
get_localinfo("amx_logdir", "addons/amxmodx/logs");
|
get_localinfo("amx_logdir", "addons/amxmodx/logs");
|
||||||
|
|
||||||
char map_pluginsfile_path[256];
|
char map_pluginsfile_path[256];
|
||||||
char configs_dir[256];
|
|
||||||
|
|
||||||
// ###### Load modules
|
// ###### Load modules
|
||||||
loadModules(get_localinfo("amxx_modules", "addons/amxmodx/configs/modules.ini"), PT_ANYTIME);
|
loadModules(get_localinfo("amxx_modules", "addons/amxmodx/configs/modules.ini"), PT_ANYTIME);
|
||||||
|
|
||||||
get_localinfo_r("amxx_configsdir", "addons/amxmodx/configs", configs_dir, sizeof(configs_dir)-1);
|
|
||||||
g_plugins.CALMFromFile(get_localinfo("amxx_plugins", "addons/amxmodx/configs/plugins.ini"));
|
g_plugins.CALMFromFile(get_localinfo("amxx_plugins", "addons/amxmodx/configs/plugins.ini"));
|
||||||
LoadExtraPluginsToPCALM(configs_dir);
|
LoadExtraPluginsToPCALM(get_localinfo("amxx_configsdir", "addons/amxmodx/configs"));
|
||||||
snprintf(map_pluginsfile_path, sizeof(map_pluginsfile_path)-1,
|
snprintf(map_pluginsfile_path, sizeof(map_pluginsfile_path)-1,
|
||||||
"%s/maps/plugins-%s.ini",
|
"%s/maps/plugins-%s.ini",
|
||||||
configs_dir,
|
get_localinfo("amxx_configsdir", "addons/amxmodx/configs"),
|
||||||
STRING(gpGlobals->mapname));
|
STRING(gpGlobals->mapname));
|
||||||
g_plugins.CALMFromFile(map_pluginsfile_path);
|
g_plugins.CALMFromFile(map_pluginsfile_path);
|
||||||
|
|
||||||
@ -433,7 +415,7 @@ int C_Spawn(edict_t *pent)
|
|||||||
|
|
||||||
// ###### Load AMX Mod X plugins
|
// ###### Load AMX Mod X plugins
|
||||||
g_plugins.loadPluginsFromFile(get_localinfo("amxx_plugins", "addons/amxmodx/configs/plugins.ini"));
|
g_plugins.loadPluginsFromFile(get_localinfo("amxx_plugins", "addons/amxmodx/configs/plugins.ini"));
|
||||||
LoadExtraPluginsFromDir(configs_dir);
|
LoadExtraPluginsFromDir(get_localinfo("amxx_configsdir", "addons/amxmodx/configs"));
|
||||||
g_plugins.loadPluginsFromFile(map_pluginsfile_path, false);
|
g_plugins.loadPluginsFromFile(map_pluginsfile_path, false);
|
||||||
g_plugins.Finalize();
|
g_plugins.Finalize();
|
||||||
g_plugins.InvalidateCache();
|
g_plugins.InvalidateCache();
|
||||||
@ -1589,7 +1571,6 @@ C_DLLEXPORT int GetEngineFunctions(enginefuncs_t *pengfuncsFromEngine, int *inte
|
|||||||
} else {
|
} else {
|
||||||
g_bmod_cstrike = false;
|
g_bmod_cstrike = false;
|
||||||
g_bmod_dod = !stricmp(g_mod_name.c_str(), "dod");
|
g_bmod_dod = !stricmp(g_mod_name.c_str(), "dod");
|
||||||
g_bmod_tfc = !stricmp(g_mod_name.c_str(), "tfc");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
meta_engfuncs.pfnCmd_Argc = C_Cmd_Argc;
|
meta_engfuncs.pfnCmd_Argc = C_Cmd_Argc;
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
// Microsoft Visual C++ generated resource script.
|
// Microsoft Visual C++ generated resource script.
|
||||||
//
|
//
|
||||||
#include "resource.h"
|
|
||||||
|
|
||||||
#define APSTUDIO_READONLY_SYMBOLS
|
#define APSTUDIO_READONLY_SYMBOLS
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
@ -27,8 +26,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
|
|||||||
//
|
//
|
||||||
|
|
||||||
VS_VERSION_INFO VERSIONINFO
|
VS_VERSION_INFO VERSIONINFO
|
||||||
FILEVERSION 1,7,6,1
|
FILEVERSION 1,7,6,0
|
||||||
PRODUCTVERSION 1,7,6,1
|
PRODUCTVERSION 1,7,6,0
|
||||||
FILEFLAGSMASK 0x17L
|
FILEFLAGSMASK 0x17L
|
||||||
#ifdef _DEBUG
|
#ifdef _DEBUG
|
||||||
FILEFLAGS 0x1L
|
FILEFLAGS 0x1L
|
||||||
@ -45,12 +44,12 @@ BEGIN
|
|||||||
BEGIN
|
BEGIN
|
||||||
VALUE "Comments", "AMX Mod X"
|
VALUE "Comments", "AMX Mod X"
|
||||||
VALUE "FileDescription", "AMX Mod X"
|
VALUE "FileDescription", "AMX Mod X"
|
||||||
VALUE "FileVersion", "1.76a"
|
VALUE "FileVersion", "1.76"
|
||||||
VALUE "InternalName", "amxmodx"
|
VALUE "InternalName", "amxmodx"
|
||||||
VALUE "LegalCopyright", "Copyright (c) 2004-2006, AMX Mod X Dev Team"
|
VALUE "LegalCopyright", "Copyright (c) 2004-2006, AMX Mod X Dev Team"
|
||||||
VALUE "OriginalFilename", "amxmodx_mm.dll"
|
VALUE "OriginalFilename", "amxmodx_mm.dll"
|
||||||
VALUE "ProductName", "AMX Mod X"
|
VALUE "ProductName", "AMX Mod X"
|
||||||
VALUE "ProductVersion", "1.76a"
|
VALUE "ProductVersion", "1.76"
|
||||||
END
|
END
|
||||||
END
|
END
|
||||||
BLOCK "VarFileInfo"
|
BLOCK "VarFileInfo"
|
||||||
|
@ -6,3 +6,4 @@ ShowStats ;HUD-stats default
|
|||||||
SayRankStats ;Say /rankstats
|
SayRankStats ;Say /rankstats
|
||||||
SayRank ;Say /rank
|
SayRank ;Say /rank
|
||||||
SayTop15 ;Say /top15
|
SayTop15 ;Say /top15
|
||||||
|
ShowStats ;HUD-stats default
|
||||||
|
@ -11,7 +11,6 @@
|
|||||||
#define CSW_HEGRENADE 4
|
#define CSW_HEGRENADE 4
|
||||||
#define CSW_C4 6
|
#define CSW_C4 6
|
||||||
#define CSW_SMOKEGRENADE 9
|
#define CSW_SMOKEGRENADE 9
|
||||||
#define CSW_KNIFE 29
|
|
||||||
#define CSW_FLASHBANG 25
|
#define CSW_FLASHBANG 25
|
||||||
|
|
||||||
// *****************************************************
|
// *****************************************************
|
||||||
|
@ -2773,7 +2773,7 @@ void ValidateMacros_DontCallThis_Smiley()
|
|||||||
MF_FindLibrary(NULL, LibType_Class);
|
MF_FindLibrary(NULL, LibType_Class);
|
||||||
MF_AddLibraries(NULL, LibType_Class, NULL);
|
MF_AddLibraries(NULL, LibType_Class, NULL);
|
||||||
MF_RemoveLibraries(NULL);
|
MF_RemoveLibraries(NULL);
|
||||||
MF_OverrideNatives(NULL, "");
|
MF_OverrideNatives(NULL);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -43,6 +43,7 @@ int gmsgResetHUD;
|
|||||||
int gmsgAmmoX;
|
int gmsgAmmoX;
|
||||||
int gmsgScoreInfo;
|
int gmsgScoreInfo;
|
||||||
int gmsgAmmoPickup;
|
int gmsgAmmoPickup;
|
||||||
|
|
||||||
int gmsgSendAudio;
|
int gmsgSendAudio;
|
||||||
int gmsgTextMsg;
|
int gmsgTextMsg;
|
||||||
int gmsgBarTime;
|
int gmsgBarTime;
|
||||||
@ -61,27 +62,26 @@ cvar_t* csstats_pause;
|
|||||||
cvar_t init_csstats_rankbots ={"csstats_rankbots","1"};
|
cvar_t init_csstats_rankbots ={"csstats_rankbots","1"};
|
||||||
cvar_t init_csstats_pause = {"csstats_pause","0"};
|
cvar_t init_csstats_pause = {"csstats_pause","0"};
|
||||||
|
|
||||||
struct sUserMsg
|
struct sUserMsg {
|
||||||
{
|
|
||||||
const char* name;
|
const char* name;
|
||||||
int* id;
|
int* id;
|
||||||
funEventCall func;
|
funEventCall func;
|
||||||
bool endmsg;
|
bool endmsg;
|
||||||
} g_user_msg[] = {
|
} g_user_msg[] = {
|
||||||
{"CurWeapon", &gmsgCurWeapon, Client_CurWeapon, false},
|
{ "CurWeapon" , &gmsgCurWeapon , Client_CurWeapon, false },
|
||||||
{"Damage", &gmsgDamage, Client_Damage, false},
|
{ "Damage" , &gmsgDamage,Client_Damage, false },
|
||||||
{"Damage", &gmsgDamageEnd, Client_Damage_End, true},
|
{ "Damage" , &gmsgDamageEnd, Client_Damage_End, true },
|
||||||
{"WeaponList", &gmsgWeaponList, Client_WeaponList, false},
|
{ "WeaponList" , &gmsgWeaponList, Client_WeaponList, false },
|
||||||
{"ResetHUD", &gmsgResetHUD, Client_ResetHUD, true},
|
{ "ResetHUD" , &gmsgResetHUD,Client_ResetHUD, true },
|
||||||
{"AmmoX", &gmsgAmmoX, Client_AmmoX, false},
|
{ "AmmoX" , &gmsgAmmoX, Client_AmmoX , false },
|
||||||
{"ScoreInfo", &gmsgScoreInfo, Client_ScoreInfo, false},
|
{ "ScoreInfo" , &gmsgScoreInfo, Client_ScoreInfo, false },
|
||||||
{"AmmoPickup", &gmsgAmmoPickup, Client_AmmoPickup, false},
|
{ "AmmoPickup" , &gmsgAmmoPickup, Client_AmmoPickup , false },
|
||||||
{"SendAudio", &gmsgSendAudio, Client_SendAudio, false},
|
|
||||||
{"TextMsg", &gmsgTextMsg, Client_TextMsg, false},
|
|
||||||
{"BarTime", &gmsgBarTime, Client_BarTime, false},
|
|
||||||
{"DeathMsg", &gmsgDeathMsg, Client_DeathMsg, false},
|
|
||||||
|
|
||||||
{0, 0, 0, false}
|
{ "SendAudio" , &gmsgSendAudio , Client_SendAudio , false },
|
||||||
|
{ "TextMsg" , &gmsgTextMsg , Client_TextMsg , false },
|
||||||
|
{ "BarTime" , &gmsgBarTime , Client_BarTime , false },
|
||||||
|
|
||||||
|
{ 0 , 0,0,false }
|
||||||
};
|
};
|
||||||
|
|
||||||
int RegUserMsg_Post(const char *pszName, int iSize)
|
int RegUserMsg_Post(const char *pszName, int iSize)
|
||||||
@ -330,20 +330,10 @@ void EmitSound_Post(edict_t *entity, int channel, const char *sample, /*int*/flo
|
|||||||
RETURN_META(MRES_IGNORED);
|
RETURN_META(MRES_IGNORED);
|
||||||
}
|
}
|
||||||
|
|
||||||
void TraceLine_Post(const float *v1, const float *v2, int fNoMonsters, edict_t *e, TraceResult *ptr)
|
void TraceLine_Post(const float *v1, const float *v2, int fNoMonsters, edict_t *e, TraceResult *ptr) {
|
||||||
{
|
if (ptr->pHit&&(ptr->pHit->v.flags& (FL_CLIENT | FL_FAKECLIENT) )&&
|
||||||
if (ptr->pHit && (ptr->pHit->v.flags & (FL_CLIENT|FL_FAKECLIENT))
|
e&&(e->v.flags& (FL_CLIENT | FL_FAKECLIENT) )&&ptr->iHitgroup)
|
||||||
&& e
|
GET_PLAYER_POINTER(e)->aiming = ptr->iHitgroup;
|
||||||
&& (e->v.flags & (FL_CLIENT|FL_FAKECLIENT))
|
|
||||||
&& ptr->iHitgroup)
|
|
||||||
{
|
|
||||||
CPlayer *pPlayer = GET_PLAYER_POINTER(e);
|
|
||||||
if (pPlayer->current != CSW_KNIFE)
|
|
||||||
{
|
|
||||||
pPlayer->aiming = ptr->iHitgroup;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
RETURN_META(MRES_IGNORED);
|
RETURN_META(MRES_IGNORED);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
// Module info
|
// Module info
|
||||||
#define MODULE_NAME "CSX"
|
#define MODULE_NAME "CSX"
|
||||||
#define MODULE_VERSION "1.76a"
|
#define MODULE_VERSION "1.76"
|
||||||
#define MODULE_AUTHOR "AMX Mod X Dev Team"
|
#define MODULE_AUTHOR "AMX Mod X Dev Team"
|
||||||
#define MODULE_URL "http://www.amxmodx.org/"
|
#define MODULE_URL "http://www.amxmodx.org/"
|
||||||
#define MODULE_LOGTAG "CSX"
|
#define MODULE_LOGTAG "CSX"
|
||||||
@ -367,7 +367,7 @@
|
|||||||
#define FN_TraceLine_Post TraceLine_Post
|
#define FN_TraceLine_Post TraceLine_Post
|
||||||
// #define FN_TraceToss_Post TraceToss_Post
|
// #define FN_TraceToss_Post TraceToss_Post
|
||||||
// #define FN_TraceMonsterHull_Post TraceMonsterHull_Post
|
// #define FN_TraceMonsterHull_Post TraceMonsterHull_Post
|
||||||
// #define FN_TraceHull_Post TraceHull_Post
|
// #define FN_TraceHull_Post TraceHull_Post
|
||||||
// #define FN_TraceModel_Post TraceModel_Post
|
// #define FN_TraceModel_Post TraceModel_Post
|
||||||
// #define FN_TraceTexture_Post TraceTexture_Post
|
// #define FN_TraceTexture_Post TraceTexture_Post
|
||||||
// #define FN_TraceSphere_Post TraceSphere_Post
|
// #define FN_TraceSphere_Post TraceSphere_Post
|
||||||
|
@ -88,10 +88,10 @@ void Client_AmmoPickup(void*);
|
|||||||
void Client_Damage_End(void*);
|
void Client_Damage_End(void*);
|
||||||
void Client_ScoreInfo(void*);
|
void Client_ScoreInfo(void*);
|
||||||
void Client_ResetHUD(void*);
|
void Client_ResetHUD(void*);
|
||||||
|
|
||||||
void Client_SendAudio(void*);
|
void Client_SendAudio(void*);
|
||||||
void Client_TextMsg(void*);
|
void Client_TextMsg(void*);
|
||||||
void Client_BarTime(void*);
|
void Client_BarTime(void*);
|
||||||
void Client_DeathMsg(void*);
|
|
||||||
|
|
||||||
bool ignoreBots (edict_t *pEnt, edict_t *pOther = NULL );
|
bool ignoreBots (edict_t *pEnt, edict_t *pOther = NULL );
|
||||||
bool isModuleActive();
|
bool isModuleActive();
|
||||||
|
@ -17,44 +17,6 @@ void Client_ResetHUD(void* mValue){
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void Client_DeathMsg(void *mValue)
|
|
||||||
{
|
|
||||||
static int killer_id;
|
|
||||||
static int victim_id;
|
|
||||||
static int is_headshot;
|
|
||||||
const char *name;
|
|
||||||
|
|
||||||
switch (mState++)
|
|
||||||
{
|
|
||||||
case 0:
|
|
||||||
{
|
|
||||||
killer_id = *(int *)mValue;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case 1:
|
|
||||||
{
|
|
||||||
victim_id = *(int *)mValue;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case 2:
|
|
||||||
{
|
|
||||||
is_headshot = *(int *)mValue;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case 3:
|
|
||||||
{
|
|
||||||
name = (const char *)mValue;
|
|
||||||
if (killer_id
|
|
||||||
&& (strcmp(name, "knife") == 0))
|
|
||||||
{
|
|
||||||
CPlayer *pPlayer = GET_PLAYER_POINTER_I(killer_id);
|
|
||||||
pPlayer->aiming = is_headshot ? 1 : 0;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void Client_WeaponList(void* mValue){
|
void Client_WeaponList(void* mValue){
|
||||||
static int wpnList;
|
static int wpnList;
|
||||||
static int iSlot;
|
static int iSlot;
|
||||||
|
@ -798,7 +798,7 @@ static cell AMX_NATIVE_CALL in_view_cone(AMX *amx, cell *params)
|
|||||||
|
|
||||||
CHECK_ENTITY(src);
|
CHECK_ENTITY(src);
|
||||||
|
|
||||||
Vector vecLOS;
|
Vector2D vec2LOS;
|
||||||
float flDot;
|
float flDot;
|
||||||
|
|
||||||
edict_t *pEdictSrc = INDEXENT(src);
|
edict_t *pEdictSrc = INDEXENT(src);
|
||||||
@ -811,12 +811,12 @@ static cell AMX_NATIVE_CALL in_view_cone(AMX *amx, cell *params)
|
|||||||
|
|
||||||
Vector origin(vecOrigin[0], vecOrigin[1], vecOrigin[2]);
|
Vector origin(vecOrigin[0], vecOrigin[1], vecOrigin[2]);
|
||||||
|
|
||||||
MAKE_VECTORS(pEdictSrc->v.v_angle);
|
MAKE_VECTORS(pEdictSrc->v.angles);
|
||||||
|
|
||||||
vecLOS = origin - (pEdictSrc->v.origin + pEdictSrc->v.view_ofs);
|
vec2LOS = (origin - pEdictSrc->v.origin).Make2D();
|
||||||
vecLOS = vecLOS.Normalize();
|
vec2LOS = vec2LOS.Normalize();
|
||||||
|
|
||||||
flDot = DotProduct(vecLOS, gpGlobals->v_forward);
|
flDot = DotProduct(vec2LOS, gpGlobals->v_forward.Make2D());
|
||||||
|
|
||||||
if (flDot >= cos(pEdictSrc->v.fov * (M_PI / 360)))
|
if (flDot >= cos(pEdictSrc->v.fov * (M_PI / 360)))
|
||||||
return 1;
|
return 1;
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
* to add multiple entries.
|
* to add multiple entries.
|
||||||
*/
|
*/
|
||||||
#define MODULE_NAME "MySQL"
|
#define MODULE_NAME "MySQL"
|
||||||
#define MODULE_VERSION "1.76a"
|
#define MODULE_VERSION "1.76"
|
||||||
#define MODULE_AUTHOR "AMX Mod X Dev Team"
|
#define MODULE_AUTHOR "AMX Mod X Dev Team"
|
||||||
#define MODULE_URL "http://www.amxmodx.org/"
|
#define MODULE_URL "http://www.amxmodx.org/"
|
||||||
#define MODULE_LOGTAG "MySQL"
|
#define MODULE_LOGTAG "MySQL"
|
||||||
|
@ -175,10 +175,7 @@ void MysqlThread::RunThread(IThreadHandle *pHandle)
|
|||||||
m_qrInfo.amxinfo.pQuery = pQuery;
|
m_qrInfo.amxinfo.pQuery = pQuery;
|
||||||
m_qrInfo.amxinfo.info.rs = &m_atomicResult;
|
m_qrInfo.amxinfo.info.rs = &m_atomicResult;
|
||||||
} else {
|
} else {
|
||||||
if (pQuery)
|
pQuery->FreeHandle();
|
||||||
{
|
|
||||||
pQuery->FreeHandle();
|
|
||||||
}
|
|
||||||
pQuery = NULL;
|
pQuery = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
; Licensed under the GNU General Public License
|
; Licensed under the GNU General Public License
|
||||||
; Originally written by -=HaXoMaTiC=-
|
; Originally written by -=HaXoMaTiC=-
|
||||||
!define PRODUCT_NAME "AMX Mod X Installer"
|
!define PRODUCT_NAME "AMX Mod X Installer"
|
||||||
!define PRODUCT_VERSION "1.76a"
|
!define PRODUCT_VERSION "1.76"
|
||||||
!define PRODUCT_PUBLISHER "AMX Mod X Dev Team"
|
!define PRODUCT_PUBLISHER "AMX Mod X Dev Team"
|
||||||
!define PRODUCT_WEB_SITE "http://www.amxmodx.org/"
|
!define PRODUCT_WEB_SITE "http://www.amxmodx.org/"
|
||||||
!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\Installer.exe"
|
!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\Installer.exe"
|
||||||
@ -841,7 +841,7 @@ Section Uninstall
|
|||||||
|
|
||||||
Delete "$SMPROGRAMS\$ICONS_GROUP\Uninstall.lnk"
|
Delete "$SMPROGRAMS\$ICONS_GROUP\Uninstall.lnk"
|
||||||
Delete "$SMPROGRAMS\$ICONS_GROUP\Website.lnk"
|
Delete "$SMPROGRAMS\$ICONS_GROUP\Website.lnk"
|
||||||
Delete "$DESKTOP\AMX Mod X Studio.lnk"
|
Delete "$DESKTOP\AMX Mod X Editor.lnk"
|
||||||
Delete "$SMPROGRAMS\$ICONS_GROUP\AMXX Studio.lnk"
|
Delete "$SMPROGRAMS\$ICONS_GROUP\AMXX Studio.lnk"
|
||||||
Delete "$SMPROGRAMS\$ICONS_GROUP\Documentation.lnk"
|
Delete "$SMPROGRAMS\$ICONS_GROUP\Documentation.lnk"
|
||||||
Delete "$SMPROGRAMS\$ICONS_GROUP\AMX Mod X.lnk"
|
Delete "$SMPROGRAMS\$ICONS_GROUP\AMX Mod X.lnk"
|
||||||
|
Binary file not shown.
@ -766,7 +766,7 @@ begin
|
|||||||
|
|
||||||
try
|
try
|
||||||
if FileList[i] = 'liblist.gam' then
|
if FileList[i] = 'liblist.gam' then
|
||||||
frmMain.IdFTP.Site('CHMOD 444 liblist.gam');
|
frmMain.IdFTP.Size('CHMOD 444 liblist.gam');
|
||||||
except
|
except
|
||||||
AddStatus('Warning: CHMOD not supported.', clMaroon);
|
AddStatus('Warning: CHMOD not supported.', clMaroon);
|
||||||
end;
|
end;
|
||||||
|
@ -148,7 +148,7 @@ var
|
|||||||
frmMain: TfrmMain;
|
frmMain: TfrmMain;
|
||||||
gMultiAccount: Boolean;
|
gMultiAccount: Boolean;
|
||||||
|
|
||||||
const VERSION = '1.76a';
|
const VERSION = '1.76';
|
||||||
|
|
||||||
implementation
|
implementation
|
||||||
|
|
||||||
|
@ -82,7 +82,6 @@ new g_announce_sync
|
|||||||
new g_status_sync
|
new g_status_sync
|
||||||
new g_left_sync
|
new g_left_sync
|
||||||
new g_bottom_sync
|
new g_bottom_sync
|
||||||
new g_he_sync
|
|
||||||
|
|
||||||
new g_MultiKillMsg[7][] =
|
new g_MultiKillMsg[7][] =
|
||||||
{
|
{
|
||||||
@ -198,7 +197,6 @@ public plugin_init()
|
|||||||
g_status_sync = CreateHudSyncObj()
|
g_status_sync = CreateHudSyncObj()
|
||||||
g_left_sync = CreateHudSyncObj()
|
g_left_sync = CreateHudSyncObj()
|
||||||
g_bottom_sync = CreateHudSyncObj()
|
g_bottom_sync = CreateHudSyncObj()
|
||||||
g_he_sync = CreateHudSyncObj()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public plugin_cfg()
|
public plugin_cfg()
|
||||||
@ -404,7 +402,7 @@ public client_death(killer, victim, wpnindex, hitplace, TK)
|
|||||||
get_user_name(victim, victim_name, 31)
|
get_user_name(victim, victim_name, 31)
|
||||||
|
|
||||||
set_hudmessage(255, 100, 100, -1.0, 0.25, 1, 6.0, 6.0, 0.5, 0.15, -1)
|
set_hudmessage(255, 100, 100, -1.0, 0.25, 1, 6.0, 6.0, 0.5, 0.15, -1)
|
||||||
ShowSyncHudMsg(0, g_he_sync, "%L", LANG_PLAYER, g_KinfeMsg[random_num(0, 3)], killer_name, victim_name)
|
show_hudmessage(0, "%L", LANG_PLAYER, g_KinfeMsg[random_num(0, 3)], killer_name, victim_name)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (KnifeKillSound)
|
if (KnifeKillSound)
|
||||||
@ -423,10 +421,10 @@ public client_death(killer, victim, wpnindex, hitplace, TK)
|
|||||||
if (!selfkill)
|
if (!selfkill)
|
||||||
{
|
{
|
||||||
if (GrenadeKill)
|
if (GrenadeKill)
|
||||||
ShowSyncHudMsg(0, g_he_sync, "%L", LANG_PLAYER, g_HeMessages[random_num(0, 3)], killer_name, victim_name)
|
show_hudmessage(0, "%L", LANG_PLAYER, g_HeMessages[random_num(0, 3)], killer_name, victim_name)
|
||||||
}
|
}
|
||||||
else if (GrenadeSuicide)
|
else if (GrenadeSuicide)
|
||||||
ShowSyncHudMsg(0, g_he_sync, "%L", LANG_PLAYER, g_SHeMessages[random_num(0, 3)], victim_name)
|
show_hudmessage(0, "%L", LANG_PLAYER, g_SHeMessages[random_num(0, 3)], victim_name)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (headshot && (HeadShotKill || HeadShotKillSound))
|
if (headshot && (HeadShotKill || HeadShotKillSound))
|
||||||
|
@ -1420,15 +1420,7 @@ kill_stats(id)
|
|||||||
// Bail out if user stats timer is non-zero,
|
// Bail out if user stats timer is non-zero,
|
||||||
// ie function already called.
|
// ie function already called.
|
||||||
if (g_fzShowUserStatsTime[id] > 0.0)
|
if (g_fzShowUserStatsTime[id] > 0.0)
|
||||||
{
|
|
||||||
return
|
return
|
||||||
}
|
|
||||||
|
|
||||||
new team = get_user_team(id)
|
|
||||||
if (team < 1 || team > 2)
|
|
||||||
{
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// Flag kill stats displayed for this player.
|
// Flag kill stats displayed for this player.
|
||||||
g_fzShowUserStatsTime[id] = get_gametime()
|
g_fzShowUserStatsTime[id] = get_gametime()
|
||||||
@ -1554,9 +1546,7 @@ endround_stats()
|
|||||||
id = iaPlayers[iPlayer]
|
id = iaPlayers[iPlayer]
|
||||||
|
|
||||||
if (g_fzShowUserStatsTime[id] == 0.0)
|
if (g_fzShowUserStatsTime[id] == 0.0)
|
||||||
{
|
|
||||||
kill_stats(id)
|
kill_stats(id)
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
g_sAwardAndScore[0] = 0
|
g_sAwardAndScore[0] = 0
|
||||||
|
@ -11,9 +11,9 @@
|
|||||||
#endif
|
#endif
|
||||||
#define _amxconst_included
|
#define _amxconst_included
|
||||||
|
|
||||||
#define AMXX_VERSION 1.761
|
#define AMXX_VERSION 1.76
|
||||||
#define AMXX_VERSION_NUM 176
|
#define AMXX_VERSION_NUM 176
|
||||||
stock const AMXX_VERSION_STR[]="1.76a"
|
stock const AMXX_VERSION_STR[]="1.76"
|
||||||
|
|
||||||
#define M_PI 3.1415926535
|
#define M_PI 3.1415926535
|
||||||
|
|
||||||
|
@ -12,7 +12,7 @@ BAN = ban
|
|||||||
KICK = kick
|
KICK = kick
|
||||||
NO_ACC_COM = You have no access to that command
|
NO_ACC_COM = You have no access to that command
|
||||||
USAGE = Usage
|
USAGE = Usage
|
||||||
MORE_CL_MATCHT = There is more than one client matching your argument
|
MORE_CL_MATCHT = here are more clients matching to your argument
|
||||||
CL_NOT_FOUND = Client with that name or userid not found
|
CL_NOT_FOUND = Client with that name or userid not found
|
||||||
CLIENT_IMM = Client "%s" has immunity
|
CLIENT_IMM = Client "%s" has immunity
|
||||||
CANT_PERF_DEAD = That action can't be performed on dead client "%s"
|
CANT_PERF_DEAD = That action can't be performed on dead client "%s"
|
||||||
@ -34,7 +34,7 @@ BAN = ban
|
|||||||
KICK = kick
|
KICK = kick
|
||||||
NO_ACC_COM = Du hast nicht genuegend Rechte, um diesen Befehl auszufuehren!
|
NO_ACC_COM = Du hast nicht genuegend Rechte, um diesen Befehl auszufuehren!
|
||||||
USAGE = Anwendung
|
USAGE = Anwendung
|
||||||
MORE_CL_MATCHT = Es gibt mehrere Spieler, auf die deine Angaben zutreffen
|
MORE_CL_MATCHT = hier sind mehrere Spieler, auf die deine Angaben zutreffen
|
||||||
CL_NOT_FOUND = Spieler mit diesem Namen oder dieser UserID nicht gefunden
|
CL_NOT_FOUND = Spieler mit diesem Namen oder dieser UserID nicht gefunden
|
||||||
CLIENT_IMM = Spieler "%s" hat Immnuitaet
|
CLIENT_IMM = Spieler "%s" hat Immnuitaet
|
||||||
CANT_PERF_DEAD = Diese Aktion kann nicht am toten Spieler "%s" ausgefuehrt werden.
|
CANT_PERF_DEAD = Diese Aktion kann nicht am toten Spieler "%s" ausgefuehrt werden.
|
||||||
@ -166,7 +166,7 @@ BAN = ban
|
|||||||
KICK = kick
|
KICK = kick
|
||||||
NO_ACC_COM = Nie mozesz uzyc tej komendy
|
NO_ACC_COM = Nie mozesz uzyc tej komendy
|
||||||
USAGE = Uzycie
|
USAGE = Uzycie
|
||||||
MORE_CL_MATCHT = Istnieje kilku graczy pasujacych do podanego wzorca
|
MORE_CL_MATCHT = tutaj jest wiecej klientow pasujacych do twojego wyboru
|
||||||
CL_NOT_FOUND = Nie znaleziono klienta z tym nickiem lub ID
|
CL_NOT_FOUND = Nie znaleziono klienta z tym nickiem lub ID
|
||||||
CLIENT_IMM = Klient "%s" ma immunitet
|
CLIENT_IMM = Klient "%s" ma immunitet
|
||||||
CANT_PERF_DEAD = Nie mozesz tego wykonac na martwym kliencie "%s"
|
CANT_PERF_DEAD = Nie mozesz tego wykonac na martwym kliencie "%s"
|
||||||
@ -210,7 +210,7 @@ BAN = banear
|
|||||||
KICK = expulsar
|
KICK = expulsar
|
||||||
NO_ACC_COM = No tienes acceso a este comando
|
NO_ACC_COM = No tienes acceso a este comando
|
||||||
USAGE = Uso
|
USAGE = Uso
|
||||||
MORE_CL_MATCHT = Hay mas de un cliente que coincide con tu argumento
|
MORE_CL_MATCHT = aqui hay mas clientes que coinciden con tu argumento
|
||||||
CL_NOT_FOUND = No se encontro ningun cliente con ese nombre o ese identificador
|
CL_NOT_FOUND = No se encontro ningun cliente con ese nombre o ese identificador
|
||||||
CLIENT_IMM = El cliente "%s" tiene inmunidad
|
CLIENT_IMM = El cliente "%s" tiene inmunidad
|
||||||
CANT_PERF_DEAD = Esta accion no se puede aplicar a un cliente muerto "%s"
|
CANT_PERF_DEAD = Esta accion no se puede aplicar a un cliente muerto "%s"
|
||||||
|
@ -303,6 +303,7 @@ COM_STATS_ADD = ^tadd <nimi> <muuttuja> - Lisaa tilastoja listaan
|
|||||||
NO_STATS = Tilastopluginit eivat ole asennettuna talla palvelimellar^n
|
NO_STATS = Tilastopluginit eivat ole asennettuna talla palvelimellar^n
|
||||||
SAVE_CONF = Tallenna saadot
|
SAVE_CONF = Tallenna saadot
|
||||||
|
|
||||||
|
|
||||||
[ls]
|
[ls]
|
||||||
NO_OPTION = C0|_|ld|\|'t f!|\|d 0pt!0|\|(s) w!th s|_|(h v4r!4bl3 (|\|4m3 "%s")
|
NO_OPTION = C0|_|ld|\|'t f!|\|d 0pt!0|\|(s) w!th s|_|(h v4r!4bl3 (|\|4m3 "%s")
|
||||||
STATS_CONF_SAVED = $t4tz0|2 (0|\|f!g|_|r4t!0|\| s4v3d s|_|((3ssf|_|lly
|
STATS_CONF_SAVED = $t4tz0|2 (0|\|f!g|_|r4t!0|\| s4v3d s|_|((3ssf|_|lly
|
||||||
|
@ -22,7 +22,7 @@ BEST_SCORE = Best score
|
|||||||
KILL_S = kill(s)
|
KILL_S = kill(s)
|
||||||
TOTAL = Total
|
TOTAL = Total
|
||||||
SHOT_S = shot(s)
|
SHOT_S = shot(s)
|
||||||
HITS_YOU_IN = %s hit you in
|
HITS_YOU_IN = %s hits you in
|
||||||
KILLED_BY_WITH = Killed by %s with %s @ %0.0fm
|
KILLED_BY_WITH = Killed by %s with %s @ %0.0fm
|
||||||
NO_HITS = no hits
|
NO_HITS = no hits
|
||||||
YOU_NO_KILLER = You have no killer...
|
YOU_NO_KILLER = You have no killer...
|
||||||
|
@ -89,6 +89,7 @@ TELE_MENU = Teleportvalikko
|
|||||||
CUR_LOC = Nykyinen sijainti
|
CUR_LOC = Nykyinen sijainti
|
||||||
SAVE_LOC = Tallenna sijainti
|
SAVE_LOC = Tallenna sijainti
|
||||||
|
|
||||||
|
|
||||||
[ls]
|
[ls]
|
||||||
ADMIN_TELEPORT_1 = l33t s3rv3r 0P: h4x3d %s t0 n3w ISP
|
ADMIN_TELEPORT_1 = l33t s3rv3r 0P: h4x3d %s t0 n3w ISP
|
||||||
ADMIN_TELEPORT_2 = l33t s3rv3r 0P %s: h4x3d %s t0 n3w ISP
|
ADMIN_TELEPORT_2 = l33t s3rv3r 0P %s: h4x3d %s t0 n3w ISP
|
||||||
|
@ -353,7 +353,7 @@ public actionVoteMapMenu(id, key)
|
|||||||
}
|
}
|
||||||
|
|
||||||
keys |= (1<<8)
|
keys |= (1<<8)
|
||||||
len += format(menuBody[len], 511, "^n9. %L^n", id, "NONE")
|
len += format(menuBody[len], 511, "^n9. None^n")
|
||||||
} else {
|
} else {
|
||||||
len = format(menuBody, 511, g_coloredMenus ? "\y%L^n%s?^n\w^n1. %L^n2. %L^n" : "%L^n%s?^n^n1. %L^n2. %L^n", id, "CHANGE_MAP_TO", g_mapName[g_voteSelected[id][0]], id, "YES", id, "NO")
|
len = format(menuBody, 511, g_coloredMenus ? "\y%L^n%s?^n\w^n1. %L^n2. %L^n" : "%L^n%s?^n^n1. %L^n2. %L^n", id, "CHANGE_MAP_TO", g_mapName[g_voteSelected[id][0]], id, "YES", id, "NO")
|
||||||
keys = MENU_KEY_1|MENU_KEY_2
|
keys = MENU_KEY_1|MENU_KEY_2
|
||||||
|
Reference in New Issue
Block a user