Fixed player commands to re-use the ones players expect.

Author: JayCroghan

src/zombiemod.cpp

@@ -60,7 +60,7 @@ extern ZRWeaponConfig* g_pZRWeaponConfig;
 extern ZRHitgroupConfig* g_pZRHitgroupConfig;
 
 CConVar<bool> g_cvarZMEnable("zm_enable", (FCVAR_REPLICATED | FCVAR_SPONLY | FCVAR_NOTIFY), "ZombieMod enabled or not.", false, ConVarZMEnableChange);
-CConVar<CUtlString> g_cvarZMVersion("zm_version", (FCVAR_REPLICATED | FCVAR_SPONLY | FCVAR_NOTIFY), "ZombieMod version", "4.0.0 d");
+CConVar<CUtlString> g_cvarZMVersion("zm_version", (FCVAR_REPLICATED | FCVAR_SPONLY | FCVAR_NOTIFY), "ZombieMod version", "4.0.0e");
 CConVar<CUtlString> g_cvarZMHumanWinOverlayParticle("zm_human_win_overlay_particle", FCVAR_NONE, "Screenspace particle to display when human win", "");
 CConVar<CUtlString> g_cvarZMZombieWinOverlayParticle("zm_zombie_win_overlay_particle", FCVAR_NONE, "Screenspace particle to display when zombie win", "");
 CConVar<int> g_cvarZMInfectSpawnType("zm_infect_spawn_type", FCVAR_NONE, "Type of Mother Zombies Spawn [0 = MZ spawn where they stand, 1 = MZ get teleported back to spawn on being picked]", (int)EZMSpawnType::ZM_RESPAWN, true, 0, true, 1);

src/zombiemod.h

@@ -67,4 +67,9 @@ bool ZM_CheckTeamWinConditions(int iTeamNum);
 static std::vector<std::string> SplitLines(const std::string& text);
 void PrintMultilineChat(CPlayerSlot slot, const std::string& message);
 
-void ConVarZMEnableChange(CConVar<bool>* cvar, CSplitScreenSlot nSlot, const bool* pNewValue, const bool* pOldValue);
+void ConVarZMEnableChange(CConVar<bool>* cvar, CSplitScreenSlot nSlot, const bool* pNewValue, const bool* pOldValue);
+
+extern void zmtele_callback(const CCommand& args, CCSPlayerController* player);
+extern void zmclass_callback(const CCommand& args, CCSPlayerController* player);
+extern void zminfect_callback(const CCommand& args, CCSPlayerController* player);
+extern void zmrevive_callback(const CCommand& args, CCSPlayerController* player);

src/zombiereborn.cpp

@@ -1780,6 +1780,12 @@ void ZR_EndRoundAndAddTeamScore(int iTeamNum)
 
 CON_COMMAND_CHAT(ztele, "- Teleport to spawn")
 {
+	if (g_cvarZMEnable.Get())
+	{
+		zmtele_callback(args, player);
+		return;
+	}
+
 	// Silently return so the command is completely hidden
 	if (!g_cvarEnableZR.Get())
 		return;
@@ -1855,6 +1861,13 @@ CON_COMMAND_CHAT(ztele, "- Teleport to spawn")
 
 CON_COMMAND_CHAT(zclass, "<teamname/class name/number> - Find and select your Z:R classes")
 {
+
+	if (g_cvarZMEnable.Get())
+	{
+		zmclass_callback(args, player);
+		return;
+	}
+
 	// Silently return so the command is completely hidden
 	if (!g_cvarEnableZR.Get())
 		return;
@@ -1921,6 +1934,12 @@ CON_COMMAND_CHAT(zclass, "<teamname/class name/number> - Find and select your Z:
 
 CON_COMMAND_CHAT_FLAGS(infect, "- Infect a player", ADMFLAG_GENERIC)
 {
+	if (g_cvarZMEnable.Get())
+	{
+		zminfect_callback(args, player);
+		return;
+	}
+
 	// Silently return so the command is completely hidden
 	if (!g_cvarEnableZR.Get())
 		return;
@@ -1981,6 +2000,12 @@ CON_COMMAND_CHAT_FLAGS(infect, "- Infect a player", ADMFLAG_GENERIC)
 
 CON_COMMAND_CHAT_FLAGS(revive, "- Revive a player", ADMFLAG_GENERIC)
 {
+	if (g_cvarZMEnable.Get())
+	{
+		zmrevive_callback(args, player);
+		return;
+	}
+
 	// Silently return so the command is completely hidden
 	if (!g_cvarEnableZR.Get())
 		return;