Some style and whitespace fixes

src/common/image.cpp

@@ -448,8 +448,8 @@ void CImage::SetDataPixels(void *pixels){
     }
 }
 
-void CImage::flipVertically(){
+void CImage::FlipVertically()
-
+{
     SDL_Surface* result = SDL_CreateRGBSurface( m_data->surface->flags,
                                                 m_data->surface->w,
                                                 m_data->surface->h,
@@ -467,7 +467,8 @@ void CImage::flipVertically(){
     Uint32 pitch = m_data->surface->pitch;
     Uint32 pxLength = pitch*m_data->surface->h;
 
-    for(int line = 0; line < m_data->surface->h; ++line) {
+    for (int line = 0; line < m_data->surface->h; ++line)
+    {
         Uint32 pos = line * pitch;
         memcpy(&resultPixels[pos], &srcPixels[(pxLength-pos)-pitch], pitch);
     }

src/common/image.h

@@ -113,7 +113,7 @@ public:
     std::string GetError();
 
     //! Flips the image vertically
-    void flipVertically();
+    void FlipVertically();
 
     //! sets/replaces the pixels from the surface
     void SetDataPixels(void *pixels);

src/common/key.cpp

@@ -31,7 +31,7 @@ unsigned int GetVirtualKey(unsigned int key)
         return VIRTUAL_KMOD(META);
 
     if(key == KEY(KP_ENTER))
-    	return KEY(RETURN);
+        return KEY(RETURN);
 
     return key;
 }

src/common/regex_utils.cpp

@@ -41,6 +41,3 @@ boost::smatch RegexUtils::AssertRegexMatch(const std::string& text, const std::s
 
     return matches;
 }
-
-        /*
-            boost::cmatch matches;*/

src/graphics/engine/engine.cpp

@@ -487,7 +487,7 @@ bool CEngine::WriteScreenShot(const std::string& fileName, int width, int height
     CImage img({width, height});
 
     img.SetDataPixels(pixels);
-    img.flipVertically();
+    img.FlipVertically();
 
     if ( img.SavePNG(fileName.c_str()) )
     {

src/graphics/opengl/gl21device.cpp

@@ -619,24 +619,24 @@ Texture CGL21Device::CreateTexture(ImageData *data, const TextureCreateParams &p
     // Set mipmap level and automatic mipmap generation if neccesary
     if (params.mipmap)
     {
-	    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, 0);
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, 0);
-	    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, mipmapLevel - 1);
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, mipmapLevel - 1);
-	    glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE);
+        glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE);
     }
     else
     {
-	    // Has to be set to 0 because no mipmaps are generated
+        // Has to be set to 0 because no mipmaps are generated
-	    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, 0);
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, 0);
-	    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0);
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0);
-	    glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_FALSE);
+        glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_FALSE);
     }
 
     // Set anisotropy level if available
     if (m_anisotropyAvailable)
     {
-	    float level = Math::Min(m_maxAnisotropy, CEngine::GetInstance().GetTextureAnisotropyLevel());
+        float level = Math::Min(m_maxAnisotropy, CEngine::GetInstance().GetTextureAnisotropyLevel());
 
-	    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, level);
+        glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, level);
     }
 
     bool convert = false;

src/graphics/opengl/gl33device.cpp

@@ -647,22 +647,22 @@ Texture CGL33Device::CreateTexture(ImageData *data, const TextureCreateParams &p
     // Set mipmap level and automatic mipmap generation if neccesary
     if (params.mipmap)
     {
-	    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, 0);
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, 0);
-	    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, mipmapLevel - 1);
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, mipmapLevel - 1);
     }
     else
     {
-	    // Has to be set to 0 because no mipmaps are generated
+        // Has to be set to 0 because no mipmaps are generated
-	    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, 0);
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, 0);
-	    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0);
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0);
     }
 
     // Set anisotropy level if available
     if (m_anisotropyAvailable)
     {
-	    float level = Math::Min(m_maxAnisotropy, CEngine::GetInstance().GetTextureAnisotropyLevel());
+        float level = Math::Min(m_maxAnisotropy, CEngine::GetInstance().GetTextureAnisotropyLevel());
 
-	    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, level);
+        glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, level);
     }
 
     bool convert = false;

src/graphics/opengl/gldevice.cpp

@@ -592,24 +592,24 @@ Texture CGLDevice::CreateTexture(ImageData *data, const TextureCreateParams &par
     // Set mipmap level and automatic mipmap generation if neccesary
     if (params.mipmap)
     {
-	    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, 0);
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, 0);
-	    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, mipmapLevel - 1);
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, mipmapLevel - 1);
-	    glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE);
+        glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE);
     }
     else
     {
-	    // Has to be set to 0 because no mipmaps are generated
+        // Has to be set to 0 because no mipmaps are generated
-	    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, 0);
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, 0);
-	    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0);
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0);
-	    glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_FALSE);
+        glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_FALSE);
     }
 
     // Set anisotropy level if available
     if (m_anisotropyAvailable)
     {
-	    float level = Math::Min(m_maxAnisotropy, CEngine::GetInstance().GetTextureAnisotropyLevel());
+        float level = Math::Min(m_maxAnisotropy, CEngine::GetInstance().GetTextureAnisotropyLevel());
 
-	    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, level);
+        glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, level);
     }
 
     bool convert = false;

src/object/mission_type.h

@@ -19,7 +19,8 @@
 
 #pragma once
 
-enum MissionType {
+enum MissionType
+{
     MISSION_NORMAL = 0,
     MISSION_RETRO,
     MISSION_CODE_BATTLE