Merge branch 'refactor'

Author: Crayon2000

CHANGELOG.md

@@ -4,10 +4,10 @@ All notable changes to this project will be documented in this file.
 
 ## Unreleased
 
+- Remove dependency on libfmt
 - Library update
-  - fmt 11.2.0
-  - GRRMOD (670f84601a5086c4d3eeb03bd3041e3c0a7f0ace)
-  - GRRLIB (c3f2acfee7a4a93e35ade02408daa1508c9309f5)
+  - GRRMOD (eaebb7a92dcacd4e74ec600b2d0056a5fac408c7)
+  - GRRLIB (8feae891610ccd08ea2d2cb5d987fc74c47ad57c)
 
 ## 1.1.0
 

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.24)
+cmake_minimum_required(VERSION 3.25)
 project(Wii-Tac-Toe)
 
 find_library(AESND aesnd
@@ -17,21 +17,17 @@ pkg_check_modules(FREETYPE REQUIRED freetype2)
 pkg_check_modules(MXML REQUIRED mxml)
 
 include(FetchContent)
-FetchContent_Declare(fmt
-  URL https://github.com/fmtlib/fmt/archive/refs/tags/11.2.0.tar.gz
-)
 FetchContent_Declare(grrlib
   GIT_REPOSITORY https://github.com/GRRLIB/GRRLIB.git
-  GIT_TAG        c3f2acfee7a4a93e35ade02408daa1508c9309f5
+  GIT_TAG        8feae891610ccd08ea2d2cb5d987fc74c47ad57c
 )
 FetchContent_Declare(grrmod
-  URL https://codeload.github.com/GRRLIB/GRRMOD/tar.gz/670f84601a5086c4d3eeb03bd3041e3c0a7f0ace
+  URL https://codeload.github.com/GRRLIB/GRRMOD/tar.gz/eaebb7a92dcacd4e74ec600b2d0056a5fac408c7
 )
-set(FMT_INSTALL OFF CACHE BOOL "Don't install" FORCE)
 set(GRRLIB_INSTALL OFF CACHE BOOL "Don't install" FORCE)
 set(GRRMOD_INSTALL OFF CACHE BOOL "Don't install" FORCE)
 set(GRRMOD_USE_MP3 OFF CACHE BOOL "Don't use MP3" FORCE)
-FetchContent_MakeAvailable(fmt grrlib grrmod)
+FetchContent_MakeAvailable(grrlib grrmod)
 
 file(GLOB_RECURSE SRC_FILES
   "${CMAKE_CURRENT_SOURCE_DIR}/source/*.cpp"
@@ -44,15 +40,17 @@ file(GLOB_RECURSE BIN_FILES
 
 add_executable(Wii-Tac-Toe)
 
-target_compile_features(Wii-Tac-Toe PRIVATE cxx_std_23)
+target_compile_features(Wii-Tac-Toe PRIVATE cxx_std_26)
 
 target_compile_options(Wii-Tac-Toe PRIVATE
   -Werror
   -Wall
+  -Wextra
   -Wunused
   -Wmisleading-indentation
   -Wduplicated-cond
   -Wduplicated-branches
+  -Wsuggest-override
 )
 
 target_sources(Wii-Tac-Toe PRIVATE
@@ -70,7 +68,6 @@ dkp_add_embedded_binary_library(data
 
 target_link_libraries(Wii-Tac-Toe PRIVATE
   data
-  fmt::fmt
   grrlib
   grrmod
   ${PNG_LIBRARIES}

CMakePresets.json

@@ -5,7 +5,10 @@
             "name": "base",
             "generator": "Ninja",
             "binaryDir": "${sourceDir}/build/${presetName}",
-            "hidden": true
+            "hidden": true,
+            "cacheVariables": {
+                "CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
+            }
         },
         {
             "name": "wiiu",

languages/english.xml

@@ -40,7 +40,7 @@
     <turn_over>
         <message text="{}, it's your turn." />
         <message text="Waiting for {}." />
-        <message text="{} is thinking of is next move." />
+        <message text="{} is thinking of his next move." />
         <message text="{} should take the Wii Remote and play." />
         <message text="{}, let's play." />
         <message text="{} should play now." />

languages/spanish.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <language type="spanish" translator="Duhow">
     <translation from="Programmer: {}" to="Programador: {}" />
-    <translation from="Graphics: {}" to="Graficos: {}" />
-    <translation from="Press The A Button" to="Pulsa el boton A" />
+    <translation from="Graphics: {}" to="Gráficos: {}" />
+    <translation from="Press The A Button" to="Pulsa el botón A" />
 
     <translation from="Ver. {}" to="Ver. {}" />
     <translation from="2 Players (1 Wiimote)" to="2 Jugadores (1 Wii Remote)" />

source/audio.cpp

@@ -21,17 +21,16 @@ static constexpr Sound RollOverSound(VOICE_MONO16, std::span{button_rollover_raw
 /**
  * Constructor for the Audio class.
  */
-Audio::Audio() :
-    Paused(false)
+Audio::Audio()
 {
     AESND_Init();
     AESND_Pause(false);
 
     GRRMOD_Init(true);
     GRRMOD_SetMOD(tic_tac_mod, sizeof(tic_tac_mod));
 
-    ScreenVoice = new Voice();
-    ButtonVoice = new Voice();
+    ScreenVoice = std::make_unique<Voice>();
+    ButtonVoice = std::make_unique<Voice>();
 }
 
 /**
@@ -42,9 +41,6 @@ Audio::~Audio()
     GRRMOD_Unload();
     GRRMOD_End();
     AESND_Pause(true);
-
-    delete ScreenVoice;
-    delete ButtonVoice;
 }
 
 /**

source/audio.h

@@ -6,6 +6,8 @@
 #ifndef AudioH
 #define AudioH
 //---------------------------------------------------------------------------
+#include <memory>
+
 // Forward declarations
 class Voice;
 
@@ -26,9 +28,9 @@ class Audio
     void PlaySoundScreenChange(u16 Volume);
     void PlaySoundButton(u16 Volume);
 private:
-    bool Paused;
-    Voice *ScreenVoice;
-    Voice *ButtonVoice;
+    bool Paused{false};
+    std::unique_ptr<Voice> ScreenVoice;
+    std::unique_ptr<Voice> ButtonVoice;
 };
 //---------------------------------------------------------------------------
 #endif

source/button.cpp

@@ -13,15 +13,6 @@
  * @param[in] NewType Button type.
  */
 Button::Button(buttonType NewType) : Object(),
-    Focused(false),
-    Selected(false),
-    Caption(""),
-    Font(nullptr),
-    TextWidth(100), // random value
-    TextHeight(14),
-    TextTop(0),
-    TextLeft(0),
-    TextColor(0x000000FF),
     Type(NewType)
 {
     switch(Type)

source/button.h

@@ -28,7 +28,8 @@ enum class buttonType : u8 {
 class Button : public Object
 {
 public:
-    Button(buttonType = buttonType::StdMenu);
+    Button() = delete;
+    Button(buttonType NewType);
     Button(Button const&) = delete;
     ~Button() = default;
     Button& operator=(Button const&) = delete;
@@ -40,16 +41,16 @@ class Button : public Object
     void SetTextColor(u32 NewColor);
     void SetTextHeight(unsigned int NewHeight);
 private:
-    bool Focused;
-    bool Selected;
-    std::string Caption;
-    GRRLIB_ttfFont *Font;
-    unsigned int TextWidth;
-    unsigned int TextHeight;
-    unsigned int TextTop;
-    unsigned int TextLeft;
-    u32 TextColor;
-    buttonType Type;
+    bool Focused{false};
+    bool Selected{false};
+    std::string Caption{};
+    GRRLIB_ttfFont *Font{nullptr};
+    unsigned int TextWidth{100}; // random default value
+    unsigned int TextHeight{14};
+    unsigned int TextTop{0};
+    unsigned int TextLeft{0};
+    u32 TextColor{0x000000FF};
+    buttonType Type{buttonType::StdMenu};
     std::unique_ptr<Texture> ButtonImgOn;
     std::unique_ptr<Texture> ButtonImgOff;
     std::unique_ptr<Texture> ButtonSelected;