EQEmulator Forums - View Single Post

monalin crusader · #5 06-14-2004, 02:28 PM

heres /guildpeace

not sure if this works yet i'll have to test it. Doing so soon.

line 808 in database.cpp

Code:

bool Database::SetGuildPeace(int32 guildid, int32 guildid2)
{
	char errbuf[MYSQL_ERRMSG_SIZE];
    char *query = 0;

	if (!RunQuery(query, MakeAnyLenString(&amp;query, "DELETE FROM guildwar WHERE guildid1=%i, guildid2=%i;", guildid, guildid2), errbuf)) 
	{
		cerr &lt;&lt; "Error in SetGuildPeace Query '" &lt;&lt; query &lt;&lt; "' " &lt;&lt; errbuf &lt;&lt; endl;
		safe_delete_array(query);

		return false;
	}
	else 
	{
	safe_delete_array(query);
	return true;
	}
}

Line 181 in database.h

Code:

	bool	SetGuildPeace(int32 guildid, int32 guildid2);

around line 1857 in client_process.cpp

change

Code:

		case OP_GuildPeace: { break; }

to

Code:

		case OP_GuildPeace: {

					GuildCommand_Struct* gc = (GuildCommand_Struct*) app->pBuffer;
					Client* client=entity_list.GetClientByName(gc->othername);

					if ((GuildRank() == 2) &amp;&amp; (client->GuildRank() == 2)) // If both clients are guild leaders
					{

						if(!database.CheckGuildWar(GuildDBID(), client->GuildDBID()))
							Message(0, "Error: You are not at war with this guild!");
						else if(!database.SetGuildPeace(GuildDBID(), client->GuildDBID()))
							Message(0, "There was an error writing to db!");
						else
							Message(0, "You are now at peace.");

					}	else if (client->GuildRank() != 2)
						Message(0, "Error: Your target is not a guild leader!");
					else if (client->GuildDBID == 0)
						Message(0, "Error: Your target is not in a guild!");
					else if (GuildRank() !=2)
						Message(0, "Error: You arent the guild leader!");
					else if (!worldserver.Connected())
						Message(0, "Error: World server disconnected");
					else if (client->GuildDBID() == GuildDBID())
						Message(0,"You are in the same guild, what do you think you are doing?");
					else if (guilddbid == 0)
						Message(0, "Error: You arent in a guild!");
					break;
				}