Просмотр исходного кода

Replace absolute includes with relative

Ivan Barsukov 1 год назад
Родитель
Сommit
9375ef2c1e
32 измененных файлов с 54 добавлено и 54 удалено
  1. 1 1
      src/gui_bridge/input_converter.c
  2. 1 1
      src/gui_bridge/input_converter.h
  3. 1 1
      src/gui_bridge/view_module_entity.c
  4. 1 1
      src/gui_bridge/view_module_entity.h
  5. 1 1
      src/levels/level_about/about_entity.c
  6. 1 1
      src/levels/level_about/about_entity.h
  7. 1 1
      src/levels/level_about/level_about.c
  8. 1 1
      src/levels/level_about/level_about.h
  9. 4 4
      src/levels/level_game/context_menu.c
  10. 1 1
      src/levels/level_game/context_menu.h
  11. 3 3
      src/levels/level_game/enemy_entity.c
  12. 1 1
      src/levels/level_game/enemy_entity.h
  13. 1 1
      src/levels/level_game/level_game.c
  14. 1 1
      src/levels/level_game/level_game.h
  15. 2 2
      src/levels/level_game/player_entity.c
  16. 4 4
      src/levels/level_game/target_entity.c
  17. 1 1
      src/levels/level_game/target_entity.h
  18. 1 1
      src/levels/level_game_over/game_over_entity.h
  19. 2 2
      src/levels/level_game_over/level_game_over.c
  20. 1 1
      src/levels/level_game_over/level_game_over.h
  21. 2 2
      src/levels/level_menu/blinking_sprite.c
  22. 1 1
      src/levels/level_menu/blinking_sprite.h
  23. 2 2
      src/levels/level_menu/delayed_sprite.c
  24. 1 1
      src/levels/level_menu/delayed_sprite.h
  25. 2 2
      src/levels/level_menu/level_menu.c
  26. 1 1
      src/levels/level_menu/level_menu.h
  27. 4 4
      src/levels/level_menu/menu_entity.c
  28. 1 1
      src/levels/level_menu/menu_entity.h
  29. 3 3
      src/levels/level_menu/moving_sprite.c
  30. 2 2
      src/levels/level_menu/moving_sprite.h
  31. 4 4
      src/levels/level_settings/level_settings.c
  32. 1 1
      src/levels/level_settings/level_settings.h

+ 1 - 1
src/gui_bridge/input_converter.c

@@ -19,7 +19,7 @@
 
 #include <furi/core/message_queue.h>
 
-#include "src/game.h"
+#include "../game.h"
 
 // #define FRAME_IN_MS (1000 / 30)
 // #define CHECK_PERIOD_IN_MS 150

+ 1 - 1
src/gui_bridge/input_converter.h

@@ -21,7 +21,7 @@
 
 #include <input/input.h>
 
-#include "src/engine/game_engine.h"
+#include "../engine/game_engine.h"
 
 typedef struct InputConverter InputConverter;
 

+ 1 - 1
src/gui_bridge/view_module_entity.c

@@ -17,7 +17,7 @@
 
 #include "view_module_entity.h"
 
-#include "src/engine/game_manager.h"
+#include "../engine/game_manager.h"
 
 #include "input_converter.h"
 #include "view_i.h" // IWYU pragma: keep

+ 1 - 1
src/gui_bridge/view_module_entity.h

@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "src/engine/entity.h"
+#include "../engine/entity.h"
 
 #include "view_module_descriptions.h"
 

+ 1 - 1
src/levels/level_about/about_entity.c

@@ -21,7 +21,7 @@
 
 #include <furi.h>
 
-#include "src/game.h"
+#include "../../game.h"
 
 static void
 about_update(Entity* self, GameManager* manager, void* _entity_context)

+ 1 - 1
src/levels/level_about/about_entity.h

@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "src/engine/entity.h"
+#include "../../engine/entity.h"
 
 typedef struct Sprite Sprite;
 

+ 1 - 1
src/levels/level_about/level_about.c

@@ -19,7 +19,7 @@
 
 #include <stddef.h>
 
-#include "src/game.h"
+#include "../../game.h"
 
 #include "about_entity.h"
 

+ 1 - 1
src/levels/level_about/level_about.h

