rearrange #includes

src/3dsystem/3d_gen.c

@@ -1,8 +1,13 @@
 #include "3dsystem/3d_gen.h"
+
 #include "3dsystem/phd_math.h"
 #include "specific/output.h"
+#include "game/const.h"
 #include "game/vars.h"
+
 #include "config.h"
+#include "util.h"
+
 #include <math.h>
 
 #define TRIGMULT2(A, B) (((A) * (B)) >> W2V_SHIFT)

src/3dsystem/phd_math.c

@@ -1,5 +1,7 @@
 #include "3dsystem/phd_math.h"
+
 #include "game/const.h"
+
 #include "util.h"
 
 static int16_t SinTable[0x402] = {

src/config.c

@@ -1,8 +1,11 @@
 #include "config.h"
+
 #include "game/const.h"
 #include "json_utils.h"
 #include "util.h"
+
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 #define Q(x) #x

src/game/ai/abortion.c

@@ -1,5 +1,6 @@
-#include "3dsystem/phd_math.h"
 #include "game/ai/abortion.h"
+
+#include "3dsystem/phd_math.h"
 #include "game/box.h"
 #include "game/collide.h"
 #include "game/control.h"

src/game/ai/abortion.h

@@ -2,6 +2,7 @@
 #define T1M_GAME_AI_ABORTION_H
 
 #include "game/types.h"
+
 #include <stdint.h>
 
 #define ABORTION_DIE_ANIM 13

src/game/ai/alligator.c

@@ -1,5 +1,6 @@
-#include "game/ai/alligator.h"
 #include "game/ai/crocodile.h"
+
+#include "game/ai/alligator.h"
 #include "game/box.h"
 #include "game/collide.h"
 #include "game/control.h"

src/game/ai/alligator.h

@@ -2,6 +2,7 @@
 #define T1M_GAME_AI_ALLIGATOR_H
 
 #include "game/types.h"
+
 #include <stdint.h>
 
 #define ALLIGATOR_BITE_DAMAGE 100

src/game/ai/ape.c

@@ -1,4 +1,5 @@
 #include "game/ai/ape.h"
+
 #include "game/box.h"
 #include "game/collide.h"
 #include "game/effects/blood.h"

src/game/ai/ape.h

@@ -2,6 +2,7 @@
 #define T1M_GAME_AI_APE_H
 
 #include "game/types.h"
+
 #include <stdint.h>
 
 #define APE_ATTACK_DAMAGE 200

src/game/ai/baldy.c

@@ -1,4 +1,5 @@
 #include "game/ai/baldy.h"
+
 #include "game/box.h"
 #include "game/collide.h"
 #include "game/items.h"

src/game/ai/baldy.h

@@ -2,6 +2,7 @@
 #define T1M_GAME_AI_BALDY_H
 
 #include "game/types.h"
+
 #include <stdint.h>
 
 #define BALDY_SHOT_DAMAGE 150

src/game/ai/bat.c

@@ -1,4 +1,5 @@
 #include "game/ai/bat.h"
+
 #include "game/box.h"
 #include "game/collide.h"
 #include "game/effects/blood.h"

src/game/ai/bat.h

@@ -2,6 +2,7 @@
 #define T1M_GAME_AI_BAT_H
 
 #include "game/types.h"
+
 #include <stdint.h>
 
 #define BAT_ATTACK_DAMAGE 2

src/game/ai/bear.c

@@ -1,4 +1,5 @@
 #include "game/ai/bear.h"
+
 #include "game/box.h"
 #include "game/collide.h"
 #include "game/effects/blood.h"

src/game/ai/bear.h

@@ -2,6 +2,7 @@
 #define T1M_GAME_AI_BEAR_H
 
 #include "game/types.h"
+
 #include <stdint.h>
 
 #define BEAR_CHARGE_DAMAGE 3

src/game/ai/centaur.c

@@ -1,4 +1,5 @@
 #include "game/ai/centaur.h"
+
 #include "game/box.h"
 #include "game/collide.h"
 #include "game/effects/blood.h"

src/game/ai/centaur.h

@@ -2,6 +2,7 @@
 #define T1M_GAME_AI_CENTAUR_H
 
 #include "game/types.h"
+
 #include <stdint.h>
 
 #define CENTAUR_PART_DAMAGE 100

src/game/ai/cowboy.c

@@ -1,4 +1,5 @@
 #include "game/ai/cowboy.h"
+
 #include "game/box.h"
 #include "game/collide.h"
 #include "game/items.h"

src/game/ai/cowboy.h

@@ -2,6 +2,7 @@
 #define T1M_GAME_AI_COWBOY_H
 
 #include "game/types.h"
+
 #include <stdint.h>
 
 #define COWBOY_SHOT_DAMAGE 70

src/game/ai/crocodile.c

@@ -1,4 +1,5 @@
 #include "game/ai/crocodile.h"
+
 #include "game/box.h"
 #include "game/collide.h"
 #include "game/control.h"

src/game/ai/crocodile.h

@@ -2,6 +2,7 @@
 #define T1M_GAME_AI_CROCODILE_H
 
 #include "game/types.h"
+
 #include <stdint.h>
 
 #define CROCODILE_BITE_DAMAGE 100

src/game/ai/dino.c

@@ -1,4 +1,5 @@
 #include "game/ai/dino.h"
+
 #include "game/box.h"
 #include "game/collide.h"
 #include "game/draw.h"

src/game/ai/dino.h

@@ -2,6 +2,7 @@
 #define T1M_GAME_AI_DINO_H
 
 #include "game/types.h"
+
 #include <stdint.h>
 
 #define DINO_ATTACK_RANGE SQUARE(WALL_L * 4) // = 16777216

src/game/ai/evil_lara.c

@@ -1,4 +1,5 @@
 #include "game/ai/evil_lara.h"
+
 #include "game/collide.h"
 #include "game/control.h"
 #include "game/draw.h"

src/game/ai/evil_lara.h

@@ -2,6 +2,7 @@
 #define T1M_GAME_AI_EVIL_LARA_H
 
 #include "game/types.h"
+
 #include <stdint.h>
 
 void SetupEvilLara(OBJECT_INFO *obj);

src/game/ai/larson.c

@@ -1,4 +1,5 @@
 #include "game/ai/larson.h"
+
 #include "game/box.h"
 #include "game/collide.h"
 #include "game/game.h"

src/game/ai/larson.h

@@ -2,6 +2,7 @@
 #define T1M_GAME_AI_LARSON_H
 
 #include "game/types.h"
+
 #include <stdint.h>
 
 #define LARSON_POSE_CHANCE 0x60 // = 96

src/game/ai/lion.c

@@ -1,10 +1,11 @@
+#include "game/ai/lion.h"
+
 #include "game/box.h"
 #include "game/collide.h"
 #include "game/effects/blood.h"
 #include "game/game.h"
 #include "game/lot.h"
 #include "game/vars.h"
-#include "game/ai/lion.h"
 
 BITE_INFO LionBite = { -2, -10, 132, 21 };
 

src/game/ai/lion.h

@@ -2,6 +2,7 @@
 #define T1M_GAME_AI_LION_H
 
 #include "game/types.h"
+
 #include <stdint.h>
 
 #define LION_BITE_DAMAGE 250

src/game/ai/mummy.c

@@ -1,5 +1,6 @@
-#include "3dsystem/phd_math.h"
 #include "game/ai/mummy.h"
+
+#include "3dsystem/phd_math.h"
 #include "game/box.h"
 #include "game/collide.h"
 #include "game/control.h"

src/game/ai/mummy.h

@@ -2,6 +2,7 @@
 #define T1M_GAME_AI_MUMMY_H
 
 #include "game/types.h"
+
 #include <stdint.h>
 
 #define MUMMY_HITPOINTS 18

src/game/ai/mutant.c

@@ -1,4 +1,5 @@
 #include "game/ai/mutant.h"
+
 #include "game/box.h"
 #include "game/collide.h"
 #include "game/effects/blood.h"

src/game/ai/mutant.h

@@ -1,9 +1,10 @@
 #ifndef T1M_GAME_AI_MUTANT_H
 #define T1M_GAME_AI_MUTANT_H
 
-#include <stdint.h>
 #include "game/types.h"
 
+#include <stdint.h>
+
 #define FLYER_CHARGE_DAMAGE 100
 #define FLYER_LUNGE_DAMAGE 150
 #define FLYER_PUNCH_DAMAGE 200

src/game/ai/natla.c

@@ -1,5 +1,6 @@
-#include "3dsystem/phd_math.h"
 #include "game/ai/natla.h"
+
+#include "3dsystem/phd_math.h"
 #include "game/box.h"
 #include "game/collide.h"
 #include "game/control.h"

src/game/ai/natla.h

@@ -2,6 +2,7 @@
 #define T1M_GAME_AI_NATLA_H
 
 #include "game/types.h"
+
 #include <stdint.h>
 
 #define NATLA_SHOT_DAMAGE 100

src/game/ai/pierre.c

@@ -1,4 +1,5 @@
 #include "game/ai/pierre.h"
+
 #include "game/box.h"
 #include "game/collide.h"
 #include "game/control.h"

src/game/ai/pierre.h

@@ -2,6 +2,7 @@
 #define T1M_GAME_AI_PIERRE_H
 
 #include "game/types.h"
+
 #include <stdint.h>
 
 #define PIERRE_POSE_CHANCE 0x60 // = 96

src/game/ai/pod.c

@@ -1,4 +1,5 @@
 #include "game/ai/pod.h"
+
 #include "game/collide.h"
 #include "game/control.h"
 #include "game/effects/body_part.h"

src/game/ai/pod.h

@@ -2,6 +2,7 @@
 #define T1M_GAME_AI_POD_H
 
 #include "game/types.h"
+
 #include <stdint.h>
 
 #define POD_EXPLODE_DIST (WALL_L * 4) // = 4096

src/game/ai/raptor.c

@@ -1,4 +1,5 @@
 #include "game/ai/raptor.h"
+
 #include "game/box.h"
 #include "game/collide.h"
 #include "game/effects/blood.h"

src/game/ai/raptor.h

@@ -2,6 +2,7 @@
 #define T1M_GAME_AI_RAPTOR_H
 
 #include "game/types.h"
+
 #include <stdint.h>
 
 #define RAPTOR_ATTACK_RANGE SQUARE(WALL_L * 3 / 2) // = 2359296

src/game/ai/rat.c

@@ -1,4 +1,5 @@
 #include "game/ai/rat.h"
+
 #include "game/box.h"
 #include "game/collide.h"
 #include "game/control.h"

src/game/ai/rat.h

@@ -2,6 +2,7 @@
 #define T1M_GAME_AI_RAT_H
 
 #include "game/types.h"
+
 #include <stdint.h>
 
 #define RAT_BITE_DAMAGE 20

src/game/ai/skate_kid.c

@@ -1,4 +1,5 @@
 #include "game/ai/skate_kid.h"
+
 #include "game/box.h"
 #include "game/collide.h"
 #include "game/draw.h"

src/game/ai/skate_kid.h

@@ -2,6 +2,7 @@
 #define T1M_GAME_AI_SKATE_KID_H
 
 #include "game/types.h"
+
 #include <stdint.h>
 
 #define SKATE_KID_STOP_SHOT_DAMAGE 50

src/game/ai/statue.c

@@ -1,4 +1,5 @@
 #include "game/ai/statue.h"
+
 #include "game/collide.h"
 #include "game/effects/body_part.h"
 #include "game/items.h"

src/game/ai/statue.h

@@ -2,6 +2,7 @@
 #define T1M_GAME_AI_STATUE_H
 
 #include "game/types.h"
+
 #include <stdint.h>
 
 #define STATUE_EXPLODE_DIST (WALL_L * 7 / 2) // = 3584

src/game/ai/vole.c

@@ -1,8 +1,9 @@
 #include "game/ai/vole.h"
+
 #include "game/ai/rat.h"
 #include "game/box.h"
-#include "game/control.h"
 #include "game/collide.h"
+#include "game/control.h"
 #include "game/effects/blood.h"
 #include "game/lot.h"
 #include "game/vars.h"

src/game/ai/vole.h

@@ -2,6 +2,7 @@
 #define T1M_GAME_AI_VOLE_H
 
 #include "game/types.h"
+
 #include <stdint.h>
 
 #define VOLE_DIE_ANIM 2

src/game/ai/wolf.c

@@ -1,10 +1,11 @@
+#include "game/ai/wolf.h"
+
 #include "game/box.h"
 #include "game/collide.h"
 #include "game/effects/blood.h"
 #include "game/game.h"
 #include "game/lot.h"
 #include "game/vars.h"
-#include "game/ai/wolf.h"
 
 BITE_INFO WolfJawBite = { 0, -14, 174, 6 };
 

src/game/ai/wolf.h

@@ -2,6 +2,7 @@
 #define T1M_GAME_AI_WOLF_H
 
 #include "game/types.h"
+
 #include <stdint.h>
 
 #define WOLF_SLEEP_FRAME 96

src/game/box.c

@@ -1,6 +1,8 @@
-#include "3dsystem/phd_math.h"
 #include "game/box.h"
+
+#include "3dsystem/phd_math.h"
 #include "game/control.h"
+#include "game/const.h"
 #include "game/draw.h"
 #include "game/game.h"
 #include "game/items.h"
@@ -9,6 +11,8 @@
 #include "game/vars.h"
 #include "util.h"
 
+#include <stddef.h>
+
 void InitialiseCreature(int16_t item_num)
 {
     ITEM_INFO *item = &Items[item_num];

src/game/box.h

@@ -2,6 +2,7 @@
 #define T1M_GAME_BOX_H
 
 #include "game/types.h"
+
 #include <stdint.h>
 
 void InitialiseCreature(int16_t item_num);

src/game/camera.c

@@ -1,6 +1,7 @@
+#include "game/camera.h"
+
 #include "3dsystem/3d_gen.h"
 #include "3dsystem/phd_math.h"
-#include "game/camera.h"
 #include "game/cinema.h"
 #include "game/const.h"
 #include "game/control.h"
@@ -8,9 +9,11 @@
 #include "game/game.h"
 #include "game/sound.h"
 #include "game/vars.h"
-#include "specific/sndpc.h"
+
 #include "util.h"
 
+#include <stddef.h>
+
 void InitialiseCamera()
 {
     Camera.shift = LaraItem->pos.y - WALL_L;

src/game/camera.h

@@ -2,6 +2,7 @@
 #define T1M_GAME_CAMERA_H
 
 #include "game/types.h"
+
 #include <stdint.h>
 
 void InitialiseCamera();

src/game/cinema.c

@@ -1,16 +1,18 @@
+#include "game/cinema.h"
+
 #include "3dsystem/3d_gen.h"
 #include "3dsystem/phd_math.h"
-#include "game/cinema.h"
+#include "game/const.h"
 #include "game/control.h"
 #include "game/draw.h"
-#include "game/gameflow.h"
 #include "game/items.h"
 #include "game/setup.h"
+#include "game/types.h"
 #include "game/vars.h"
 #include "specific/display.h"
 #include "specific/input.h"
 #include "specific/sndpc.h"
-#include "config.h"
+
 #include "util.h"
 
 static int32_t OldSoundIsActive;

src/game/collide.c

@@ -1,12 +1,14 @@
+#include "game/collide.h"
+
 #include "3dsystem/3d_gen.h"
 #include "3dsystem/phd_math.h"
-#include "game/collide.h"
 #include "game/const.h"
 #include "game/control.h"
 #include "game/draw.h"
 #include "game/items.h"
 #include "game/sound.h"
 #include "game/sphere.h"
+#include "game/types.h"
 #include "game/vars.h"
 #include "util.h"
 

src/game/collide.h

@@ -2,6 +2,7 @@
 #define T1M_GAME_COLLIDE_H
 
 #include "types.h"
+
 #include <stdint.h>
 
 void GetCollisionInfo(

src/game/control.c

@@ -1,9 +1,10 @@
+#include "game/control.h"
+
 #include "3dsystem/phd_math.h"
 #include "game/camera.h"
-#include "game/control.h"
+#include "game/const.h"
 #include "game/demo.h"
 #include "game/game.h"
-#include "game/gameflow.h"
 #include "game/hair.h"
 #include "game/inv.h"
 #include "game/items.h"
@@ -20,9 +21,12 @@
 #include "specific/input.h"
 #include "specific/shed.h"
 #include "specific/sndpc.h"
+
 #include "config.h"
 #include "util.h"
 
+#include <stddef.h>
+
 int32_t ControlPhase(int32_t nframes, int32_t demo_mode)
 {
     int32_t return_val = 0;

src/game/control.h

@@ -2,6 +2,7 @@
 #define T1M_GAME_CONTROL_H
 
 #include "game/types.h"
+
 #include <stdint.h>
 
 int32_t ControlPhase(int32_t nframes, int32_t demo_mode);

src/game/demo.c

@@ -1,13 +1,15 @@
-#include "game/control.h"
 #include "game/demo.h"
+
+#include "game/const.h"
+#include "game/control.h"
 #include "game/game.h"
-#include "game/gameflow.h"
 #include "game/items.h"
 #include "game/setup.h"
-#include "game/setup.h"
 #include "game/text.h"
+#include "game/types.h"
 #include "game/vars.h"
 #include "specific/frontend.h"
+
 #include "util.h"
 
 int32_t StartDemo()

src/game/draw.c

@@ -1,14 +1,15 @@
+#include "game/draw.h"
+
 #include "3dsystem/3d_gen.h"
 #include "3dsystem/3d_insert.h"
 #include "3dsystem/scalespr.h"
 #include "game/const.h"
-#include "game/draw.h"
 #include "game/game.h"
 #include "game/hair.h"
 #include "game/health.h"
 #include "game/vars.h"
 #include "specific/output.h"
-#include "config.h"
+
 #include "util.h"
 
 int32_t DrawPhaseCinematic()

src/game/draw.h

@@ -2,6 +2,7 @@
 #define T1M_GAME_DRAW_H
 
 #include "game/types.h"
+
 #include <stdint.h>
 
 int32_t DrawPhaseCinematic();

src/game/effects/blood.c

@@ -1,5 +1,6 @@
-#include "3dsystem/phd_math.h"
 #include "game/effects/blood.h"
+
+#include "3dsystem/phd_math.h"
 #include "game/items.h"
 #include "game/vars.h"
 

src/game/effects/blood.h

@@ -2,6 +2,7 @@
 #define T1M_GAME_EFFECTS_BLOOD_H
 
 #include "game/types.h"
+
 #include <stdint.h>
 
 void SetupBlood(OBJECT_INFO *obj);

src/game/effects/body_part.c

@@ -1,9 +1,10 @@
+#include "game/effects/body_part.h"
+
 #include "3dsystem/3d_gen.h"
 #include "3dsystem/phd_math.h"
 #include "game/collide.h"
 #include "game/control.h"
 #include "game/draw.h"
-#include "game/effects/body_part.h"
 #include "game/game.h"
 #include "game/items.h"
 #include "game/sound.h"

src/game/effects/body_part.h

@@ -2,6 +2,7 @@
 #define T1M_GAME_EFFECTS_BODY_PART_H
 
 #include "game/types.h"
+
 #include <stdint.h>
 
 void SetupBodyPart(OBJECT_INFO *obj);

src/game/effects/bubble.c

@@ -1,6 +1,7 @@
+#include "game/effects/bubble.h"
+
 #include "3dsystem/phd_math.h"
 #include "game/control.h"
-#include "game/effects/bubble.h"
 #include "game/game.h"
 #include "game/items.h"
 #include "game/sound.h"

src/game/effects/bubble.h

@@ -2,6 +2,7 @@
 #define T1M_GAME_EFFECTS_BUBBLE_H
 
 #include "game/types.h"
+
 #include <stdint.h>
 
 void SetupBubble(OBJECT_INFO *obj);

src/game/effects/chain_block.c

@@ -1,6 +1,8 @@
 #include "game/effects/chain_block.h"
+
 #include "game/sound.h"
 #include "game/vars.h"
+
 #include "config.h"
 
 // original name: ChainBlockFX

src/game/effects/dino_stomp.c

@@ -1,5 +1,7 @@
 #include "game/effects/dino_stomp.h"
+
 #include "game/vars.h"
+
 #include "util.h"
 
 #define MAX_BOUNCE 100

src/game/effects/earthquake.c

@@ -1,6 +1,7 @@
+#include "game/effects/earthquake.h"
+
 #include "game/control.h"
 #include "game/draw.h"
-#include "game/effects/earthquake.h"
 #include "game/game.h"
 #include "game/sound.h"
 #include "game/vars.h"

src/game/effects/earthquake.h

@@ -2,6 +2,7 @@
 #define T1M_GAME_OBJECTS_EARTH_QUAKE_H
 
 #include "game/types.h"
+
 #include <stdint.h>
 
 void SetupEarthquake(OBJECT_INFO *obj);

src/game/effects/explosion.c

@@ -1,4 +1,5 @@
 #include "game/effects/explosion.h"
+
 #include "game/items.h"
 #include "game/sound.h"
 #include "game/vars.h"

src/game/effects/explosion.h

@@ -2,6 +2,7 @@
 #define T1M_GAME_EFFECTS_EXPLOSION_H
 
 #include "game/types.h"
+
 #include <stdint.h>
 
 void SetupExplosion(OBJECT_INFO *obj);

src/game/effects/finish_level.c

@@ -1,4 +1,5 @@
 #include "game/effects/finish_level.h"
+
 #include "game/vars.h"
 
 // original name: finish_level_effect

src/game/effects/flicker.c

@@ -1,4 +1,5 @@
 #include "game/effects/flicker.h"
+
 #include "game/control.h"
 #include "game/sound.h"
 #include "game/vars.h"

src/game/effects/flipmap.c

@@ -1,4 +1,5 @@
 #include "game/effects/flipmap.h"
+
 #include "game/control.h"
 
 // original name: flip_map_effect

src/game/effects/flood.c

@@ -1,4 +1,5 @@
 #include "game/effects/flood.h"
+
 #include "game/sound.h"
 #include "game/vars.h"
 

src/game/effects/lara_effects.c

@@ -1,5 +1,6 @@
-#include "3dsystem/3d_gen.h"
 #include "game/effects/lara_effects.h"
+
+#include "3dsystem/3d_gen.h"
 #include "game/vars.h"
 #include "config.h"
 

src/game/effects/missile.c

@@ -1,9 +1,10 @@
+#include "game/effects/missile.h"
+
 #include "3dsystem/3d_gen.h"
 #include "3dsystem/phd_math.h"
 #include "game/collide.h"
 #include "game/control.h"
 #include "game/draw.h"
-#include "game/effects/missile.h"
 #include "game/game.h"
 #include "game/items.h"
 #include "game/sound.h"

src/game/effects/missile.h

@@ -2,6 +2,7 @@
 #define T1M_GAME_EFFECTS_MISSILE_H
 
 #include "game/types.h"
+
 #include <stdint.h>
 
 #define SHARD_DAMAGE 30

src/game/effects/powerup.c

@@ -1,4 +1,5 @@
 #include "game/effects/powerup.h"
+
 #include "game/sound.h"
 #include "game/vars.h"
 

src/game/effects/raising_block.c

@@ -1,4 +1,5 @@
 #include "game/effects/raising_block.h"
+
 #include "game/sound.h"
 #include "game/vars.h"
 

src/game/effects/ricochet.c

@@ -1,4 +1,5 @@
 #include "game/effects/ricochet.h"
+
 #include "game/game.h"
 #include "game/items.h"
 #include "game/sound.h"

src/game/effects/ricochet.h

@@ -2,6 +2,7 @@
 #define T1M_GAME_EFFECTS_RICOCHET_H
 
 #include "game/types.h"
+
 #include <stdint.h>
 
 void SetupRicochet(OBJECT_INFO *obj);

src/game/effects/sand.c

@@ -1,4 +1,5 @@
 #include "game/effects/sand.h"
+
 #include "game/sound.h"
 #include "game/vars.h"
 

src/game/effects/splash.c

@@ -1,6 +1,7 @@
+#include "game/effects/splash.h"
+
 #include "3dsystem/phd_math.h"
 #include "game/control.h"
-#include "game/effects/splash.h"
 #include "game/game.h"
 #include "game/items.h"
 #include "game/sound.h"

src/game/effects/splash.h

@@ -2,6 +2,7 @@
 #define T1M_GAME_EFFECTS_SPLASH_H
 
 #include "game/types.h"
+
 #include <stdint.h>
 
 void SetupSplash(OBJECT_INFO *obj);

src/game/effects/stairs2slope.c

@@ -1,4 +1,5 @@
 #include "game/effects/stairs2slope.h"
+
 #include "game/sound.h"
 #include "game/vars.h"
 

src/game/effects/twinkle.c

@@ -1,4 +1,5 @@
 #include "game/effects/twinkle.h"
+
 #include "game/game.h"
 #include "game/items.h"
 #include "game/sphere.h"

src/game/effects/twinkle.h

@@ -2,6 +2,7 @@
 #define T1M_GAME_EFFECTS_TWINKLE_H
 
 #include "game/types.h"
+
 #include <stdint.h>
 
 void SetupTwinkle(OBJECT_INFO *obj);

src/game/effects/waterfall.c

@@ -1,5 +1,6 @@
-#include "game/draw.h"
 #include "game/effects/waterfall.h"
+
+#include "game/draw.h"
 #include "game/game.h"
 #include "game/items.h"
 #include "game/vars.h"

src/game/effects/waterfall.h

@@ -2,6 +2,7 @@
 #define T1M_GAME_EFFECTS_WATERFALL_H
 
 #include "game/types.h"
+
 #include <stdint.h>
 
 #define WATERFALL_RANGE (WALL_L * 10) // = 10240

src/game/game.c

@@ -1,8 +1,9 @@
+#include "game/game.h"
+
 #include "game/camera.h"
+#include "game/const.h"
 #include "game/control.h"
 #include "game/draw.h"
-#include "game/game.h"
-#include "game/gameflow.h"
 #include "game/savegame.h"
 #include "game/setup.h"
 #include "game/text.h"
@@ -13,9 +14,12 @@
 #include "specific/output.h"
 #include "specific/shed.h"
 #include "specific/sndpc.h"
+
 #include "config.h"
 #include "util.h"
 
+#include <stdio.h>
+
 int32_t StartGame(int32_t level_num, GAMEFLOW_LEVEL_TYPE level_type)
 {
     // T1M: level_type argument is missing in OG

src/game/game.h

@@ -2,6 +2,7 @@
 #define T1M_GAME_GAME_H
 
 #include "game/types.h"
+
 #include <stdint.h>
 
 int32_t StartGame(int32_t level_num, GAMEFLOW_LEVEL_TYPE level_type);

src/game/gameflow.c

@@ -1,10 +1,10 @@
+#include "game/gameflow.h"
+
 #include "game/cinema.h"
+#include "game/const.h"
 #include "game/control.h"
 #include "game/game.h"
-#include "game/gameflow.h"
-#include "game/inv.h"
 #include "game/lara.h"
-#include "game/savegame.h"
 #include "game/vars.h"
 #include "specific/display.h"
 #include "specific/file.h"
@@ -14,9 +14,12 @@
 #include "specific/sndpc.h"
 
 #include "config.h"
+#include "json_parser/json.h"
 #include "json_utils.h"
+#include "util.h"
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 typedef struct {

src/game/gameflow.h

@@ -2,6 +2,7 @@
 #define T1M_GAME_GAMEFLOW_H
 
 #include "game/types.h"
+
 #include <stdint.h>
 
 // T1M: gameflow implementation.

src/game/hair.c

@@ -1,12 +1,13 @@
+#include "game/hair.h"
+
 #include "3dsystem/3d_gen.h"
 #include "3dsystem/phd_math.h"
 #include "game/const.h"
 #include "game/control.h"
 #include "game/draw.h"
-#include "game/game.h"
-#include "game/hair.h"
 #include "game/types.h"
 #include "game/vars.h"
+
 #include "config.h"
 #include "util.h"
 

src/game/health.c

@@ -1,11 +1,17 @@
-#include "3dsystem/scalespr.h"
 #include "game/health.h"
+
+#include "3dsystem/scalespr.h"
+#include "game/const.h"
 #include "game/text.h"
+#include "game/types.h"
 #include "game/vars.h"
 #include "specific/output.h"
+
 #include "config.h"
 #include "util.h"
 
+#include <stdio.h>
+
 #define MAX_PICKUP_COLUMNS 4
 #define MAX_PICKUPS 16