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

BlockEdit command: Allow modifying draw mode and min/max corners

Browse Source
This commit is contained in:
UnknownShadow200 2023-12-03 11:19:14 +11:00
parent e58642e566
commit 67aaf98f87
3 changed files with 43 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/Commands.c
View File

@ -424,15 +424,37 @@ static cc_bool BlockEditCommand_GetInt(const cc_string* str, const char* name, i
}
return true;
}
static cc_bool BlockEditCommand_GetTexture(const cc_string* str, int* tex) {
return BlockEditCommand_GetInt(str, "Texture", tex, 0, ATLAS1D_MAX_ATLASES - 1);
}
static cc_bool BlockEditCommand_GetCoords(const cc_string* str, Vec3* coords) {
cc_string parts[3];
IVec3 xyz;
int numParts = String_UNSAFE_Split(str, ' ', parts, 3);
if (numParts != 3) {
Chat_AddRaw("&eBlockEdit: &c3 values are required for a coordinate (X Y Z)");
return false;
}
if (!BlockEditCommand_GetInt(&parts[0], "X coord", &xyz.X, -127, 127)) return false;
if (!BlockEditCommand_GetInt(&parts[1], "Y coord", &xyz.Y, -127, 127)) return false;
if (!BlockEditCommand_GetInt(&parts[2], "Z coord", &xyz.Z, -127, 127)) return false;
coords->X = xyz.X / 16.0f;
coords->Y = xyz.Y / 16.0f;
coords->Z = xyz.Z / 16.0f;
return true;
}
static void BlockEditCommand_Execute(const cc_string* args, int argsCount__) {
cc_string parts[3];
cc_string* prop;
cc_string* value;
int argsCount, block, v;
Vec3 coords;
if (String_CaselessEqualsConst(args, "properties")) {
Chat_AddRaw("&eEditable block properties:");
@ -441,6 +463,8 @@ static void BlockEditCommand_Execute(const cc_string* args, int argsCount__) {
Chat_AddRaw("&a sides &e- Sets textures on four sides of the block");
Chat_AddRaw("&a left/right/front/back/top/bottom &e- Sets one texture");
Chat_AddRaw("&a collide &e- Sets collision mode of the block");
Chat_AddRaw("&a drawmode &e- Sets draw mode of the block");
Chat_AddRaw("&a min/max &e- Sets min/max corner coordinates of the block");
return;
}
@ -499,6 +523,18 @@ static void BlockEditCommand_Execute(const cc_string* args, int argsCount__) {
if (!BlockEditCommand_GetInt(value, "Collide mode", &v, 0, COLLIDE_CLIMB)) return;
Blocks.Collide[block] = v;
} else if (String_CaselessEqualsConst(prop, "drawmode")) {
if (!BlockEditCommand_GetInt(value, "Draw mode", &v, 0, DRAW_SPRITE)) return;
Blocks.Draw[block] = v;
} else if (String_CaselessEqualsConst(prop, "min")) {
if (!BlockEditCommand_GetCoords(value, &coords)) return;
Blocks.MinBB[block] = coords;
} else if (String_CaselessEqualsConst(prop, "max")) {
if (!BlockEditCommand_GetCoords(value, &coords)) return;
Blocks.MaxBB[block] = coords;
} else {
Chat_Add1("&eBlockEdit: &eUnknown property %s &e(See &a/client help blockedit&e)", prop);
return;

3
src/LScreens.c
View File

@ -851,7 +851,8 @@ CC_NOINLINE static cc_uint32 MainScreen_GetVersion(const cc_string* version) {
/* 1.0.1 -> { 1, 0, 1, 0 } */
count = String_UNSAFE_Split(version, '.', parts, 4);
for (i = 0; i < count; i++) {
for (i = 0; i < count; i++)
{
Convert_ParseUInt8(&parts[i], &raw[i]);
}
return Stream_GetU32_BE(raw);

8
src/String.c
View File

@ -71,9 +71,10 @@ cc_string String_UNSAFE_SubstringAt(STRING_REF const cc_string* str, int offset)
int String_UNSAFE_Split(STRING_REF const cc_string* str, char c, cc_string* subs, int maxSubs) {
int beg = 0, end, count, i;
for (i = 0; i < maxSubs && beg <= str->length; i++) {
for (i = 0; i < maxSubs && beg <= str->length; i++)
{
end = String_IndexOfAt(str, beg, c);
if (end == -1) end = str->length;
if (end == -1 || i == (maxSubs - 1)) end = str->length;
subs[i] = String_UNSAFE_Substring(str, beg, end - beg);
beg = end + 1;
@ -679,7 +680,8 @@ static cc_bool Convert_TryParseDigits(const cc_string* str, cc_bool* negative, c
if (str->buffer[0] == '+') { offset = 1; }
/* add digits, starting at last digit */
for (i = str->length - 1; i >= offset; i--) {
for (i = str->length - 1; i >= offset; i--)
{
char c = str->buffer[i];
if (c < '0' || c > '9' || digits < start) return false;
*digits-- = c;