Browse Source

Merge pull request #25150 from eska014/html5-warning

Fix HTML5 build warning
Rémi Verschelde 6 years ago
parent
commit
f0035b7cc7
2 changed files with 3 additions and 4 deletions
  1. 2 2
      core/math/random_pcg.h
  2. 1 2
      platform/javascript/os_javascript.h

+ 2 - 2
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);
 

+ 1 - 2
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;