Merge branch 'master' into opengl3

3 files changed, 12 insertions, 10 deletions

diff --git a/source/Irrlicht/CIrrDeviceLinux.h b/source/Irrlicht/CIrrDeviceLinux.h
index 45d3f10..2d8945c 100644
--- a/source/Irrlicht/CIrrDeviceLinux.h
+++ b/source/Irrlicht/CIrrDeviceLinux.h
@@ -414,6 +414,9 @@ namespace irr
 		// text is utf-8

 		mutable core::stringc Clipboard;

 #endif

+#if defined(_IRR_LINUX_X11_XINPUT2_)

+		int currentTouchedCount;

+#endif

 		u32 Width, Height;

 		bool WindowHasFocus;

 		bool WindowMinimized;

@@ -453,10 +456,6 @@ namespace irr
 		};

 		core::array<JoystickInfo> ActiveJoysticks;

 #endif

-

-#if defined(_IRR_LINUX_X11_XINPUT2_)

-		int currentTouchedCount;

-#endif

 	};

 

 

diff --git a/source/Irrlicht/CIrrDeviceSDL.cpp b/source/Irrlicht/CIrrDeviceSDL.cpp
index ecd8a8d..b0c7747 100644
--- a/source/Irrlicht/CIrrDeviceSDL.cpp
+++ b/source/Irrlicht/CIrrDeviceSDL.cpp
@@ -345,13 +345,16 @@ void CIrrDeviceSDL::logAttributes()
 bool CIrrDeviceSDL::createWindow()

 {

 	if (CreationParams.Fullscreen) {

+#ifdef _IRR_EMSCRIPTEN_PLATFORM_

 		SDL_Flags |= SDL_WINDOW_FULLSCREEN;

-	} else  {

-		if (Resizable)

-			SDL_Flags |= SDL_WINDOW_RESIZABLE;

-		if (CreationParams.WindowMaximized)

-			SDL_Flags |= SDL_WINDOW_MAXIMIZED;

+#else

+		SDL_Flags |= SDL_WINDOW_FULLSCREEN_DESKTOP;

+#endif

 	}

+	if (Resizable)

+		SDL_Flags |= SDL_WINDOW_RESIZABLE;

+	if (CreationParams.WindowMaximized)

+		SDL_Flags |= SDL_WINDOW_MAXIMIZED;

 	SDL_Flags |= SDL_WINDOW_OPENGL;

 

 #ifdef _IRR_EMSCRIPTEN_PLATFORM_

diff --git a/source/Irrlicht/CWriteFile.cpp b/source/Irrlicht/CWriteFile.cpp
index aa07b49..2af6936 100644
--- a/source/Irrlicht/CWriteFile.cpp
+++ b/source/Irrlicht/CWriteFile.cpp
@@ -12,7 +12,7 @@ namespace io
 

 

 CWriteFile::CWriteFile(const io::path& fileName, bool append)

-: FileSize(0), Filename(fileName)

+: Filename(fileName), FileSize(0)

 {

 	#ifdef _DEBUG

 	setDebugName("CWriteFile");