Prepare simple warlist mode

chillerbot · Aug 26, 2024 · e46f6f6 · e46f6f6
1 parent f8ce4d9
commit e46f6f6
Show file tree

Hide file tree

Showing 7 changed files with 539 additions and 414 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2409,6 +2409,8 @@ if(CLIENT)
     components/chillerbot/vibebot.h
     components/chillerbot/warlist.cpp
     components/chillerbot/warlist.h
+    components/chillerbot/warlist_commands_advanced.cpp
+    components/chillerbot/warlist_commands_simple.cpp
     components/console.cpp
     components/console.h
     components/controls.cpp

diff --git a/src/engine/shared/chillerbot/variables.h b/src/engine/shared/chillerbot/variables.h
@@ -64,6 +64,7 @@ MACRO_CONFIG_STR(ClSavedDummySkin, saved_dummy_skin, 24, "default", CFGFLAG_CLIE
 
 // warlist
 MACRO_CONFIG_INT(ClWarList, cl_war_list, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Display nameplate color based on chillerbot/warlist directory")
+MACRO_CONFIG_INT(ClWarListAdvanced, cl_war_list_advanced, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Activates more complex warlist mode")
 MACRO_CONFIG_INT(ClNameplatesWarReason, cl_nameplates_war_reason, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show war reason in name plates")
 MACRO_CONFIG_INT(ClWarListAutoReload, cl_war_list_auto_reload, 10, 0, 600, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Reload warlist every x seconds 0=off")
 

diff --git a/src/game/client/components/chillerbot/chatcommand.cpp b/src/game/client/components/chillerbot/chatcommand.cpp
@@ -8,8 +8,8 @@
 
 #include <game/client/components/chat.h>
 
-#include "chatcommand.h"
 #include "base/system.h"
+#include "chatcommand.h"
 
 void CChatCommand::OnServerMsg(const char *pMsg)
 {
@@ -51,7 +51,7 @@ bool CChatCommand::OnChatCmd(char Prefix, int ClientId, int Team, const char *pC
 bool CChatCommand::ParseChatCmd(char Prefix, int ClientId, int Team, const char *pCmdWithArgs)
 {
 	char aRawArgLine[512];
-	aRawArgLine[0] = '\0';
+	str_copy(aRawArgLine, pCmdWithArgs);
 	const int MaxArgLen = 256;
 	char aCmd[MaxArgLen];
 	int i;
@@ -61,9 +61,12 @@ bool CChatCommand::ParseChatCmd(char Prefix, int ClientId, int Team, const char
 			break;
 		aCmd[i] = pCmdWithArgs[i];
 	}
-	const char *pArgStart = str_skip_whitespaces(aCmd + i);
-	if(pArgStart)
-		str_copy(aRawArgLine, pArgStart);
+
+	int Skip = i;
+	while(pCmdWithArgs[Skip] && str_isspace(pCmdWithArgs[Skip]))
+		Skip++;
+	str_copy(aRawArgLine, pCmdWithArgs + Skip);
+
 	aCmd[i] = '\0';
 	int ROffset = m_pClient->m_ChatHelper.ChatCommandGetROffset(aCmd);