compilation fix 2

Author: cfrankb

packages/Makefile

@@ -4,7 +4,7 @@ DATAPATH = ../data/*
 APPDIR = $(APP_NAME).AppDir
 APP_DATA = $(APPDIR)/usr/share/data
 APP_ID = com.cfrankb.$(APP_NAME)
-APP_ICON = data/${APP_NAME}.png
+APP_ICON = data/appimage/${APP_NAME}.png
 DESKTOP_FILE = data/$(APP_ID).desktop
 APP_DESKTOP_FILE = $(APPDIR)/usr/share/applications/$(APP_ID).desktop
 

packages/bin/deb-genc.py

@@ -67,7 +67,7 @@
     t.write(MAN_PAGE)
 
 
-DEPENDS = ", ".join(["libc6 (>= 2.27)", "libsdl2", "libsdl2-mixer", "libxmp", "libz"])
+DEPENDS = ", ".join(["libc6 (>= 2.27)", "libsdl3", "libsdl3-mixer", "libxmp", "libz"])
 
 paths = ["src/*.cpp", "src/**/*.cpp", "src/**/**/*.cpp"]
 src = []

packages/data/appimage/cs3-runtime.png

@@ -122,11 +122,11 @@ namespace AssetMan
         if (!ptr)
         {
             LOGE("can't fetch asset: %s", filepath.c_str());
-            return false;
+            return {};
         }
         data.assign(ptr, ptr + size);
         delete[] ptr;
-        return true;
+        return data;
 #else
         CFileWrap file;
         if (!file.open(filepath.c_str(), "rb"))

src/assetman.cpp

@@ -198,7 +198,7 @@ void CGameMixin::drawFont6x6(CFrame &bitmap, int x, int y, const char *text, con
  * @param color color
  * @param fill fill ?
  */
