From 35466475fe538a8d9764a1f98f3ed896cd706041 Mon Sep 17 00:00:00 2001 From: Leon Krause Date: Sun, 20 Jan 2019 00:12:50 +0100 Subject: Fix HTML5 build warning --- core/math/random_pcg.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/math/random_pcg.h b/core/math/random_pcg.h index d594d16b98..ef69bf7120 100644 --- a/core/math/random_pcg.h +++ b/core/math/random_pcg.h @@ -39,9 +39,9 @@ class RandomPCG { pcg32_random_t pcg; public: - static const uint64_t DEFAULT_SEED = 12047754176567800795ULL; + static const uint64_t DEFAULT_SEED = 12047754176567800795U; static const uint64_t DEFAULT_INC = PCG_DEFAULT_INC_64; - static const uint64_t RANDOM_MAX = 4294967295; + static const uint64_t RANDOM_MAX = 0xFFFFFFFF; RandomPCG(uint64_t seed = DEFAULT_SEED, uint64_t inc = PCG_DEFAULT_INC_64); -- cgit v1.2.3 From db6be7b59ffaf7b98bf6d438a335ad1c8d98cec2 Mon Sep 17 00:00:00 2001 From: Leon Krause Date: Sun, 20 Jan 2019 00:13:20 +0100 Subject: Refactor OS_JavaScript header --- platform/javascript/os_javascript.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/platform/javascript/os_javascript.h b/platform/javascript/os_javascript.h index 64148915a5..a9f9e23463 100644 --- a/platform/javascript/os_javascript.h +++ b/platform/javascript/os_javascript.h @@ -58,6 +58,7 @@ class OS_JavaScript : public OS_Unix { int last_click_button_index; MainLoop *main_loop; + int video_driver_index; AudioDriverJavaScript audio_driver_javascript; bool idb_available; @@ -85,8 +86,6 @@ class OS_JavaScript : public OS_Unix { static void file_access_close_callback(const String &p_file, int p_flags); - int video_driver_index; - protected: virtual int get_current_video_driver() const; -- cgit v1.2.3