From 639dfa4a1e26bb5c65966ebe61b90934de33f1d3 Mon Sep 17 00:00:00 2001 From: kervala Date: Sun, 8 Nov 2015 13:22:33 +0100 Subject: [PATCH] Changed: Minor changes --- code/nel/src/3d/driver/opengl/driver_opengl_window.cpp | 8 ++++---- .../src/3d/driver/opengl/mac/cocoa_window_delegate.mm | 3 +-- code/nel/src/misc/rgba.cpp | 3 ++- code/ryzom/client/src/connection.cpp | 10 +++++----- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_window.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_window.cpp index c76f2943b..e45d031a6 100644 --- a/code/nel/src/3d/driver/opengl/driver_opengl_window.cpp +++ b/code/nel/src/3d/driver/opengl/driver_opengl_window.cpp @@ -1758,14 +1758,14 @@ bool CDriverGL::setWindowStyle(EWindowStyle windowStyle) #elif defined(NL_OS_MAC) // leave fullscreen mode, enter windowed mode - if(windowStyle == EWSWindowed && [containerView() isInFullScreenMode]) + if (windowStyle == EWSWindowed && [containerView() isInFullScreenMode]) { // disable manual setting of back buffer size, cocoa handles this // automatically as soon as the view gets resized CGLError error = CGLDisable((CGLContextObj)[_ctx CGLContextObj], kCGLCESurfaceBackingSize); - if(error != kCGLNoError) + if (error != kCGLNoError) nlerror("cannot disable kCGLCESurfaceBackingSize (%s)", CGLErrorString(error)); @@ -1780,13 +1780,13 @@ bool CDriverGL::setWindowStyle(EWindowStyle windowStyle) } // enter fullscreen, leave windowed mode - else if(windowStyle == EWSFullscreen && ![containerView() isInFullScreenMode]) + else if (windowStyle == EWSFullscreen && ![containerView() isInFullScreenMode]) { // enable manual back buffer size for mode setting in fullscreen CGLError error = CGLEnable((CGLContextObj)[_ctx CGLContextObj], kCGLCESurfaceBackingSize); - if(error != kCGLNoError) + if (error != kCGLNoError) nlerror("cannot enable kCGLCESurfaceBackingSize (%s)", CGLErrorString(error)); diff --git a/code/nel/src/3d/driver/opengl/mac/cocoa_window_delegate.mm b/code/nel/src/3d/driver/opengl/mac/cocoa_window_delegate.mm index a2eb54a6b..2e5faf852 100644 --- a/code/nel/src/3d/driver/opengl/mac/cocoa_window_delegate.mm +++ b/code/nel/src/3d/driver/opengl/mac/cocoa_window_delegate.mm @@ -31,8 +31,7 @@ static void windowDidMove(NSWindow* window, CDriverGL* driver) driver->_WindowX = windowRect.origin.x; // map y from cocoa to NeL coordinates before setting in driver - driver->_WindowY = - screenRect.size.height - windowRect.size.height - windowRect.origin.y; + driver->_WindowY = screenRect.size.height - windowRect.size.height - windowRect.origin.y; } @implementation CocoaWindowDelegate diff --git a/code/nel/src/misc/rgba.cpp b/code/nel/src/misc/rgba.cpp index 2ab5eabf3..944ca50d3 100644 --- a/code/nel/src/misc/rgba.cpp +++ b/code/nel/src/misc/rgba.cpp @@ -298,7 +298,8 @@ void CRGBA::modulateColors(CRGBA *dest, const CRGBA *src1, const CRGBA *src2, ui uint64 blank = 0; /// well, this could be further optimized when stride is 4 if (dup == 1) - { __asm + { + __asm { push ebp movq mm2, blank diff --git a/code/ryzom/client/src/connection.cpp b/code/ryzom/client/src/connection.cpp index 6c24bcd8d..285bbfab8 100644 --- a/code/ryzom/client/src/connection.cpp +++ b/code/ryzom/client/src/connection.cpp @@ -213,11 +213,11 @@ void connectionRestoreVideoMode () (ClientCfg.Width != mode.Width) || (ClientCfg.Height != mode.Height))) { - mode.Windowed = ClientCfg.Windowed; - mode.Depth = uint8(ClientCfg.Depth); - mode.Width = ClientCfg.Width; - mode.Height = ClientCfg.Height; - mode.Frequency= ClientCfg.Frequency; + mode.Windowed = ClientCfg.Windowed; + mode.Depth = uint8(ClientCfg.Depth); + mode.Width = ClientCfg.Width; + mode.Height = ClientCfg.Height; + mode.Frequency = ClientCfg.Frequency; setVideoMode(mode); }