pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-13 18:51:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[GM Command] Fix Crash Issue and Validation with #zclip (#2014)

Browse Source 
* Fix crash issue and validation with zclip

* Formatting.

Co-authored-by: Kinglykrab <89047260+Kinglykrab@users.noreply.github.com>
This commit is contained in:
Chris Miles 2022-02-21 17:02:48 -05:00 committed by GitHub
parent d86544ff60
commit 3c35e9bbc8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
zone/gm_commands/zclip.cpp
View File

@ -3,38 +3,41 @@
void command_zclip(Client *c, const Seperator *sep) void command_zclip(Client *c, const Seperator *sep)
{ {
int arguments = sep->argnum; int arguments = sep->argnum;
if ( if (arguments <= 3) {
!arguments || c->Message(
!sep->IsNumber(1) || Chat::White,
!sep->IsNumber(2) "Usage: #zclip [Minimum Clip] [Maximum Clip] [Fog Minimum Clip] [Fog Maximum Clip] [Permanent (0 = False, 1 = True)]"
) { );
c->Message(Chat::White, "Usage: #zclip [Minimum Clip] [Maximum Clip] [Fog Minimum Clip] [Fog Maximum Clip] [Permanent (0 = False, 1 = True)]"); return;
} }
auto minimum_clip = std::stof(sep->arg[1]); auto minimum_clip = sep->arg[1] ? std::stof(sep->arg[1]) : 0;
auto maximum_clip = std::stof(sep->arg[2]); auto maximum_clip = sep->arg[2] ? std::stof(sep->arg[2]) : 0;
auto minimum_fog_clip = sep->arg[3] ? std::stof(sep->arg[3]) : 0; auto minimum_fog_clip = sep->arg[3] ? std::stof(sep->arg[3]) : 0;
auto maximum_fog_clip = sep->arg[4] ? std::stof(sep->arg[4]) : 0; auto maximum_fog_clip = sep->arg[4] ? std::stof(sep->arg[4]) : 0;
auto permanent = sep->arg[5] ? atobool(sep->arg[5]) : false; auto permanent = sep->arg[5] ? atobool(sep->arg[5]) : false;
if (minimum_clip <= 0 || maximum_clip <= 0) { if (minimum_clip <= 0 || maximum_clip <= 0) {
c->Message(Chat::White, "Minimum Clip and Maximum Clip must be greater than 0."); c->Message(Chat::White, "Minimum Clip and Maximum Clip must be greater than 0.");
return; return;
} else if (minimum_clip > maximum_clip) { }
else if (minimum_clip > maximum_clip) {
c->Message(Chat::White, "Minimum Clip must be less than or equal to Maximum Clip!"); c->Message(Chat::White, "Minimum Clip must be less than or equal to Maximum Clip!");
return; return;
} else { }
else {
zone->newzone_data.minclip = minimum_clip; zone->newzone_data.minclip = minimum_clip;
zone->newzone_data.maxclip = maximum_clip; zone->newzone_data.maxclip = maximum_clip;
if (minimum_fog_clip) { if (minimum_fog_clip) {
for (int fog_index = 0; fog_index < 4; fog_index++) { for (float &fog_index: zone->newzone_data.fog_minclip) {
zone->newzone_data.fog_minclip[fog_index] = minimum_fog_clip; fog_index = minimum_fog_clip;
} }
} }
if (maximum_fog_clip) { if (maximum_fog_clip) {
for (int fog_index = 0; fog_index < 4; fog_index++) { for (float &fog_index: zone->newzone_data.fog_maxclip) {
zone->newzone_data.fog_maxclip[fog_index] = maximum_fog_clip; fog_index = maximum_fog_clip;
} }
} }