diff --git a/src/dependency/minidef/src/MiniDef.cpp b/src/dependency/minidef/src/MiniDef.cpp index 55e2001..94c6a98 100644 --- a/src/dependency/minidef/src/MiniDef.cpp +++ b/src/dependency/minidef/src/MiniDef.cpp @@ -72,7 +72,6 @@ void DefinitionFile::GenerateCpp(const bx::FilePath& outDir) bx::Error error; bx::FileWriter writer; bx::FilePath writePath = outDir; - std::filesystem::create_directory(outDir.getCPtr()); writePath.join("Generated.h"); writer.open(writePath, false, &error); diff --git a/src/engine/main.cpp b/src/engine/main.cpp index c41b8e6..a5a3d9f 100644 --- a/src/engine/main.cpp +++ b/src/engine/main.cpp @@ -1,9 +1,6 @@ #include #include -#include #include -#include -#include #define WIN32_LEAN_AND_MEAN #include #undef min diff --git a/src/game/Global.cpp b/src/game/Global.cpp index 40579ad..0bae8c0 100644 --- a/src/game/Global.cpp +++ b/src/game/Global.cpp @@ -5,7 +5,6 @@ #include "bx/math.h" #include #include -#include namespace { diff --git a/src/game/Log.cpp b/src/game/Log.cpp index be3fb4b..a77b8e9 100644 --- a/src/game/Log.cpp +++ b/src/game/Log.cpp @@ -2,8 +2,8 @@ #include "bx/handlealloc.h" #include "bx/hash.h" #include - -#include +#define WIN32_LEAN_AND_MEAN +#include "Windows.h" #define ESC "\x1B[" #define YELLOW ESC "33m" diff --git a/src/game/mini.def b/src/game/mini.def index f3b60b9..e96478c 100644 --- a/src/game/mini.def +++ b/src/game/mini.def @@ -1,8 +1,59 @@ +type PuzPos +{ + i8 X + i8 Y +} + +type ElemPos +{ + PuzPos Position + u8 ElemIdx +} + +enum PuzzleElementType Type(u8) +{ + None, + WaterIn, + WaterGoal, + WaterChannel, + ElectricIn, + ElectricGoal, + Blocked, + Bridge, +} + +type PuzzleNode +{ + PuzzleElementType PlacedTypes +} + +type StaticPuzzleCard +{ + PuzzleNode Nodes Arr(8) + u16 ModelHandle +} + +type StaticPuzzleCardHandle +{ + u16 Idx +} + +type PuzzleCardStack +{ + StaticPuzzleCardHandle RefCard + u8 MaxAvailableCount + u8 UsedCount +} + type PuzzleData { - u8 WidthTiles - u8 HeightTiles - u32 AvailableCardCount - u32 PlacedCardCount - u32 GoalPositionCount + u8 WidthTiles + u8 HeightTiles + u32 AvailableCardCount + PuzzleCardStack AvailableCards Arr(8) + u32 PlacedCardCount + PlacedPuzzleCard PlacedCards Arr(8) + PuzzleNode PlacedNodes Arr(8) + u32 GoalPositionCount + ElemPos GoalPositions }