mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-09-04 03:27:55 +00:00
Code Issues Releases Wiki Activity

subdivided game.cpp; split movepcto into separate functions

Browse Source
This commit is contained in:
Zeno Rogue
2019-12-08 19:17:28 +01:00
parent 2fb1210811
commit 26fb19e7a8
29 changed files with 8689 additions and 8479 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
monstergen.cpp
View File

@@ -8,6 +8,8 @@
#include "hyper.h"
namespace hr {
EX int avengers, mirrorspirits, wandering_jiangshi, jiangshi_on_screen;
EX bool timerghost = true;
EX bool gen_wandering = true;
@@ -312,7 +314,7 @@ EX void wandering() {
kills[moBomberbird] = 0;
kills[moTameBomberbird] = 0;
for(cell *c: currentmap->allcells()) if(c->wall == waMineUnknown) kills[moBomberbird]++;
for(cell *c: currentmap->allcells()) if(among(c->wall, waMineMine, waMineUnknown) && mineMarked(c)) kills[moTameBomberbird]++;
for(cell *c: currentmap->allcells()) if(among(c->wall, waMineMine, waMineUnknown) && mine::marked_mine(c)) kills[moTameBomberbird]++;
return;
}
if(!canmove) return;
@@ -440,7 +442,7 @@ EX void wandering() {
else if(c->land == laVariant && wchance(items[itVarTreasure], 50)) {
int i = hrand(21);
if(getBits(c) & (1>>i)) {
eMonster m = variant_features[i].wanderer;
eMonster m = variant::features[i].wanderer;
if(m) c->monst = m, c->hitpoints = 3;
}
continue;