@@ -17,6 +17,6 @@
 
 #pragma once
 
-#include "src/engine/level.h"
+#include "../../engine/level.h"
 
 extern const LevelBehaviour level_about;

+ 4 - 4
src/levels/level_game/context_menu.c

@@ -25,10 +25,10 @@
 #include <gui/elements.h>
 #include <gui/modules/variable_item_list.h>
 
-#include "src/engine/game_manager.h"
-#include "src/game.h"
-#include "src/gui_bridge/input_converter.h"
-#include "src/levels/level_game/level_game.h"
+#include "../../engine/game_manager.h"
+#include "../../game.h"
+#include "../../gui_bridge/input_converter.h"
+#include "../../levels/level_game/level_game.h"
 
 #define ITEM_TEXT_PADDING_X 6
 #define ITEM_TEXT_PADDING_Y 4

+ 1 - 1
src/levels/level_game/context_menu.h

@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "src/engine/entity.h"
+#include "../../engine/entity.h"
 
 typedef void (*ContextMenuBackCallback)(void* context);
 typedef void (*ContextMenuItemCallback)(void* context, uint32_t index);

+ 3 - 3
src/levels/level_game/enemy_entity.c

@@ -17,9 +17,9 @@
 
 #include "enemy_entity.h"
 
-#include "src/engine/game_manager.h"
-#include "src/game.h"
-#include "src/game_notifications.h"
+#include "../../engine/game_manager.h"
+#include "../../game.h"
+#include "../../game_notifications.h"
 
 #include "level_game.h"
 #include "player_entity.h"

+ 1 - 1
src/levels/level_game/enemy_entity.h

@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "src/engine/entity.h"
+#include "../../engine/entity.h"
 
 #define ENEMY_SIZE 6.0f
 #define HALF_ENEMY_SIZE 3.0f

+ 1 - 1
src/levels/level_game/level_game.c

@@ -23,7 +23,7 @@
 
 #include <dolphin/dolphin.h>
 
-#include "src/game.h"
+#include "../../game.h"
 
 #include "context_menu.h"
 

+ 1 - 1
src/levels/level_game/level_game.h

@@ -19,7 +19,7 @@
 
 #include <m-list.h>
 
-#include "src/engine/level.h"
+#include "../../engine/level.h"
 
 LIST_DEF(EntityList, Entity*, M_POD_OPLIST);
 #define M_OPL_EntityList_t() LIST_OPLIST(EntityList)

+ 2 - 2
src/levels/level_game/player_entity.c

@@ -17,8 +17,8 @@
 
 #include "player_entity.h"
 
-#include "src/engine/game_manager.h"
-#include "src/game.h"
+#include "../../engine/game_manager.h"
+#include "../../game.h"
 
 #include "level_game.h"
 

+ 4 - 4
src/levels/level_game/target_entity.c

@@ -17,11 +17,11 @@
 
 #include "target_entity.h"
 
-#include "src/engine/game_manager.h"
-#include "src/engine/level.h"
+#include "../../engine/game_manager.h"
+#include "../../engine/level.h"
 
-#include "src/game.h"
-#include "src/game_notifications.h"
+#include "../../game.h"
+#include "../../game_notifications.h"
 
 #include "enemy_entity.h"
 #include "level_game.h"

+ 1 - 1
src/levels/level_game/target_entity.h

@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "src/engine/entity.h"
+#include "../../engine/entity.h"
 
 typedef struct Sprite Sprite;
 

+ 1 - 1
src/levels/level_game_over/game_over_entity.h

@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "src/engine/entity.h"
+#include "../../engine/entity.h"
 
 typedef struct Sprite Sprite;
 

+ 2 - 2
src/levels/level_game_over/level_game_over.c

@@ -21,8 +21,8 @@
 
 #include <furi.h>
 
-#include "src/game.h"
-#include "src/game_settings.h"
+#include "../../game.h"
+#include "../../game_settings.h"
 
 #include "game_over_entity.h"
 

+ 1 - 1
src/levels/level_game_over/level_game_over.h

@@ -17,6 +17,6 @@
 
 #pragma once
 
-#include "src/engine/level.h"
+#include "../../engine/level.h"
 
 extern const LevelBehaviour level_game_over;

