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

[Quests] Use separate variable for quest idle override. (#4026)

Browse Source 
* [Quests] Use separate variable for quest idle override.

* Fix missing zone->
This commit is contained in:
Paul Coene 2024-01-27 14:09:00 -05:00 committed by GitHub
parent 4c769c46b3
commit 5b43bf4a5e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zone/entity.cpp
View File

@ -525,7 +525,7 @@ void EntityList::MobProcess()
// -- the entity's spawn2 point is marked as path_while_zone_idle // -- the entity's spawn2 point is marked as path_while_zone_idle
// -- the zone is newly empty and we're allowing mobs to settle // -- the zone is newly empty and we're allowing mobs to settle
if ( if (
numclients > 0 || numclients > 0 || zone->quest_idle_override ||
(s2 && s2->PathWhenZoneIdle()) || (s2 && s2->PathWhenZoneIdle()) ||
mob_settle_timer->Enabled() mob_settle_timer->Enabled()
) { ) {

4
zone/questmgr.cpp
View File

@ -934,9 +934,9 @@ void QuestManager::repopzone() {
} }
} }
void QuestManager::processmobswhilezoneempty(bool turn_on) { void QuestManager::processmobswhilezoneempty(bool on) {
if (zone) { if (zone) {
zone->SetIdleWhenEmpty(!turn_on); zone->quest_idle_override = on;
} else { } else {
LogQuests( LogQuests(
"QuestManager::processmobswhilezoneempty called with nullptr zone. Probably syntax error in quest file" "QuestManager::processmobswhilezoneempty called with nullptr zone. Probably syntax error in quest file"

2
zone/questmgr.h
View File

@ -106,7 +106,7 @@ public:
void depopall(int npc_type = 0); void depopall(int npc_type = 0);
void depopzone(bool StartSpawnTimer = true); void depopzone(bool StartSpawnTimer = true);
void repopzone(); void repopzone();
void processmobswhilezoneempty(bool idle_when_empty); void processmobswhilezoneempty(bool quest_override_on);
void settarget(const char *type, int target_id); void settarget(const char *type, int target_id);
void follow(int entity_id, int distance); void follow(int entity_id, int distance);
void sfollow(); void sfollow();

1
zone/zone.cpp
View File

@ -974,6 +974,7 @@ Zone::Zone(uint32 in_zoneid, uint32 in_instanceid, const char* in_short_name)
default_ruleset = 0; default_ruleset = 0;
is_zone_time_localized = false; is_zone_time_localized = false;
quest_idle_override = false;
loglevelvar = 0; loglevelvar = 0;
merchantvar = 0; merchantvar = 0;

1
zone/zone.h
View File

@ -105,6 +105,7 @@ public:
AA::Ability *GetAlternateAdvancementAbilityByRank(int rank_id); AA::Ability *GetAlternateAdvancementAbilityByRank(int rank_id);
AA::Rank *GetAlternateAdvancementRank(int rank_id); AA::Rank *GetAlternateAdvancementRank(int rank_id);
bool is_zone_time_localized; bool is_zone_time_localized;
bool quest_idle_override;
bool IsIdleWhenEmpty() const; bool IsIdleWhenEmpty() const;
void SetIdleWhenEmpty(bool idle_when_empty); void SetIdleWhenEmpty(bool idle_when_empty);
uint32 GetSecondsBeforeIdle() const; uint32 GetSecondsBeforeIdle() const;