mirror of
https://github.com/zenorogue/hyperrogue.git
synced 2025-03-26 21:37:02 +00:00
memory settings saved; adjusted for the lack of get_new_handler on steam
This commit is contained in:
parent
b93fe4e792
commit
609fc29119
@ -224,6 +224,8 @@ void initConfig() {
|
||||
addsaver(vid.auto_eye, "auto-eyelevel", false);
|
||||
|
||||
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::rendernogl, "rug-rendernogl");
|
||||
|
@ -207,7 +207,12 @@ void apply_memory_reserve() {
|
||||
}
|
||||
}
|
||||
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();
|
||||
#endif
|
||||
if(reserve_count > 0) std::set_new_handler(reserve_handler);
|
||||
}
|
||||
|
||||
|
@ -402,6 +402,7 @@ extern "C" {
|
||||
#include <set>
|
||||
#include <random>
|
||||
#include <complex>
|
||||
#include <new>
|
||||
|
||||
#ifdef USE_UNORDERED_MAP
|
||||
#include <unordered_map>
|
||||
|
Loading…
x
Reference in New Issue
Block a user