+ 2 - 2
src/levels/level_menu/blinking_sprite.c

@@ -17,9 +17,9 @@
 
 #include "blinking_sprite.h"
 
-#include "src/engine/game_manager.h"
+#include "../../engine/game_manager.h"
 
-#include "src/game.h"
+#include "../../game.h"
 
 Entity*
 blinking_sprite_add_to_level(Level* level,

+ 1 - 1
src/levels/level_menu/blinking_sprite.h

@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "src/engine/entity.h"
+#include "../../engine/entity.h"
 
 typedef struct Sprite Sprite;
 

+ 2 - 2
src/levels/level_menu/delayed_sprite.c

@@ -17,9 +17,9 @@
 
 #include "delayed_sprite.h"
 
-#include "src/engine/game_manager.h"
+#include "../../engine/game_manager.h"
 
-#include "src/game.h"
+#include "../../game.h"
 
 Entity*
 delayed_sprite_add_to_level(Level* level,

+ 1 - 1
src/levels/level_menu/delayed_sprite.h

@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "src/engine/entity.h"
+#include "../../engine/entity.h"
 
 typedef struct Sprite Sprite;
 

+ 2 - 2
src/levels/level_menu/level_menu.c

@@ -19,9 +19,9 @@
 
 #include <stddef.h>
 
-#include "src/engine/vector.h"
+#include "../../engine/vector.h"
 
-#include "src/game.h"
+#include "../../game.h"
 
 #include "blinking_sprite.h"
 #include "delayed_sprite.h"

+ 1 - 1
src/levels/level_menu/level_menu.h

@@ -17,6 +17,6 @@
 
 #pragma once
 
-#include "src/engine/level.h"
+#include "../../engine/level.h"
 
 extern const LevelBehaviour level_menu;

+ 4 - 4
src/levels/level_menu/menu_entity.c

@@ -17,11 +17,11 @@
 
 #include "menu_entity.h"
 
-#include "src/engine/entity.h"
-#include "src/engine/game_manager.h"
-#include "src/engine/level.h"
+#include "../../engine/entity.h"
+#include "../../engine/game_manager.h"
+#include "../../engine/level.h"
 
-#include "src/game.h"
+#include "../../game.h"
 
 static void
 menu_update(Entity* self, GameManager* manager, void* _entity_context)

+ 1 - 1
src/levels/level_menu/menu_entity.h

@@ -17,6 +17,6 @@
 
 #pragma once
 
-#include "src/engine/entity.h"
+#include "../../engine/entity.h"
 
 extern const EntityDescription menu_description;

+ 3 - 3
src/levels/level_menu/moving_sprite.c

@@ -17,10 +17,10 @@
 
 #include "moving_sprite.h"
 
-#include "src/engine/entity.h"
-#include "src/engine/game_manager.h"
+#include "../../engine/entity.h"
+#include "../../engine/game_manager.h"
 
-#include "src/game.h"
+#include "../../game.h"
 
 Entity*
 moving_sprite_add_to_level(Level* level,

+ 2 - 2
src/levels/level_menu/moving_sprite.h

@@ -17,8 +17,8 @@
 
 #pragma once
 
-#include "src/engine/entity.h"
-#include "src/engine/vector.h"
+#include "../../engine/entity.h"
+#include "../../engine/vector.h"
 
 typedef struct Sprite Sprite;
 

+ 4 - 4
src/levels/level_settings/level_settings.c

@@ -21,11 +21,11 @@
 
 #include <gui/modules/variable_item_list.h>
 
-#include "src/game.h"
-#include "src/game_settings.h"
+#include "../../game.h"
+#include "../../game_settings.h"
 
-#include "src/gui_bridge/view_module_descriptions.h"
-#include "src/gui_bridge/view_module_entity.h"
+#include "../../gui_bridge/view_module_descriptions.h"
+#include "../../gui_bridge/view_module_entity.h"
 
 const char* const difficulty_text[DifficultyCount] = {
     "Easy",

+ 1 - 1
src/levels/level_settings/level_settings.h

@@ -17,6 +17,6 @@
 
 #pragma once
 
-#include "src/engine/level.h"
+#include "../../engine/level.h"
 
 extern const LevelBehaviour level_settings;