diff --git a/ld/gamefiles.inc b/ld/gamefiles.inc index 2eed94541..7e43a2b6e 100644 --- a/ld/gamefiles.inc +++ b/ld/gamefiles.inc @@ -12,7 +12,7 @@ src/game/game_0008f0.o (section); \ src/game/game_000900.o (section); \ src/game/game_000910.o (section); \ - src/game/game_000920.o (section); \ + src/game/dlights.o (section); \ src/game/game_005fd0.o (section); \ src/game/game_006bd0.o (section); \ src/game/game_00b190.o (section); \ @@ -76,7 +76,7 @@ src/game/chr/chrai.o (section); \ src/game/chr/chraicommands.o (section); \ src/game/game_0601b0.o (section); \ - src/game/game_066310.o (section); \ + src/game/propobj.o (section); \ src/game/game_091e10.o (section); \ src/game/game_092610.o (section); \ src/game/game_095320.o (section); \ @@ -101,9 +101,9 @@ src/game/game_0c33f0.o (section); \ src/game/game_0c3620.o (section); \ src/game/bondwalk.o (section); \ - src/game/game_0c79f0.o (section); \ + src/game/bondmove.o (section); \ src/game/bondgrab.o (section); \ - src/game/game_0cf150.o (section); \ + src/game/bondeyespy.o (section); \ src/game/bondbike.o (section); \ src/game/game_0d4690.o (section); \ src/game/game_0d5a90.o (section); \ @@ -121,9 +121,9 @@ src/game/game_10ccd0.o (section); \ src/game/game_111600.o (section); \ src/game/game_113220.o (section); \ - src/game/game_114240.o (section); \ + src/game/padhalllv.o (section); \ src/game/pad.o (section); \ - src/game/game_1165d0.o (section); \ + src/game/pak/pak.o (section); \ src/game/game_11ecf0.o (section); \ src/game/game_11f000.o (section); \ src/game/game_127910.o (section); \ @@ -137,10 +137,10 @@ src/game/game_1371b0.o (section); \ src/game/game_13b670.o (section); \ src/game/game_13c510.o (section); \ - src/game/game_13e0e0.o (section); \ + src/game/wallhit.o (section); \ src/game/game_141820.o (section); \ - src/game/game_148b80.o (section); \ - src/game/game_149c90.o (section); \ + src/game/splat.o (section); \ + src/game/camdraw.o (section); \ src/game/game_150820.o (section); \ src/game/pdoptions.o (section); \ src/game/game_152fa0.o (section); \ @@ -161,11 +161,11 @@ src/game/game_175f90.o (section); \ src/game/game_176000.o (section); \ src/game/game_176080.o (section); \ - src/game/game_176d70.o (section); \ + src/game/utils.o (section); \ src/game/game_177e00.o (section); \ src/game/game_179060.o (section); \ src/game/game_17f930.o (section); \ - src/game/game_187770.o (section); \ + src/game/mplayer.o (section); \ src/game/game_18e5a0.o (section); \ src/game/game_190260.o (section); \ src/game/game_197600.o (section); \ diff --git a/src/game/bondbike.c b/src/game/bondbike.c index 2e7457e56..73cc5bdb0 100644 --- a/src/game/bondbike.c +++ b/src/game/bondbike.c @@ -9,7 +9,7 @@ #include "game/data/data_01a3a0.h" #include "game/data/data_020df0.h" #include "game/game_0601b0.h" -#include "game/game_066310.h" +#include "game/propobj.h" #include "game/game_091e10.h" #include "game/game_092610.h" #include "game/game_095320.h" @@ -17,7 +17,7 @@ #include "game/game_097ba0.h" #include "game/game_0b3350.h" #include "game/game_0b63b0.h" -#include "game/game_0c79f0.h" +#include "game/bondmove.h" #include "game/game_113220.h" #include "game/game_167ae0.h" #include "game/pdoptions.h" diff --git a/src/game/game_0cf150.c b/src/game/bondeyespy.c similarity index 99% rename from src/game/game_0cf150.c rename to src/game/bondeyespy.c index 4c9cca66c..9279db950 100644 --- a/src/game/game_0cf150.c +++ b/src/game/bondeyespy.c @@ -9,11 +9,11 @@ #include "game/data/data_020df0.h" #include "game/game_01e250.h" #include "game/game_0601b0.h" -#include "game/game_066310.h" +#include "game/propobj.h" #include "game/game_092610.h" #include "game/game_097ba0.h" #include "game/game_0b63b0.h" -#include "game/game_0cf150.h" +#include "game/bondeyespy.h" #include "game/game_0dcdb0.h" #include "game/game_111600.h" #include "game/game_127910.h" diff --git a/src/game/bondgrab.c b/src/game/bondgrab.c index f7a249425..52e34b8f5 100644 --- a/src/game/bondgrab.c +++ b/src/game/bondgrab.c @@ -10,11 +10,11 @@ #include "game/data/data_01a3a0.h" #include "game/data/data_020df0.h" #include "game/game_0601b0.h" -#include "game/game_066310.h" +#include "game/propobj.h" #include "game/game_095320.h" #include "game/game_097ba0.h" #include "game/game_0b63b0.h" -#include "game/game_0c79f0.h" +#include "game/bondmove.h" #include "game/game_113220.h" #include "game/game_11ecf0.h" #include "gvars/gvars.h" diff --git a/src/game/game_0c79f0.c b/src/game/bondmove.c similarity index 99% rename from src/game/game_0c79f0.c rename to src/game/bondmove.c index bf7b60d61..6b9ed2338 100644 --- a/src/game/game_0c79f0.c +++ b/src/game/bondmove.c @@ -14,7 +14,7 @@ #include "game/game_005fd0.h" #include "game/game_01e250.h" #include "game/game_0601b0.h" -#include "game/game_066310.h" +#include "game/propobj.h" #include "game/game_096750.h" #include "game/game_096ca0.h" #include "game/game_097ba0.h" @@ -22,14 +22,14 @@ #include "game/game_0b3350.h" #include "game/game_0b63b0.h" #include "game/game_0c3620.h" -#include "game/game_0c79f0.h" +#include "game/bondmove.h" #include "game/game_0fd660.h" #include "game/game_113220.h" #include "game/game_127910.h" #include "game/game_157db0.h" #include "game/game_167ae0.h" #include "game/game_177e00.h" -#include "game/game_187770.h" +#include "game/mplayer.h" #include "game/pdoptions.h" #include "gvars/gvars.h" #include "lib/lib_09660.h" diff --git a/src/game/bondwalk.c b/src/game/bondwalk.c index 4f4468fc7..ec5c39de2 100644 --- a/src/game/bondwalk.c +++ b/src/game/bondwalk.c @@ -12,12 +12,12 @@ #include "game/game_005fd0.h" #include "game/game_01e250.h" #include "game/game_0601b0.h" -#include "game/game_066310.h" +#include "game/propobj.h" #include "game/game_092610.h" #include "game/game_095320.h" #include "game/game_097ba0.h" #include "game/game_0b63b0.h" -#include "game/game_0c79f0.h" +#include "game/bondmove.h" #include "game/game_111600.h" #include "game/game_113220.h" #include "game/game_11ecf0.h" diff --git a/src/game/game_149c90.c b/src/game/camdraw.c similarity index 99% rename from src/game/game_149c90.c rename to src/game/camdraw.c index 6fe83e1b4..fce296bda 100644 --- a/src/game/game_149c90.c +++ b/src/game/camdraw.c @@ -9,11 +9,11 @@ #include "game/game_0b3350.h" #include "game/game_0f09f0.h" #include "game/game_102230.h" -#include "game/game_1165d0.h" -#include "game/game_148b80.h" -#include "game/game_149c90.h" +#include "game/pak/pak.h" +#include "game/splat.h" +#include "game/camdraw.h" #include "game/game_157db0.h" -#include "game/game_176d70.h" +#include "game/utils.h" #include "game/lang.h" #include "gvars/gvars.h" #include "lib/lib_04a80.h" diff --git a/src/game/cheats.c b/src/game/cheats.c index 39eafbea2..b10e9a01b 100644 --- a/src/game/cheats.c +++ b/src/game/cheats.c @@ -9,9 +9,9 @@ #include "game/data/data_020df0.h" #include "game/game_10ccd0.h" #include "game/game_111600.h" -#include "game/game_1165d0.h" +#include "game/pak/pak.h" #include "game/game_127910.h" -#include "game/game_149c90.h" +#include "game/camdraw.h" #include "game/game_19c990.h" #include "game/lang.h" #include "gvars/gvars.h" diff --git a/src/game/chr/chraction.c b/src/game/chr/chraction.c index c04dee774..27ab63550 100644 --- a/src/game/chr/chraction.c +++ b/src/game/chr/chraction.c @@ -8,13 +8,13 @@ #include "game/data/data_0160b0.h" #include "game/data/data_01a3a0.h" #include "game/data/data_020df0.h" -#include "game/game_000920.h" +#include "game/dlights.h" #include "game/game_005fd0.h" #include "game/game_01b0a0.h" #include "game/game_01e250.h" #include "game/game_02cde0.h" #include "game/game_0601b0.h" -#include "game/game_066310.h" +#include "game/propobj.h" #include "game/game_092610.h" #include "game/game_095320.h" #include "game/game_096750.h" @@ -26,18 +26,18 @@ #include "game/game_0b3350.h" #include "game/game_0b63b0.h" #include "game/game_111600.h" -#include "game/game_114240.h" -#include "game/game_1165d0.h" +#include "game/padhalllv.h" +#include "game/pak/pak.h" #include "game/game_11ecf0.h" #include "game/game_127910.h" #include "game/game_129900.h" #include "game/game_12f6c0.h" -#include "game/game_13e0e0.h" +#include "game/wallhit.h" #include "game/game_157db0.h" #include "game/game_1655c0.h" #include "game/game_165670.h" #include "game/game_167ae0.h" -#include "game/game_187770.h" +#include "game/mplayer.h" #include "game/game_190260.h" #include "game/game_197600.h" #include "game/game_1999b0.h" diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c index 2ee55cfe0..514d823fd 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -11,12 +11,12 @@ #include "game/data/data_0160b0.h" #include "game/data/data_01a3a0.h" #include "game/data/data_020df0.h" -#include "game/game_000920.h" +#include "game/dlights.h" #include "game/game_011110.h" #include "game/game_016100.h" #include "game/game_01e250.h" #include "game/game_0601b0.h" -#include "game/game_066310.h" +#include "game/propobj.h" #include "game/game_091e10.h" #include "game/game_092610.h" #include "game/game_095320.h" @@ -25,7 +25,7 @@ #include "game/game_0b0420.h" #include "game/game_0b28d0.h" #include "game/game_0b63b0.h" -#include "game/game_0c79f0.h" +#include "game/bondmove.h" #include "game/game_0dcdb0.h" #include "game/game_10ccd0.h" #include "game/game_111600.h" diff --git a/src/game/data/cheats.c b/src/game/data/cheats.c index 808f86245..0f3ca343b 100644 --- a/src/game/data/cheats.c +++ b/src/game/data/cheats.c @@ -5,7 +5,7 @@ #include "game/cheats.h" #include "game/game_107fb0.h" #include "game/game_10ccd0.h" -#include "game/game_176d70.h" +#include "game/utils.h" #include "game/game_1a3340.h" #include "gvars/gvars.h" #include "game/data/cheats.h" diff --git a/src/game/data/data_0160b0.c b/src/game/data/data_0160b0.c index e3f11615a..c3506decf 100644 --- a/src/game/data/data_0160b0.c +++ b/src/game/data/data_0160b0.c @@ -6,7 +6,7 @@ #include "game/cheats.h" #include "game/game_107fb0.h" #include "game/game_10ccd0.h" -#include "game/game_176d70.h" +#include "game/utils.h" #include "game/game_177e00.h" #include "game/game_1a3340.h" #include "gvars/gvars.h" diff --git a/src/game/data/data_01a3a0.c b/src/game/data/data_01a3a0.c index 1b25131c6..278dd6470 100644 --- a/src/game/data/data_01a3a0.c +++ b/src/game/data/data_01a3a0.c @@ -6,8 +6,8 @@ #include "game/game_107fb0.h" #include "game/game_10c9c0.h" #include "game/game_10ccd0.h" -#include "game/game_1165d0.h" -#include "game/game_176d70.h" +#include "game/pak/pak.h" +#include "game/utils.h" #include "game/game_177e00.h" #include "game/game_179060.h" #include "game/game_17f930.h" diff --git a/src/game/data/data_020df0.c b/src/game/data/data_020df0.c index 1f7ff17af..7a309afc8 100644 --- a/src/game/data/data_020df0.c +++ b/src/game/data/data_020df0.c @@ -5,10 +5,10 @@ #include "game/cheats.h" #include "game/game_107fb0.h" #include "game/game_10ccd0.h" -#include "game/game_149c90.h" +#include "game/camdraw.h" #include "game/game_16ce10.h" #include "game/game_173a00.h" -#include "game/game_176d70.h" +#include "game/utils.h" #include "game/game_177e00.h" #include "game/game_179060.h" #include "game/game_17f930.h" diff --git a/src/game/game_000920.c b/src/game/dlights.c similarity index 99% rename from src/game/game_000920.c rename to src/game/dlights.c index 47053d5cc..88f8f2a3a 100644 --- a/src/game/game_000920.c +++ b/src/game/dlights.c @@ -7,19 +7,19 @@ #include "game/data/data_0160b0.h" #include "game/data/data_01a3a0.h" #include "game/data/data_020df0.h" -#include "game/game_000920.h" -#include "game/game_066310.h" +#include "game/dlights.h" +#include "game/propobj.h" #include "game/game_092610.h" #include "game/game_0b3350.h" #include "game/game_0b63b0.h" #include "game/game_12d3f0.h" #include "game/game_12f6c0.h" -#include "game/game_13e0e0.h" +#include "game/wallhit.h" #include "game/game_157db0.h" #include "game/game_166e40.h" #include "game/game_167ae0.h" #include "game/game_176080.h" -#include "game/game_176d70.h" +#include "game/utils.h" #include "game/game_17f930.h" #include "gvars/gvars.h" #include "lib/lib_0e9d0.h" diff --git a/src/game/game_006bd0.c b/src/game/game_006bd0.c index 1ab9ba738..23206b7b8 100644 --- a/src/game/game_006bd0.c +++ b/src/game/game_006bd0.c @@ -7,7 +7,7 @@ #include "game/data/data_0160b0.h" #include "game/data/data_01a3a0.h" #include "game/data/data_020df0.h" -#include "game/game_000920.h" +#include "game/dlights.h" #include "game/game_005fd0.h" #include "game/game_006bd0.h" #include "game/game_01e250.h" diff --git a/src/game/game_00b210.c b/src/game/game_00b210.c index 342197342..f7a93bbb2 100644 --- a/src/game/game_00b210.c +++ b/src/game/game_00b210.c @@ -6,7 +6,7 @@ #include "game/data/data_0160b0.h" #include "game/data/data_01a3a0.h" #include "game/data/data_020df0.h" -#include "game/game_187770.h" +#include "game/mplayer.h" #include "game/game_19aa80.h" #include "gvars/gvars.h" #include "types.h" diff --git a/src/game/game_00c490.c b/src/game/game_00c490.c index 7fe100c58..1b6d7d520 100644 --- a/src/game/game_00c490.c +++ b/src/game/game_00c490.c @@ -20,7 +20,7 @@ #include "game/game_01e250.h" #include "game/game_02cde0.h" #include "game/game_0601b0.h" -#include "game/game_066310.h" +#include "game/propobj.h" #include "game/game_091e10.h" #include "game/game_096750.h" #include "game/game_111600.h" @@ -30,7 +30,7 @@ #include "game/game_166e40.h" #include "game/game_167ae0.h" #include "game/game_17f930.h" -#include "game/game_187770.h" +#include "game/mplayer.h" #include "game/game_19aa80.h" #include "game/lang.h" #include "game/pad.h" diff --git a/src/game/game_011110.c b/src/game/game_011110.c index 53abceb8c..2ee36cda7 100644 --- a/src/game/game_011110.c +++ b/src/game/game_011110.c @@ -15,11 +15,11 @@ #include "game/game_091e10.h" #include "game/game_097ba0.h" #include "game/game_0b63b0.h" -#include "game/game_0c79f0.h" +#include "game/bondmove.h" #include "game/game_111600.h" #include "game/game_1655c0.h" #include "game/game_17f930.h" -#include "game/game_187770.h" +#include "game/mplayer.h" #include "game/pad.h" #include "gvars/gvars.h" #include "lib/lib_121e0.h" diff --git a/src/game/game_0147d0.c b/src/game/game_0147d0.c index b91107bb6..2791f73f0 100644 --- a/src/game/game_0147d0.c +++ b/src/game/game_0147d0.c @@ -10,7 +10,7 @@ #include "game/game_01e250.h" #include "game/game_02cde0.h" #include "game/game_0601b0.h" -#include "game/game_187770.h" +#include "game/mplayer.h" #include "game/game_197600.h" #include "gvars/gvars.h" #include "lib/lib_121e0.h" diff --git a/src/game/game_014f10.c b/src/game/game_014f10.c index 295851182..1132c5a5a 100644 --- a/src/game/game_014f10.c +++ b/src/game/game_014f10.c @@ -9,7 +9,7 @@ #include "game/game_014f10.h" #include "game/game_01e250.h" #include "game/game_0601b0.h" -#include "game/game_066310.h" +#include "game/propobj.h" #include "gvars/gvars.h" #include "types.h" diff --git a/src/game/game_015010.c b/src/game/game_015010.c index cfab2d74b..8a75bc1fa 100644 --- a/src/game/game_015010.c +++ b/src/game/game_015010.c @@ -7,7 +7,7 @@ #include "game/data/data_01a3a0.h" #include "game/data/data_020df0.h" #include "game/game_015010.h" -#include "game/game_066310.h" +#include "game/propobj.h" #include "game/game_091e10.h" #include "gvars/gvars.h" #include "types.h" diff --git a/src/game/game_016100.c b/src/game/game_016100.c index db24dead1..c4a530127 100644 --- a/src/game/game_016100.c +++ b/src/game/game_016100.c @@ -8,7 +8,7 @@ #include "game/data/data_020df0.h" #include "game/game_016100.h" #include "game/game_01afc0.h" -#include "game/game_066310.h" +#include "game/propobj.h" #include "game/game_097ba0.h" #include "game/game_0b28d0.h" #include "game/game_0b3350.h" diff --git a/src/game/game_01bea0.c b/src/game/game_01bea0.c index eb907625a..f909364dc 100644 --- a/src/game/game_01bea0.c +++ b/src/game/game_01bea0.c @@ -21,7 +21,7 @@ #include "game/game_16cfa0.h" #include "game/game_177e00.h" #include "game/game_179060.h" -#include "game/game_187770.h" +#include "game/mplayer.h" #include "game/game_19aa80.h" #include "game/game_19c990.h" #include "gvars/gvars.h" diff --git a/src/game/game_01e250.c b/src/game/game_01e250.c index bd60d5f1a..f7b9587c7 100644 --- a/src/game/game_01e250.c +++ b/src/game/game_01e250.c @@ -10,7 +10,7 @@ #include "game/data/data_020df0.h" #include "game/game_01e250.h" #include "game/game_0601b0.h" -#include "game/game_066310.h" +#include "game/propobj.h" #include "game/game_092610.h" #include "game/game_095320.h" #include "game/game_096360.h" @@ -21,7 +21,7 @@ #include "game/game_0b3350.h" #include "game/game_0b63b0.h" #include "game/game_0c33f0.h" -#include "game/game_0c79f0.h" +#include "game/bondmove.h" #include "game/game_11ecf0.h" #include "game/game_127910.h" #include "game/game_128f30.h" @@ -29,13 +29,13 @@ #include "game/game_129900.h" #include "game/game_12d3f0.h" #include "game/game_12f6c0.h" -#include "game/game_13e0e0.h" -#include "game/game_148b80.h" +#include "game/wallhit.h" +#include "game/splat.h" #include "game/game_157db0.h" #include "game/game_165670.h" #include "game/game_166e40.h" #include "game/game_179060.h" -#include "game/game_187770.h" +#include "game/mplayer.h" #include "game/game_190260.h" #include "game/game_1999b0.h" #include "game/pad.h" diff --git a/src/game/game_02cde0.c b/src/game/game_02cde0.c index 6990067c1..8193b3aea 100644 --- a/src/game/game_02cde0.c +++ b/src/game/game_02cde0.c @@ -11,11 +11,11 @@ #include "game/game_01e250.h" #include "game/game_02cde0.h" #include "game/game_0601b0.h" -#include "game/game_066310.h" +#include "game/propobj.h" #include "game/game_096750.h" #include "game/game_0b28d0.h" #include "game/game_167ae0.h" -#include "game/game_187770.h" +#include "game/mplayer.h" #include "game/game_1a3340.h" #include "game/pad.h" #include "gvars/gvars.h" diff --git a/src/game/game_0601b0.c b/src/game/game_0601b0.c index 0047b5a1b..ed30cba09 100644 --- a/src/game/game_0601b0.c +++ b/src/game/game_0601b0.c @@ -8,10 +8,10 @@ #include "game/data/data_0160b0.h" #include "game/data/data_01a3a0.h" #include "game/data/data_020df0.h" -#include "game/game_000920.h" +#include "game/dlights.h" #include "game/game_01e250.h" #include "game/game_0601b0.h" -#include "game/game_066310.h" +#include "game/propobj.h" #include "game/game_092610.h" #include "game/game_095320.h" #include "game/game_097890.h" @@ -20,13 +20,13 @@ #include "game/game_0b0420.h" #include "game/game_0b3350.h" #include "game/game_0b63b0.h" -#include "game/game_0c79f0.h" +#include "game/bondmove.h" #include "game/game_127910.h" #include "game/game_129900.h" #include "game/game_12d3f0.h" #include "game/game_12f6c0.h" -#include "game/game_13e0e0.h" -#include "game/game_148b80.h" +#include "game/wallhit.h" +#include "game/splat.h" #include "game/game_157db0.h" #include "game/game_190260.h" #include "game/game_19c990.h" diff --git a/src/game/game_091e10.c b/src/game/game_091e10.c index 70d56f2d9..494743508 100644 --- a/src/game/game_091e10.c +++ b/src/game/game_091e10.c @@ -7,7 +7,7 @@ #include "game/data/data_01a3a0.h" #include "game/data/data_020df0.h" #include "game/game_0601b0.h" -#include "game/game_066310.h" +#include "game/propobj.h" #include "game/game_091e10.h" #include "game/game_0b28d0.h" #include "game/game_157db0.h" diff --git a/src/game/game_092610.c b/src/game/game_092610.c index fd37364a2..33fd9844a 100644 --- a/src/game/game_092610.c +++ b/src/game/game_092610.c @@ -7,13 +7,13 @@ #include "game/data/data_0160b0.h" #include "game/data/data_01a3a0.h" #include "game/data/data_020df0.h" -#include "game/game_000920.h" +#include "game/dlights.h" #include "game/game_092610.h" #include "game/game_096750.h" #include "game/game_0dcdb0.h" #include "game/game_166e40.h" #include "game/game_167ae0.h" -#include "game/game_187770.h" +#include "game/mplayer.h" #include "game/pad.h" #include "gvars/gvars.h" #include "lib/lib_0e9d0.h" diff --git a/src/game/game_095320.c b/src/game/game_095320.c index de27728c9..88d24e2be 100644 --- a/src/game/game_095320.c +++ b/src/game/game_095320.c @@ -8,7 +8,7 @@ #include "game/data/data_01a3a0.h" #include "game/data/data_020df0.h" #include "game/game_0601b0.h" -#include "game/game_066310.h" +#include "game/propobj.h" #include "game/game_091e10.h" #include "game/game_095320.h" #include "game/game_0b3350.h" diff --git a/src/game/game_096360.c b/src/game/game_096360.c index a91750b22..e6209a242 100644 --- a/src/game/game_096360.c +++ b/src/game/game_096360.c @@ -6,7 +6,7 @@ #include "game/data/data_0160b0.h" #include "game/data/data_01a3a0.h" #include "game/data/data_020df0.h" -#include "game/game_066310.h" +#include "game/propobj.h" #include "game/game_095320.h" #include "game/game_096360.h" #include "game/game_0b3350.h" diff --git a/src/game/game_097ba0.c b/src/game/game_097ba0.c index f966b2798..ce5cb113c 100644 --- a/src/game/game_097ba0.c +++ b/src/game/game_097ba0.c @@ -11,7 +11,7 @@ #include "game/game_005fd0.h" #include "game/game_01e250.h" #include "game/game_0601b0.h" -#include "game/game_066310.h" +#include "game/propobj.h" #include "game/game_092610.h" #include "game/game_096360.h" #include "game/game_0969d0.h" @@ -25,10 +25,10 @@ #include "game/game_0b3350.h" #include "game/game_0b63b0.h" #include "game/game_0c33f0.h" -#include "game/game_0c79f0.h" +#include "game/bondmove.h" #include "game/game_0d7070.h" #include "game/game_111600.h" -#include "game/game_1165d0.h" +#include "game/pak/pak.h" #include "game/game_127910.h" #include "game/game_12d3f0.h" #include "game/game_1531a0.h" @@ -36,7 +36,7 @@ #include "game/game_167ae0.h" #include "game/game_16e810.h" #include "game/game_176080.h" -#include "game/game_187770.h" +#include "game/mplayer.h" #include "game/game_19c990.h" #include "game/game_1a3340.h" #include "game/lang.h" diff --git a/src/game/game_0b0420.c b/src/game/game_0b0420.c index d2f184a7f..7dc5560bc 100644 --- a/src/game/game_0b0420.c +++ b/src/game/game_0b0420.c @@ -14,7 +14,7 @@ #include "game/game_0dcdb0.h" #include "game/game_127910.h" #include "game/game_179060.h" -#include "game/game_187770.h" +#include "game/mplayer.h" #include "game/game_197600.h" #include "game/lang.h" #include "game/pdoptions.h" diff --git a/src/game/game_0b63b0.c b/src/game/game_0b63b0.c index 5b9553e5a..b71271218 100644 --- a/src/game/game_0b63b0.c +++ b/src/game/game_0b63b0.c @@ -13,7 +13,7 @@ #include "game/game_01e250.h" #include "game/game_02cde0.h" #include "game/game_0601b0.h" -#include "game/game_066310.h" +#include "game/propobj.h" #include "game/game_092610.h" #include "game/game_095320.h" #include "game/game_096750.h" @@ -24,19 +24,19 @@ #include "game/game_0b2150.h" #include "game/game_0b3350.h" #include "game/game_0b63b0.h" -#include "game/game_0c79f0.h" -#include "game/game_0cf150.h" +#include "game/bondmove.h" +#include "game/bondeyespy.h" #include "game/game_0d5a90.h" #include "game/game_0dcdb0.h" #include "game/game_0f09f0.h" #include "game/game_102240.h" #include "game/game_107fb0.h" #include "game/game_111600.h" -#include "game/game_1165d0.h" +#include "game/pak/pak.h" #include "game/game_127910.h" #include "game/game_129900.h" #include "game/game_141820.h" -#include "game/game_148b80.h" +#include "game/splat.h" #include "game/game_1531a0.h" #include "game/game_157db0.h" #include "game/game_1655c0.h" @@ -48,7 +48,7 @@ #include "game/game_16e810.h" #include "game/game_177e00.h" #include "game/game_17f930.h" -#include "game/game_187770.h" +#include "game/mplayer.h" #include "game/game_18e5a0.h" #include "game/game_19c990.h" #include "game/game_1a3340.h" diff --git a/src/game/game_0d4690.c b/src/game/game_0d4690.c index 77ef3f0cd..6fe53dfc7 100644 --- a/src/game/game_0d4690.c +++ b/src/game/game_0d4690.c @@ -9,7 +9,7 @@ #include "game/game_0b3350.h" #include "game/game_0d4690.h" #include "game/game_166e40.h" -#include "game/game_176d70.h" +#include "game/utils.h" #include "gvars/gvars.h" #include "lib/lib_09660.h" #include "lib/lib_0d520.h" diff --git a/src/game/game_0d7070.c b/src/game/game_0d7070.c index 43490db54..f9aa5cf29 100644 --- a/src/game/game_0d7070.c +++ b/src/game/game_0d7070.c @@ -7,7 +7,7 @@ #include "game/data/data_0160b0.h" #include "game/data/data_01a3a0.h" #include "game/data/data_020df0.h" -#include "game/game_066310.h" +#include "game/propobj.h" #include "game/game_097ba0.h" #include "game/game_0b0420.h" #include "game/game_0b2150.h" diff --git a/src/game/game_0dcdb0.c b/src/game/game_0dcdb0.c index d40623bb8..d172a4634 100644 --- a/src/game/game_0dcdb0.c +++ b/src/game/game_0dcdb0.c @@ -6,7 +6,7 @@ #include "game/data/data_0160b0.h" #include "game/data/data_01a3a0.h" #include "game/data/data_020df0.h" -#include "game/game_066310.h" +#include "game/propobj.h" #include "game/game_092610.h" #include "game/game_0b0420.h" #include "game/game_0b63b0.h" @@ -16,7 +16,7 @@ #include "game/game_127910.h" #include "game/game_1531a0.h" #include "game/game_167ae0.h" -#include "game/game_187770.h" +#include "game/mplayer.h" #include "game/pdoptions.h" #include "gvars/gvars.h" #include "lib/lib_09660.h" diff --git a/src/game/game_0e0770.c b/src/game/game_0e0770.c index e54f6e879..f3bf064d3 100644 --- a/src/game/game_0e0770.c +++ b/src/game/game_0e0770.c @@ -13,7 +13,7 @@ #include "game/game_0e0770.h" #include "game/game_1531a0.h" #include "game/game_166e40.h" -#include "game/game_176d70.h" +#include "game/utils.h" #include "gvars/gvars.h" #include "lib/lib_09660.h" #include "lib/lib_0d520.h" diff --git a/src/game/game_0e5ce0.c b/src/game/game_0e5ce0.c index 09b4c3ce5..59c202ef4 100644 --- a/src/game/game_0e5ce0.c +++ b/src/game/game_0e5ce0.c @@ -12,10 +12,10 @@ #include "game/game_0e0770.h" #include "game/game_0e5ce0.h" #include "game/game_0f09f0.h" -#include "game/game_149c90.h" +#include "game/camdraw.h" #include "game/game_1531a0.h" #include "game/game_167ae0.h" -#include "game/game_187770.h" +#include "game/mplayer.h" #include "game/game_19aa80.h" #include "game/game_19c990.h" #include "game/lang.h" diff --git a/src/game/game_0f09f0.c b/src/game/game_0f09f0.c index 8c70ee2c7..c9ae9a59f 100644 --- a/src/game/game_0f09f0.c +++ b/src/game/game_0f09f0.c @@ -9,7 +9,7 @@ #include "game/game_005fd0.h" #include "game/game_006bd0.h" #include "game/game_02cde0.h" -#include "game/game_066310.h" +#include "game/propobj.h" #include "game/game_095320.h" #include "game/game_096ca0.h" #include "game/game_097ba0.h" @@ -22,16 +22,16 @@ #include "game/game_0fd660.h" #include "game/game_107fb0.h" #include "game/game_10ccd0.h" -#include "game/game_1165d0.h" +#include "game/pak/pak.h" #include "game/game_1371b0.h" -#include "game/game_149c90.h" +#include "game/camdraw.h" #include "game/game_1531a0.h" #include "game/game_166e40.h" #include "game/game_167ae0.h" #include "game/game_16cfa0.h" #include "game/game_16e810.h" #include "game/game_179060.h" -#include "game/game_187770.h" +#include "game/mplayer.h" #include "game/game_19aa80.h" #include "game/game_1a3340.h" #include "game/lang.h" diff --git a/src/game/game_0fd660.c b/src/game/game_0fd660.c index 39fe09623..da31a96ea 100644 --- a/src/game/game_0fd660.c +++ b/src/game/game_0fd660.c @@ -17,7 +17,7 @@ #include "game/game_111600.h" #include "game/game_1531a0.h" #include "game/game_166e40.h" -#include "game/game_187770.h" +#include "game/mplayer.h" #include "game/game_190260.h" #include "game/game_197600.h" #include "game/game_19c990.h" diff --git a/src/game/game_102240.c b/src/game/game_102240.c index 339747e0f..b95bf6608 100644 --- a/src/game/game_102240.c +++ b/src/game/game_102240.c @@ -22,7 +22,7 @@ #include "game/game_111600.h" #include "game/game_1531a0.h" #include "game/game_167ae0.h" -#include "game/game_187770.h" +#include "game/mplayer.h" #include "game/game_19aa80.h" #include "game/game_19c990.h" #include "game/lang.h" diff --git a/src/game/game_107fb0.c b/src/game/game_107fb0.c index 353966057..be3f2c2f8 100644 --- a/src/game/game_107fb0.c +++ b/src/game/game_107fb0.c @@ -11,10 +11,10 @@ #include "game/game_0f09f0.h" #include "game/game_107fb0.h" #include "game/game_10ccd0.h" -#include "game/game_1165d0.h" +#include "game/pak/pak.h" #include "game/game_1531a0.h" -#include "game/game_176d70.h" -#include "game/game_187770.h" +#include "game/utils.h" +#include "game/mplayer.h" #include "game/lang.h" #include "gvars/gvars.h" #include "lib/lib_09660.h" diff --git a/src/game/game_10c9c0.c b/src/game/game_10c9c0.c index e22b441cb..f2011be20 100644 --- a/src/game/game_10c9c0.c +++ b/src/game/game_10c9c0.c @@ -8,7 +8,7 @@ #include "game/data/data_020df0.h" #include "game/game_0f09f0.h" #include "game/game_10c9c0.h" -#include "game/game_187770.h" +#include "game/mplayer.h" #include "game/game_19aa80.h" #include "gvars/gvars.h" #include "types.h" diff --git a/src/game/game_10ccd0.c b/src/game/game_10ccd0.c index 11a0e4e7f..76e83f7ee 100644 --- a/src/game/game_10ccd0.c +++ b/src/game/game_10ccd0.c @@ -20,13 +20,13 @@ #include "game/game_102240.h" #include "game/game_107fb0.h" #include "game/game_10ccd0.h" -#include "game/game_1165d0.h" -#include "game/game_149c90.h" +#include "game/pak/pak.h" +#include "game/camdraw.h" #include "game/game_157db0.h" #include "game/game_1655c0.h" #include "game/game_167ae0.h" -#include "game/game_176d70.h" -#include "game/game_187770.h" +#include "game/utils.h" +#include "game/mplayer.h" #include "game/game_19aa80.h" #include "game/game_19c990.h" #include "game/lang.h" diff --git a/src/game/game_113220.c b/src/game/game_113220.c index eeeb8563c..826e77ad7 100644 --- a/src/game/game_113220.c +++ b/src/game/game_113220.c @@ -7,7 +7,7 @@ #include "game/data/data_01a3a0.h" #include "game/data/data_020df0.h" #include "game/game_096b20.h" -#include "game/game_0c79f0.h" +#include "game/bondmove.h" #include "game/game_113220.h" #include "gvars/gvars.h" #include "lib/lib_12dc0.h" diff --git a/src/game/game_127910.c b/src/game/game_127910.c index 2ef2ea535..3e39b4f44 100644 --- a/src/game/game_127910.c +++ b/src/game/game_127910.c @@ -7,7 +7,7 @@ #include "game/data/data_0160b0.h" #include "game/data/data_01a3a0.h" #include "game/data/data_020df0.h" -#include "game/game_066310.h" +#include "game/propobj.h" #include "game/game_097ba0.h" #include "game/game_0b63b0.h" #include "game/game_127910.h" diff --git a/src/game/game_129210.c b/src/game/game_129210.c index 66a4dec91..dd342a533 100644 --- a/src/game/game_129210.c +++ b/src/game/game_129210.c @@ -8,7 +8,7 @@ #include "game/data/data_01a3a0.h" #include "game/data/data_020df0.h" #include "game/game_01e250.h" -#include "game/game_066310.h" +#include "game/propobj.h" #include "game/game_129210.h" #include "gvars/gvars.h" #include "lib/lib_126b0.h" diff --git a/src/game/game_129900.c b/src/game/game_129900.c index b43bff3b6..ccc6688fb 100644 --- a/src/game/game_129900.c +++ b/src/game/game_129900.c @@ -7,21 +7,21 @@ #include "game/data/data_0160b0.h" #include "game/data/data_01a3a0.h" #include "game/data/data_020df0.h" -#include "game/game_000920.h" +#include "game/dlights.h" #include "game/game_01e250.h" #include "game/game_0601b0.h" -#include "game/game_066310.h" +#include "game/propobj.h" #include "game/game_091e10.h" #include "game/game_092610.h" #include "game/game_0b3350.h" #include "game/game_129900.h" #include "game/game_12d3f0.h" -#include "game/game_13e0e0.h" +#include "game/wallhit.h" #include "game/game_157db0.h" #include "game/game_1668e0.h" #include "game/game_166e40.h" -#include "game/game_176d70.h" -#include "game/game_187770.h" +#include "game/utils.h" +#include "game/mplayer.h" #include "gvars/gvars.h" #include "lib/lib_09660.h" #include "lib/lib_0d520.h" diff --git a/src/game/game_12d3f0.c b/src/game/game_12d3f0.c index 14879d59c..df4b1e84f 100644 --- a/src/game/game_12d3f0.c +++ b/src/game/game_12d3f0.c @@ -6,9 +6,9 @@ #include "game/data/data_0160b0.h" #include "game/data/data_01a3a0.h" #include "game/data/data_020df0.h" -#include "game/game_000920.h" +#include "game/dlights.h" #include "game/game_0601b0.h" -#include "game/game_066310.h" +#include "game/propobj.h" #include "game/game_0b3350.h" #include "game/game_12d3f0.h" #include "game/game_157db0.h" diff --git a/src/game/game_12f6c0.c b/src/game/game_12f6c0.c index 752d09c86..9bc0f7c39 100644 --- a/src/game/game_12f6c0.c +++ b/src/game/game_12f6c0.c @@ -6,7 +6,7 @@ #include "game/data/data_0160b0.h" #include "game/data/data_01a3a0.h" #include "game/data/data_020df0.h" -#include "game/game_000920.h" +#include "game/dlights.h" #include "game/game_01e250.h" #include "game/game_0b3350.h" #include "game/game_12f6c0.h" diff --git a/src/game/game_131060.c b/src/game/game_131060.c index 4b479fdb2..444089692 100644 --- a/src/game/game_131060.c +++ b/src/game/game_131060.c @@ -6,7 +6,7 @@ #include "game/data/data_0160b0.h" #include "game/data/data_01a3a0.h" #include "game/data/data_020df0.h" -#include "game/game_000920.h" +#include "game/dlights.h" #include "game/game_0b3350.h" #include "game/game_12f6c0.h" #include "game/game_131060.h" diff --git a/src/game/game_13c510.c b/src/game/game_13c510.c index 729b437ec..41b760259 100644 --- a/src/game/game_13c510.c +++ b/src/game/game_13c510.c @@ -6,7 +6,7 @@ #include "game/data/data_0160b0.h" #include "game/data/data_01a3a0.h" #include "game/data/data_020df0.h" -#include "game/game_000920.h" +#include "game/dlights.h" #include "game/game_0b2150.h" #include "game/game_0b3350.h" #include "game/game_11f000.h" diff --git a/src/game/game_141820.c b/src/game/game_141820.c index fe9e0bfec..ac5bf7cb3 100644 --- a/src/game/game_141820.c +++ b/src/game/game_141820.c @@ -6,7 +6,7 @@ #include "game/data/data_0160b0.h" #include "game/data/data_01a3a0.h" #include "game/data/data_020df0.h" -#include "game/game_000920.h" +#include "game/dlights.h" #include "game/game_005fd0.h" #include "game/game_096750.h" #include "game/game_0d4690.h" diff --git a/src/game/game_150820.c b/src/game/game_150820.c index 493d47be2..1ba26df68 100644 --- a/src/game/game_150820.c +++ b/src/game/game_150820.c @@ -6,7 +6,7 @@ #include "game/data/data_0160b0.h" #include "game/data/data_01a3a0.h" #include "game/data/data_020df0.h" -#include "game/game_000920.h" +#include "game/dlights.h" #include "game/game_092610.h" #include "game/game_096750.h" #include "game/game_0b3350.h" diff --git a/src/game/game_157db0.c b/src/game/game_157db0.c index e09339b61..7e8dc0533 100644 --- a/src/game/game_157db0.c +++ b/src/game/game_157db0.c @@ -6,7 +6,7 @@ #include "game/data/data_0160b0.h" #include "game/data/data_01a3a0.h" #include "game/data/data_020df0.h" -#include "game/game_000920.h" +#include "game/dlights.h" #include "game/game_013550.h" #include "game/game_013ee0.h" #include "game/game_01e250.h" @@ -20,7 +20,7 @@ #include "game/game_135c70.h" #include "game/game_13b670.h" #include "game/game_13c510.h" -#include "game/game_13e0e0.h" +#include "game/wallhit.h" #include "game/game_1531a0.h" #include "game/game_157db0.h" #include "game/game_165360.h" diff --git a/src/game/game_167ae0.c b/src/game/game_167ae0.c index 88d810398..6aa66e05b 100644 --- a/src/game/game_167ae0.c +++ b/src/game/game_167ae0.c @@ -9,7 +9,7 @@ #include "game/data/data_0160b0.h" #include "game/data/data_01a3a0.h" #include "game/data/data_020df0.h" -#include "game/game_000920.h" +#include "game/dlights.h" #include "game/game_005fd0.h" #include "game/game_006bd0.h" #include "game/game_00b480.h" @@ -53,21 +53,21 @@ #include "game/game_01de30.h" #include "game/game_01e250.h" #include "game/game_0601b0.h" -#include "game/game_066310.h" +#include "game/propobj.h" #include "game/game_095320.h" #include "game/game_097ba0.h" #include "game/game_0abe70.h" #include "game/game_0b0420.h" #include "game/game_0b28d0.h" #include "game/game_0b63b0.h" -#include "game/game_0c79f0.h" +#include "game/bondmove.h" #include "game/game_0d4690.h" #include "game/game_0dcdb0.h" #include "game/game_0f09f0.h" #include "game/game_0fd660.h" #include "game/game_107fb0.h" #include "game/game_10c9c0.h" -#include "game/game_1165d0.h" +#include "game/pak/pak.h" #include "game/game_11ecf0.h" #include "game/game_11f000.h" #include "game/game_127910.h" @@ -78,10 +78,10 @@ #include "game/game_135c70.h" #include "game/game_1371b0.h" #include "game/game_13c510.h" -#include "game/game_13e0e0.h" +#include "game/wallhit.h" #include "game/game_141820.h" -#include "game/game_148b80.h" -#include "game/game_149c90.h" +#include "game/splat.h" +#include "game/camdraw.h" #include "game/game_150820.h" #include "game/game_1531a0.h" #include "game/game_157db0.h" @@ -90,10 +90,10 @@ #include "game/game_16cfa0.h" #include "game/game_16e810.h" #include "game/game_176080.h" -#include "game/game_176d70.h" +#include "game/utils.h" #include "game/game_179060.h" #include "game/game_17f930.h" -#include "game/game_187770.h" +#include "game/mplayer.h" #include "game/game_19aa80.h" #include "game/game_19c990.h" #include "game/lang.h" diff --git a/src/game/game_176080.c b/src/game/game_176080.c index 41e682d42..f18ecb8cf 100644 --- a/src/game/game_176080.c +++ b/src/game/game_176080.c @@ -8,7 +8,7 @@ #include "game/data/data_020df0.h" #include "game/game_0b63b0.h" #include "game/game_176080.h" -#include "game/game_187770.h" +#include "game/mplayer.h" #include "game/pdoptions.h" #include "gvars/gvars.h" #include "lib/lib_09660.h" diff --git a/src/game/game_177e00.c b/src/game/game_177e00.c index 002590676..812333cb5 100644 --- a/src/game/game_177e00.c +++ b/src/game/game_177e00.c @@ -15,7 +15,7 @@ #include "game/game_107fb0.h" #include "game/game_167ae0.h" #include "game/game_177e00.h" -#include "game/game_187770.h" +#include "game/mplayer.h" #include "game/game_19aa80.h" #include "game/lang.h" #include "game/pdoptions.h" diff --git a/src/game/game_179060.c b/src/game/game_179060.c index 84426777b..7f2d40b71 100644 --- a/src/game/game_179060.c +++ b/src/game/game_179060.c @@ -10,12 +10,12 @@ #include "game/game_0d4690.h" #include "game/game_0f09f0.h" #include "game/game_107fb0.h" -#include "game/game_149c90.h" +#include "game/camdraw.h" #include "game/game_1531a0.h" #include "game/game_16cfa0.h" #include "game/game_179060.h" #include "game/game_17f930.h" -#include "game/game_187770.h" +#include "game/mplayer.h" #include "game/game_19aa80.h" #include "game/lang.h" #include "game/pdoptions.h" diff --git a/src/game/game_17f930.c b/src/game/game_17f930.c index 67e57de75..9616536d5 100644 --- a/src/game/game_17f930.c +++ b/src/game/game_17f930.c @@ -7,11 +7,11 @@ #include "game/data/data_0160b0.h" #include "game/data/data_01a3a0.h" #include "game/data/data_020df0.h" -#include "game/game_000920.h" +#include "game/dlights.h" #include "game/game_005fd0.h" #include "game/game_00c490.h" #include "game/game_0601b0.h" -#include "game/game_066310.h" +#include "game/propobj.h" #include "game/game_092610.h" #include "game/game_096750.h" #include "game/game_097ba0.h" @@ -24,7 +24,7 @@ #include "game/game_1531a0.h" #include "game/game_179060.h" #include "game/game_17f930.h" -#include "game/game_187770.h" +#include "game/mplayer.h" #include "game/game_18e5a0.h" #include "game/game_197600.h" #include "game/game_19aa80.h" diff --git a/src/game/game_190260.c b/src/game/game_190260.c index c3dd06e21..7ab9e7a7d 100644 --- a/src/game/game_190260.c +++ b/src/game/game_190260.c @@ -9,20 +9,20 @@ #include "game/data/data_020df0.h" #include "game/game_01e250.h" #include "game/game_0601b0.h" -#include "game/game_066310.h" +#include "game/propobj.h" #include "game/game_092610.h" #include "game/game_096750.h" #include "game/game_097ba0.h" #include "game/game_0b0420.h" #include "game/game_0b63b0.h" -#include "game/game_114240.h" +#include "game/padhalllv.h" #include "game/game_11ecf0.h" #include "game/game_127910.h" -#include "game/game_148b80.h" +#include "game/splat.h" #include "game/game_157db0.h" #include "game/game_179060.h" #include "game/game_17f930.h" -#include "game/game_187770.h" +#include "game/mplayer.h" #include "game/game_18e5a0.h" #include "game/game_190260.h" #include "game/game_197600.h" diff --git a/src/game/game_197600.c b/src/game/game_197600.c index 0ce2fe22a..9971a8d29 100644 --- a/src/game/game_197600.c +++ b/src/game/game_197600.c @@ -8,14 +8,14 @@ #include "game/data/data_01a3a0.h" #include "game/data/data_020df0.h" #include "game/game_01e250.h" -#include "game/game_066310.h" +#include "game/propobj.h" #include "game/game_097970.h" #include "game/game_0b0420.h" #include "game/game_0fd660.h" #include "game/game_11ecf0.h" #include "game/game_127910.h" #include "game/game_179060.h" -#include "game/game_187770.h" +#include "game/mplayer.h" #include "game/game_190260.h" #include "game/game_197600.h" #include "game/game_1999b0.h" diff --git a/src/game/game_1999b0.c b/src/game/game_1999b0.c index 07350221d..1a131fc01 100644 --- a/src/game/game_1999b0.c +++ b/src/game/game_1999b0.c @@ -8,11 +8,11 @@ #include "game/data/data_01a3a0.h" #include "game/data/data_020df0.h" #include "game/game_01e250.h" -#include "game/game_066310.h" +#include "game/propobj.h" #include "game/game_092610.h" #include "game/game_097ba0.h" #include "game/game_0b0420.h" -#include "game/game_114240.h" +#include "game/padhalllv.h" #include "game/game_11ecf0.h" #include "game/game_127910.h" #include "game/game_1999b0.h" diff --git a/src/game/game_19aa80.c b/src/game/game_19aa80.c index bf6c7ba6b..c61ee518d 100644 --- a/src/game/game_19aa80.c +++ b/src/game/game_19aa80.c @@ -12,7 +12,7 @@ #include "game/game_096750.h" #include "game/game_127910.h" #include "game/game_179060.h" -#include "game/game_187770.h" +#include "game/mplayer.h" #include "game/game_190260.h" #include "game/game_19aa80.h" #include "game/game_19c990.h" diff --git a/src/game/game_19c990.c b/src/game/game_19c990.c index d675c1ac7..9a44b6f03 100644 --- a/src/game/game_19c990.c +++ b/src/game/game_19c990.c @@ -7,9 +7,9 @@ #include "game/data/data_0160b0.h" #include "game/data/data_01a3a0.h" #include "game/data/data_020df0.h" -#include "game/game_000920.h" +#include "game/dlights.h" #include "game/game_0601b0.h" -#include "game/game_066310.h" +#include "game/propobj.h" #include "game/game_092610.h" #include "game/game_095320.h" #include "game/game_096750.h" @@ -21,9 +21,9 @@ #include "game/game_107fb0.h" #include "game/game_10ccd0.h" #include "game/game_111600.h" -#include "game/game_114240.h" +#include "game/padhalllv.h" #include "game/game_129900.h" -#include "game/game_13e0e0.h" +#include "game/wallhit.h" #include "game/game_150820.h" #include "game/game_1531a0.h" #include "game/game_157db0.h" diff --git a/src/game/game_1a3340.c b/src/game/game_1a3340.c index ff14da626..2ae226a7f 100644 --- a/src/game/game_1a3340.c +++ b/src/game/game_1a3340.c @@ -19,7 +19,7 @@ #include "game/game_166e40.h" #include "game/game_16e810.h" #include "game/game_173a00.h" -#include "game/game_187770.h" +#include "game/mplayer.h" #include "game/game_19c990.h" #include "game/game_1a3340.h" #include "game/lang.h" diff --git a/src/game/game_187770.c b/src/game/mplayer.c similarity index 99% rename from src/game/game_187770.c rename to src/game/mplayer.c index 35be925f5..41c9ed8ae 100644 --- a/src/game/game_187770.c +++ b/src/game/mplayer.c @@ -13,15 +13,15 @@ #include "game/game_0b63b0.h" #include "game/game_0d4690.h" #include "game/game_0f09f0.h" -#include "game/game_1165d0.h" +#include "game/pak/pak.h" #include "game/game_127910.h" -#include "game/game_149c90.h" +#include "game/camdraw.h" #include "game/game_1531a0.h" #include "game/game_167ae0.h" #include "game/game_16cfa0.h" #include "game/game_179060.h" #include "game/game_17f930.h" -#include "game/game_187770.h" +#include "game/mplayer.h" #include "game/game_19aa80.h" #include "game/lang.h" #include "gvars/gvars.h" diff --git a/src/game/game_114240.c b/src/game/padhalllv.c similarity index 99% rename from src/game/game_114240.c rename to src/game/padhalllv.c index 9ca897c9f..8da9d018a 100644 --- a/src/game/game_114240.c +++ b/src/game/padhalllv.c @@ -7,7 +7,7 @@ #include "game/data/data_01a3a0.h" #include "game/data/data_020df0.h" #include "game/game_0601b0.h" -#include "game/game_114240.h" +#include "game/padhalllv.h" #include "game/game_157db0.h" #include "game/pad.h" #include "gvars/gvars.h" diff --git a/src/game/game_1165d0.c b/src/game/pak/pak.c similarity index 99% rename from src/game/game_1165d0.c rename to src/game/pak/pak.c index 1033e7d31..f20278cbf 100644 --- a/src/game/game_1165d0.c +++ b/src/game/pak/pak.c @@ -8,10 +8,10 @@ #include "game/data/data_020df0.h" #include "game/game_0f09f0.h" #include "game/game_10ccd0.h" -#include "game/game_1165d0.h" +#include "game/pak/pak.h" #include "game/game_128f30.h" -#include "game/game_149c90.h" -#include "game/game_176d70.h" +#include "game/camdraw.h" +#include "game/utils.h" #include "gvars/gvars.h" #include "lib/lib_06100.h" #include "lib/lib_06330.h" diff --git a/src/game/game_066310.c b/src/game/propobj.c similarity index 99% rename from src/game/game_066310.c rename to src/game/propobj.c index 920f8f09d..ea7304879 100644 --- a/src/game/game_066310.c +++ b/src/game/propobj.c @@ -10,12 +10,12 @@ #include "game/data/data_0160b0.h" #include "game/data/data_01a3a0.h" #include "game/data/data_020df0.h" -#include "game/game_000920.h" +#include "game/dlights.h" #include "game/game_006bd0.h" #include "game/game_011110.h" #include "game/game_01e250.h" #include "game/game_0601b0.h" -#include "game/game_066310.h" +#include "game/propobj.h" #include "game/game_091e10.h" #include "game/game_092610.h" #include "game/game_095320.h" @@ -32,7 +32,7 @@ #include "game/game_0b3350.h" #include "game/game_0b63b0.h" #include "game/game_0c33f0.h" -#include "game/game_0c79f0.h" +#include "game/bondmove.h" #include "game/game_0dcdb0.h" #include "game/game_0f09f0.h" #include "game/game_111600.h" @@ -43,7 +43,7 @@ #include "game/game_129900.h" #include "game/game_12d3f0.h" #include "game/game_12f6c0.h" -#include "game/game_13e0e0.h" +#include "game/wallhit.h" #include "game/game_150820.h" #include "game/game_1531a0.h" #include "game/game_157db0.h" @@ -53,7 +53,7 @@ #include "game/game_167ae0.h" #include "game/game_179060.h" #include "game/game_17f930.h" -#include "game/game_187770.h" +#include "game/mplayer.h" #include "game/game_190260.h" #include "game/game_1999b0.h" #include "game/game_19c990.h" diff --git a/src/game/game_148b80.c b/src/game/splat.c similarity index 99% rename from src/game/game_148b80.c rename to src/game/splat.c index 8fa51ccbf..04a74ac6f 100644 --- a/src/game/game_148b80.c +++ b/src/game/splat.c @@ -6,12 +6,12 @@ #include "game/data/data_0160b0.h" #include "game/data/data_01a3a0.h" #include "game/data/data_020df0.h" -#include "game/game_066310.h" +#include "game/propobj.h" #include "game/game_12d3f0.h" -#include "game/game_13e0e0.h" -#include "game/game_148b80.h" +#include "game/wallhit.h" +#include "game/splat.h" #include "game/game_157db0.h" -#include "game/game_176d70.h" +#include "game/utils.h" #include "gvars/gvars.h" #include "lib/lib_12dc0.h" #include "lib/lib_159b0.h" diff --git a/src/game/game_176d70.c b/src/game/utils.c similarity index 99% rename from src/game/game_176d70.c rename to src/game/utils.c index fc3f28e30..7e57b8960 100644 --- a/src/game/game_176d70.c +++ b/src/game/utils.c @@ -6,7 +6,7 @@ #include "game/data/data_0160b0.h" #include "game/data/data_01a3a0.h" #include "game/data/data_020df0.h" -#include "game/game_176d70.h" +#include "game/utils.h" #include "gvars/gvars.h" #include "lib/lib_121e0.h" #include "lib/lib_4a360.h" diff --git a/src/game/game_13e0e0.c b/src/game/wallhit.c similarity index 99% rename from src/game/game_13e0e0.c rename to src/game/wallhit.c index 20a866d03..13be9af88 100644 --- a/src/game/game_13e0e0.c +++ b/src/game/wallhit.c @@ -6,15 +6,15 @@ #include "game/data/data_0160b0.h" #include "game/data/data_01a3a0.h" #include "game/data/data_020df0.h" -#include "game/game_000920.h" +#include "game/dlights.h" #include "game/game_01e250.h" #include "game/game_0b0420.h" #include "game/game_0b3350.h" #include "game/game_127910.h" -#include "game/game_13e0e0.h" +#include "game/wallhit.h" #include "game/game_1668e0.h" #include "game/game_166e40.h" -#include "game/game_176d70.h" +#include "game/utils.h" #include "game/pdoptions.h" #include "gvars/gvars.h" #include "lib/lib_0d520.h" diff --git a/src/include/game/game_0cf150.h b/src/include/game/bondeyespy.h similarity index 83% rename from src/include/game/game_0cf150.h rename to src/include/game/bondeyespy.h index a676d5636..1e58a0bcb 100644 --- a/src/include/game/game_0cf150.h +++ b/src/include/game/bondeyespy.h @@ -1,5 +1,5 @@ -#ifndef IN_GAME_GAME_0CF150_H -#define IN_GAME_GAME_0CF150_H +#ifndef IN_GAME_BONDEYESPY_H +#define IN_GAME_BONDEYESPY_H #include #include "types.h" diff --git a/src/include/game/game_0c79f0.h b/src/include/game/bondmove.h similarity index 96% rename from src/include/game/game_0c79f0.h rename to src/include/game/bondmove.h index 75376e2f2..d76d1db67 100644 --- a/src/include/game/game_0c79f0.h +++ b/src/include/game/bondmove.h @@ -1,5 +1,5 @@ -#ifndef IN_GAME_GAME_0C79F0_H -#define IN_GAME_GAME_0C79F0_H +#ifndef IN_GAME_BONDMOVE_H +#define IN_GAME_BONDMOVE_H #include #include "types.h" diff --git a/src/include/game/game_149c90.h b/src/include/game/camdraw.h similarity index 97% rename from src/include/game/game_149c90.h rename to src/include/game/camdraw.h index 6c909d646..664d03cce 100644 --- a/src/include/game/game_149c90.h +++ b/src/include/game/camdraw.h @@ -1,5 +1,5 @@ -#ifndef _IN_GAME_GAME_149C90_H -#define _IN_GAME_GAME_149C90_H +#ifndef _IN_GAME_CAMDRAW_H +#define _IN_GAME_CAMDRAW_H #include #include "types.h" diff --git a/src/include/game/game_000920.h b/src/include/game/dlights.h similarity index 95% rename from src/include/game/game_000920.h rename to src/include/game/dlights.h index 7f51a07bd..2fbc542e1 100644 --- a/src/include/game/game_000920.h +++ b/src/include/game/dlights.h @@ -1,5 +1,5 @@ -#ifndef IN_GAME_GAME_000920_H -#define IN_GAME_GAME_000920_H +#ifndef IN_GAME_DLIGHTS_H +#define IN_GAME_DLIGHTS_H #include #include "types.h" diff --git a/src/include/game/game_187770.h b/src/include/game/mplayer.h similarity index 98% rename from src/include/game/game_187770.h rename to src/include/game/mplayer.h index 7465393cf..390106234 100644 --- a/src/include/game/game_187770.h +++ b/src/include/game/mplayer.h @@ -1,5 +1,5 @@ -#ifndef IN_GAME_GAME_187770_H -#define IN_GAME_GAME_187770_H +#ifndef IN_GAME_MPLAYER_H +#define IN_GAME_MPLAYER_H #include #include "types.h" diff --git a/src/include/game/game_114240.h b/src/include/game/padhalllv.h similarity index 92% rename from src/include/game/game_114240.h rename to src/include/game/padhalllv.h index 0508723ee..d525a1600 100644 --- a/src/include/game/game_114240.h +++ b/src/include/game/padhalllv.h @@ -1,5 +1,5 @@ -#ifndef IN_GAME_GAME_114240_H -#define IN_GAME_GAME_114240_H +#ifndef IN_GAME_PADHALLLV_H +#define IN_GAME_PADHALLLV_H #include #include "types.h" diff --git a/src/include/game/game_1165d0.h b/src/include/game/pak/pak.h similarity index 98% rename from src/include/game/game_1165d0.h rename to src/include/game/pak/pak.h index b1c1c2927..0fdf2afb0 100644 --- a/src/include/game/game_1165d0.h +++ b/src/include/game/pak/pak.h @@ -1,5 +1,5 @@ -#ifndef IN_GAME_GAME_1165D0_H -#define IN_GAME_GAME_1165D0_H +#ifndef IN_GAME_PAK_PAK_H +#define IN_GAME_PAK_PAK_H #include #include "types.h" diff --git a/src/include/game/game_066310.h b/src/include/game/propobj.h similarity index 99% rename from src/include/game/game_066310.h rename to src/include/game/propobj.h index 4cc032166..a6e4b31b6 100644 --- a/src/include/game/game_066310.h +++ b/src/include/game/propobj.h @@ -1,5 +1,5 @@ -#ifndef IN_GAME_GAME_066310_H -#define IN_GAME_GAME_066310_H +#ifndef IN_GAME_PROPOBJ_H +#define IN_GAME_PROPOBJ_H #include #include "types.h" diff --git a/src/include/game/game_148b80.h b/src/include/game/splat.h similarity index 80% rename from src/include/game/game_148b80.h rename to src/include/game/splat.h index b63e54366..064c56b0c 100644 --- a/src/include/game/game_148b80.h +++ b/src/include/game/splat.h @@ -1,5 +1,5 @@ -#ifndef _IN_GAME_GAME_148B80_H -#define _IN_GAME_GAME_148B80_H +#ifndef _IN_GAME_SPLAT_H +#define _IN_GAME_SPLAT_H #include #include "types.h" diff --git a/src/include/game/game_176d70.h b/src/include/game/utils.h similarity index 87% rename from src/include/game/game_176d70.h rename to src/include/game/utils.h index 452d0d7e7..1160cbc32 100644 --- a/src/include/game/game_176d70.h +++ b/src/include/game/utils.h @@ -1,5 +1,5 @@ -#ifndef IN_GAME_GAME_176D70_H -#define IN_GAME_GAME_176D70_H +#ifndef IN_GAME_UTILS_H +#define IN_GAME_UTILS_H #include #include "types.h" diff --git a/src/include/game/game_13e0e0.h b/src/include/game/wallhit.h similarity index 89% rename from src/include/game/game_13e0e0.h rename to src/include/game/wallhit.h index 394e2ca27..228ee5160 100644 --- a/src/include/game/game_13e0e0.h +++ b/src/include/game/wallhit.h @@ -1,5 +1,5 @@ -#ifndef _IN_GAME_GAME_13E0E0_H -#define _IN_GAME_GAME_13E0E0_H +#ifndef _IN_GAME_WALLHIT_H +#define _IN_GAME_WALLHIT_H #include #include "types.h" diff --git a/src/lib/lib_0d520.c b/src/lib/lib_0d520.c index 6b8fc9c6e..2fc9c5e8e 100644 --- a/src/lib/lib_0d520.c +++ b/src/lib/lib_0d520.c @@ -29,11 +29,11 @@ #include "game/game_01b0a0.h" #include "game/game_095320.h" #include "game/game_10ccd0.h" -#include "game/game_1165d0.h" +#include "game/pak/pak.h" #include "game/game_11ecf0.h" #include "game/game_127910.h" -#include "game/game_148b80.h" -#include "game/game_149c90.h" +#include "game/splat.h" +#include "game/camdraw.h" #include "game/game_1531a0.h" #include "game/game_166e40.h" #include "game/game_167ae0.h" @@ -42,8 +42,8 @@ #include "game/game_175f50.h" #include "game/game_175f90.h" #include "game/game_176080.h" -#include "game/game_176d70.h" -#include "game/game_187770.h" +#include "game/utils.h" +#include "game/mplayer.h" #include "game/game_1a78b0.h" #include "gvars/gvars.h" #include "lib/lib_03050.h" diff --git a/src/lib/lib_13900.c b/src/lib/lib_13900.c index 5aa18c9af..3d7068621 100644 --- a/src/lib/lib_13900.c +++ b/src/lib/lib_13900.c @@ -6,7 +6,7 @@ #include "game/data/data_0160b0.h" #include "game/data/data_01a3a0.h" #include "game/data/data_020df0.h" -#include "game/game_1165d0.h" +#include "game/pak/pak.h" #include "gvars/gvars.h" #include "lib/lib_04a80.h" #include "lib/lib_0d520.h" diff --git a/src/lib/lib_16110.c b/src/lib/lib_16110.c index dfa08728f..daf545d30 100644 --- a/src/lib/lib_16110.c +++ b/src/lib/lib_16110.c @@ -8,7 +8,7 @@ #include "game/data/data_01a3a0.h" #include "game/data/data_020df0.h" #include "game/game_096750.h" -#include "game/game_114240.h" +#include "game/padhalllv.h" #include "gvars/gvars.h" #include "lib/lib_04790.h" #include "lib/lib_159b0.h"