mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-12-19 12:28:07 +00:00
Code Issues Releases Wiki Activity

old moveMonster removed

Browse Source
This commit is contained in:
Zeno Rogue
2019-11-22 18:19:22 +01:00
parent 9521b622e1
commit e6853e6540
3 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
complex.cpp
View File

@@ -1802,7 +1802,8 @@ EX namespace hive {
if(!q) { if(c->land == laHive) c->landparam += 3; continue; }
int d = gmoves[hrand(q)];
cell *c2 = c->move(d);
movei mi(c, d);
auto& c2 = mi.t;
if(c2->monst || isPlayerOn(c2)) {
eMonster killed = c2->monst;
if(isPlayerOn(c2)) killed = moPlayer;
@@ -1818,7 +1819,7 @@ EX namespace hive {
// c->monst = moDeadBug, deadbug.push_back(c);
}
else {
moveMonster(c2, c, d);
moveMonster(mi);
// pheromones!
if(c->land == laHive && c->landparam < 90) c->landparam += 5;
if(c2->land == laHive && c2->landparam < 90) c2->landparam += 5;
@@ -3148,7 +3149,7 @@ EX namespace prairie {
beastAttack(cp, true, true);
if(!cn->monst && !isPlayerOn(cn) && passable_for(cp->monst, cn, cp, P_DEADLY))
moveMonster(cn, cp, NODIR);
moveMonster(movei(cp, cn, TELEPORT));
else {
playSound(NULL, "hit-axe"+pick123());
beastcrash(cn, cp);