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

Merge pull request #165 from Arkshine/feature/add-version-lib-and-missing-rc

Browse Source 
Update versioning system and add missing module RC file (bug 6222)
This commit is contained in:
Vincent Herbet
2015-01-07 18:59:51 +01:00
parent aa8170ecfd ab4294f3ca
commit 7f71cfaee7
71 changed files with 2117 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
amxmodx/amxmodx.cpp
View File

@ -814,7 +814,7 @@ static cell AMX_NATIVE_CALL is_user_alive(AMX *amx, cell *params) /* 1 param */
static cell AMX_NATIVE_CALL get_amxx_verstring(AMX *amx, cell *params) /* 2 params */
{
return set_amxstring(amx, params[1], SVN_VERSION_STRING, params[2]);
return set_amxstring(amx, params[1], AMXX_VERSION, params[2]);
}
static cell AMX_NATIVE_CALL get_user_frags(AMX *amx, cell *params) /* 1 param */

2
amxmodx/amxxlog.cpp
View File

@ -101,7 +101,7 @@ void CLog::CreateNewFile()
ALERT(at_logged, "[AMXX] Unexpected fatal logging error. AMXX Logging disabled.\n");
SET_LOCALINFO("amxx_logging", "0");
} else {
fprintf(fp, "AMX Mod X log file started (file \"%s\") (version \"%s\")\n", name, SVN_VERSION_STRING);
fprintf(fp, "AMX Mod X log file started (file \"%s\") (version \"%s\")\n", name, AMXX_VERSION);
fclose(fp);
}
}

6
amxmodx/meta_api.cpp
View File

@ -36,7 +36,7 @@ plugin_info_t Plugin_info =
{
META_INTERFACE_VERSION, // ifvers
"AMX Mod X", // name
SVN_VERSION_STRING, // version
AMXX_VERSION, // version
__DATE__, // date
"AMX Mod X Dev Team", // author
"http://www.amxmodx.org", // url
@ -450,7 +450,7 @@ int C_Spawn(edict_t *pent)
int loaded = countModules(CountModules_Running); // Call after attachModules so all modules don't have pending stat
// Set some info about amx version and modules
CVAR_SET_STRING(init_amxmodx_version.name, SVN_VERSION_STRING);
CVAR_SET_STRING(init_amxmodx_version.name, AMXX_VERSION);
char buffer[32];
sprintf(buffer, "%d", loaded);
CVAR_SET_STRING(init_amxmodx_modules.name, buffer);
@ -1458,7 +1458,7 @@ C_DLLEXPORT int Meta_Attach(PLUG_LOADTIME now, META_FUNCTIONS *pFunctionTable, m
// ###### Print short GPL
print_srvconsole("\n AMX Mod X version %s Copyright (c) 2004-2014 AMX Mod X Development Team \n"
" AMX Mod X comes with ABSOLUTELY NO WARRANTY; for details type `amxx gpl'.\n", SVN_VERSION_STRING);
" AMX Mod X comes with ABSOLUTELY NO WARRANTY; for details type `amxx gpl'.\n", AMXX_VERSION);
print_srvconsole(" This is free software and you are welcome to redistribute it under \n"
" certain conditions; type 'amxx gpl' for details.\n \n");

7
amxmodx/srvcmd.cpp
View File

@ -180,8 +180,11 @@ void amx_command()
print_srvconsole("\tFelix \"SniperBeamer\" Geyer, Jonny \"Got His Gun\" Bergstrom\n");
print_srvconsole("\tLukasz \"SidLuke\" Wlasinski, Christian \"Basic-Master\" Hammacher\n");
print_srvconsole("\tBorja \"faluco\" Ferrer, Scott \"DS\" Ehlert\n");
print_srvconsole("Compiled: %s\n", __DATE__ ", " __TIME__);
print_srvconsole("Build ID: %s\n", SVN_BUILD_ID);
print_srvconsole("Compiled: %s\n", AMXX_BUILD_TIME);
#if defined(AMXX_GENERATED_BUILD)
print_srvconsole("Built from: https://github.com/alliedmodders/amxmodx/commit/%s", AMXX_SHA);
print_srvconsole("Build ID: %s:%s", AMXX_LOCAL_REV, AMXX_SHA);
#endif
#if defined JIT && !defined ASM32
print_srvconsole("Core mode: JIT Only\n");
#elif !defined JIT && defined ASM32