From 699e5f0ff583bdde56c137741e97c2c7fe3297af Mon Sep 17 00:00:00 2001 From: Wolf3s <75867486+wolfysdl@users.noreply.github.com> Date: Sun, 4 Jun 2023 09:36:57 -0300 Subject: [PATCH] misc cleanup --- .vscode/.gitignore | 1 + engine/inc/file/file_utils.hpp | 8 +++++--- .../inc/loaders/texture/builder/texture_builder_data.hpp | 9 +++++---- engine/inc/math/math.hpp | 3 --- engine/src/file/file_utils.cpp | 3 +-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.vscode/.gitignore b/.vscode/.gitignore index dae89fb..8bea732 100644 --- a/.vscode/.gitignore +++ b/.vscode/.gitignore @@ -4,3 +4,4 @@ /c_cpp_properties.json /tasks.json /settings.json +/ps2dev-intellisense \ No newline at end of file diff --git a/engine/inc/file/file_utils.hpp b/engine/inc/file/file_utils.hpp index dd5507d..142856b 100644 --- a/engine/inc/file/file_utils.hpp +++ b/engine/inc/file/file_utils.hpp @@ -11,6 +11,8 @@ #pragma once #include +#include +#include namespace Tyra { @@ -42,9 +44,9 @@ class FileUtils { private: // Argv name+path & just path - char cwd[255]; - char elfName[255]; - char elfPath[255 - 14]; + char cwd[NAME_MAX]; + char elfName[NAME_MAX]; + char elfPath[NAME_MAX - 14]; void setPathInfo(const char* path); }; diff --git a/engine/inc/loaders/texture/builder/texture_builder_data.hpp b/engine/inc/loaders/texture/builder/texture_builder_data.hpp index c6b515d..6adb7bf 100644 --- a/engine/inc/loaders/texture/builder/texture_builder_data.hpp +++ b/engine/inc/loaders/texture/builder/texture_builder_data.hpp @@ -24,13 +24,14 @@ class TextureBuilderData { std::string name; int width, height; - unsigned char* data; + u8* data; TextureBpp bpp; - unsigned char gsComponents; + u8 gsComponents; int clutWidth, clutHeight; - unsigned char* clut; + u8* clut; TextureBpp clutBpp; - unsigned char clutGsComponents; + u8 clutGsComponents; }; + } // namespace Tyra diff --git a/engine/inc/math/math.hpp b/engine/inc/math/math.hpp index 2aa502a..6b8b679 100644 --- a/engine/inc/math/math.hpp +++ b/engine/inc/math/math.hpp @@ -36,9 +36,6 @@ class Math { static int randomi(const int& min, const int& max); static bool equalf(const float& a, const float& b, const float& epsilon = 0.00001F); - - private: - Math(); }; } // namespace Tyra diff --git a/engine/src/file/file_utils.cpp b/engine/src/file/file_utils.cpp index 7277baf..ca31075 100644 --- a/engine/src/file/file_utils.cpp +++ b/engine/src/file/file_utils.cpp @@ -12,8 +12,7 @@ #include #include #include -#include -#include + #include #include #include "file/file_utils.hpp"