mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-06-18 14:24:07 +00:00
Code Issues Releases Wiki Activity

memory settings saved; adjusted for the lack of get_new_handler on steam

Browse Source
This commit is contained in:
Zeno Rogue 2019-06-13 19:19:15 +02:00
parent b93fe4e792
commit 609fc29119
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.cpp
View File

@ -224,6 +224,8 @@ void initConfig() {
addsaver(vid.auto_eye, "auto-eyelevel", false); addsaver(vid.auto_eye, "auto-eyelevel", false);
addsaver(memory_saving_mode, "memory_saving_mode", (ISMOBILE || ISPANDORA || ISWEB) ? 1 : 0); addsaver(memory_saving_mode, "memory_saving_mode", (ISMOBILE || ISPANDORA || ISWEB) ? 1 : 0);
addsaver(reserve_limit, "memory_reserve", 128);
addsaver(show_memory_warning, "show_memory_warning");
addsaver(rug::renderonce, "rug-renderonce"); addsaver(rug::renderonce, "rug-renderonce");
addsaver(rug::rendernogl, "rug-rendernogl"); addsaver(rug::rendernogl, "rug-rendernogl");

5
savemem.cpp
View File

@ -207,7 +207,12 @@ void apply_memory_reserve() {
} }
} }
catch(std::bad_alloc&) {} catch(std::bad_alloc&) {}
#if ((ISLINUX && ISSTEAM) || ISWINDOWS)
// no get_new_handler on this compiler...
default_handler = [] { throw std::bad_alloc(); };
#else
default_handler = std::get_new_handler(); default_handler = std::get_new_handler();
#endif
if(reserve_count > 0) std::set_new_handler(reserve_handler); if(reserve_count > 0) std::set_new_handler(reserve_handler);
} }

1
sysconfig.h
View File

@ -402,6 +402,7 @@ extern "C" {
#include <set> #include <set>
#include <random> #include <random>
#include <complex> #include <complex>
#include <new>
#ifdef USE_UNORDERED_MAP #ifdef USE_UNORDERED_MAP
#include <unordered_map> #include <unordered_map>