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

game: try again to resolve the problem of ghosts in special encounter...

Browse Source
This commit is contained in:
ALONSO Laurent
2021-12-09 09:27:06 +01:00
committed by Celtic Minstrel
parent 00afad672b
commit c4bf587ccd
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/game/boe.monster.cpp
View File

@@ -1140,21 +1140,21 @@ bool summon_monster(mon_num_t which,location where,short duration,eAttitude give
}
void activate_monsters(short code,short /*attitude*/) {
if(code == 0)
if(code <= 0)
return;
for(short i = 0; i < univ.town->creatures.size(); i++)
if(univ.town->creatures[i].spec_enc_code == code) {
cTownperson& monst = univ.town->creatures[i];
univ.town.monst.assign(i, monst, univ.scenario.get_monster(monst.number), univ.party.easy_mode, univ.difficulty_adjust());
univ.town.monst[i].spec_enc_code = 0;
univ.town.monst[i].active = 2;
for(short i = 0; i < univ.town->creatures.size(); i++) {
cTownperson& monst = univ.town->creatures[i];
if(univ.town->creatures[i].number == 0 || univ.town->creatures[i].spec_enc_code != code) continue;
univ.town.monst.assign(i, monst, univ.scenario.get_monster(monst.number), univ.party.easy_mode, univ.difficulty_adjust());
univ.town.monst[i].spec_enc_code = 0;
univ.town.monst[i].active = 2;
univ.town.monst[i].summon_time = 0;
univ.town.monst[i].target = 6;
univ.town.monst[i].summon_time = 0;
univ.town.monst[i].target = 6;
univ.town.set_crate(univ.town.monst[i].cur_loc.x,univ.town.monst[i].cur_loc.y,false);
univ.town.set_barrel(univ.town.monst[i].cur_loc.x,univ.town.monst[i].cur_loc.y,false);
}
univ.town.set_crate(univ.town.monst[i].cur_loc.x,univ.town.monst[i].cur_loc.y,false);
univ.town.set_barrel(univ.town.monst[i].cur_loc.x,univ.town.monst[i].cur_loc.y,false);
}
}
mon_num_t get_summon_monster(short summon_class) {

2
src/scenario/monster.cpp
View File

@@ -462,7 +462,7 @@ cTownperson::cTownperson() {
time_flag = eMonstTime::ALWAYS;
spec1 = -1;
spec2 = -1;
spec_enc_code = -1;
spec_enc_code = 0;
time_code = 0;
monster_time = 0;
personality = -1;