clang tidy rule

falltergeist · Dec 21, 2021 · 561437f · 561437f
1 parent 6b2cbaf
commit 561437f
Show file tree

Hide file tree

Showing 41 changed files with 238 additions and 212 deletions.
diff --git a/.clang-format b/.clang-format
@@ -16,3 +16,5 @@ FixNamespaceComments: false
 AllowAllArgumentsOnNextLine: false
 AllowAllParametersOfDeclarationOnNextLine: false
 IndentWidth: 4
+PointerAlignment: Left
+ReferenceAlignment: Left
diff --git a/.clang-tidy b/.clang-tidy
@@ -1,5 +1,6 @@
 Checks: "-*,\
-  readability-braces-around-statements\
+  readability-braces-around-statements,\
+  cppcoreguidelines-init-variables
 "
 
 WarningsAsErrors: "*"

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -76,7 +76,7 @@ endif()
 add_executable(falltergeist main.cpp ${SOURCES} ${_additional_includes})
 
 set_target_properties(falltergeist PROPERTIES
-	CXX_STANDARD 14
+	CXX_STANDARD 17
 	CXX_STANDARD_REQUIRED YES
 	CXX_EXTENSIONS NO
 )

diff --git a/src/Audio/Mixer.cpp b/src/Audio/Mixer.cpp
@@ -48,7 +48,7 @@ namespace Falltergeist
                 throw Exception(Mix_GetError());
             }
             logger->info() << message + "[OK]" << std::endl;
-            int frequency, channels;
+            int frequency = 0, channels = 0;
             Mix_QuerySpec(&frequency, &_format, &channels);
         }
 

diff --git a/src/CrossPlatform.cpp b/src/CrossPlatform.cpp
@@ -125,7 +125,7 @@ namespace Falltergeist
         }
         endmntent(mtab);
     #elif defined (BSD)
