mirror of
https://github.com/zenorogue/hyperrogue.git
synced 2024-11-20 11:54:48 +00:00
renamed IF_MAP_CONTAINS_KEY to IF_KEY_EXISTS, and used a better implementation
This commit is contained in:
parent
18c6aa7823
commit
cd60b0ffb3
@ -45,7 +45,7 @@ EX bool hide_player() {
|
|||||||
;
|
;
|
||||||
}
|
}
|
||||||
|
|
||||||
#define ADC(V,c) IF_MAP_CONTAINS_KEY(it, current_display->all_drawn_copies, c) for(const shiftmatrix& V: it->second)
|
#define ADC(V,c) IF_KEY_EXISTS(it, current_display->all_drawn_copies, c) for(const shiftmatrix& V: it->second)
|
||||||
|
|
||||||
EX hookset<bool(int sym, int uni)> hooks_handleKey;
|
EX hookset<bool(int sym, int uni)> hooks_handleKey;
|
||||||
EX hookset<bool(cell *c, const shiftmatrix& V)> hooks_drawcell;
|
EX hookset<bool(cell *c, const shiftmatrix& V)> hooks_drawcell;
|
||||||
|
4
hyper.h
4
hyper.h
@ -577,8 +577,8 @@ typedef function<int(struct cell*)> cellfunction;
|
|||||||
|
|
||||||
/* conditions */
|
/* conditions */
|
||||||
|
|
||||||
/** `IF_MAP_CONTAINS_KEY(it, map, key) statement` checks whether the map 'map' contain key 'key', and if so, executes statement with it set to the relevant iterator */
|
/** `IF_KEY_EXISTS(it, map, key) statement` checks whether the map 'map' contain key 'key', and if so, executes statement with it set to the relevant iterator */
|
||||||
#define IF_MAP_CONTAINS_KEY(it, map, key) for(auto it = map.find(key); it != map.end(); it = map.end())
|
#define IF_KEY_EXISTS(it, map, key) for(auto it: {map.find(key)}) if(it != map.end())
|
||||||
|
|
||||||
// canAttack/moveval flags
|
// canAttack/moveval flags
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user