diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-07-28 01:27:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-28 01:27:34 +0200 |
| commit | a6916d1f179f760f015f385c01729d205af97abe (patch) | |
| tree | 50d664500e5ce164ed8498f34e84aef35678f225 /main | |
| parent | 932b75e2477dd97775b5b29639c514e091a83cf2 (diff) | |
| parent | 56e2c6c7043ca14159284b7b1f07e95d6fcf9a9e (diff) | |
Merge pull request #40678 from aaronfranke/string-float64
Make all String float conversion methods be 64-bit
Diffstat (limited to 'main')
| -rw-r--r-- | main/main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/main.cpp b/main/main.cpp index 6965e5415a..9978be7ab7 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -879,7 +879,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph } else if (I->get() == "--time-scale") { // force time scale if (I->next()) { - Engine::get_singleton()->set_time_scale(I->next()->get().to_double()); + Engine::get_singleton()->set_time_scale(I->next()->get().to_float()); N = I->next()->next(); } else { OS::get_singleton()->print("Missing time scale argument, aborting.\n"); @@ -2017,7 +2017,7 @@ bool Main::start() { String stretch_mode = GLOBAL_DEF("display/window/stretch/mode", "disabled"); String stretch_aspect = GLOBAL_DEF("display/window/stretch/aspect", "ignore"); - Size2i stretch_size = Size2(GLOBAL_DEF("display/window/size/width", 0), + Size2i stretch_size = Size2i(GLOBAL_DEF("display/window/size/width", 0), GLOBAL_DEF("display/window/size/height", 0)); Window::ContentScaleMode cs_sm = Window::CONTENT_SCALE_MODE_DISABLED; |