mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-11-27 14:37:16 +00:00
Code Issues Releases Wiki Activity

fixed a crash when changing sight range while in rug

Browse Source
This commit is contained in:
Zeno Rogue 2023-08-15 20:29:09 +02:00
parent 0e1d7c024e
commit 18d042b9eb
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
config.cpp
View File

@ -1834,23 +1834,24 @@ EX void edit_sightrange_3d(char key, bool fog) {
} }
EX void edit_sightrange() { EX void edit_sightrange() {
#if CAP_RUG
USING_NATIVE_GEOMETRY_IN_RUG;
#endif
cmode = sm::SIDE; cmode = sm::SIDE;
gamescreen(); gamescreen();
dialog::init("sight range settings"); dialog::init("sight range settings");
add_edit(vid.use_smart_range); add_edit(vid.use_smart_range);
int wdim = WDIM;
#if CAP_RUG
USING_NATIVE_GEOMETRY_IN_RUG;
#endif
if(vid.use_smart_range) { if(vid.use_smart_range) {
add_edit(WDIM == 2 ? vid.smart_range_detail : vid.smart_range_detail_3); add_edit(wdim == 2 ? vid.smart_range_detail : vid.smart_range_detail_3);
if(GDIM == 3) edit_sightrange_3d('r', true); if(GDIM == 3) edit_sightrange_3d('r', true);
} }
else { else {
if(WDIM == 2) { if(wdim == 2) {
add_edit(sightrange_bonus); add_edit(sightrange_bonus);
edit_sightrange_3d('r', true); if(GDIM == 3) edit_sightrange_3d('r', true);
} }
if(WDIM == 3) edit_sightrange_3d('r', false); if(wdim == 3) edit_sightrange_3d('r', false);
} }
#if CAP_SOLV #if CAP_SOLV
if(models::is_perspective(pmodel) && sol) { if(models::is_perspective(pmodel) && sol) {
@ -1880,16 +1881,16 @@ EX void edit_sightrange() {
dialog::editNumber(slr::shader_iterations, 0, 50, 1, 10, "", ""); dialog::editNumber(slr::shader_iterations, 0, 50, 1, 10, "", "");
}); });
} }
if(vid.use_smart_range && WDIM == 2) { if(vid.use_smart_range && wdim == 2) {
dialog::addBoolItem_action(XLAT("area-based range"), vid.smart_area_based, 'a'); dialog::addBoolItem_action(XLAT("area-based range"), vid.smart_area_based, 'a');
} }
if(vid.use_smart_range == 0 && allowChangeRange() && WDIM == 2) { if(vid.use_smart_range == 0 && allowChangeRange() && wdim == 2) {
dialog::addSelItem(XLAT("generation range bonus"), its(genrange_bonus), 'o'); dialog::addSelItem(XLAT("generation range bonus"), its(genrange_bonus), 'o');
dialog::add_action([] () { genrange_bonus = sightrange_bonus; doOvergenerate(); }); dialog::add_action([] () { genrange_bonus = sightrange_bonus; doOvergenerate(); });
dialog::addSelItem(XLAT("game range bonus"), its(gamerange_bonus), 's'); dialog::addSelItem(XLAT("game range bonus"), its(gamerange_bonus), 's');
dialog::add_action([] () { gamerange_bonus = sightrange_bonus; doOvergenerate(); }); dialog::add_action([] () { gamerange_bonus = sightrange_bonus; doOvergenerate(); });
} }
if(WDIM == 3 && !vid.use_smart_range) { if(wdim == 3 && !vid.use_smart_range) {
dialog::addBoolItem_action(XLAT("sloppy range checking"), vid.sloppy_3d, 's'); dialog::addBoolItem_action(XLAT("sloppy range checking"), vid.sloppy_3d, 's');
} }
if(GDIM == 3 && !vid.use_smart_range) { if(GDIM == 3 && !vid.use_smart_range) {