From 74c642bd835dfd4b9ca77a1e0968f2c985232b2c Mon Sep 17 00:00:00 2001
From: h4570 <sandro.sobczynski@gmail.com>
Date: Thu, 11 Aug 2022 20:39:04 +0200
Subject: [PATCH] minor fixes

---
 engine/inc/audio/audio.hpp                         | 14 ++++++++------
 engine/inc/pad/pad.hpp                             |  8 ++++----
 engine/src/audio/audio.cpp                         |  2 +-
 .../core/bag/packaging/stapip_bag_packager.cpp     |  1 +
 .../3d/pipeline/static/core/stapip_core.cpp        |  2 +-
 5 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/engine/inc/audio/audio.hpp b/engine/inc/audio/audio.hpp
index ab06e24..9229c3d 100644
--- a/engine/inc/audio/audio.hpp
+++ b/engine/inc/audio/audio.hpp
@@ -37,14 +37,14 @@ class Audio {
   void init();
 
   /**
-   * Load 24bit 22050Hz Stereo WAV.
+   * Load 24bit 22kHz Stereo WAV.
    * Can be used multiple times for song switching.
    * @param t_path Example: "host:song.wav" or "host:folder/song.wav"
    */
   void loadSong(const char* t_path);
 
   /**
-   * Load 24bit 22050Hz Stereo WAV.
+   * Load 24bit 22kHz Stereo WAV.
    * Can be used multiple times for song switching.
    * @param t_path Example: "host:song.wav" or "host:folder/song.wav"
    */
@@ -89,15 +89,17 @@ class Audio {
   void removeSongListener(const u32& t_id);
 
   /**
-   * Load ADPCM sample. ADPCM sample is an output from
-   * "adpenc" tool, shipped with PS2SDK.
+   * Load ADPCM sample.
+   * ADPCM sample is an output from "Convert WAV to ADPCM" task (adpenc tool).
+   * Adpenc expects 22kHz 16bit file.
    * @param t_path Example: "host:hit.adpcm" or "host:folder/jump.adpcm"
    */
   audsrv_adpcm_t* loadADPCM(const char* t_path);
 
   /**
-   * Load ADPCM sample. ADPCM sample is an output from
-   * "adpenc" tool, shipped with PS2SDK.
+   * Load ADPCM sample.
+   * ADPCM sample is an output from "Convert WAV to ADPCM" task (adpenc tool).
+   * Adpenc expects 22kHz 16bit file.
    * @param t_path Example: "host:hit.adpcm" or "host:folder/jump.adpcm"
    */
   inline audsrv_adpcm_t* loadADPCM(const std::string& t_path) {
diff --git a/engine/inc/pad/pad.hpp b/engine/inc/pad/pad.hpp
index e5a9d5c..196d636 100644
--- a/engine/inc/pad/pad.hpp
+++ b/engine/inc/pad/pad.hpp
@@ -34,10 +34,10 @@ class Pad {
   void init();
   void update();
 
-  inline const PadButtons& getClicked() { return clicked; }
-  inline const PadButtons& getPressed() { return pressed; }
-  inline const PadJoy& getLeftJoyPad() { return leftJoyPad; }
-  inline const PadJoy& getRightJoyPad() { return rightJoyPad; }
+  inline const PadButtons& getClicked() const { return clicked; }
+  inline const PadButtons& getPressed() const { return pressed; }
+  inline const PadJoy& getLeftJoyPad() const { return leftJoyPad; }
+  inline const PadJoy& getRightJoyPad() const { return rightJoyPad; }
 
  private:
   char padBuf[256] alignas(sizeof(char) * 256);
diff --git a/engine/src/audio/audio.cpp b/engine/src/audio/audio.cpp
index ae3bb4b..7bc527f 100644
--- a/engine/src/audio/audio.cpp
+++ b/engine/src/audio/audio.cpp
@@ -221,7 +221,7 @@ audsrv_adpcm_t* Audio::loadADPCM(const char* t_path) {
   u8 data[adpcmFileSize];
   rewind(file);
   fread(data, sizeof(u8), adpcmFileSize, file);
-  audsrv_adpcm_t* result = new audsrv_adpcm_t();
+  auto* result = new audsrv_adpcm_t();
   result->size = 0;
   result->buffer = 0;
   result->loop = 0;
diff --git a/engine/src/renderer/3d/pipeline/static/core/bag/packaging/stapip_bag_packager.cpp b/engine/src/renderer/3d/pipeline/static/core/bag/packaging/stapip_bag_packager.cpp
index 1ecc647..20207d6 100644
--- a/engine/src/renderer/3d/pipeline/static/core/bag/packaging/stapip_bag_packager.cpp
+++ b/engine/src/renderer/3d/pipeline/static/core/bag/packaging/stapip_bag_packager.cpp
@@ -16,6 +16,7 @@
 namespace Tyra {
 
 StaPipBagPackager::StaPipBagPackager() {}
+
 StaPipBagPackager::~StaPipBagPackager() {}
 
 void StaPipBagPackager::init(Renderer3DFrustumPlanes* t_frustumPlanes) {
diff --git a/engine/src/renderer/3d/pipeline/static/core/stapip_core.cpp b/engine/src/renderer/3d/pipeline/static/core/stapip_core.cpp
index 781bfe6..9c0be46 100644
--- a/engine/src/renderer/3d/pipeline/static/core/stapip_core.cpp
+++ b/engine/src/renderer/3d/pipeline/static/core/stapip_core.cpp
@@ -177,7 +177,7 @@ void StaPipCore::render(StaPipBag* bag, StaPipBagPackagesBBox* bbox) {
 
   if (checkYesFrustumInClipYes || checkYesFrustumInClipNo || checkNoClipNo) {
     u16 packagesCount = 0;
-    auto biggerPkgs = packager.create(&packagesCount, bag, maxVertCount);
+    auto* biggerPkgs = packager.create(&packagesCount, bag, maxVertCount);
     Verbose("Material - in frustum. Pkgs: ", packagesCount,
             " size: ", static_cast<int>(biggerPkgs[0].size));
     for (u16 i = 0; i < packagesCount; i++) {