Merge pull request #267 from addtheice/RunQueryToDatabaseQuery_zone_raids

Run query to database query zone raids
This commit is contained in:
Alex 2014-10-08 16:31:38 -07:00
commit f3e04bfe4c

View File

@ -74,14 +74,14 @@ void Raid::AddMember(Client *c, uint32 group, bool rleader, bool groupleader, bo
if(!c) if(!c)
return; return;
char errbuf[MYSQL_ERRMSG_SIZE]; std::string query = StringFormat("INSERT INTO raid_members SET raidid = %lu, charid = %lu, "
char* query = 0; "groupid = %lu, _class = %d, level = %d, name = '%s', "
MYSQL_RES *result; "isgroupleader = %d, israidleader = %d, islooter = %d",
if (database.RunQuery(query,MakeAnyLenString(&query, "INSERT INTO raid_members SET raidid=%lu, charid=%lu, groupid=%lu, _class=%d, level=%d, name='%s', isgroupleader=%d, israidleader=%d, islooter=%d", (unsigned long)GetID(), (unsigned long)c->CharacterID(), (unsigned long)group, c->GetClass(), c->GetLevel(), c->GetName(), groupleader, rleader, looter ),errbuf,&result)){ (unsigned long)GetID(), (unsigned long)c->CharacterID(),
mysql_free_result(result); (unsigned long)group, c->GetClass(), c->GetLevel(),
} c->GetName(), groupleader, rleader, looter);
auto results = database.QueryDatabase(query);
safe_delete_array(query);
LearnMembers(); LearnMembers();
VerifyRaid(); VerifyRaid();
if(group < 12) if(group < 12)
@ -100,32 +100,26 @@ void Raid::AddMember(Client *c, uint32 group, bool rleader, bool groupleader, bo
safe_delete(pack); safe_delete(pack);
} }
void Raid::RemoveMember(const char *c) void Raid::RemoveMember(const char *characterName)
{ {
char errbuf[MYSQL_ERRMSG_SIZE]; std::string query = StringFormat("DELETE FROM raid_members where name='%s'", characterName);
char* query = 0; auto results = database.QueryDatabase(query);
MYSQL_RES *result;
if (database.RunQuery(query,MakeAnyLenString(&query, "DELETE FROM raid_members where name='%s'", c ),errbuf,&result)){
mysql_free_result(result);
}
Client *m = entity_list.GetClientByName(c); Client *client = entity_list.GetClientByName(characterName);
safe_delete_array(query);
disbandCheck = true; disbandCheck = true;
SendRaidRemoveAll(c); SendRaidRemoveAll(characterName);
SendRaidDisband(m); SendRaidDisband(client);
LearnMembers(); LearnMembers();
VerifyRaid(); VerifyRaid();
if(m){ if(client)
m->SetRaidGrouped(false); client->SetRaidGrouped(false);
}
ServerPacket *pack = new ServerPacket(ServerOP_RaidRemove, sizeof(ServerRaidGeneralAction_Struct)); ServerPacket *pack = new ServerPacket(ServerOP_RaidRemove, sizeof(ServerRaidGeneralAction_Struct));
ServerRaidGeneralAction_Struct *rga = (ServerRaidGeneralAction_Struct*)pack->pBuffer; ServerRaidGeneralAction_Struct *rga = (ServerRaidGeneralAction_Struct*)pack->pBuffer;
rga->rid = GetID(); rga->rid = GetID();
rga->instance_id = zone->GetInstanceID(); rga->instance_id = zone->GetInstanceID();
strn0cpy(rga->playername, c, 64); strn0cpy(rga->playername, characterName, 64);
rga->zoneid = zone->GetZoneID(); rga->zoneid = zone->GetZoneID();
worldserver.SendPacket(pack); worldserver.SendPacket(pack);
safe_delete(pack); safe_delete(pack);
@ -133,14 +127,9 @@ void Raid::RemoveMember(const char *c)
void Raid::DisbandRaid() void Raid::DisbandRaid()
{ {
char errbuf[MYSQL_ERRMSG_SIZE]; std::string query = StringFormat("DELETE FROM raid_members WHERE raidid = %lu", (unsigned long)GetID());
char* query = 0; auto results = database.QueryDatabase(query);
MYSQL_RES *result;
if (database.RunQuery(query,MakeAnyLenString(&query, "DELETE FROM raid_members WHERE raidid=%lu", (unsigned long)GetID()),errbuf,&result)){
mysql_free_result(result);
}
safe_delete_array(query);
LearnMembers(); LearnMembers();
VerifyRaid(); VerifyRaid();
SendRaidDisbandAll(); SendRaidDisbandAll();
@ -159,14 +148,10 @@ void Raid::DisbandRaid()
void Raid::MoveMember(const char *name, uint32 newGroup) void Raid::MoveMember(const char *name, uint32 newGroup)
{ {
char errbuf[MYSQL_ERRMSG_SIZE]; std::string query = StringFormat("UPDATE raid_members SET groupid = %lu WHERE name = '%s'",
char* query = 0; (unsigned long)newGroup, name);
MYSQL_RES *result; auto results = database.QueryDatabase(query);
if (database.RunQuery(query,MakeAnyLenString(&query, "UPDATE raid_members SET groupid=%lu WHERE name='%s'", (unsigned long)newGroup, name),errbuf,&result)){
mysql_free_result(result);
}
safe_delete_array(query);
LearnMembers(); LearnMembers();
VerifyRaid(); VerifyRaid();
SendRaidMoveAll(name); SendRaidMoveAll(name);
@ -183,21 +168,13 @@ void Raid::MoveMember(const char *name, uint32 newGroup)
void Raid::SetGroupLeader(const char *who, bool glFlag) void Raid::SetGroupLeader(const char *who, bool glFlag)
{ {
char errbuf[MYSQL_ERRMSG_SIZE]; std::string query = StringFormat("UPDATE raid_members SET isgroupleader = %lu WHERE name = '%s'",
char* query = 0; (unsigned long)glFlag, who);
MYSQL_RES *result; auto results = database.QueryDatabase(query);
if (database.RunQuery(query,MakeAnyLenString(&query, "UPDATE raid_members SET isgroupleader=%lu WHERE name='%s'", (unsigned long)glFlag, who),errbuf,&result)){
mysql_free_result(result);
}
safe_delete_array(query);
LearnMembers(); LearnMembers();
VerifyRaid(); VerifyRaid();
//if(glFlag == true){ //we're setting the flag
//this->SendMakeGroupLeaderPacket(who);
//}
ServerPacket *pack = new ServerPacket(ServerOP_RaidGroupLeader, sizeof(ServerRaidGeneralAction_Struct)); ServerPacket *pack = new ServerPacket(ServerOP_RaidGroupLeader, sizeof(ServerRaidGeneralAction_Struct));
ServerRaidGeneralAction_Struct *rga = (ServerRaidGeneralAction_Struct*)pack->pBuffer; ServerRaidGeneralAction_Struct *rga = (ServerRaidGeneralAction_Struct*)pack->pBuffer;
rga->rid = GetID(); rga->rid = GetID();
@ -210,25 +187,15 @@ void Raid::SetGroupLeader(const char *who, bool glFlag)
void Raid::SetRaidLeader(const char *wasLead, const char *name) void Raid::SetRaidLeader(const char *wasLead, const char *name)
{ {
char errbuf[MYSQL_ERRMSG_SIZE]; std::string query = StringFormat("UPDATE raid_members SET israidleader = 0 WHERE name = '%s'", wasLead);
char* query = 0; auto results = database.QueryDatabase(query);
MYSQL_RES *result; if (!results.Success())
if (!database.RunQuery(query,MakeAnyLenString(&query, "UPDATE raid_members SET israidleader=0 WHERE name='%s'", wasLead),errbuf,&result)){ printf("Set Raid Leader error: %s\n", results.ErrorMessage().c_str());
printf("Set Raid Leader error: %s\n", errbuf);
}
else
mysql_free_result(result);
safe_delete_array(query); query = StringFormat("UPDATE raid_members SET israidleader = 1 WHERE name = '%s'", name);
query = 0; results = database.QueryDatabase(query);
if (!results.Success())
if (!database.RunQuery(query,MakeAnyLenString(&query, "UPDATE raid_members SET israidleader=1 WHERE name='%s'", name),errbuf,&result)){ printf("Set Raid Leader error: %s\n", results.ErrorMessage().c_str());
printf("Set Raid Leader error: %s\n", errbuf);
}
else
mysql_free_result(result);
safe_delete_array(query);
strn0cpy(leadername, name, 64); strn0cpy(leadername, name, 64);
@ -264,14 +231,10 @@ bool Raid::IsGroupLeader(const char *who)
void Raid::UpdateLevel(const char *name, int newLevel) void Raid::UpdateLevel(const char *name, int newLevel)
{ {
char errbuf[MYSQL_ERRMSG_SIZE]; std::string query = StringFormat("UPDATE raid_members SET level = %lu WHERE name = '%s'",
char* query = 0; (unsigned long)newLevel, name);
MYSQL_RES *result; auto results = database.QueryDatabase(query);
if (database.RunQuery(query,MakeAnyLenString(&query, "UPDATE raid_members SET level=%lu WHERE name='%s'", (unsigned long)newLevel, name),errbuf,&result)){
mysql_free_result(result);
}
safe_delete_array(query);
LearnMembers(); LearnMembers();
VerifyRaid(); VerifyRaid();
} }
@ -775,27 +738,16 @@ void Raid::TeleportRaid(Mob* sender, uint32 zoneID, uint16 instance_id, float x,
void Raid::ChangeLootType(uint32 type) void Raid::ChangeLootType(uint32 type)
{ {
char errbuf[MYSQL_ERRMSG_SIZE]; std::string query = StringFormat("UPDATE raid_details SET loottype = %lu WHERE raidid = %lu",
char* query = 0; (unsigned long)type, (unsigned long)GetID());
MYSQL_RES *result; auto results = database.QueryDatabase(query);
if (database.RunQuery(query,MakeAnyLenString(&query, "UPDATE raid_details SET loottype=%lu WHERE raidid=%lu", (unsigned long)type, (unsigned long)GetID()),errbuf,&result)){
mysql_free_result(result);
}
safe_delete_array(query);
LootType = type; LootType = type;
} }
void Raid::AddRaidLooter(const char* looter) void Raid::AddRaidLooter(const char* looter)
{ {
char errbuf[MYSQL_ERRMSG_SIZE]; std::string query = StringFormat("UPDATE raid_members SET islooter = 1 WHERE name = '%s'", looter);
char* query = 0; auto results = database.QueryDatabase(query);
MYSQL_RES *result;
if (database.RunQuery(query,MakeAnyLenString(&query, "UPDATE raid_members SET islooter=1 WHERE name='%s'", looter),errbuf,&result)){
mysql_free_result(result);
}
safe_delete_array(query);
for(int x = 0; x < MAX_RAID_MEMBERS; x++) for(int x = 0; x < MAX_RAID_MEMBERS; x++)
{ {
@ -812,36 +764,19 @@ void Raid::AddRaidLooter(const char* looter)
rga->instance_id = zone->GetInstanceID(); rga->instance_id = zone->GetInstanceID();
worldserver.SendPacket(pack); worldserver.SendPacket(pack);
safe_delete(pack); safe_delete(pack);
/* For reference only at this time. This code adds a looter to the Raid Options Window.
EQApplicationPacket* outapp = new EQApplicationPacket(OP_RaidUpdate, sizeof(RaidGeneral_Struct));
RaidGeneral_Struct *rgs = (RaidGeneral_Struct*)outapp->pBuffer;
rgs->action = 33;
strcpy(rgs->leader_name, looter);
QueuePacket(outapp);
safe_delete(outapp); */
} }
void Raid::RemoveRaidLooter(const char* looter) void Raid::RemoveRaidLooter(const char* looter)
{ {
char errbuf[MYSQL_ERRMSG_SIZE]; std::string query = StringFormat("UPDATE raid_members SET islooter = 0 WHERE name = '%s'", looter);
char* query = 0; auto results = database.QueryDatabase(query);
MYSQL_RES *result;
if (database.RunQuery(query,MakeAnyLenString(&query, "UPDATE raid_members SET islooter=0 WHERE name='%s'", looter),errbuf,&result)){
mysql_free_result(result);
}
safe_delete_array(query);
for(int x = 0; x < MAX_RAID_MEMBERS; x++) for(int x = 0; x < MAX_RAID_MEMBERS; x++)
{ if(strcmp(looter, members[x].membername) == 0) {
if(strcmp(looter, members[x].membername) == 0)
{
members[x].IsLooter = 0; members[x].IsLooter = 0;
break; break;
} }
}
ServerPacket *pack = new ServerPacket(ServerOP_DetailsChange, sizeof(ServerRaidGeneralAction_Struct)); ServerPacket *pack = new ServerPacket(ServerOP_DetailsChange, sizeof(ServerRaidGeneralAction_Struct));
ServerRaidGeneralAction_Struct *rga = (ServerRaidGeneralAction_Struct*)pack->pBuffer; ServerRaidGeneralAction_Struct *rga = (ServerRaidGeneralAction_Struct*)pack->pBuffer;
rga->rid = GetID(); rga->rid = GetID();
@ -849,15 +784,6 @@ void Raid::RemoveRaidLooter(const char* looter)
rga->instance_id = zone->GetInstanceID(); rga->instance_id = zone->GetInstanceID();
worldserver.SendPacket(pack); worldserver.SendPacket(pack);
safe_delete(pack); safe_delete(pack);
/* For reference only at this time. This code removes a looter from the Raid Options Window.
EQApplicationPacket* outapp = new EQApplicationPacket(OP_RaidUpdate, sizeof(RaidGeneral_Struct));
RaidGeneral_Struct *rgs = (RaidGeneral_Struct*)outapp->pBuffer;
rgs->action = 34;
strcpy(rgs->leader_name, looter);
QueuePacket(outapp);
safe_delete(outapp); */
} }
bool Raid::IsRaidMember(const char *name){ bool Raid::IsRaidMember(const char *name){
@ -1281,14 +1207,10 @@ void Raid::SendRaidGroupRemove(const char *who, uint32 gid)
void Raid::LockRaid(bool lockFlag) void Raid::LockRaid(bool lockFlag)
{ {
char errbuf[MYSQL_ERRMSG_SIZE]; std::string query = StringFormat("UPDATE raid_details SET locked = %d WHERE raidid = %lu",
char* query = 0; lockFlag, (unsigned long)GetID());
MYSQL_RES *result; auto results = database.QueryDatabase(query);
if (database.RunQuery(query,MakeAnyLenString(&query, "UPDATE raid_details SET locked=%d WHERE raidid=%lu", lockFlag, (unsigned long)GetID()),errbuf,&result)){
mysql_free_result(result);
}
safe_delete_array(query);
locked = lockFlag; locked = lockFlag;
if(lockFlag) if(lockFlag)
SendRaidLock(); SendRaidLock();
@ -1307,74 +1229,70 @@ void Raid::LockRaid(bool lockFlag)
void Raid::SetRaidDetails() void Raid::SetRaidDetails()
{ {
char errbuf[MYSQL_ERRMSG_SIZE]; std::string query = StringFormat("INSERT INTO raid_details SET raidid = %lu, loottype = 4, locked = 0",
char* query = 0; (unsigned long)GetID());
MYSQL_RES *result; auto results = database.QueryDatabase(query);
if (database.RunQuery(query,MakeAnyLenString(&query, "INSERT INTO raid_details SET raidid=%lu, loottype=4, locked=0", (unsigned long)GetID()),errbuf,&result)){
mysql_free_result(result);
}
safe_delete_array(query);
} }
void Raid::GetRaidDetails() void Raid::GetRaidDetails()
{ {
char errbuf[MYSQL_ERRMSG_SIZE]; std::string query = StringFormat("SELECT locked, loottype FROM raid_details WHERE raidid = %lu",
char* query = 0; (unsigned long)GetID());
MYSQL_RES *result; auto results = database.QueryDatabase(query);
MYSQL_ROW row; if (!results.Success())
if (database.RunQuery(query,MakeAnyLenString(&query, "SELECT locked, loottype FROM raid_details WHERE raidid=%lu", (unsigned long)GetID()),errbuf,&result)){ return;
safe_delete_array(query);
if(mysql_num_rows(result) < 1) { if (results.RowCount() == 0) {
mysql_free_result(result); LogFile->write(EQEMuLog::Error, "Error getting raid details for raid %lu: %s", (unsigned long)GetID(), results.ErrorMessage().c_str());
LogFile->write(EQEMuLog::Error, "Error getting raid details for raid %lu: %s", (unsigned long)GetID(), errbuf);
return; return;
} }
row = mysql_fetch_row(result);
if(row){ auto row = results.begin();
locked = atoi(row[0]); locked = atoi(row[0]);
LootType = atoi(row[1]); LootType = atoi(row[1]);
} }
mysql_free_result(result);
}
}
bool Raid::LearnMembers() bool Raid::LearnMembers()
{ {
memset(members, 0, (sizeof(RaidMember)*MAX_RAID_MEMBERS)); memset(members, 0, (sizeof(RaidMember)*MAX_RAID_MEMBERS));
char errbuf[MYSQL_ERRMSG_SIZE];
char* query = 0; std::string query = StringFormat("SELECT name, groupid, _class, level, "
MYSQL_RES *result; "isgroupleader, israidleader, islooter "
MYSQL_ROW row; "FROM raid_members WHERE raidid = %lu",
if (database.RunQuery(query,MakeAnyLenString(&query, "SELECT name, groupid, _class, level, isgroupleader, israidleader, islooter FROM raid_members WHERE raidid=%lu", (unsigned long)GetID()),errbuf,&result)){ (unsigned long)GetID());
safe_delete_array(query); auto results = database.QueryDatabase(query);
if(mysql_num_rows(result) < 1) { if (!results.Success())
mysql_free_result(result); return false;
LogFile->write(EQEMuLog::Error, "Error getting raid members for raid %lu: %s", (unsigned long)GetID(), errbuf);
if(results.RowCount() == 0) {
LogFile->write(EQEMuLog::Error, "Error getting raid members for raid %lu: %s", (unsigned long)GetID(), results.ErrorMessage().c_str());
disbandCheck = true; disbandCheck = true;
return(false); return false;
} }
int i = 0;
while((row = mysql_fetch_row(result))) { int index = 0;
for(auto row = results.begin(); row != results.end(); ++row) {
if(!row[0]) if(!row[0])
continue; continue;
members[i].member = nullptr;
strn0cpy(members[i].membername, row[0], 64); members[index].member = nullptr;
int GroupNum = atoi(row[1]); strn0cpy(members[index].membername, row[0], 64);
if(GroupNum > 11) int groupNum = atoi(row[1]);
members[i].GroupNumber = 0xFFFFFFFF; if(groupNum > 11)
members[index].GroupNumber = 0xFFFFFFFF;
else else
members[i].GroupNumber = GroupNum; members[index].GroupNumber = groupNum;
members[i]._class = atoi(row[2]);
members[i].level = atoi(row[3]); members[index]._class = atoi(row[2]);
members[i].IsGroupLeader = atoi(row[4]); members[index].level = atoi(row[3]);
members[i].IsRaidLeader = atoi(row[5]); members[index].IsGroupLeader = atoi(row[4]);
members[i].IsLooter = atoi(row[6]); members[index].IsRaidLeader = atoi(row[5]);
i++; members[index].IsLooter = atoi(row[6]);
++index;
} }
mysql_free_result(result);
} return true;
return(true);
} }
void Raid::VerifyRaid() void Raid::VerifyRaid()