diff --git a/src/dependency/minidef/src/CppGen.cpp b/src/dependency/minidef/src/CppGen.cpp index 6373813..f8ed495 100644 --- a/src/dependency/minidef/src/CppGen.cpp +++ b/src/dependency/minidef/src/CppGen.cpp @@ -230,6 +230,7 @@ namespace Gen { )END"; + // TODO: Sizeof is wrong!! we don't use padding!! constexpr char MetadataTypeEntry7[] = R"END( TypeDef{sizeof(%s), %u, "%s", %u, {%s}, {%s}, {%s}}, )END"; constexpr char MetadataEnd1[] = R"END( }; diff --git a/src/game/Level.cpp b/src/game/Level.cpp index 50586d2..3fd2a77 100644 --- a/src/game/Level.cpp +++ b/src/game/Level.cpp @@ -6,6 +6,7 @@ #include "Level.h" #include "Log.h" #include "Puzzle.h" +#include "bx/bx.h" #include "rendering/Rendering.h" #include "SDL3/SDL_mouse.h" @@ -437,7 +438,7 @@ namespace Game Vec3 cameraPos = camTransform.Position; // TODO: disable warning & check if parentheses make sense like this - Vec2 uiOffset = Vec2{static_cast(Data.WidthTiles / Puzzle::Config::CardSize - 1), + Vec2 uiOffset = Vec2{static_cast(Data.WidthTiles / Puzzle::Config::CardSize) - 1, static_cast(Data.HeightTiles / Puzzle::Config::CardSize) - 1}; uiOffset *= -UICardOffset * 0.5f; @@ -558,7 +559,7 @@ namespace Game { auto& cover = level.PuzzleTileCovers.Get(CoverHandles[cardIdx * Puzzle::Config::MaxCoversInTile + i]); - cover.EData.Visible = true; + cover.EData.Visible = IsActive; cover.EData.ModelH = staticCard.Sockets[i].Model; cover.EData.Transform = tile.EData.Transform; Gen::TranslateLocal(cover.EData.Transform, model.Sockets[i].Pos); diff --git a/src/game/data/puzzles/0.pzl b/src/game/data/puzzles/0.pzl index c507e28..78cb6c9 100644 --- a/src/game/data/puzzles/0.pzl +++ b/src/game/data/puzzles/0.pzl @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:87b57c10d2d0024161336d00112e281236bece2bed26194e3dce33e89be7eaa7 +oid sha256:deda5ca16e6d732fb41bbdc7cec4dd2932389f3d66b8c9f69d93771a3972b22e size 10312 diff --git a/src/game/data/static/uiconfig.dat b/src/game/data/static/uiconfig.dat index b0ddfaf..b332890 100644 Binary files a/src/game/data/static/uiconfig.dat and b/src/game/data/static/uiconfig.dat differ