Recoded weapon restrictions, and made new way of storing data. (Arrays)
* Removed ZMarket as an external plugin (to be integrated next commit) * Updated weapon configs, removed weapongroups.txt and moved weapons.txt to root zr config folder. * Moved offset finding to respective module, made new forward *OnOffsetsFound. * Updated weapons&hitgroups config file format to match playerclass.txt * Updated translations. * Recoded weapon restrict menu, commented out all zadmin options that don't quite work. * Added weaponammo module (not finished but existent) * Started zmarket module.
This commit is contained in:
@ -71,8 +71,8 @@ bool:ClassApplyModel(client, classindex, cachetype = ZR_CLASS_CACHE_PLAYER)
|
||||
if (strcmp(modelpath, "random", false) == 0)
|
||||
{
|
||||
// TODO: Make a function that gets a random model from the specified team.
|
||||
new randmodel = GetRandomInt(0, GetArraySize(arrayModelsList) - 1);
|
||||
GetArrayString(arrayModelsList, randmodel, modelpath, sizeof(modelpath));
|
||||
new randmodel = GetRandomInt(0, GetArraySize(arrayModels) - 1);
|
||||
GetArrayString(arrayModels, randmodel, modelpath, sizeof(modelpath));
|
||||
Format(modelpath, sizeof(modelpath), "%s.mdl", modelpath);
|
||||
}
|
||||
|
||||
|
@ -209,14 +209,6 @@ ClassMenuSelect(client, teamid)
|
||||
AddMenuItem(menu, classname, menuitem);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// No classes found. Display message. The main class menu should
|
||||
// prevent this from happening, but we print a message just in case.
|
||||
// THIS TRANSLATION PHRASES IS NOT IN FILE.
|
||||
Format(menuitem, sizeof(menuitem), "%t\n", "Classes menu not found");
|
||||
AddMenuItem(menu, classname, menuitem, ITEMDRAW_RAWLINE);
|
||||
}
|
||||
|
||||
SetMenuExitBackButton(menu, true);
|
||||
DisplayMenu(menu, client, MENU_TIME_FOREVER);
|
||||
|
@ -54,7 +54,7 @@ ClassOverlayOnCommandsHook()
|
||||
// Explode string into array indexes.
|
||||
new cmdcount = ExplodeString(togglecmds, ", ", arrayCmds, CLASSOVERLAY_TOGGLE_MAX_CMDS, CLASSOVERLAY_TOGGLE_MAX_LENGTH);
|
||||
|
||||
// x = array index.
|
||||
// x = Array index.
|
||||
// arrayCmds[x] = suicide command.
|
||||
for (new x = 0; x <= cmdcount - 1; x++)
|
||||
{
|
||||
|
@ -252,9 +252,8 @@ enum ClassDataTypes
|
||||
|
||||
/**
|
||||
* Keyvalue handle to store class data.
|
||||
*
|
||||
* @redir config.inc
|
||||
*/
|
||||
new Handle:kvClassData = INVALID_HANDLE;
|
||||
|
||||
/**
|
||||
* The original class data. This array only changed when class data is loaded.
|
||||
@ -322,20 +321,20 @@ new ClassPlayerNextAdminClass[MAXPLAYERS + 1];
|
||||
*/
|
||||
ClassLoad()
|
||||
{
|
||||
// Register config file.
|
||||
ConfigRegisterConfig(File_Classes, Structure_Keyvalue, CONFIG_FILE_ALIAS_CLASSES);
|
||||
|
||||
// Make sure kvClassData is ready to use.
|
||||
if (kvClassData != INVALID_HANDLE)
|
||||
{
|
||||
CloseHandle(kvClassData);
|
||||
}
|
||||
kvClassData = CreateKeyValues("classes");
|
||||
kvClassData = CreateKeyValues(CONFIG_FILE_ALIAS_CLASSES);
|
||||
|
||||
// Get weapons config path.
|
||||
decl String:pathclasses[PLATFORM_MAX_PATH];
|
||||
new bool:exists = ConfigGetCvarFilePath(CVAR_CONFIG_PATH_CLASSES, pathclasses);
|
||||
|
||||
// Register config info.
|
||||
ConfigRegisterConfig(ConfigClasses, false, GetFunctionByName(GetMyHandle(), "ClassOnConfigReload"), _, pathclasses, CONFIG_FILE_ALIAS_CLASSES);
|
||||
|
||||
// If file doesn't exist, then log and stop.
|
||||
if (!exists)
|
||||
{
|
||||
@ -463,8 +462,10 @@ ClassLoad()
|
||||
LogPrintToLog(LOG_FORMAT_TYPE_NORMAL, "Classes", "Config Validation", "Total: %d | Successful: %d | Unsuccessful: %d", ClassCount, ClassCount - failedcount, failedcount);
|
||||
|
||||
// Set config data.
|
||||
ConfigSetConfigLoaded(ConfigClasses, true);
|
||||
ConfigSetConfigHandle(ConfigClasses, kvClassData);
|
||||
ConfigSetConfigLoaded(File_Classes, true);
|
||||
ConfigSetConfigReloadFunc(File_Classes, GetFunctionByName(GetMyHandle(), "ClassOnConfigReload"));
|
||||
// ConfigSetConfigHandle(File_Classes, INVALID_HANDLE);
|
||||
ConfigSetConfigPath(File_Classes, pathclasses);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -475,9 +476,6 @@ ClassLoad()
|
||||
public ClassOnConfigReload(ConfigFile:config)
|
||||
{
|
||||
// Reload class config.
|
||||
if (config == ConfigClasses)
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
Reference in New Issue
Block a user