-void CGameMixin::drawRect(CFrame &frame, const Rect &rect, const Color color, bool fill)
+void CGameMixin::drawRect(CFrame &frame, const rect_t &rect, const Color color, bool fill)
 {
     uint32_t *rgba = frame.getRGB().data();
     const int rowPixels = frame.width();
@@ -239,7 +239,7 @@ void CGameMixin::drawRect(CFrame &frame, const Rect &rect, const Color color, bo
  * @param colorMap
  */
 
-void CGameMixin::drawTile(CFrame &bitmap, const int x, const int y, CFrame &tile, const Rect &rect, const ColorMask colorMask, std::unordered_map<uint32_t, uint32_t> *colorMap)
+void CGameMixin::drawTile(CFrame &bitmap, const int x, const int y, CFrame &tile, const rect_t &rect, const ColorMask colorMask, std::unordered_map<uint32_t, uint32_t> *colorMap)
 {
     const int width = bitmap.width();
     uint32_t *dest = bitmap.getRGB().data() + x + y * width;
@@ -506,8 +506,8 @@ void CGameMixin::drawScreen(CFrame &bitmap)
         const Color rectBorder = isPlayerHurt              ? PINK
                                  : visualcues.livesShimmer ? GREEN
                                                            : LIGHTGRAY;
-        drawRect(bitmap, Rect{0, bitmap.height() - 16, getWidth(), TILE_SIZE}, rectBG, true);
-        drawRect(bitmap, Rect{0, bitmap.height() - 16, getWidth(), TILE_SIZE}, rectBorder, false);
+        drawRect(bitmap, rect_t{0, bitmap.height() - 16, getWidth(), TILE_SIZE}, rectBG, true);
+        drawRect(bitmap, rect_t{0, bitmap.height() - 16, getWidth(), TILE_SIZE}, rectBorder, false);
     }
 
     // draw current event text
@@ -539,7 +539,7 @@ void CGameMixin::drawScroll(CFrame &bitmap)
     constexpr int scrollHeight = 48;
     constexpr int partWidth = 16;
     const int y = bitmap.height() - scrollHeight;
-    constexpr Rect rect{0, 0, partWidth, scrollHeight};
+    constexpr rect_t rect{0, 0, partWidth, scrollHeight};
     drawTile(bitmap, 0, y, *sheet[SCROLL_LEFT], rect);
     for (int x = partWidth; x < bitmap.width() - partWidth; x += partWidth)
         drawTile(bitmap, x, y, *sheet[SCROLL_MID], rect);
@@ -727,7 +727,7 @@ void CGameMixin::drawViewPortDynamic(CFrame &bitmap)
             {
                 if (firstX || firstY || lastX || lastY)
                 {
-                    Rect rect{
+                    rect_t rect{
                         .x = !firstX ? 0 : halfOffset,
                         .y = !firstY ? 0 : halfOffset,
                         .width = !(firstX || lastX) ? tileSize : halfOffset,
@@ -772,7 +772,7 @@ void CGameMixin::drawViewPortDynamic(CFrame &bitmap)
 
         if (firstX || firstY || lastX || lastY)
         {
-            Rect rect{
+            rect_t rect{
                 .x = !firstX ? 0 : halfOffset,
                 .y = !firstY ? 0 : halfOffset,
                 .width = !(firstX || lastX) ? tileSize : halfOffset,
@@ -853,7 +853,7 @@ void CGameMixin::drawBossses(CFrame &bitmap, const int mx, const int my, const i
         return a1 < b2 && a2 > b1;
     };
 
-    auto betweenRect = [&between](const Rect &bRect, const Rect &sRect)
+    auto betweenRect = [&between](const rect_t &bRect, const rect_t &sRect)
     {
         return between(bRect.x, bRect.x + bRect.width, sRect.x, sRect.x + sRect.width) &&
                between(bRect.y, bRect.y + bRect.height, sRect.y, sRect.y + sRect.height);
@@ -868,7 +868,7 @@ void CGameMixin::drawBossses(CFrame &bitmap, const int mx, const int my, const i
         return _wu;
     };
 
-    auto printRect = [](const Rect &rect, const std::string_view &name)
+    auto printRect = [](const rect_t &rect, const std::string_view &name)
     {
         LOGI("%s (%d, %d) w:%d h: %d", name.data(), rect.x, rect.y, rect.width, rect.height);
     };
@@ -910,15 +910,15 @@ void CGameMixin::drawBossses(CFrame &bitmap, const int mx, const int my, const i
         // (using GRID_SIZE)
 
         // Boss Rect
-        const Rect bRect{
+        const rect_t bRect{
             GRID_SIZE * (boss.x() - hitbox.x),
             GRID_SIZE * (boss.y() - hitbox.y),
             frame.width(),
             frame.height(),
         };
 
         // Screen Rect
-        const Rect sRect{
+        const rect_t sRect{
             .x = GRID_SIZE * mx,
             .y = GRID_SIZE * my,
             .width = GRID_SIZE * sx,
@@ -929,7 +929,7 @@ void CGameMixin::drawBossses(CFrame &bitmap, const int mx, const int my, const i
         {
             const int x = bRect.x - sRect.x;
             const int y = bRect.y - sRect.y;
-            const Rect rect{
+            const rect_t rect{
                 .x = x < 0 ? std::abs(x) : 0,
                 .y = y < 0 ? std::abs(y) : 0,
                 .width = calcSize(x, bRect.width, sRect.width),
@@ -949,7 +949,7 @@ void CGameMixin::drawBossses(CFrame &bitmap, const int mx, const int my, const i
 
         // Hp Rect
         const float hpRatio = (float)boss.maxHp() / MAX_HP_GAUGE;
-        const Rect hRect{
+        const rect_t hRect{
             .x = bRect.x,
             .y = bRect.y - HP_BAR_HEIGHT - HP_BAR_SPACING,
             .width = MAX_HP_GAUGE, // boss.maxHp(),
@@ -959,13 +959,13 @@ void CGameMixin::drawBossses(CFrame &bitmap, const int mx, const int my, const i
         {
             const int x = hRect.x - sRect.x;
             const int y = hRect.y - sRect.y;
-            const Rect rectFullHp{
+            const rect_t rectFullHp{
                 .x = std::max(0, x),
                 .y = std::max(0, y),
                 .width = calcSize(x, hRect.width, sRect.width),
                 .height = calcSize(y, hRect.height, sRect.height),
             };
-            const Rect rectHp{
+            const rect_t rectHp{
                 .x = std::max(0, x),
                 .y = std::max(0, y),
                 .width = calcSize(x, static_cast<int>(boss.hp() / hpRatio), sRect.width),
@@ -2264,7 +2264,7 @@ void CGameMixin::drawSugarMeter(CFrame &bitmap, const int bx)
     m_visualStates.rSugar = sugar;
     for (int i = 0; i < (int)CGame::MAX_SUGAR_RUSH_LEVEL; ++i)
     {
-        const Rect rect{
+        const rect_t rect{
             .x = bx * (int)FONT_SIZE + i * 5,
             .y = Y_STATUS + 2,
             .width = 4,
@@ -2402,9 +2402,9 @@ void CGameMixin::drawHealthBar(CFrame &bitmap, const bool isPlayerHurt)
         const Color hpColor = game.isGodMode() ? WHITE : isPlayerHurt ? PINK
                                                                       : LIME;
         const int hpWidth = std::min(game.health() / 2, bitmap.width() - 4);
-        drawRect(bitmap, Rect{4, bitmap.height() - 12, hpWidth, 8},
+        drawRect(bitmap, rect_t{4, bitmap.height() - 12, hpWidth, 8},
                  hpColor, true);
-        drawRect(bitmap, Rect{4, bitmap.height() - 12, hpWidth, 8},
+        drawRect(bitmap, rect_t{4, bitmap.height() - 12, hpWidth, 8},
                  WHITE, false);
     }
 }
@@ -2526,9 +2526,9 @@ void CGameMixin::drawUI(CFrame &bitmap, CGameUI &ui)
     {
         int x = baseX + btn.x;
         int y = baseY + btn.y;
-        drawRect(bitmap, Rect{.x = baseX + btn.x, .y = baseY + btn.y, .width = btn.width, .height = btn.height}, static_cast<Color>(btn.color), true);
+        drawRect(bitmap, rect_t{.x = baseX + btn.x, .y = baseY + btn.y, .width = btn.width, .height = btn.height}, static_cast<Color>(btn.color), true);
         drawFont(bitmap, x, y, btn.text.c_str(), BLACK, CLEAR, 2, 2);
-        drawRect(bitmap, Rect{.x = baseX + btn.x, .y = baseY + btn.y, .width = btn.width, .height = btn.height}, RED, false);
+        drawRect(bitmap, rect_t{.x = baseX + btn.x, .y = baseY + btn.y, .width = btn.width, .height = btn.height}, RED, false);
     }
 }
 

src/gamemixin.cpp

@@ -300,13 +300,13 @@ protected slots:
     void drawLevelIntro(CFrame &bitmap);
     void drawFont(CFrame &frame, int x, int y, const char *text, Color color = WHITE, Color bgcolor = BLACK, const int scaleX = 1, const int scaleY = 1);
     void drawFont6x6(CFrame &frame, int x, int y, const char *text, const Color color = WHITE, const Color bgcolor = BLACK);
-    void drawRect(CFrame &frame, const Rect &rect, const Color color = GREEN, bool fill = true);
+    void drawRect(CFrame &frame, const rect_t &rect, const Color color = GREEN, bool fill = true);
     void plotLine(CFrame &frame, int x0, int y0, const int x1, const int y1, const Color color);
     inline void drawTimeout(CFrame &bitmap);
     inline void drawKeys(CFrame &bitmap);
     inline void drawSugarMeter(CFrame &bitmap, const int bx);
     inline void drawTile(CFrame &bitmap, const int x, const int y, CFrame &tile, const bool alpha, const ColorMask colorMask = COLOR_NOCHANGE, std::unordered_map<uint32_t, uint32_t> *colorMap = nullptr);
-    inline void drawTile(CFrame &bitmap, const int x, const int y, CFrame &tile, const Rect &rect, const ColorMask colorMask = COLOR_NOCHANGE, std::unordered_map<uint32_t, uint32_t> *colorMap = nullptr);
+    inline void drawTile(CFrame &bitmap, const int x, const int y, CFrame &tile, const rect_t &rect, const ColorMask colorMask = COLOR_NOCHANGE, std::unordered_map<uint32_t, uint32_t> *colorMap = nullptr);
     void drawTileFaz(CFrame &bitmap, const int x, const int y, CFrame &tile, int fazBitShift = 0, const ColorMask colorMask = COLOR_NOCHANGE);
     inline CFrame *tile2Frame(const uint8_t tileID, ColorMask &colorMask, std::unordered_map<uint32_t, uint32_t> *&colorMap);
     void drawHealthBar(CFrame &bitmap, const bool isPlayerHurt);

src/gamemixin.h

@@ -33,6 +33,7 @@
 #include "build.h"
 #include "statedata.h"
 #include "states.h"
+#include "strhelper.h"
 
 const uint32_t FPS = CRuntime::tickRate();
 const uint32_t SLEEP = 1000 / FPS;

src/main.cpp

@@ -18,7 +18,7 @@
 
 #pragma once
 
-struct Rect
+struct rect_t
 {
     int x;
     int y;

src/rect.h

@@ -155,7 +155,7 @@ void CRuntime::paint()
 
     SDL_UpdateTexture(m_app.texture, nullptr, bitmap.getRGB().data(), getWidth() * sizeof(uint32_t));
 #if defined(__ANDROID__)
-    Rect safeArea = getSafeAreaWindow();
+    rect_t safeArea = getSafeAreaWindow();
     SDL_FRect rectDest{.x = _f(safeArea.x), .y = _f(safeArea.y), .w = _f(safeArea.width), .h = _f(safeArea.height)};
 #else
     int width;
@@ -265,9 +265,9 @@ void CRuntime::debugSDL()
     const Rez rezScreen = getScreenSize();
     LOGI("SCREENSIZE: %d x %d; Orientation: %d", rezScreen.w, rezScreen.h, currentOrientation);
 
-    Rect safeAreaWmd = getSafeAreaWindow();
+    rect_t safeAreaWmd = getSafeAreaWindow();
     LOGI("safeAreaWnd: x: %d, y: %d, w: %d, h: %d", safeAreaWmd.x, safeAreaWmd.y, safeAreaWmd.width, safeAreaWmd.height);
-    Rect safeAreaTexture = windowRect2textureRect(safeAreaWmd);
+    rect_t safeAreaTexture = windowRect2textureRect(safeAreaWmd);
     LOGI("safeAreaTexture: x: %d, y: %d, w: %d, h: %d", safeAreaTexture.x, safeAreaTexture.y, safeAreaTexture.width, safeAreaTexture.height);
 
     int pixelW = 0, pixelH = 0;
@@ -1299,7 +1299,7 @@ void CRuntime::drawTitleScreen(CFrame &bitmap)
     drawTitlePix(bitmap, offsetY);
 
     const int baseY = 2 * offsetY + title.height();
-    const Rect rect{
+    const rect_t rect{
         8,
         baseY,
         getWidth() - 16,
@@ -2492,7 +2492,7 @@ Rez CRuntime::getWindowSize()
 CRuntime::pos_t CRuntime::windowPos2texturePos(posF_t pos)
 {
 #if defined(__ANDROID__)
-    Rect safeRect = getSafeAreaWindow();
+    rect_t safeRect = getSafeAreaWindow();
     pos.x -= safeRect.x;
     pos.y -= safeRect.y;
     float w = getWidth();
@@ -2514,22 +2514,22 @@ void CRuntime::onOrientationChange()
         LOGI("Orientation changed - %s mode", isLandscape ? "Landscape" : "Portrait");
 }
 
-Rect CRuntime::getSafeAreaWindow()
+rect_t CRuntime::getSafeAreaWindow()
 {
     SDL_Rect safe;
     if (!SDL_GetWindowSafeArea(m_app.window, &safe))
     {
         LOGE("SDL_GetWindowSafeArea() failed; error: %s", SDL_GetError());
     }
-    return Rect{
+    return rect_t{
         safe.x,
         safe.y,
         safe.w,
         safe.h,
     };
 }
 
-Rect CRuntime::windowRect2textureRect(const Rect &wRect)
+rect_t CRuntime::windowRect2textureRect(const rect_t &wRect)
 {
     Rez rez = getWindowSize();
     float w = (float)getWidth() * 2;
@@ -2538,7 +2538,7 @@ Rect CRuntime::windowRect2textureRect(const Rect &wRect)
     {
         return static_cast<int>(w * (float)u / rez.w);
     };
-    return Rect{
+    return rect_t{
         _c(wRect.x),
         _c(wRect.y),
         _c(wRect.width),

src/runtime.cpp

@@ -67,8 +67,8 @@ class CRuntime : public CGameMixin
     bool createSDLWindow();
     Rez getScreenSize();
     Rez getWindowSize();
-    Rect getSafeAreaWindow();
-    Rect windowRect2textureRect(const Rect &wRect);
+    rect_t getSafeAreaWindow();
+    rect_t windowRect2textureRect(const rect_t &wRect);
     void debugSDL();
     bool saveToFile(const std::string filepath, const std::string name);
     bool loadFromFile(const std::string filepath, std::string &name);