AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-13 17:47:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Commands: Refactor singleplayerOnly into flags, and add a flag that tells the client to not split command arguments by spaces

Browse Source
This commit is contained in:
UnknownShadow200 2021-11-13 18:25:04 +11:00
parent 7db720f10f
commit 177a898ebc
2 changed files with 41 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/Chat.c
View File

@ -335,6 +335,7 @@ static void Commands_Execute(const cc_string* input) {
struct ChatCommand* cmd; struct ChatCommand* cmd;
int offset, count; int offset, count;
cc_string name, value;
cc_string args[50]; cc_string args[50];
if (String_CaselessStarts(&text, &prefixSpace)) { /* /client command args */ if (String_CaselessStarts(&text, &prefixSpace)) { /* /client command args */
@ -349,15 +350,22 @@ static void Commands_Execute(const cc_string* input) {
/* Check for only / or /client */ /* Check for only / or /client */
if (!text.length) { Commands_PrintDefault(); return; } if (!text.length) { Commands_PrintDefault(); return; }
count = String_UNSAFE_Split(&text, ' ', args, Array_Elems(args)); String_UNSAFE_Separate(&text, ' ', &name, &value);
cmd = Commands_FindMatch(&args[0]); cmd = Commands_FindMatch(&name);
if (!cmd) return; if (!cmd) return;
if (cmd->singleplayerOnly && !Server.IsSinglePlayer) { if ((cmd->flags & COMMAND_FLAG_SINGLEPLAYER_ONLY) && !Server.IsSinglePlayer) {
Chat_Add1("&e/client: \"&f%s&e\" can only be used in singleplayer.", &args[0]); Chat_Add1("&e/client: \"&f%s&e\" can only be used in singleplayer.", &name);
return; return;
} }
cmd->Execute(&args[1], count - 1);
if (cmd->flags & COMMAND_FLAG_UNSPLIT_ARGS) {
/* argsCount = 0 if value.length is 0, 1 otherwise */
cmd->Execute(&value, value.length != 0);
} else {
count = String_UNSAFE_Split(&value, ' ', args, Array_Elems(args));
cmd->Execute(args, count);
}
} }
@ -369,7 +377,7 @@ static void HelpCommand_Execute(const cc_string* args, int argsCount) {
int i; int i;
if (!argsCount) { Commands_PrintDefault(); return; } if (!argsCount) { Commands_PrintDefault(); return; }
cmd = Commands_FindMatch(&args[0]); cmd = Commands_FindMatch(args);
if (!cmd) return; if (!cmd) return;
for (i = 0; i < Array_Elems(cmd->help); i++) { for (i = 0; i < Array_Elems(cmd->help); i++) {
@ -379,7 +387,8 @@ static void HelpCommand_Execute(const cc_string* args, int argsCount) {
} }
static struct ChatCommand HelpCommand = { static struct ChatCommand HelpCommand = {
"Help", HelpCommand_Execute, false, "Help", HelpCommand_Execute,
COMMAND_FLAG_UNSPLIT_ARGS,
{ {
"&a/client help [command name]", "&a/client help [command name]",
"&eDisplays the help for the given command.", "&eDisplays the help for the given command.",
@ -399,7 +408,8 @@ static void GpuInfoCommand_Execute(const cc_string* args, int argsCount) {
} }
static struct ChatCommand GpuInfoCommand = { static struct ChatCommand GpuInfoCommand = {
"GpuInfo", GpuInfoCommand_Execute, false, "GpuInfo", GpuInfoCommand_Execute,
COMMAND_FLAG_UNSPLIT_ARGS,
{ {
"&a/client gpuinfo", "&a/client gpuinfo",
"&eDisplays information about your GPU.", "&eDisplays information about your GPU.",
@ -412,18 +422,19 @@ static void RenderTypeCommand_Execute(const cc_string* args, int argsCount) {
Chat_AddRaw("&e/client: &cYou didn't specify a new render type."); return; Chat_AddRaw("&e/client: &cYou didn't specify a new render type."); return;
} }
flags = EnvRenderer_CalcFlags(&args[0]); flags = EnvRenderer_CalcFlags(args);
if (flags >= 0) { if (flags >= 0) {
EnvRenderer_SetMode(flags); EnvRenderer_SetMode(flags);
Options_Set(OPT_RENDER_TYPE, &args[0]); Options_Set(OPT_RENDER_TYPE, args);
Chat_Add1("&e/client: &fRender type is now %s.", &args[0]); Chat_Add1("&e/client: &fRender type is now %s.", args);
} else { } else {
Chat_Add1("&e/client: &cUnrecognised render type &f\"%s\"&c.", &args[0]); Chat_Add1("&e/client: &cUnrecognised render type &f\"%s\"&c.", args);
} }
} }
static struct ChatCommand RenderTypeCommand = { static struct ChatCommand RenderTypeCommand = {
"RenderType", RenderTypeCommand_Execute, false, "RenderType", RenderTypeCommand_Execute,
COMMAND_FLAG_UNSPLIT_ARGS,
{ {
"&a/client rendertype [normal/legacy/legacyfast]", "&a/client rendertype [normal/legacy/legacyfast]",
"&bnormal: &eDefault renderer, with all environmental effects enabled.", "&bnormal: &eDefault renderer, with all environmental effects enabled.",
@ -451,7 +462,8 @@ static void ResolutionCommand_Execute(const cc_string* args, int argsCount) {
} }
static struct ChatCommand ResolutionCommand = { static struct ChatCommand ResolutionCommand = {
"Resolution", ResolutionCommand_Execute, false, "Resolution", ResolutionCommand_Execute,
0,
{ {
"&a/client resolution [width] [height]", "&a/client resolution [width] [height]",
"&ePrecisely sets the size of the rendered window.", "&ePrecisely sets the size of the rendered window.",
@ -460,14 +472,15 @@ static struct ChatCommand ResolutionCommand = {
static void ModelCommand_Execute(const cc_string* args, int argsCount) { static void ModelCommand_Execute(const cc_string* args, int argsCount) {
if (argsCount) { if (argsCount) {
Entity_SetModel(&LocalPlayer_Instance.Base, &args[0]); Entity_SetModel(&LocalPlayer_Instance.Base, args);
} else { } else {
Chat_AddRaw("&e/client model: &cYou didn't specify a model name."); Chat_AddRaw("&e/client model: &cYou didn't specify a model name.");
} }
} }
static struct ChatCommand ModelCommand = { static struct ChatCommand ModelCommand = {
"Model", ModelCommand_Execute, true, "Model", ModelCommand_Execute,
COMMAND_FLAG_SINGLEPLAYER_ONLY | COMMAND_FLAG_UNSPLIT_ARGS,
{ {
"&a/client model [name]", "&a/client model [name]",
"&bnames: &echibi, chicken, creeper, human, pig, sheep", "&bnames: &echibi, chicken, creeper, human, pig, sheep",
@ -481,7 +494,8 @@ static void ClearDeniedCommand_Execute(const cc_string* args, int argsCount) {
} }
static struct ChatCommand ClearDeniedCommand = { static struct ChatCommand ClearDeniedCommand = {
"ClearDenied", ClearDeniedCommand_Execute, false, "ClearDenied", ClearDeniedCommand_Execute,
COMMAND_FLAG_UNSPLIT_ARGS,
{ {
"&a/client cleardenied", "&a/client cleardenied",
"&eClears the list of texture pack URLs you have denied", "&eClears the list of texture pack URLs you have denied",
@ -585,7 +599,8 @@ static void CuboidCommand_Execute(const cc_string* args, int argsCount) {
} }
static struct ChatCommand CuboidCommand = { static struct ChatCommand CuboidCommand = {
"Cuboid", CuboidCommand_Execute, true, "Cuboid", CuboidCommand_Execute,
COMMAND_FLAG_SINGLEPLAYER_ONLY,
{ {
"&a/client cuboid [block] [persist]", "&a/client cuboid [block] [persist]",
"&eFills the 3D rectangle between two points with [block].", "&eFills the 3D rectangle between two points with [block].",
@ -618,7 +633,8 @@ static void TeleportCommand_Execute(const cc_string* args, int argsCount) {
} }
static struct ChatCommand TeleportCommand = { static struct ChatCommand TeleportCommand = {
"TP", TeleportCommand_Execute, true, "TP", TeleportCommand_Execute,
COMMAND_FLAG_SINGLEPLAYER_ONLY,
{ {
"&a/client tp [x y z]", "&a/client tp [x y z]",
"&eMoves you to the given coordinates.", "&eMoves you to the given coordinates.",

7
src/Chat.h
View File

@ -39,13 +39,18 @@ extern double Chat_AnnouncementReceived;
extern double Chat_BigAnnouncementReceived; extern double Chat_BigAnnouncementReceived;
extern double Chat_SmallAnnouncementReceived; extern double Chat_SmallAnnouncementReceived;
/* This command is only available in singleplayer */
#define COMMAND_FLAG_SINGLEPLAYER_ONLY 0x01
/* args is passed as a single string instead of being split by spaces */
#define COMMAND_FLAG_UNSPLIT_ARGS 0x02
struct ChatCommand; struct ChatCommand;
/* Represents a client-side command/action. */ /* Represents a client-side command/action. */
struct ChatCommand { struct ChatCommand {
const char* name; /* Full name of this command */ const char* name; /* Full name of this command */
/* Function pointer for the actual action the command performs */ /* Function pointer for the actual action the command performs */
void (*Execute)(const cc_string* args, int argsCount); void (*Execute)(const cc_string* args, int argsCount);
cc_bool singleplayerOnly; /* Whether this command is only usable in singleplayer */ cc_uint8 flags; /* Flags for handling this command (see COMMAND_FLAG defines) */
const char* help[5]; /* Messages to show when a player uses /help on this command */ const char* help[5]; /* Messages to show when a player uses /help on this command */
struct ChatCommand* next; /* Next command in linked-list of client commands */ struct ChatCommand* next; /* Next command in linked-list of client commands */
}; };