openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Consolidate active quest data into a single map

Browse Source
This commit is contained in:
Celtic Minstrel
2017-04-14 11:38:06 -04:00
parent 5b5b2af46f
commit e57441f6a0
11 changed files with 55 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/universe/universe.cpp
View File

@@ -1369,9 +1369,7 @@ void cUniverse::enter_scenario(const std::string& name) {
}
for(short i = 0; i < scenario.quests.size(); i++) {
if(scenario.quests[i].flags >= 10) {
party.quest_status[i] = eQuestStatus::STARTED;
party.quest_start[i] = 1;
party.quest_source[i] = -1;
party.active_quests[i] = cJob(1);
}
}
@@ -1397,7 +1395,7 @@ void cUniverse::generate_job_bank(int which, job_bank_t& bank) {
for(size_t i = 0; iSlot < 4 && i < scenario.quests.size(); i++) {
if(scenario.quests[i].bank1 != which && scenario.quests[i].bank2 != which)
continue;
if(party.quest_status[i] != eQuestStatus::AVAILABLE)
if(party.active_quests[i].status != eQuestStatus::AVAILABLE)
continue;
if(get_ran(1,1,100) <= 50 - bank.anger)
bank.jobs[iSlot++] = i;