From 801b9051c9d26008f112d1dd5a6e85f209398472 Mon Sep 17 00:00:00 2001 From: doyle Date: Sun, 26 Nov 2023 16:28:35 +1100 Subject: [PATCH] fp: Address warnings on GCC --- External/tely | 2 +- feely_pona_game.cpp | 25 ------------------------- 2 files changed, 1 insertion(+), 26 deletions(-) diff --git a/External/tely b/External/tely index 2cc8b2d..aa60765 160000 --- a/External/tely +++ b/External/tely @@ -1 +1 @@ -Subproject commit 2cc8b2d7b2a255eccad747ea6a91187093eb64f7 +Subproject commit aa6076510f62f915bc9dbcbb1a954f5aefaf17df diff --git a/feely_pona_game.cpp b/feely_pona_game.cpp index bf9b0e3..997a3be 100644 --- a/feely_pona_game.cpp +++ b/feely_pona_game.cpp @@ -292,19 +292,6 @@ static FP_GameEntity *FP_Game_MakeEntityPointerF(FP_Game *game, DQN_FMT_ATTRIB c return result; } -static FP_GameEntityHandle FP_Game_MakeEntityF(FP_Game *game, DQN_FMT_ATTRIB char const *fmt, ...) -{ - va_list args; - va_start(args, fmt); - FP_GameEntity *entity = FP_Game_MakeEntityPointerF(game, fmt, args); - va_end(args); - - FP_GameEntityHandle result = {}; - if (entity) - result = entity->handle; - return result; -} - static bool FP_Game_IsNilEntity(FP_GameEntity *entity) { bool result = entity ? ((entity->handle.id & FP_GAME_ENTITY_HANDLE_INDEX_MASK) == 0) : true; @@ -537,18 +524,6 @@ static void FP_Game_EntityActionReset(FP_Game *game, FP_GameEntityHandle entity_ entity->action.end_at_clock_ms = DQN_MAX(duration_ms, game->play.clock_ms + duration_ms); } -static Dqn_V2I FP_Game_WorldPosToTilePos(FP_Game *game, Dqn_V2 world_pos) -{ - Dqn_V2I result = Dqn_V2I_InitNx2(world_pos.x / game->play.tile_size, world_pos.y / game->play.tile_size); - return result; -} - -static Dqn_V2 FP_Game_TilePosToWorldPos(FP_Game *game, Dqn_V2I tile_pos) -{ - Dqn_V2 result = Dqn_V2_InitNx2(tile_pos.x * game->play.tile_size, tile_pos.y * game->play.tile_size); - return result; -} - static Dqn_V2 FP_Game_CalcWaypointWorldPos(FP_Game *game, FP_GameEntityHandle entity_handle, FP_GameWaypoint const *waypoint) { Dqn_V2 result = {};