From 0adca22d9e86130dfbcbfe2fc021710a8d45a927 Mon Sep 17 00:00:00 2001 From: schererleander Date: Thu, 12 Mar 2026 02:01:02 +0100 Subject: refactor(map): return Map by value instead of heap allocation --- src/main.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src/main.c') diff --git a/src/main.c b/src/main.c index 5b45923..bc0a14d 100644 --- a/src/main.c +++ b/src/main.c @@ -14,11 +14,12 @@ int main(void) { SetTargetFPS(TARGET_FPS); Entities entities = {0}; - Map *map = LoadMap("assets/maps/debug.tmx", &entities); + Map map = LoadMap("assets/maps/debug.tmx", &entities); - Marker *spawn = FindMarker(map, "player_spawn"); + Marker *spawn = FindMarker(&map, "player_spawn"); Vector2 spawnPos = spawn ? spawn->position : (Vector2){0, 0}; + RaytmxExternalTileset playerTileset = LoadTSX("assets/tilesets/elf.tsx"); Player player = {.position = spawnPos, .speed = 80.0f, @@ -39,16 +40,16 @@ int main(void) { }; while (!WindowShouldClose()) { - UpdatePlayer(&player, map, &entities); + UpdatePlayer(&player, &map, &entities); UpdateFairy(&fairy, player.position); camera.target = player.position; BeginDrawing(); ClearBackground(BLACK); BeginMode2D(camera); - DrawMap(map); - DrawPickups(&entities, map); - DrawKeys(&entities, map); + DrawMap(&map); + DrawPickups(&entities, &map); + DrawKeys(&entities, &map); DrawPlayer(&player); DrawFairy(&fairy); EndMode2D(); @@ -56,6 +57,7 @@ int main(void) { } UnloadMap(map); + CloseWindow(); return 0; } -- cgit v1.3.1