pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-08-28 20:07:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:EQEmu/Server

Browse Source
This commit is contained in:
KimLS
2014-11-04 21:01:43 -08:00
parent 957f05860b d4139b98e3
commit cb0d5ac7d0
31 changed files with 1009 additions and 881 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/questmgr.cpp
+17 -25
View File
@@ -2548,7 +2548,7 @@ void QuestManager::DestroyInstance(uint16 instance_id)
uint16 QuestManager::GetInstanceID(const char *zone, int16 version)
{
QuestManagerCurrentQuestVars();
if(initiator)
if (initiator)
{
return database.GetInstanceID(zone, initiator->CharacterID(), version);
}
@@ -2558,7 +2558,7 @@ uint16 QuestManager::GetInstanceID(const char *zone, int16 version)
void QuestManager::AssignToInstance(uint16 instance_id)
{
QuestManagerCurrentQuestVars();
if(initiator)
if (initiator)
{
database.AddClientToInstance(instance_id, initiator->CharacterID());
}
@@ -2567,10 +2567,10 @@ void QuestManager::AssignToInstance(uint16 instance_id)
void QuestManager::AssignGroupToInstance(uint16 instance_id)
{
QuestManagerCurrentQuestVars();
if(initiator)
if (initiator)
{
Group *g = initiator->GetGroup();
if(g)
if (g)
{
uint32 gid = g->GetID();
database.AssignGroupToInstance(gid, instance_id);
@@ -2581,7 +2581,7 @@ void QuestManager::AssignGroupToInstance(uint16 instance_id)
void QuestManager::AssignRaidToInstance(uint16 instance_id)
{
QuestManagerCurrentQuestVars();
if(initiator)
if (initiator)
{
Raid *r = initiator->GetRaid();
if(r)
@@ -2595,36 +2595,28 @@ void QuestManager::AssignRaidToInstance(uint16 instance_id)
void QuestManager::RemoveFromInstance(uint16 instance_id)
{
QuestManagerCurrentQuestVars();
if(initiator) {
if(database.RemoveClientFromInstance(instance_id, initiator->CharacterID())) {
if (initiator)
{
if (database.RemoveClientFromInstance(instance_id, initiator->CharacterID()))
initiator->Message(MT_Say, "Removed client from instance.");
} else {
else
initiator->Message(MT_Say, "Failed to remove client from instance.");
}
}
}
void QuestManager::RemoveAllFromInstance(uint16 instance_id)
{
QuestManagerCurrentQuestVars();
if(initiator) {
if (initiator)
{
std::list<uint32> charid_list;
bool removed_all = true;
uint16 fail_count = 0;
database.GetCharactersInInstance(instance_id,charid_list);
auto iter = charid_list.begin();
while(iter != charid_list.end()) {
if(!database.RemoveClientFromInstance(instance_id, *iter)) {
removed_all = false;
++fail_count;
}
++iter;
}
if (removed_all) {
if (database.RemoveClientsFromInstance(instance_id))
initiator->Message(MT_Say, "Removed all players from instance.");
} else {
// once the expedition system is in, this message it not relevant
initiator->Message(MT_Say, "Failed to remove %i player(s) from instance.", fail_count);
else
{
database.GetCharactersInInstance(instance_id, charid_list);
initiator->Message(MT_Say, "Failed to remove %i player(s) from instance.", charid_list.size()); // once the expedition system is in, this message it not relevant
}
}
}