various bug fixes

Author: cfrankb

bin/sync.py

@@ -59,6 +59,7 @@ def sync_pixels(sync_list):
         "data/pixels/sheet1.obl",
         "data/pixels/tiles.obl",
         "data/pixels/uisheet.png",
+        "data/pixels/cs3layers.png",
     ]
     for f in paths:
         sync_list.append([f, DEST_PIXELS + ntpath.basename(f), False])

data/levels.mapz

@@ -346,11 +346,7 @@ std::vector<JoyAim> LineOfSight::findPath(ISprite &sprite, const Pos &playerPos)
             }
         }
         if (!moved)
-        {
-            //     LOGE("Cannot move from (%d,%d) toward (%d,%d) on line %d",
-            //        x, y, goalPos.x, goalPos.y, __LINE__);
             return {};
-        }
     }
 
     return directions;
@@ -498,14 +494,6 @@ std::vector<JoyAim> AStarSmooth::findPath(ISprite &sprite, const Pos &playerPos)
 ////////////////////////////////////////////////
 CPath::Result CPath::followPath(ISprite &sprite, const Pos &playerPos, const IPath &astar)
 {
-    /*
-    if (!sprite.isBoss())
-        LOGI("sprite: %p[%d,%d] aim:%d p[%d,%d] ptr=%lu timeout=%lu cache:%lu ttl:%d",
-             &sprite, sprite.x(), sprite.y(), sprite.getAim(),
-             playerPos.x, playerPos.y,
-             m_pathIndex, m_pathTimeout, m_cachedDirections.size(), sprite.getTTL());
-             */
-
     // Check if path is invalid or timed out
     if (m_pathIndex >= m_cachedDirections.size() || m_pathTimeout <= 0)
     {

data/pixels/animz.obl

@@ -24,11 +24,12 @@
 #include <vector>
 #include <set>
 #include <array>
+#include "shared/IFile.h"
 
 constexpr uint8_t NO_SPECIAL_ID = 0;
 constexpr const size_t SEQ_COUNT = 30;
 
-const std::array<CAnimator::animzSeq_t, SEQ_COUNT> g_animzSeq = {{
+constexpr const std::array<CAnimator::animzSeq_t, SEQ_COUNT> g_animzSeq = {{
     {TILES_DIAMOND, ANIMZ_DIAMOND, ANIMZ_DIAMOND_LEN, NO_SPECIAL_ID},
     {TILES_INSECT1, ANIMZ_INSECT1_DN, ANIMZ_INSECT1_LEN, ANIMZ_INSECT1},
     {TILES_SWAMP, ANIMZ_SWAMP, ANIMZ_SWAMP_LEN, NO_SPECIAL_ID},
@@ -61,14 +62,6 @@ const std::array<CAnimator::animzSeq_t, SEQ_COUNT> g_animzSeq = {{
     {SFX_FLAME, ANIMZ_FLAME, ANIMZ_FLAME_LEN, ANIMZ_FLAME},                     // barrel flame
 }};
 
-const std::set<uint8_t> g_specialCases = {
-    TILES_INSECT1,
-    TILES_MUSH_IDLE,
-    TILES_DRAGO,
-    TILES_ETURTLE,
-    TILES_WHTEWORM,
-};
-
 CAnimator::CAnimator() : m_seqIndex(g_animzSeq.size(), 0)
 {
     memset(m_tileMainLayer, NO_ANIMZ, sizeof(m_tileMainLayer));
@@ -83,7 +76,6 @@ CAnimator::CAnimator() : m_seqIndex(g_animzSeq.size(), 0)
         ++i;
     }
 
-    //    std::fill(m_tileMainLayer.begin(), m_tileReplacement.end(), NO_ANIMZ);
     for (const auto &seq : g_animzSeq)
     {
         m_seqLookUp[seq.srcTile] = animzInfo_t{
@@ -125,11 +117,6 @@ uint16_t CAnimator::offset() const
     return m_offset;
 }
 
-bool CAnimator::isSpecialCase(uint8_t tileID) const
-{
-    return g_specialCases.find(tileID) != g_specialCases.end();
-}
-
 animzInfo_t CAnimator::getSpecialInfo(const int tileID) const
 {
     const auto &it = m_seqLookUp.find(tileID);
@@ -142,4 +129,30 @@ animzInfo_t CAnimator::getSpecialInfo(const int tileID) const
         };
     }
     return animzInfo_t{};
-}
+}
+
+bool CAnimator::read(IFile &sfile)
+{
+    if (sfile.read(m_tileMainLayer, sizeof(m_tileMainLayer)) != IFILE_OK)
+    {
+        return false;
+    }
+    if (sfile.read(m_tileLayer, sizeof(m_tileLayer)) != IFILE_OK)
+    {
+        return false;
+    }
+    return false;
+}
+
+bool CAnimator::write(IFile &sfile) const
+{
+    if (sfile.write(m_tileMainLayer, sizeof(m_tileMainLayer)) != IFILE_OK)
+    {
+        return false;
+    }
+    if (sfile.write(m_tileLayer, sizeof(m_tileLayer)) != IFILE_OK)
+    {
+        return false;
+    }
+    return false;
+}

data/pixels/cs3layers.png

@@ -17,11 +17,16 @@
 */
 #pragma once
 
+#include "tilesdata.h"
 #include <cstdint>
 #include <unordered_map>
 #include <vector>
 #include <array>
 
+extern const uint8_t g_specialCases[];
+
+class IFile;
+
 struct animzInfo_t
 {
     uint8_t frames;
@@ -46,9 +51,18 @@ class CAnimator
     }
 
     uint16_t offset() const;
-    bool isSpecialCase(uint8_t tileID) const;
+    constexpr bool isSpecialCase(uint8_t tileID) const
+    {
+        for (const auto &val : m_specialCases)
+            if (val == tileID)
+                return true;
+        return false;
+    }
     animzInfo_t getSpecialInfo(const int tileID) const;
 
+    bool read(IFile &sfile);
+    bool write(IFile &sfile) const;
+
     struct animzSeq_t
     {
         uint16_t srcTile;  ///< Source tile ID.
@@ -58,6 +72,14 @@ class CAnimator
     };
 
 private:
+    static inline constexpr const uint8_t m_specialCases[] = {
+        TILES_INSECT1,
+        TILES_MUSH_IDLE,
+        TILES_DRAGO,
+        TILES_ETURTLE,
+        TILES_WHTEWORM,
+    };
+
     enum : uint32_t
     {
         NO_ANIMZ = 255,

data/pixels/tiles.obl

@@ -189,6 +189,18 @@ enum Animz
     ANIMZ_EXPLOSION0_5        = 0xa3,
     ANIMZ_EXPLOSION0_6        = 0xa4,
     ANIMZ_EXPLOSION0_7        = 0xa5,
+    ANIMZ_SKELETON            = 0xa6,
+    ANIMZ_SKELETON_2          = 0xa7,
+    ANIMZ_SKELETON_3          = 0xa8,
+    ANIMZ_SKELETONDN          = 0xa9,
+    ANIMZ_SKELETONDN_2        = 0xaa,
+    ANIMZ_SKELETONDN_3        = 0xab,
+    ANIMZ_SKELETONLF          = 0xac,
+    ANIMZ_SKELETONLF_2        = 0xad,
+    ANIMZ_SKELETONLF_3        = 0xae,
+    ANIMZ_SKELETONRG          = 0xaf,
+    ANIMZ_SKELETONRG_2        = 0xb0,
+    ANIMZ_SKELETONRG_3        = 0xb1,
     ANIMZ_SWAMP_LEN           = 0x02,
     ANIMZ_DIAMOND_LEN         = 0x06,
     ANIMZ_FLAME_LEN           = 0x03,
@@ -226,5 +238,9 @@ enum Animz
     ANIMZ_EXPLOSION7_LEN      = 0x04,
     ANIMZ_EXPLOSION5_LEN      = 0x07,
     ANIMZ_EXPLOSION0_LEN      = 0x07,
-    ANIMZ_TOTAL_COUNT         = 0xa6,
+    ANIMZ_SKELETON_LEN        = 0x03,
+    ANIMZ_SKELETONDN_LEN      = 0x03,
+    ANIMZ_SKELETONLF_LEN      = 0x03,
+    ANIMZ_SKELETONRG_LEN      = 0x03,
+    ANIMZ_TOTAL_COUNT         = 0xb2,
 };