mirror of
https://github.com/zenorogue/hyperrogue.git
synced 2024-11-17 18:54:48 +00:00
expansion:: show correct types in strict_tree_rules
This commit is contained in:
parent
ebf9a299b5
commit
24fcc1a642
@ -452,8 +452,6 @@ EX int curr_dist(cell *c) {
|
|||||||
int position;
|
int position;
|
||||||
|
|
||||||
EX int type_in_reduced(expansion_analyzer& ea, cell *c, const cellfunction& f) {
|
EX int type_in_reduced(expansion_analyzer& ea, cell *c, const cellfunction& f) {
|
||||||
if(currentmap->strict_tree_rules())
|
|
||||||
return rulegen::get_state(c);
|
|
||||||
int a = ea.N;
|
int a = ea.N;
|
||||||
int t = type_in(ea, c, f);
|
int t = type_in(ea, c, f);
|
||||||
if(expansion.N != a) {
|
if(expansion.N != a) {
|
||||||
@ -587,6 +585,17 @@ void celldrawer::do_viewdist() {
|
|||||||
if(c->master->alt) t = c->master->alt->fiftyval;
|
if(c->master->alt) t = c->master->alt->fiftyval;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
else if(currentmap->strict_tree_rules()) switch(distance_from) {
|
||||||
|
case dfPlayer:
|
||||||
|
t = -1;
|
||||||
|
break;
|
||||||
|
case dfStart:
|
||||||
|
t = c->master->fieldval;
|
||||||
|
break;
|
||||||
|
case dfWorld:
|
||||||
|
if(c->master->alt) t = c->master->alt->fieldval;
|
||||||
|
break;
|
||||||
|
}
|
||||||
else t = type_in_reduced(expansion, c, curr_dist);
|
else t = type_in_reduced(expansion, c, curr_dist);
|
||||||
if(t >= 0) label = its(t), dc = distribute_color(t);
|
if(t >= 0) label = its(t), dc = distribute_color(t);
|
||||||
break;
|
break;
|
||||||
|
Loading…
Reference in New Issue
Block a user