Request to slightly improve add grid way point comand

[AndMetal]

I thought it would be fine the way I did this, but I guess maybe not.

Originally Posted by AndMetal

zone/command.cpp

void command_wp(Client *c, const Seperator *sep)
{
	if (sep->arg[4] == NULL)
		int wp = database.GetHighestWaypoint(zone->GetZoneID(), atoi(sep->arg[2]));
	else
		int wp = atoi(sep->arg[4]);
	if (strcasecmp("add",sep->arg[1]) == 0)
		database.AddWP(c, atoi(sep->arg[2]),wp, c->GetX(), c->GetY(), c->GetZ(), atoi(sep->arg[3]),zone->GetZoneID());
	else if (strcasecmp("delete",sep->arg[1]) == 0)
		database.DeleteWaypoint(c, atoi(sep->arg[2]),atoi(sep->arg[4]),zone->GetZoneID());
	else
		c->Message(0,"Usage: #wp add/delete grid_num pause wp_num");
}

Try this instead:

void command_wp(Client *c, const Seperator *sep)
{
	int wp;
	if (sep->arg[4] == NULL)
		wp = database.GetHighestWaypoint(zone->GetZoneID(), atoi(sep->arg[2]));
	else
		wp = atoi(sep->arg[4]);
	if (strcasecmp("add",sep->arg[1]) == 0)
		database.AddWP(c, atoi(sep->arg[2]),wp, c->GetX(), c->GetY(), c->GetZ(), atoi(sep->arg[3]),zone->GetZoneID());
	else if (strcasecmp("delete",sep->arg[1]) == 0)
		database.DeleteWaypoint(c, atoi(sep->arg[2]),atoi(sep->arg[4]),zone->GetZoneID());
	else
		c->Message(0,"Usage: #wp add/delete grid_num pause wp_num");
}

Let me know if that works. I knew when I wrote it that 2nd one would work, I just figured the other way would be a little cleaner & still work

Oh well, that's why KLS & Derision are the "devs", and I just tinker

[trevius]

Derision isn't an official Dev yet, but he probably should be

I will give that a try later and see if it compiles like that. It looks like that could resolve it. But, I was getting a similar error when trying to compile some code with a rule I made up. I will post more after I get to test it.

[ChaosSlayer]

So Trev - did you ever managed to get this one working?

[trevius]

I guess I never tried the latest code change AndMetal made on this. Now it compiles just fine. Going to test it later after the next server reboot to verify it works. If so, I will sticky this in the Server Code Submissions section

[ChaosSlayer]

that be perfect - trying to populated something as large as West Karana by hand... is simply insane without this feature

[AndMetal]

The original code didn't work as intended, but I had a chance to compile & debug, and this is what I came up with.

In zone/zonedb.h around line 215 (under the Grids/Paths heading), add

	int		GetHighestWaypoint(uint32 zoneid, int32 gridid);

In zone/waypoints.cpp around line 1300 (the end of the file), add

int ZoneDatabase::GetHighestWaypoint(uint32 zoneid, int32 gridid) {
	char *query = 0;
	char errbuff[MYSQL_ERRMSG_SIZE];
	MYSQL_RES *result;
	MYSQL_ROW row;
	int res = 0;
	if (RunQuery(query, MakeAnyLenString(&query,
		"SELECT COALESCE(MAX(number), 0) FROM grid_entries WHERE zoneid = %i AND gridid = %i",
		zoneid, gridid),errbuff,&result)) {
		safe_delete_array(query);
		if (mysql_num_rows(result) == 1) {
			row = mysql_fetch_row(result);
			res = atoi( row[0] );
		}
		mysql_free_result(result);
	} else {
		LogFile->write(EQEMuLog::Error, "Error in GetHighestWaypoint query '%s': %s", query, errbuff);
		safe_delete_array(query);
	}

	return(res);
}

And in zone/command.cpp around line 2345, change

void command_wp(Client *c, const Seperator *sep)
{
	if (strcasecmp("add",sep->arg[1]) == 0)
		database.AddWP(c, atoi(sep->arg[2]),atoi(sep->arg[4]), c->GetX(), c->GetY(), c->GetZ(), atoi(sep->arg[3]),zone->GetZoneID());
	else if (strcasecmp("delete",sep->arg[1]) == 0)
		database.DeleteWaypoint(c, atoi(sep->arg[2]),atoi(sep->arg[4]),zone->GetZoneID());
	else
		c->Message(0,"Usage: #wp add/delete grid_num pause wp_num");
}

to this

void command_wp(Client *c, const Seperator *sep)
{
	int wp = atoi(sep->arg[4]);

	if (strcasecmp("add",sep->arg[1]) == 0) {
		if (wp == 0) //AndMetal: default to highest if it's left blank, or we enter 0
			wp = database.GetHighestWaypoint(zone->GetZoneID(), atoi(sep->arg[2])) + 1;
		database.AddWP(c, atoi(sep->arg[2]),wp, c->GetX(), c->GetY(), c->GetZ(), atoi(sep->arg[3]),zone->GetZoneID());
	}
	else if (strcasecmp("delete",sep->arg[1]) == 0)
		database.DeleteWaypoint(c, atoi(sep->arg[2]),wp,zone->GetZoneID());
	else
		c->Message(0,"Usage: #wp add/delete grid_num pause wp_num");
}