diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-01-20 09:25:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-20 09:25:21 +0100 |
| commit | f0035b7cc78392938c5c163e961ff4604cb10c1a (patch) | |
| tree | 09e3d85d725b04963b72d3585812253ac9015b40 | |
| parent | 35728e41ba21da931cac5a1c15b52f06b28af353 (diff) | |
| parent | db6be7b59ffaf7b98bf6d438a335ad1c8d98cec2 (diff) | |
Merge pull request #25150 from eska014/html5-warning
Fix HTML5 build warning
| -rw-r--r-- | core/math/random_pcg.h | 4 | ||||
| -rw-r--r-- | platform/javascript/os_javascript.h | 3 |
2 files changed, 3 insertions, 4 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); 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; |