Update GRRMOD

Crayon2000 · Aug 30, 2024 · dd18696 · dd18696
1 parent 27b839a
commit dd18696
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,8 @@ All notable changes to this project will be documented in this file.
 
 ## Unreleased
 
-- TBD
+- Library update
+  - GRRMOD (1ea0e8bb54eb9c2b052fba87d34530dca0365b97)
 
 ## 1.1.0
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -25,7 +25,7 @@ FetchContent_Declare(grrlib
   GIT_TAG        d93847e6a3e350bd1157d61cc1315d8bbff76968
 )
 FetchContent_Declare(grrmod
-  URL https://codeload.github.com/GRRLIB/GRRMOD/tar.gz/9a6e7d85329b813d633f4b10de31c704167c0054
+  URL https://codeload.github.com/GRRLIB/GRRMOD/tar.gz/1ea0e8bb54eb9c2b052fba87d34530dca0365b97
   SOURCE_SUBDIR "GRRMOD"
 )
 set(GRRMOD_USE_MP3 OFF CACHE BOOL "Don't use MP3" FORCE)

diff --git a/README.md b/README.md
@@ -23,12 +23,11 @@ Prerequisites:
   * Mini-XML
   * libpng
   * FreeType
-  * libjpeg-turbo
 
 To compile:
 
 ```text
-pacman --sync --needed --noconfirm ppc-mxml ppc-libpng ppc-freetype ppc-libjpeg-turbo
+pacman --sync --needed --noconfirm ppc-mxml ppc-libpng ppc-freetype
 mkdir --parents build && cd build
 /opt/devkitpro/portlibs/wii/bin/powerpc-eabi-cmake ..
 cmake --build .

diff --git a/source/cursor.cpp b/source/cursor.cpp
@@ -8,13 +8,13 @@
 /**
  * Constructor for the Cursor class.
  */
-Cursor::Cursor() : Object()
+Cursor::Cursor() : Object(),
+    Cursors(Texture::CreateFromPNG(hands_png))
 {
     Width = 96;
     Height = 96;
 
     // Load textures
-    Cursors = Texture::CreateFromPNG(hands_png);
     GRRLIB_InitTileSet(reinterpret_cast<GRRLIB_texImg *>(Cursors.get()), Width, Height, 0);
 
     // Set hotspot

diff --git a/source/object.cpp b/source/object.cpp
@@ -14,13 +14,6 @@ Object::Object() :
 {
 }
 
-/**
- * Destructor for the Object class.
- */
-Object::~Object()
-{
-}
-
 /**
  * Get the left position of the object.
  * @see SetLeft()
@@ -194,7 +187,7 @@ u8 Object::GetAlpha()
  * @param[in] Alpha Alpha color.
  */
 void Object::SetAlpha(u8 Alpha)
-{
+{
     Color = (Color & 0xFFFFFF00) | (Alpha & 0xFF);
 }
 

diff --git a/source/object.h b/source/object.h
@@ -18,7 +18,7 @@ class Object
 public:
     Object();
     Object(Object const&) = delete;
-    virtual ~Object();
+    virtual ~Object() = default;
     Object& operator=(Object const&) = delete;
     float GetLeft();
     float GetTop();

diff --git a/source/symbol.cpp b/source/symbol.cpp
@@ -7,12 +7,12 @@
  * Constructor for the Symbol class.
  */
 Symbol::Symbol() :
-    Object()
+    Object(),
+    Img(Texture::CreateFromPNG(symbols_png))
 {
     Width = 136;
     Height = 100;
 
-    Img = Texture::CreateFromPNG(symbols_png);
     GRRLIB_InitTileSet(reinterpret_cast<GRRLIB_texImg *>(Img.get()), Width, Height, 0);
 }