-        struct statfs *mntbuf;
+        struct statfs *mntbuf = nullptr;
         int mntsize = getmntinfo(&mntbuf, MNT_NOWAIT);
         for ( int i = 0; i < mntsize; i++ ) {
             std::string directory = ((struct statfs *)&mntbuf[i])->f_mntonname;

diff --git a/src/Format/Acm/Decoder.cpp b/src/Format/Acm/Decoder.cpp
@@ -58,8 +58,8 @@ namespace Falltergeist
             void Decoder::_sub4d3fcc(short *memory, int *buffer, int sbSize,
                     int blocks)
             {
-                int row0, row1, row2 = 0, row3 = 0, db0, db1;
-                int i;
+                int row0 = 0, row1 = 0, row2 = 0, row3 = 0, db0 = 0, db1 = 0;
+                int i = 0;
                 int sbSize2 = sbSize * 2, sbSize3 = sbSize * 3;
                 if (blocks == 2)
                 {
@@ -151,8 +151,8 @@ namespace Falltergeist
             void Decoder::_sub4d420c(int *memory, int *buffer, int sbSize,
                     int blocks)
             {
-                int row0, row1, row2 = 0, row3 = 0, db0, db1;
-                int i;
+                int row0 = 0, row1 = 0, row2 = 0, row3 = 0, db0 = 0, db1 = 0;
+                int i = 0;
                 int sbSize2 = sbSize * 2, sbSize3 = sbSize * 3;
                 if (blocks == 4)
                 {

diff --git a/src/Format/Acm/File.cpp b/src/Format/Acm/File.cpp
@@ -29,7 +29,7 @@ namespace Falltergeist
                 _stream >> hdr.channels;
                 _stream >> hdr.rate;
 
-                int16_t tmpword;
+                int16_t tmpword = 0;
                 _stream.readBytes((uint8_t*)&tmpword, 2);
                 _subblocks = (int32_t) (tmpword >> 4);
                 _levels = (int32_t) (tmpword&15);

diff --git a/src/Format/Acm/Unpacker.cpp b/src/Format/Acm/Unpacker.cpp
@@ -73,7 +73,7 @@ namespace Falltergeist
             {
                 while (bits > _availBits)
                 {
-                    unsigned char one_byte;
+                    unsigned char one_byte = 0;
                     if (_bufferBitOffset == UNPACKER_BUFFER_SIZE)
                     {
                         auto remains = stream->bytesRemains();
@@ -129,7 +129,7 @@ namespace Falltergeist
                 _blockPtr = block;
                 int pwr = _getBits(4) & 0xF, val = _getBits(16) & 0xFFFF,
                         count = 1 << pwr, v = 0;
-                int i;
+                int i = 0;
                 for (i = 0; i < count; i++)
                 {
                     _buffMiddle[i] = (short) v;

diff --git a/src/Format/Dat/File.cpp b/src/Format/Dat/File.cpp
@@ -39,9 +39,9 @@ namespace Falltergeist
                     throw Exception("File::_initialize() - can't open stream: " + filename());
                 }
 
-                unsigned int FileSize;
-                unsigned int filesTreeSize;
-                unsigned int filesTotalNumber;
+                unsigned int FileSize = 0;
+                unsigned int filesTreeSize = 0;
+                unsigned int filesTotalNumber = 0;
 
                 // reading data size from dat file
                 setPosition(size() - 4);
@@ -145,11 +145,11 @@ namespace Falltergeist
 
             File& File::operator>>(Entry& entry)
             {
-                uint32_t filenameSize;
-                uint8_t compressed;
-                uint32_t unpackedSize;
-                uint32_t packedSize;
-                uint32_t dataOffset;
+                uint32_t filenameSize = 0;
+                uint8_t compressed = 0;
+                uint32_t unpackedSize = 0;
+                uint32_t packedSize = 0;
+                uint32_t dataOffset = 0;
 
                 *this >> filenameSize;
 

diff --git a/src/Format/Dat/Stream.cpp b/src/Format/Dat/Stream.cpp
@@ -174,7 +174,7 @@ namespace Falltergeist
 
             uint32_t Stream::uint32()
             {
-                uint32_t value;
+                uint32_t value = 0;
                 *this >> value;
                 return value;
             }
@@ -186,7 +186,7 @@ namespace Falltergeist
 
             uint16_t Stream::uint16()
             {
-                uint16_t value;
+                uint16_t value = 0;
                 *this >> value;
                 return value;
             }
@@ -198,7 +198,7 @@ namespace Falltergeist
 
             uint8_t Stream::uint8()
             {
-                uint8_t value;
+                uint8_t value = 0;
                 *this >> value;
                 return value;
             }

diff --git a/src/Format/Gam/File.cpp b/src/Format/Gam/File.cpp
@@ -16,7 +16,7 @@ namespace Falltergeist
                 stream.setPosition(0);
 
                 unsigned int i = 0;
-                unsigned char ch;
+                unsigned char ch = 0;
                 std::string line;
                 while (i != stream.size())
                 {

diff --git a/src/Format/Lip/File.cpp b/src/Format/Lip/File.cpp
@@ -25,14 +25,14 @@ namespace Falltergeist
 
                 for (uint32_t i=0; i < _phonemesCount; i++)
                 {
-                    uint8_t phoneme;
+                    uint8_t phoneme = 0;
                     stream >> phoneme;
                     _phonemes.push_back(phoneme);
                 }
 
                 for (uint32_t i=0; i < _markersCount; i++)
                 {
-                    uint32_t stype, smarker;
+                    uint32_t stype = 0, smarker = 0;
                     stream >> stype >> smarker;
                     _markerSamples.push_back(smarker);
                     _markerTimestamps.push_back(smarker*1000 / 22050 /2); //ms

diff --git a/src/Format/Lst/File.cpp b/src/Format/Lst/File.cpp
@@ -15,7 +15,7 @@ namespace Falltergeist
                 stream.setPosition(0);
 
                 std::string line;
-                unsigned char ch;
+                unsigned char ch = 0;
                 for (unsigned int i = 0; i != stream.size(); ++i)
                 {
                     stream >> ch;

diff --git a/src/Format/Map/File.cpp b/src/Format/Map/File.cpp
@@ -273,12 +273,12 @@ namespace Falltergeist
                         object->setFrmTypeId((FID & 0x0F000000) >> 24);
                         object->setObjectID3((FID & 0xF0000000) >> 28);
                         break;
-                    case OBJECT_TYPE::SCENERY:
+                    case OBJECT_TYPE::SCENERY: {
                         object->setObjectSubtypeId(callback(PID)->subtypeId());
-                        uint32_t elevhex;  // elev+hex
-                        uint32_t hex;
-                        uint32_t elev;
-                        int32_t map;
+                        uint32_t elevhex = 0;  // elev+hex
+                        uint32_t hex = 0;
+                        uint32_t elev = 0;
+                        int32_t map = 0;
                         switch((SCENERY_TYPE)object->objectSubtypeId())
                         {
                             case SCENERY_TYPE::LADDER_TOP:
@@ -314,6 +314,7 @@ namespace Falltergeist
                                 throw Exception("File::_readObject() - unknown scenery type");
                         }
                         break;
+                    }
                     case OBJECT_TYPE::WALL:
                         break;
                     case OBJECT_TYPE::TILE:

diff --git a/src/Format/Mve/File.cpp b/src/Format/Mve/File.cpp
@@ -19,7 +19,7 @@ namespace Falltergeist
                 const int16_t MVE_HDRCONST1 = 0x001A;
                 const int16_t MVE_HDRCONST2 = 0x0100;
                 const int16_t MVE_HDRCONST3 = 0x1133;
-                int16_t check1, check2, check3;
+                int16_t check1 = 0, check2 = 0, check3 = 0;
 
                 char head[20];
                 _stream.readBytes((uint8_t*)head,20);

diff --git a/src/Format/Pal/Color.cpp b/src/Format/Pal/Color.cpp
@@ -65,7 +65,7 @@ namespace Falltergeist
 
             Color::operator unsigned int() const
             {
-                uint8_t k;
+                uint8_t k = 0;
                 if (_nomod) {
                     k = 1;
                 }

diff --git a/src/Format/Sve/File.cpp b/src/Format/Sve/File.cpp
@@ -14,7 +14,7 @@ namespace Falltergeist
 
                 std::string line;
 
-                unsigned char ch;
+                unsigned char ch = 0;
                 for (unsigned int i = 0; i != stream.size(); ++i)
                 {
                     stream >> ch;

diff --git a/src/Game/Helper/EggHelper.cpp b/src/Game/Helper/EggHelper.cpp
@@ -33,7 +33,7 @@ namespace Falltergeist
                 }
 
                 // calculate if dude egg intersects with object
-                Hexagon *dudeHex;
+                Hexagon *dudeHex = nullptr;
                 if (dude->movementQueue()->size()) {
                     dudeHex = dude->movementQueue()->back();
                 } else {
@@ -44,7 +44,7 @@ namespace Falltergeist
                 auto dudePos = dudeHex->position();
 
                 bool noBlockTrans = false;
-                bool transparent;
+                bool transparent = false;
 
                 switch (object->lightOrientation()) {
                     case Orientation::EW:

diff --git a/src/Graphics/IndexBuffer.cpp b/src/Graphics/IndexBuffer.cpp
@@ -8,7 +8,7 @@ namespace Falltergeist {
             _indexes = indexes;
             _count = count;
 
-            unsigned int usage;
+            unsigned int usage = GL_NONE;
             switch (usagePattern) {
                 case UsagePattern::DynamicDraw:
                     usage = GL_DYNAMIC_DRAW;

diff --git a/src/Graphics/Renderer.cpp b/src/Graphics/Renderer.cpp
@@ -180,7 +180,7 @@ namespace Falltergeist {
             logger->info() << "[RENDERER] " << "Extensions: " << std::endl;
 
             if (_renderpath == RenderPath::OGL32) {
-                GLint count;
+                GLint count = 0;
                 glGetIntegerv(GL_NUM_EXTENSIONS, &count);
 
                 for (GLint i = 0; i < count; i++) {
@@ -295,8 +295,8 @@ namespace Falltergeist {
 
         void Renderer::screenshot() {
             std::string filename;
-            Uint32 rmask, gmask, bmask, amask;
-            SDL_Surface *output;
+            Uint32 rmask = 0, gmask = 0, bmask = 0, amask = 0;
+            SDL_Surface *output = nullptr;
 
             int iter = 0;
             do {

diff --git a/src/Graphics/Shader.cpp b/src/Graphics/Shader.cpp
@@ -46,11 +46,11 @@ namespace Falltergeist
             glShaderSource(shader, 1, &src, NULL);
             glCompileShader(shader);
 
-            GLint status;
+            GLint status = 0;
             glGetShaderiv(shader, GL_COMPILE_STATUS, &status);
             if (!status)
             {
-                GLint len;
+                GLint len = 0;
                 glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &len);
                 GLchar *log = (GLchar *) malloc(len);
                 glGetShaderInfoLog(shader, len, NULL, log);
@@ -95,12 +95,12 @@ namespace Falltergeist
                 }
                 glLinkProgram(_progId);
 
-                GLint status;
+                GLint status = 0;
                 glGetProgramiv(_progId, GL_LINK_STATUS, &status);
 
                 if (!status)
                 {
-                    GLint len;
+                    GLint len = 0;
                     glGetProgramiv(_progId, GL_INFO_LOG_LENGTH, &len);
                     GLchar *log = (GLchar *) malloc(len);
                     glGetProgramInfoLog(_progId, len, NULL, log);
@@ -125,7 +125,7 @@ namespace Falltergeist
 
         void Shader::use() const
         {
-            GLint cur;
+            GLint cur = 0;
             GL_CHECK(glGetIntegerv(GL_CURRENT_PROGRAM, &cur));
             if ((GLuint)cur!=_progId)
             {

diff --git a/src/Graphics/Texture.cpp b/src/Graphics/Texture.cpp
@@ -44,8 +44,8 @@ namespace Falltergeist {
                     return;
                 }
             */
-            GLint curunit;
-            GLint curtexture;
+            GLint curunit = 0;
+            GLint curtexture = 0;
 
             if (_textureID > 0) {
                 GL_CHECK(glGetIntegerv(GL_ACTIVE_TEXTURE, &curunit));

diff --git a/src/Graphics/VertexArray.cpp b/src/Graphics/VertexArray.cpp
@@ -37,7 +37,7 @@ namespace Falltergeist {
             for (auto &attribute : bufferLayout.attributes()) {
                 GL_CHECK(glEnableVertexAttribArray(attribute.index()));
 
-                unsigned int glType;
+                unsigned int glType = GL_NONE;
                 switch (attribute.type()) {
                     case VertexBufferAttribute::Type::Float:
                         glType = GL_FLOAT;

diff --git a/src/Graphics/VertexBuffer.cpp b/src/Graphics/VertexBuffer.cpp
@@ -8,7 +8,7 @@ namespace Falltergeist {
             _data = data;
             _size = size;
 
-            unsigned int usage;
+            unsigned int usage = GL_NONE;
             switch (usagePattern) {
                 case UsagePattern::DynamicDraw:
                     usage = GL_DYNAMIC_DRAW;

diff --git a/src/Ini/Parser.cpp b/src/Ini/Parser.cpp
@@ -1,3 +1,5 @@
+#include <math.h>
+
 #include <algorithm>
 #include <functional>
 #include <sstream>
@@ -66,7 +68,7 @@ namespace Falltergeist
 
         bool Parser::_parseBool(std::string &name, std::string &line, std::shared_ptr<File> ini)
         {
-            bool value;
+            bool value = false;
             if (_tryBool(line, &value))
             {
                 Logger::debug("INI") << "boolean value found for property `" << name << "`: " <<
@@ -200,8 +202,8 @@ namespace Falltergeist
 
         bool Parser::_parseDecimal(std::string &name, std::string &line, std::shared_ptr<File> ini)
         {
-            int intval;
-            double doubleval;
+            int intval = 0;
+            double doubleval = 0.0;
             int ret = _tryDecimal(line, &intval, &doubleval);
             if (ret!=0)
             {
@@ -226,7 +228,7 @@ namespace Falltergeist
 
         bool Parser::_parseArrayBool(std::vector<Value> &vec, std::string val)
         {
-            bool value;
+            bool value = 0;
             if (_tryBool(val,&value))
             {
                 Logger::debug("INI") << "boolean value found for property `" << "`: " <<
@@ -241,8 +243,8 @@ namespace Falltergeist
 
         bool Parser::_parseArrayDecimal(std::vector<Value> &vec, std::string val)
         {
-            int intval;
-            double doubleval;
+            int intval = 0;
+            double doubleval = 0.0;
             int ret = _tryDecimal(val, &intval, &doubleval);
             if (ret!=0)
             {