Merged heads. Fixed conflicts in cvars.inc and zadmin.inc.

Readded some functions in zadmin.inc, but made them as comments. No reason to remove these so we don't have to remake them again.
This commit is contained in:
richard
2009-05-30 04:42:23 +02:00
44 changed files with 2843 additions and 2585 deletions

View File

@@ -17,6 +17,7 @@ CommandsInit()
{
// Forward event to modules. (create commands)
ConfigOnCommandsCreate();
ClassOnCommandsCreate();
WeaponsOnCommandsCreate();
VolOnCommandsCreate();
@@ -42,10 +43,6 @@ CommandsInit()
RegAdminCmd("zr_anticamp_list", Command_AnticampList, ADMFLAG_GENERIC, "List current volumes.");
RegConsoleCmd("zr_log_flags", Command_LogFlags, "List available logging flags.");
RegConsoleCmd("zr_class_dump", Command_ClassDump, "Dumps class data at a specified index in the specified cache. Usage: zr_class_dump <cachetype> <index|targetname>");
RegAdminCmd("zr_class_modify", Command_ClassModify, ADMFLAG_GENERIC, "Modify class data on one or more classes. Usage: zr_class_modify <classname|\"zombies\"|\"humans\"|\"admins\"> <attribute> <value> [is_multiplier]");
}*/
/*public Action:Command_Infect(client, argc)