[Scummvm-git-logs] scummvm master -> 797ca3568dc2d507cb3b7c18ba8de78eb369cde1

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
797ca3568d JANITORIAL: Fix code formatting


Commit: 797ca3568dc2d507cb3b7c18ba8de78eb369cde1
    https://github.com/scummvm/scummvm/commit/797ca3568dc2d507cb3b7c18ba8de78eb369cde1
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-08-20T21:17:19+02:00

Commit Message:
JANITORIAL: Fix code formatting

Changed paths:
    engines/grim/grim.cpp
    graphics/opengl/framebuffer.cpp


diff --git a/engines/grim/grim.cpp b/engines/grim/grim.cpp
index 4ed21a2814..7f92a8ce02 100644
--- a/engines/grim/grim.cpp
+++ b/engines/grim/grim.cpp
@@ -1116,12 +1116,12 @@ void GrimEngine::mainLoop() {
 			g_imuseState = -1;
 		}
 
-		#if defined(__EMSCRIPTEN__)
-		// If SDL_HINT_EMSCRIPTEN_ASYNCIFY is enabled, SDL pauses the application and gives 
-		// back control to the browser automatically by calling emscripten_sleep via SDL_Delay. 
-		// Without this the page would completely lock up. 
+#if defined(__EMSCRIPTEN__)
+		// If SDL_HINT_EMSCRIPTEN_ASYNCIFY is enabled, SDL pauses the application and gives
+		// back control to the browser automatically by calling emscripten_sleep via SDL_Delay.
+		// Without this the page would completely lock up.
 		g_system->delayMillis(0);
-		#endif
+#endif
 
 		uint32 endTime = g_system->getMillis();
 		if (startTime > endTime)
diff --git a/graphics/opengl/framebuffer.cpp b/graphics/opengl/framebuffer.cpp
index c6fa6d16a9..d03722ec4f 100644
--- a/graphics/opengl/framebuffer.cpp
+++ b/graphics/opengl/framebuffer.cpp
@@ -160,17 +160,17 @@ void FrameBuffer::init() {
 		glBindRenderbuffer(GL_RENDERBUFFER, _renderBuffers[0]);
 
 		const char *glVersion = (const char *)glGetString(GL_VERSION);
-		if (strstr(glVersion,"WebGL 1.0") != NULL) {
+		if (strstr(glVersion, "WebGL 1.0") != NULL) {
 			// See https://www.khronos.org/registry/webgl/specs/latest/1.0/#FBO_ATTACHMENTS
 			// and https://github.com/emscripten-core/emscripten/issues/4832
-			#ifndef GL_DEPTH_STENCIL
-			#define GL_DEPTH_STENCIL 0x84F9
-			#endif
+#ifndef GL_DEPTH_STENCIL
+#define GL_DEPTH_STENCIL 0x84F9
+#endif
 			glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_STENCIL, _texWidth, _texHeight);
-			
-			#ifndef GL_DEPTH_STENCIL_ATTACHMENT
-			#define GL_DEPTH_STENCIL_ATTACHMENT 0x821A
-			#endif
+
+#ifndef GL_DEPTH_STENCIL_ATTACHMENT
+#define GL_DEPTH_STENCIL_ATTACHMENT 0x821A
+#endif
 			glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, GL_RENDERBUFFER, _renderBuffers[0]);
 		} else {
 			glRenderbufferStorage(GL_RENDERBUFFER, useDepthComponent24() ? GL_DEPTH_COMPONENT24 : GL_DEPTH_COMPONENT16, _texWidth, _texHeight);