From 3fbe31c651e49fc03f8742ea8545d97d98a7766b Mon Sep 17 00:00:00 2001 From: avolkov Date: Fri, 9 Oct 2009 20:38:29 +0000 Subject: [PATCH] Source tree reorg: Normalized #include paths after the dir moves git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3215 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/Makeproject | 2 +- sc2/build/msvc6/UrQuanMasters.dsp | 26 ++++++++++----------- sc2/src/libs/graphics/drawable.c | 3 ++- sc2/src/libs/graphics/sdl/3do_funcs.c | 3 ++- sc2/src/libs/graphics/sdl/sdl_common.c | 6 ++--- sc2/src/libs/graphics/tfb_draw.c | 3 ++- sc2/src/libs/graphics/widgets.c | 7 +++--- sc2/src/libs/input/sdl/input.c | 3 ++- sc2/src/libs/resource/resinit.c | 4 ++-- sc2/src/libs/sound/trackplayer.c | 5 +++- sc2/src/libs/video/video.c | 3 ++- sc2/src/libs/video/vidplayer.c | 9 ++++---- sc2/src/uqm.c | 14 +++++------ sc2/src/uqm/comm/arilou/arilouc.c | 8 +++---- sc2/src/uqm/comm/blackur/blackurc.c | 6 ++--- sc2/src/uqm/comm/chmmr/chmmrc.c | 8 +++---- sc2/src/uqm/comm/comandr/comandr.c | 9 ++++---- sc2/src/uqm/comm/commall.h | 8 +++---- sc2/src/uqm/comm/druuge/druugec.c | 10 ++++---- sc2/src/uqm/comm/ilwrath/ilwrathc.c | 8 +++---- sc2/src/uqm/comm/melnorm/melnorm.c | 12 +++++----- sc2/src/uqm/comm/mycon/myconc.c | 8 +++---- sc2/src/uqm/comm/orz/orzc.c | 9 ++++---- sc2/src/uqm/comm/pkunk/pkunkc.c | 10 ++++---- sc2/src/uqm/comm/rebel/rebel.c | 8 +++---- sc2/src/uqm/comm/shofixt/shofixt.c | 8 +++---- sc2/src/uqm/comm/slyhome/slyhome.c | 9 ++++---- sc2/src/uqm/comm/slyland/slyland.c | 12 +++++----- sc2/src/uqm/comm/spahome/spahome.c | 10 ++++---- sc2/src/uqm/comm/spathi/spathic.c | 8 +++---- sc2/src/uqm/comm/starbas/starbas.c | 12 +++++----- sc2/src/uqm/comm/supox/supoxc.c | 8 +++---- sc2/src/uqm/comm/syreen/syreenc.c | 10 ++++---- sc2/src/uqm/comm/talkpet/talkpet.c | 8 +++---- sc2/src/uqm/comm/thradd/thraddc.c | 10 ++++---- sc2/src/uqm/comm/umgah/umgahc.c | 8 +++---- sc2/src/uqm/comm/urquan/urquanc.c | 6 ++--- sc2/src/uqm/comm/utwig/utwigc.c | 10 ++++---- sc2/src/uqm/comm/vux/vuxc.c | 6 ++--- sc2/src/uqm/comm/yehat/yehatc.c | 10 ++++---- sc2/src/uqm/comm/zoqfot/zoqfotc.c | 10 ++++---- sc2/src/uqm/netplay/checksum.c | 2 +- sc2/src/uqm/netplay/checksum.h | 2 +- sc2/src/uqm/netplay/netmelee.c | 24 +++++++++---------- sc2/src/uqm/netplay/netmisc.c | 2 +- sc2/src/uqm/netplay/netmisc.h | 2 +- sc2/src/uqm/netplay/notify.h | 2 +- sc2/src/uqm/netplay/packethandlers.c | 10 ++++---- sc2/src/uqm/netplay/packetsenders.h | 2 +- sc2/src/uqm/planets/calc.c | 2 +- sc2/src/uqm/planets/cargo.c | 14 +++++------ sc2/src/uqm/planets/devices.c | 24 +++++++++---------- sc2/src/uqm/planets/genall.h | 5 +++- sc2/src/uqm/planets/genburv.c | 5 +--- sc2/src/uqm/planets/genchmmr.c | 15 +++++------- sc2/src/uqm/planets/gencol.c | 9 ++++---- sc2/src/uqm/planets/gendru.c | 13 ++++------- sc2/src/uqm/planets/genilw.c | 13 ++++------- sc2/src/uqm/planets/genmel.c | 9 ++++---- sc2/src/uqm/planets/genmyc.c | 15 +++++------- sc2/src/uqm/planets/genorz.c | 17 ++++++-------- sc2/src/uqm/planets/genpet.c | 15 +++++------- sc2/src/uqm/planets/genpku.c | 13 ++++------- sc2/src/uqm/planets/genrain.c | 5 ++-- sc2/src/uqm/planets/gensam.c | 14 +++++------ sc2/src/uqm/planets/genshof.c | 9 ++++---- sc2/src/uqm/planets/gensly.c | 5 ++-- sc2/src/uqm/planets/gensol.c | 17 ++++++-------- sc2/src/uqm/planets/genspa.c | 13 ++++------- sc2/src/uqm/planets/gensup.c | 13 ++++------- sc2/src/uqm/planets/gensyr.c | 5 ++-- sc2/src/uqm/planets/genthrad.c | 15 +++++------- sc2/src/uqm/planets/genutw.c | 15 +++++------- sc2/src/uqm/planets/genvault.c | 9 +++----- sc2/src/uqm/planets/genvux.c | 17 ++++++-------- sc2/src/uqm/planets/genwreck.c | 5 +--- sc2/src/uqm/planets/genyeh.c | 13 ++++------- sc2/src/uqm/planets/genzoq.c | 13 ++++------- sc2/src/uqm/planets/lander.c | 22 +++++++++--------- sc2/src/uqm/planets/lander.h | 6 ++--- sc2/src/uqm/planets/orbits.c | 4 ++-- sc2/src/uqm/planets/oval.c | 2 +- sc2/src/uqm/planets/pl_stuff.c | 6 ++--- sc2/src/uqm/planets/planets.c | 12 +++++----- sc2/src/uqm/planets/planets.h | 4 ++-- sc2/src/uqm/planets/plangen.c | 10 ++++---- sc2/src/uqm/planets/pstarmap.c | 26 ++++++++++----------- sc2/src/uqm/planets/report.c | 16 ++++++------- sc2/src/uqm/planets/roster.c | 14 +++++------ sc2/src/uqm/planets/scan.c | 32 +++++++++++++------------- sc2/src/uqm/planets/solarsys.c | 32 +++++++++++++------------- sc2/src/uqm/planets/sundata.h | 2 +- sc2/src/uqm/ships/androsyn/androsyn.c | 5 ++-- sc2/src/uqm/ships/arilou/arilou.c | 4 ++-- sc2/src/uqm/ships/blackurq/blackurq.c | 6 ++--- sc2/src/uqm/ships/chenjesu/chenjesu.c | 7 +++--- sc2/src/uqm/ships/chmmr/chmmr.c | 8 +++---- sc2/src/uqm/ships/druuge/druuge.c | 4 ++-- sc2/src/uqm/ships/human/human.c | 8 +++---- sc2/src/uqm/ships/ilwrath/ilwrath.c | 9 ++++---- sc2/src/uqm/ships/lastbat/lastbat.c | 10 ++++---- sc2/src/uqm/ships/melnorme/melnorme.c | 6 ++--- sc2/src/uqm/ships/mmrnmhrm/mmrnmhrm.c | 6 ++--- sc2/src/uqm/ships/mycon/mycon.c | 4 ++-- sc2/src/uqm/ships/orz/orz.c | 9 ++++---- sc2/src/uqm/ships/pkunk/pkunk.c | 6 ++--- sc2/src/uqm/ships/probe/probe.c | 4 ++-- sc2/src/uqm/ships/ship.h | 14 ++++++----- sc2/src/uqm/ships/shofixti/shofixti.c | 6 ++--- sc2/src/uqm/ships/sis_ship/sis_ship.c | 10 ++++---- sc2/src/uqm/ships/slylandr/slylandr.c | 6 ++--- sc2/src/uqm/ships/spathi/spathi.c | 4 ++-- sc2/src/uqm/ships/supox/supox.c | 5 ++-- sc2/src/uqm/ships/syreen/syreen.c | 4 ++-- sc2/src/uqm/ships/thradd/thradd.c | 7 +++--- sc2/src/uqm/ships/umgah/umgah.c | 4 ++-- sc2/src/uqm/ships/urquan/urquan.c | 6 ++--- sc2/src/uqm/ships/utwig/utwig.c | 7 +++--- sc2/src/uqm/ships/vux/vux.c | 6 ++--- sc2/src/uqm/ships/yehat/yehat.c | 4 ++-- sc2/src/uqm/ships/zoqfot/zoqfot.c | 4 ++-- 121 files changed, 520 insertions(+), 571 deletions(-) diff --git a/sc2/Makeproject b/sc2/Makeproject index c14d7dde9..6717bf248 100644 --- a/sc2/Makeproject +++ b/sc2/Makeproject @@ -16,7 +16,7 @@ case "$HOST_SYSTEM" in uqm_NAME="$uqm_NAME.exe" ;; esac -uqm_CFLAGS="$uqm_CFLAGS -Isrc -Isrc/uqm" +uqm_CFLAGS="$uqm_CFLAGS -Isrc" if [ "$uqm_HAVE_REGEX" = 0 ]; then uqm_CFLAGS="$uqm_CFLAGS -Isrc/regex" fi diff --git a/sc2/build/msvc6/UrQuanMasters.dsp b/sc2/build/msvc6/UrQuanMasters.dsp index eeb60d353..afbda6090 100644 --- a/sc2/build/msvc6/UrQuanMasters.dsp +++ b/sc2/build/msvc6/UrQuanMasters.dsp @@ -44,7 +44,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\..\src" /I "..\..\src\uqm" /I "..\..\src\regex" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D _VW=320 /D _VH=240 /D "HAVE_OPENGL" /D "GFXMODULE_SDL" /D "THREADLIB_SDL" /D "HAVE_OPENAL" /D "HAVE_ZIP" /D "HAVE_JOYSTICK" /D "NETPLAY" /D "ZLIB_DLL" /D "USE_INTERNAL_MIKMOD" /D "USE_PLATFORM_ACCEL" /FD /c +# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\..\src" /I "..\..\src\regex" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D _VW=320 /D _VH=240 /D "HAVE_OPENGL" /D "GFXMODULE_SDL" /D "THREADLIB_SDL" /D "HAVE_OPENAL" /D "HAVE_ZIP" /D "HAVE_JOYSTICK" /D "NETPLAY" /D "ZLIB_DLL" /D "USE_INTERNAL_MIKMOD" /D "USE_PLATFORM_ACCEL" /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" @@ -74,7 +74,7 @@ PostBuild_Cmds=rebase -b 0x400000 -x . "../../uqm.exe" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\src\uqm" /I "..\..\src\regex" /D "DEBUG" /D "_DEBUG" /D "DEBUG_TRACK_SEM" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D _VW=320 /D _VH=240 /D "HAVE_OPENGL" /D "GFXMODULE_SDL" /D "THREADLIB_SDL" /D "HAVE_OPENAL" /D "HAVE_ZIP" /D "HAVE_JOYSTICK" /D "NETPLAY" /D "ZLIB_DLL" /D "USE_INTERNAL_MIKMOD" /D "USE_PLATFORM_ACCEL" /FR /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\src\regex" /D "DEBUG" /D "_DEBUG" /D "DEBUG_TRACK_SEM" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D _VW=320 /D _VH=240 /D "HAVE_OPENGL" /D "GFXMODULE_SDL" /D "THREADLIB_SDL" /D "HAVE_OPENAL" /D "HAVE_ZIP" /D "HAVE_JOYSTICK" /D "NETPLAY" /D "ZLIB_DLL" /D "USE_INTERNAL_MIKMOD" /D "USE_PLATFORM_ACCEL" /FR /FD /GZ /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" @@ -100,9 +100,9 @@ LINK32=link.exe # PROP Intermediate_Dir "Debug_NoAccel" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD BASE CPP /nologo /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c # SUBTRACT BASE CPP /YX -# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\src\uqm" /I "..\..\src\regex" /D "DEBUG" /D "_DEBUG" /D "DEBUG_TRACK_SEM" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D _VW=320 /D _VH=240 /D "HAVE_OPENGL" /D "GFXMODULE_SDL" /D "THREADLIB_SDL" /D "HAVE_OPENAL" /D "HAVE_ZIP" /D "HAVE_JOYSTICK" /D "NETPLAY" /D "ZLIB_DLL" /D "USE_INTERNAL_MIKMOD" /FR /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\src\regex" /D "DEBUG" /D "_DEBUG" /D "DEBUG_TRACK_SEM" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D _VW=320 /D _VH=240 /D "HAVE_OPENGL" /D "GFXMODULE_SDL" /D "THREADLIB_SDL" /D "HAVE_OPENAL" /D "HAVE_ZIP" /D "HAVE_JOYSTICK" /D "NETPLAY" /D "ZLIB_DLL" /D "USE_INTERNAL_MIKMOD" /FR /FD /GZ /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" @@ -128,9 +128,9 @@ LINK32=link.exe # PROP Intermediate_Dir "Release_NoAccel" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c # SUBTRACT BASE CPP /YX -# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\..\src" /I "..\..\src\uqm" /I "..\..\src\regex" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D _VW=320 /D _VH=240 /D "HAVE_OPENGL" /D "GFXMODULE_SDL" /D "THREADLIB_SDL" /D "HAVE_OPENAL" /D "HAVE_ZIP" /D "HAVE_JOYSTICK" /D "NETPLAY" /D "ZLIB_DLL" /D "USE_INTERNAL_MIKMOD" /FR /FD /c +# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\..\src" /I "..\..\src\regex" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D _VW=320 /D _VH=240 /D "HAVE_OPENGL" /D "GFXMODULE_SDL" /D "THREADLIB_SDL" /D "HAVE_OPENAL" /D "HAVE_ZIP" /D "HAVE_JOYSTICK" /D "NETPLAY" /D "ZLIB_DLL" /D "USE_INTERNAL_MIKMOD" /FR /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" @@ -4425,11 +4425,11 @@ SOURCE=..\..\src\port.h # End Source File # Begin Source File -SOURCE=..\..\src\uqm.c +SOURCE=..\..\src\types.h # End Source File # Begin Source File -SOURCE=..\..\src\types.h +SOURCE=..\..\src\uqm.c # End Source File # Begin Source File @@ -4569,7 +4569,7 @@ SOURCE=..\..\TODO # PROP Default_Filter "" # Begin Source File -SOURCE=..\..\src\res\kohr-ah1.ico +SOURCE="..\..\src\res\kohr-ah1.ico" # End Source File # Begin Source File @@ -4581,19 +4581,19 @@ SOURCE=..\..\src\res\starcon2.ico # End Source File # Begin Source File -SOURCE=..\..\src\res\ur-quan-icon-alpha.ico +SOURCE="..\..\src\res\ur-quan-icon-alpha.ico" # End Source File # Begin Source File -SOURCE=..\..\src\res\ur-quan-icon-std.ico +SOURCE="..\..\src\res\ur-quan-icon-std.ico" # End Source File # Begin Source File -SOURCE=..\..\src\res\ur-quan1.ico +SOURCE="..\..\src\res\ur-quan1.ico" # End Source File # Begin Source File -SOURCE=..\..\src\res\ur-quan2.ico +SOURCE="..\..\src\res\ur-quan2.ico" # End Source File # Begin Source File diff --git a/sc2/src/libs/graphics/drawable.c b/sc2/src/libs/graphics/drawable.c index 77b927023..2aba6034c 100644 --- a/sc2/src/libs/graphics/drawable.c +++ b/sc2/src/libs/graphics/drawable.c @@ -19,9 +19,10 @@ #include "gfxintrn.h" #include "libs/misc.h" #include "tfb_draw.h" -#include "units.h" #include "libs/mathlib.h" #include "gfxother.h" +// XXX: we should not include anything from uqm/ inside libs/ +#include "uqm/units.h" FRAME _CurFramePtr; diff --git a/sc2/src/libs/graphics/sdl/3do_funcs.c b/sc2/src/libs/graphics/sdl/3do_funcs.c index 02dd5a5cd..2dabd70ac 100644 --- a/sc2/src/libs/graphics/sdl/3do_funcs.c +++ b/sc2/src/libs/graphics/sdl/3do_funcs.c @@ -22,9 +22,10 @@ #include "pure.h" #include "opengl.h" #include "primitives.h" -#include "units.h" #include "libs/graphics/drawcmd.h" #include "libs/graphics/tfb_draw.h" +// XXX: we should not include anything from uqm/ inside libs/ +#include "uqm/units.h" int batch_depth = 0; diff --git a/sc2/src/libs/graphics/sdl/sdl_common.c b/sc2/src/libs/graphics/sdl/sdl_common.c index a8bdd1966..bdebc5e4f 100644 --- a/sc2/src/libs/graphics/sdl/sdl_common.c +++ b/sc2/src/libs/graphics/sdl/sdl_common.c @@ -31,10 +31,10 @@ #include "port.h" #include "libs/uio.h" #include "libs/log.h" -#include "controls.h" #include "libs/vidlib.h" - // XXX: Should not be included from here. -#include "uqmdebug.h" +// XXX: we should not include anything from uqm/ inside libs/ +#include "uqm/controls.h" +#include "uqm/uqmdebug.h" #include SDL_INCLUDE(SDL_thread.h) SDL_Surface *SDL_Video; diff --git a/sc2/src/libs/graphics/tfb_draw.c b/sc2/src/libs/graphics/tfb_draw.c index 3f905936f..997615aeb 100644 --- a/sc2/src/libs/graphics/tfb_draw.c +++ b/sc2/src/libs/graphics/tfb_draw.c @@ -17,8 +17,9 @@ #include "gfx_common.h" #include "tfb_draw.h" #include "drawcmd.h" -#include "units.h" #include "libs/log.h" +// XXX: we should not include anything from uqm/ inside libs/ +#include "uqm/units.h" static const HOT_SPOT NullHs = {0, 0}; diff --git a/sc2/src/libs/graphics/widgets.c b/sc2/src/libs/graphics/widgets.c index b87a04a68..5ff458081 100644 --- a/sc2/src/libs/graphics/widgets.c +++ b/sc2/src/libs/graphics/widgets.c @@ -16,10 +16,11 @@ #include "gfx_common.h" #include "widgets.h" -#include "colors.h" #include "libs/strlib.h" -#include "setup.h" -#include "units.h" +// XXX: we should not include anything from uqm/ inside libs/ +#include "uqm/colors.h" +#include "uqm/setup.h" +#include "uqm/units.h" WIDGET *widget_focus = NULL; diff --git a/sc2/src/libs/input/sdl/input.c b/sc2/src/libs/input/sdl/input.c index 1c68e77c7..bd07ea842 100644 --- a/sc2/src/libs/input/sdl/input.c +++ b/sc2/src/libs/input/sdl/input.c @@ -25,11 +25,12 @@ #include "libs/input/sdl/vcontrol.h" #include "libs/input/sdl/keynames.h" #include "libs/misc.h" -#include "controls.h" #include "libs/file.h" #include "libs/log.h" #include "libs/reslib.h" #include "options.h" +// XXX: we should not include anything from uqm/ inside libs/ +#include "uqm/controls.h" #define KBDBUFSIZE (1 << 8) diff --git a/sc2/src/libs/resource/resinit.c b/sc2/src/libs/resource/resinit.c index 541d08a8f..7c196ff0a 100644 --- a/sc2/src/libs/resource/resinit.c +++ b/sc2/src/libs/resource/resinit.c @@ -19,17 +19,17 @@ #include "resintrn.h" #include "libs/misc.h" #include "options.h" -#include "nameref.h" #include "types.h" #include "libs/log.h" #include "libs/gfxlib.h" #include "libs/reslib.h" #include "libs/sndlib.h" #include "libs/vidlib.h" -#include "coderes.h" #include "propfile.h" #include #include +// XXX: we should not include anything from uqm/ inside libs/ +#include "uqm/coderes.h" static RESOURCE_INDEX allocResourceIndex (void) { diff --git a/sc2/src/libs/sound/trackplayer.c b/sc2/src/libs/sound/trackplayer.c index 44c10d117..df17a4418 100644 --- a/sc2/src/libs/sound/trackplayer.c +++ b/sc2/src/libs/sound/trackplayer.c @@ -18,10 +18,13 @@ #include "libs/sound/trackplayer.h" #include "libs/sound/trackint.h" #include "libs/log.h" -#include "comm.h" #include "options.h" #include #include +#include +#include +// XXX: we should not include anything from uqm/ inside libs/ +#include "uqm/comm.h" static int track_count; //total number of subtitle tracks diff --git a/sc2/src/libs/video/video.c b/sc2/src/libs/video/video.c index f8a80c28d..28380ea5d 100644 --- a/sc2/src/libs/video/video.c +++ b/sc2/src/libs/video/video.c @@ -16,9 +16,10 @@ #include "video.h" -#include "setup.h" #include "vidplayer.h" #include "libs/inplib.h" +// XXX: we should not include anything from uqm/ inside libs/ +#include "uqm/setup.h" #define NULL_VIDEO_REF (0) diff --git a/sc2/src/libs/video/vidplayer.c b/sc2/src/libs/video/vidplayer.c index f9f936e83..7d5348f66 100644 --- a/sc2/src/libs/video/vidplayer.c +++ b/sc2/src/libs/video/vidplayer.c @@ -16,13 +16,14 @@ #include "vidplayer.h" -#include "controls.h" -#include "settings.h" -#include "setup.h" -#include "sounds.h" #include "libs/graphics/gfx_common.h" #include "libs/graphics/tfb_draw.h" #include "libs/log.h" +// XXX: we should not include anything from uqm/ inside libs/ +#include "uqm/controls.h" +#include "uqm/settings.h" +#include "uqm/setup.h" +#include "uqm/sounds.h" // video callbacks static void vp_BeginFrame (TFB_VideoDecoder*); diff --git a/sc2/src/uqm.c b/sc2/src/uqm.c index 1ac2547e6..faf727132 100644 --- a/sc2/src/uqm.c +++ b/sc2/src/uqm.c @@ -31,8 +31,8 @@ #include "libs/input/input_common.h" #include "libs/inplib.h" #include "libs/tasklib.h" -#include "controls.h" -#include "battle.h" +#include "uqm/controls.h" +#include "uqm/battle.h" // For BATTLE_FRAME_RATE #include "libs/file.h" #include "port.h" @@ -41,16 +41,16 @@ #include "libs/log.h" #include "options.h" #include "uqmversion.h" -#include "comm.h" +#include "uqm/comm.h" #ifdef NETPLAY # include "libs/callback.h" # include "libs/alarm.h" # include "libs/net.h" -# include "netplay/netoptions.h" -# include "netplay/netplay.h" +# include "uqm/netplay/netoptions.h" +# include "uqm/netplay/netplay.h" #endif -#include "setup.h" -#include "starcon.h" +#include "uqm/setup.h" +#include "uqm/starcon.h" #if defined (GFXMODULE_SDL) diff --git a/sc2/src/uqm/comm/arilou/arilouc.c b/sc2/src/uqm/comm/arilou/arilouc.c index 00fc08b0a..00cdc287e 100644 --- a/sc2/src/uqm/comm/arilou/arilouc.c +++ b/sc2/src/uqm/comm/arilou/arilouc.c @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "comm/commall.h" -#include "comm/arilou/resinst.h" -#include "comm/arilou/strings.h" +#include "../commall.h" +#include "resinst.h" +#include "strings.h" -#include "gameev.h" +#include "uqm/gameev.h" static LOCDATA arilou_desc = diff --git a/sc2/src/uqm/comm/blackur/blackurc.c b/sc2/src/uqm/comm/blackur/blackurc.c index 33a79a1f9..413551ebc 100644 --- a/sc2/src/uqm/comm/blackur/blackurc.c +++ b/sc2/src/uqm/comm/blackur/blackurc.c @@ -16,9 +16,9 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "comm/commall.h" -#include "comm/blackur/resinst.h" -#include "comm/blackur/strings.h" +#include "../commall.h" +#include "resinst.h" +#include "strings.h" static LOCDATA blackurq_desc = { diff --git a/sc2/src/uqm/comm/chmmr/chmmrc.c b/sc2/src/uqm/comm/chmmr/chmmrc.c index 0799f9804..444aef68a 100644 --- a/sc2/src/uqm/comm/chmmr/chmmrc.c +++ b/sc2/src/uqm/comm/chmmr/chmmrc.c @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "comm/commall.h" -#include "comm/chmmr/resinst.h" -#include "comm/chmmr/strings.h" +#include "../commall.h" +#include "resinst.h" +#include "strings.h" -#include "build.h" +#include "uqm/build.h" static LOCDATA chmmr_desc = diff --git a/sc2/src/uqm/comm/comandr/comandr.c b/sc2/src/uqm/comm/comandr/comandr.c index e971f7ccf..d1a78c72f 100644 --- a/sc2/src/uqm/comm/comandr/comandr.c +++ b/sc2/src/uqm/comm/comandr/comandr.c @@ -16,10 +16,11 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "setup.h" -#include "comm/commall.h" -#include "comm/comandr/resinst.h" -#include "comm/comandr/strings.h" +#include "../commall.h" +#include "resinst.h" +#include "strings.h" + +#include "uqm/setup.h" #include "libs/graphics/gfx_common.h" static LOCDATA commander_desc = diff --git a/sc2/src/uqm/comm/commall.h b/sc2/src/uqm/comm/commall.h index f84c59e38..2213ba58c 100644 --- a/sc2/src/uqm/comm/commall.h +++ b/sc2/src/uqm/comm/commall.h @@ -17,10 +17,10 @@ #ifndef _COMMALL_H #define _COMMALL_H -#include "colors.h" -#include "comm.h" -#include "commglue.h" -#include "encount.h" +#include "uqm/colors.h" +#include "uqm/comm.h" +#include "uqm/commglue.h" +#include "uqm/encount.h" #include "libs/reslib.h" #endif /* _COMMALL_H */ diff --git a/sc2/src/uqm/comm/druuge/druugec.c b/sc2/src/uqm/comm/druuge/druugec.c index 60d9a3bd7..c00447af6 100644 --- a/sc2/src/uqm/comm/druuge/druugec.c +++ b/sc2/src/uqm/comm/druuge/druugec.c @@ -16,12 +16,12 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "comm/commall.h" -#include "comm/druuge/resinst.h" -#include "comm/druuge/strings.h" +#include "../commall.h" +#include "resinst.h" +#include "strings.h" -#include "build.h" -#include "setup.h" +#include "uqm/build.h" +#include "uqm/setup.h" static LOCDATA druuge_desc = diff --git a/sc2/src/uqm/comm/ilwrath/ilwrathc.c b/sc2/src/uqm/comm/ilwrath/ilwrathc.c index 258af3d69..3f07c3047 100644 --- a/sc2/src/uqm/comm/ilwrath/ilwrathc.c +++ b/sc2/src/uqm/comm/ilwrath/ilwrathc.c @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "comm/commall.h" -#include "comm/ilwrath/resinst.h" -#include "comm/ilwrath/strings.h" +#include "../commall.h" +#include "resinst.h" +#include "strings.h" -#include "gameev.h" +#include "uqm/gameev.h" static LOCDATA ilwrath_desc = diff --git a/sc2/src/uqm/comm/melnorm/melnorm.c b/sc2/src/uqm/comm/melnorm/melnorm.c index 803e7a3b1..1f186f665 100644 --- a/sc2/src/uqm/comm/melnorm/melnorm.c +++ b/sc2/src/uqm/comm/melnorm/melnorm.c @@ -16,13 +16,13 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "comm/commall.h" -#include "comm/melnorm/resinst.h" -#include "comm/melnorm/strings.h" +#include "../commall.h" +#include "resinst.h" +#include "strings.h" -#include "gameev.h" -#include "setup.h" -#include "shipcont.h" +#include "uqm/gameev.h" +#include "uqm/setup.h" +#include "uqm/shipcont.h" #include "libs/inplib.h" #include "libs/mathlib.h" diff --git a/sc2/src/uqm/comm/mycon/myconc.c b/sc2/src/uqm/comm/mycon/myconc.c index 60be1a17a..640c96cb7 100644 --- a/sc2/src/uqm/comm/mycon/myconc.c +++ b/sc2/src/uqm/comm/mycon/myconc.c @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "comm/commall.h" -#include "comm/mycon/resinst.h" -#include "comm/mycon/strings.h" +#include "../commall.h" +#include "resinst.h" +#include "strings.h" -#include "gameev.h" +#include "uqm/gameev.h" #include "libs/mathlib.h" diff --git a/sc2/src/uqm/comm/orz/orzc.c b/sc2/src/uqm/comm/orz/orzc.c index e0b4c2008..2e4f9b6fe 100644 --- a/sc2/src/uqm/comm/orz/orzc.c +++ b/sc2/src/uqm/comm/orz/orzc.c @@ -16,10 +16,11 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "comm/commall.h" -#include "comm/orz/resinst.h" -#include "comm/orz/strings.h" -#include "build.h" +#include "../commall.h" +#include "resinst.h" +#include "strings.h" + +#include "uqm/build.h" static LOCDATA orz_desc = diff --git a/sc2/src/uqm/comm/pkunk/pkunkc.c b/sc2/src/uqm/comm/pkunk/pkunkc.c index 8d07a7323..be56c8662 100644 --- a/sc2/src/uqm/comm/pkunk/pkunkc.c +++ b/sc2/src/uqm/comm/pkunk/pkunkc.c @@ -16,12 +16,12 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "comm/commall.h" -#include "comm/pkunk/resinst.h" -#include "comm/pkunk/strings.h" +#include "../commall.h" +#include "resinst.h" +#include "strings.h" -#include "build.h" -#include "gameev.h" +#include "uqm/build.h" +#include "uqm/gameev.h" static LOCDATA pkunk_desc = diff --git a/sc2/src/uqm/comm/rebel/rebel.c b/sc2/src/uqm/comm/rebel/rebel.c index fd4ad1c1f..448400e53 100644 --- a/sc2/src/uqm/comm/rebel/rebel.c +++ b/sc2/src/uqm/comm/rebel/rebel.c @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "comm/commall.h" -#include "comm/yehat/resinst.h" -#include "comm/rebel/strings.h" +#include "../commall.h" +#include "../yehat/resinst.h" +#include "strings.h" -#include "build.h" +#include "uqm/build.h" static LOCDATA yehat_desc = diff --git a/sc2/src/uqm/comm/shofixt/shofixt.c b/sc2/src/uqm/comm/shofixt/shofixt.c index a49fb6e21..8aa9651ff 100644 --- a/sc2/src/uqm/comm/shofixt/shofixt.c +++ b/sc2/src/uqm/comm/shofixt/shofixt.c @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "comm/commall.h" -#include "comm/shofixt/resinst.h" -#include "comm/shofixt/strings.h" +#include "../commall.h" +#include "resinst.h" +#include "strings.h" -#include "gameev.h" +#include "uqm/gameev.h" static LOCDATA shofixti_desc = diff --git a/sc2/src/uqm/comm/slyhome/slyhome.c b/sc2/src/uqm/comm/slyhome/slyhome.c index 6028d54a9..a6bf1949f 100644 --- a/sc2/src/uqm/comm/slyhome/slyhome.c +++ b/sc2/src/uqm/comm/slyhome/slyhome.c @@ -16,10 +16,11 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "gameev.h" -#include "comm/commall.h" -#include "comm/slyhome/resinst.h" -#include "comm/slyhome/strings.h" +#include "../commall.h" +#include "resinst.h" +#include "strings.h" + +#include "uqm/gameev.h" static LOCDATA slylandro_desc = diff --git a/sc2/src/uqm/comm/slyland/slyland.c b/sc2/src/uqm/comm/slyland/slyland.c index a8751a5de..4d33b03fe 100644 --- a/sc2/src/uqm/comm/slyland/slyland.c +++ b/sc2/src/uqm/comm/slyland/slyland.c @@ -16,13 +16,13 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "comm/commall.h" -#include "comm/slyland/resinst.h" -#include "comm/slyland/strings.h" -#include "options.h" +#include "../commall.h" +#include "resinst.h" +#include "strings.h" -#include "battle.h" -#include "setup.h" +#include "options.h" +#include "uqm/battle.h" +#include "uqm/setup.h" static LOCDATA slylandro_desc = diff --git a/sc2/src/uqm/comm/spahome/spahome.c b/sc2/src/uqm/comm/spahome/spahome.c index 06a49b0f0..9fbb815dc 100644 --- a/sc2/src/uqm/comm/spahome/spahome.c +++ b/sc2/src/uqm/comm/spahome/spahome.c @@ -16,12 +16,12 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "comm/commall.h" -#include "comm/spathi/resinst.h" -#include "comm/spahome/strings.h" +#include "../commall.h" +#include "../spathi/resinst.h" +#include "strings.h" -#include "build.h" -#include "gameev.h" +#include "uqm/build.h" +#include "uqm/gameev.h" static LOCDATA spahome_desc = diff --git a/sc2/src/uqm/comm/spathi/spathic.c b/sc2/src/uqm/comm/spathi/spathic.c index 9199dcd7b..73ed74287 100644 --- a/sc2/src/uqm/comm/spathi/spathic.c +++ b/sc2/src/uqm/comm/spathi/spathic.c @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "comm/commall.h" -#include "comm/spathi/resinst.h" -#include "comm/spathi/strings.h" +#include "../commall.h" +#include "resinst.h" +#include "strings.h" -#include "build.h" +#include "uqm/build.h" static LOCDATA spathi_desc = diff --git a/sc2/src/uqm/comm/starbas/starbas.c b/sc2/src/uqm/comm/starbas/starbas.c index 9eb28feed..e9c30dbe8 100644 --- a/sc2/src/uqm/comm/starbas/starbas.c +++ b/sc2/src/uqm/comm/starbas/starbas.c @@ -16,13 +16,13 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "comm/commall.h" -#include "comm/comandr/resinst.h" -#include "comm/starbas/strings.h" +#include "../commall.h" +#include "../comandr/resinst.h" +#include "strings.h" -#include "build.h" -#include "setup.h" -#include "shipcont.h" +#include "uqm/build.h" +#include "uqm/setup.h" +#include "uqm/shipcont.h" #include "libs/graphics/gfx_common.h" #include "libs/inplib.h" #include "libs/mathlib.h" diff --git a/sc2/src/uqm/comm/supox/supoxc.c b/sc2/src/uqm/comm/supox/supoxc.c index 683fe5f89..fc15ee95e 100644 --- a/sc2/src/uqm/comm/supox/supoxc.c +++ b/sc2/src/uqm/comm/supox/supoxc.c @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "comm/commall.h" -#include "comm/supox/resinst.h" -#include "comm/supox/strings.h" +#include "../commall.h" +#include "resinst.h" +#include "strings.h" -#include "build.h" +#include "uqm/build.h" static LOCDATA supox_desc = diff --git a/sc2/src/uqm/comm/syreen/syreenc.c b/sc2/src/uqm/comm/syreen/syreenc.c index 3147ebfb7..8db8145e2 100644 --- a/sc2/src/uqm/comm/syreen/syreenc.c +++ b/sc2/src/uqm/comm/syreen/syreenc.c @@ -16,12 +16,12 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "comm/commall.h" -#include "comm/syreen/resinst.h" -#include "comm/syreen/strings.h" -#include "libs/sound/sound.h" +#include "../commall.h" +#include "resinst.h" +#include "strings.h" -#include "build.h" +#include "libs/sound/sound.h" +#include "uqm/build.h" static LOCDATA syreen_desc = diff --git a/sc2/src/uqm/comm/talkpet/talkpet.c b/sc2/src/uqm/comm/talkpet/talkpet.c index 49954360d..33747edc5 100644 --- a/sc2/src/uqm/comm/talkpet/talkpet.c +++ b/sc2/src/uqm/comm/talkpet/talkpet.c @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "comm/commall.h" -#include "comm/talkpet/resinst.h" -#include "comm/talkpet/strings.h" +#include "../commall.h" +#include "resinst.h" +#include "strings.h" -#include "build.h" +#include "uqm/build.h" static LOCDATA talkpet_desc = { diff --git a/sc2/src/uqm/comm/thradd/thraddc.c b/sc2/src/uqm/comm/thradd/thraddc.c index 3a95efc79..920dd54ed 100644 --- a/sc2/src/uqm/comm/thradd/thraddc.c +++ b/sc2/src/uqm/comm/thradd/thraddc.c @@ -16,12 +16,12 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "comm/commall.h" -#include "comm/thradd/resinst.h" -#include "comm/thradd/strings.h" +#include "../commall.h" +#include "resinst.h" +#include "strings.h" -#include "build.h" -#include "gameev.h" +#include "uqm/build.h" +#include "uqm/gameev.h" static LOCDATA thradd_desc = diff --git a/sc2/src/uqm/comm/umgah/umgahc.c b/sc2/src/uqm/comm/umgah/umgahc.c index d16f5ab14..c357384a8 100644 --- a/sc2/src/uqm/comm/umgah/umgahc.c +++ b/sc2/src/uqm/comm/umgah/umgahc.c @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "comm/commall.h" -#include "comm/umgah/resinst.h" -#include "comm/umgah/strings.h" +#include "../commall.h" +#include "resinst.h" +#include "strings.h" -#include "build.h" +#include "uqm/build.h" static LOCDATA umgah_desc = diff --git a/sc2/src/uqm/comm/urquan/urquanc.c b/sc2/src/uqm/comm/urquan/urquanc.c index ecc39a3cd..a6aff347c 100644 --- a/sc2/src/uqm/comm/urquan/urquanc.c +++ b/sc2/src/uqm/comm/urquan/urquanc.c @@ -16,9 +16,9 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "comm/commall.h" -#include "comm/urquan/resinst.h" -#include "comm/urquan/strings.h" +#include "../commall.h" +#include "resinst.h" +#include "strings.h" static LOCDATA urquan_desc = { diff --git a/sc2/src/uqm/comm/utwig/utwigc.c b/sc2/src/uqm/comm/utwig/utwigc.c index d6e3de148..6bf2365f6 100644 --- a/sc2/src/uqm/comm/utwig/utwigc.c +++ b/sc2/src/uqm/comm/utwig/utwigc.c @@ -16,12 +16,12 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "comm/commall.h" -#include "comm/utwig/resinst.h" -#include "comm/utwig/strings.h" +#include "../commall.h" +#include "resinst.h" +#include "strings.h" -#include "build.h" -#include "gameev.h" +#include "uqm/build.h" +#include "uqm/gameev.h" static LOCDATA utwig_desc = diff --git a/sc2/src/uqm/comm/vux/vuxc.c b/sc2/src/uqm/comm/vux/vuxc.c index a8c357bfc..559bd8e9d 100644 --- a/sc2/src/uqm/comm/vux/vuxc.c +++ b/sc2/src/uqm/comm/vux/vuxc.c @@ -16,9 +16,9 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "comm/commall.h" -#include "comm/vux/resinst.h" -#include "comm/vux/strings.h" +#include "../commall.h" +#include "resinst.h" +#include "strings.h" static LOCDATA vux_desc = { diff --git a/sc2/src/uqm/comm/yehat/yehatc.c b/sc2/src/uqm/comm/yehat/yehatc.c index 99455b835..1ce341130 100644 --- a/sc2/src/uqm/comm/yehat/yehatc.c +++ b/sc2/src/uqm/comm/yehat/yehatc.c @@ -16,12 +16,12 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "comm/commall.h" -#include "comm/yehat/resinst.h" -#include "comm/yehat/strings.h" +#include "../commall.h" +#include "resinst.h" +#include "strings.h" -#include "build.h" -#include "gameev.h" +#include "uqm/build.h" +#include "uqm/gameev.h" #include "libs/mathlib.h" diff --git a/sc2/src/uqm/comm/zoqfot/zoqfotc.c b/sc2/src/uqm/comm/zoqfot/zoqfotc.c index ae627ff1a..324a2afb6 100644 --- a/sc2/src/uqm/comm/zoqfot/zoqfotc.c +++ b/sc2/src/uqm/comm/zoqfot/zoqfotc.c @@ -16,12 +16,12 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "comm/commall.h" -#include "comm/zoqfot/resinst.h" -#include "comm/zoqfot/strings.h" +#include "../commall.h" +#include "resinst.h" +#include "strings.h" -#include "build.h" -#include "gameev.h" +#include "uqm/build.h" +#include "uqm/gameev.h" #define ZOQ_FG_COLOR WHITE_COLOR diff --git a/sc2/src/uqm/netplay/checksum.c b/sc2/src/uqm/netplay/checksum.c index a5a628888..0b2797f36 100644 --- a/sc2/src/uqm/netplay/checksum.c +++ b/sc2/src/uqm/netplay/checksum.c @@ -28,7 +28,7 @@ // for DUMP_CRC_OPS #include "netconnection.h" #include "netmelee.h" -#include "tactrans.h" +#include "../tactrans.h" // for new_ship #include "libs/log.h" #include "libs/mathlib.h" diff --git a/sc2/src/uqm/netplay/checksum.h b/sc2/src/uqm/netplay/checksum.h index d3e4a3572..8df9525b5 100644 --- a/sc2/src/uqm/netplay/checksum.h +++ b/sc2/src/uqm/netplay/checksum.h @@ -28,7 +28,7 @@ typedef uint32 Checksum; #include "netplay.h" #include "crc.h" -#include "element.h" +#include "../element.h" #include "libs/gfxlib.h" #include "netconnection.h" diff --git a/sc2/src/uqm/netplay/netmelee.c b/sc2/src/uqm/netplay/netmelee.c index 07db76f84..32accd51b 100644 --- a/sc2/src/uqm/netplay/netmelee.c +++ b/sc2/src/uqm/netplay/netmelee.c @@ -21,22 +21,22 @@ #include "libs/callback.h" #include "libs/log.h" #include "libs/net.h" -#include "netplay/netinput.h" -#include "netplay/netmisc.h" -#include "netplay/netsend.h" -#include "netplay/notify.h" -#include "netplay/packetq.h" -#include "netplay/proto/npconfirm.h" -#include "netplay/proto/ready.h" -#include "netplay/proto/reset.h" +#include "netinput.h" +#include "netmisc.h" +#include "netsend.h" +#include "notify.h" +#include "packetq.h" +#include "proto/npconfirm.h" +#include "proto/ready.h" +#include "proto/reset.h" -#include "battlecontrols.h" +#include "../battlecontrols.h" // for NetworkInputContext -#include "controls.h" +#include "../controls.h" // for BATTLE_INPUT_STATE -#include "init.h" +#include "../init.h" // for NUM_PLAYERS -#include "globdata.h" +#include "../globdata.h" // for GLOBAL #include diff --git a/sc2/src/uqm/netplay/netmisc.c b/sc2/src/uqm/netplay/netmisc.c index bbbaaf9ad..73faf16c0 100644 --- a/sc2/src/uqm/netplay/netmisc.c +++ b/sc2/src/uqm/netplay/netmisc.c @@ -23,7 +23,7 @@ #include "packetsenders.h" #include "proto/ready.h" -#include "melee.h" +#include "../melee.h" // For feedback functions. #include diff --git a/sc2/src/uqm/netplay/netmisc.h b/sc2/src/uqm/netplay/netmisc.h index 623ff15de..2ff809296 100644 --- a/sc2/src/uqm/netplay/netmisc.h +++ b/sc2/src/uqm/netplay/netmisc.h @@ -25,7 +25,7 @@ typedef struct BattleStateData BattleStateData; #include "netstate.h" #include "types.h" -#include "battle.h" +#include "../battle.h" // for BattleFrameCounter, BATTLE_FRAME_RATE struct BattleStateData { diff --git a/sc2/src/uqm/netplay/notify.h b/sc2/src/uqm/netplay/notify.h index 59dc15823..c4290d1bd 100644 --- a/sc2/src/uqm/netplay/notify.h +++ b/sc2/src/uqm/netplay/notify.h @@ -22,7 +22,7 @@ #include "netplay.h" // for NETPLAY_CHECKSUM #include "netconnection.h" -#include "controls.h" +#include "../controls.h" // for BATTLE_INPUT_STATE #ifdef NETPLAY_CHECKSUM # include "checksum.h" diff --git a/sc2/src/uqm/netplay/packethandlers.c b/sc2/src/uqm/netplay/packethandlers.c index f4125ab19..7a4d46ec7 100644 --- a/sc2/src/uqm/netplay/packethandlers.c +++ b/sc2/src/uqm/netplay/packethandlers.c @@ -31,15 +31,15 @@ #include "proto/reset.h" #include "libs/log.h" -#include "controls.h" +#include "../controls.h" // for BATTLE_INPUT_STATE -#include "init.h" +#include "../init.h" // for NUM_PLAYERS -#include "globdata.h" +#include "../globdata.h" // for GLOBAL -#include "melee.h" +#include "../melee.h" // for various update functions. -#include "pickmele.h" +#include "../pickmele.h" // for various update functions. #include "libs/mathlib.h" // for TFB_SeedRandom diff --git a/sc2/src/uqm/netplay/packetsenders.h b/sc2/src/uqm/netplay/packetsenders.h index 4ee298cb0..6e2af7214 100644 --- a/sc2/src/uqm/netplay/packetsenders.h +++ b/sc2/src/uqm/netplay/packetsenders.h @@ -24,7 +24,7 @@ #include "netconnection.h" #include "packet.h" -#include "controls.h" +#include "../controls.h" // for BATTLE_INPUT_STATE void sendInit(NetConnection *conn); diff --git a/sc2/src/uqm/planets/calc.c b/sc2/src/uqm/planets/calc.c index 206b91dd8..ac663ebf5 100644 --- a/sc2/src/uqm/planets/calc.c +++ b/sc2/src/uqm/planets/calc.c @@ -17,7 +17,7 @@ */ /* ----------------------------- INCLUDES ---------------------------- */ -#include "encount.h" +#include "../encount.h" #include "libs/mathlib.h" #include "libs/log.h" /* -------------------------------- DATA -------------------------------- */ diff --git a/sc2/src/uqm/planets/cargo.c b/sc2/src/uqm/planets/cargo.c index dedf700b3..ed1da1c18 100644 --- a/sc2/src/uqm/planets/cargo.c +++ b/sc2/src/uqm/planets/cargo.c @@ -16,13 +16,13 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "colors.h" -#include "controls.h" -#include "gamestr.h" -#include "shipcont.h" -#include "setup.h" -#include "sounds.h" -#include "util.h" +#include "../colors.h" +#include "../controls.h" +#include "../gamestr.h" +#include "../shipcont.h" +#include "../setup.h" +#include "../sounds.h" +#include "../util.h" void diff --git a/sc2/src/uqm/planets/devices.c b/sc2/src/uqm/planets/devices.c index 90d1440b5..448f37b52 100644 --- a/sc2/src/uqm/planets/devices.c +++ b/sc2/src/uqm/planets/devices.c @@ -16,18 +16,18 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "build.h" -#include "encount.h" -#include "gamestr.h" -#include "controls.h" -#include "settings.h" -#include "shipcont.h" -#include "load.h" -#include "setup.h" -#include "state.h" -#include "grpinfo.h" -#include "sounds.h" -#include "util.h" +#include "../build.h" +#include "../encount.h" +#include "../gamestr.h" +#include "../controls.h" +#include "../settings.h" +#include "../shipcont.h" +#include "../load.h" +#include "../setup.h" +#include "../state.h" +#include "../grpinfo.h" +#include "../sounds.h" +#include "../util.h" #include "libs/strlib.h" diff --git a/sc2/src/uqm/planets/genall.h b/sc2/src/uqm/planets/genall.h index dfdb01277..eb15d2fe0 100644 --- a/sc2/src/uqm/planets/genall.h +++ b/sc2/src/uqm/planets/genall.h @@ -17,8 +17,11 @@ #ifndef _GENALL_H #define _GENALL_H -#include "planets/planets.h" +#include "planets.h" #include "libs/compiler.h" +#include "../globdata.h" +#include "../nameref.h" +#include "../resinst.h" #endif /* _GENALL_H */ diff --git a/sc2/src/uqm/planets/genburv.c b/sc2/src/uqm/planets/genburv.c index 7b7da59a2..9bbb6d0b2 100644 --- a/sc2/src/uqm/planets/genburv.c +++ b/sc2/src/uqm/planets/genburv.c @@ -16,10 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "globdata.h" -#include "nameref.h" -#include "resinst.h" -#include "planets/genall.h" +#include "genall.h" #include "libs/mathlib.h" diff --git a/sc2/src/uqm/planets/genchmmr.c b/sc2/src/uqm/planets/genchmmr.c index 9defe44aa..3466b72d6 100644 --- a/sc2/src/uqm/planets/genchmmr.c +++ b/sc2/src/uqm/planets/genchmmr.c @@ -16,16 +16,13 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "build.h" -#include "encount.h" -#include "globdata.h" +#include "genall.h" #include "lander.h" -#include "nameref.h" -#include "resinst.h" -#include "setup.h" -#include "state.h" -#include "sounds.h" -#include "planets/genall.h" +#include "../build.h" +#include "../encount.h" +#include "../setup.h" +#include "../state.h" +#include "../sounds.h" #include "libs/mathlib.h" diff --git a/sc2/src/uqm/planets/gencol.c b/sc2/src/uqm/planets/gencol.c index 3f816449b..566f200ad 100644 --- a/sc2/src/uqm/planets/gencol.c +++ b/sc2/src/uqm/planets/gencol.c @@ -16,11 +16,10 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "build.h" -#include "globdata.h" -#include "state.h" -#include "grpinfo.h" -#include "planets/genall.h" +#include "genall.h" +#include "../build.h" +#include "../state.h" +#include "../grpinfo.h" void diff --git a/sc2/src/uqm/planets/gendru.c b/sc2/src/uqm/planets/gendru.c index d84ad0f85..1862f610b 100644 --- a/sc2/src/uqm/planets/gendru.c +++ b/sc2/src/uqm/planets/gendru.c @@ -16,15 +16,12 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "build.h" -#include "encount.h" -#include "globdata.h" +#include "genall.h" #include "lander.h" -#include "ipdisp.h" -#include "nameref.h" -#include "resinst.h" -#include "state.h" -#include "planets/genall.h" +#include "../build.h" +#include "../encount.h" +#include "../ipdisp.h" +#include "../state.h" #include "libs/mathlib.h" diff --git a/sc2/src/uqm/planets/genilw.c b/sc2/src/uqm/planets/genilw.c index 95737f65a..73eb0c7d2 100644 --- a/sc2/src/uqm/planets/genilw.c +++ b/sc2/src/uqm/planets/genilw.c @@ -16,14 +16,11 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "build.h" -#include "encount.h" -#include "globdata.h" -#include "ipdisp.h" -#include "nameref.h" -#include "resinst.h" -#include "state.h" -#include "planets/genall.h" +#include "genall.h" +#include "../build.h" +#include "../encount.h" +#include "../ipdisp.h" +#include "../state.h" #include "libs/mathlib.h" diff --git a/sc2/src/uqm/planets/genmel.c b/sc2/src/uqm/planets/genmel.c index ab8fea5a4..b02a48a01 100644 --- a/sc2/src/uqm/planets/genmel.c +++ b/sc2/src/uqm/planets/genmel.c @@ -16,11 +16,10 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "build.h" -#include "encount.h" -#include "globdata.h" -#include "state.h" -#include "planets/genall.h" +#include "genall.h" +#include "../build.h" +#include "../encount.h" +#include "../state.h" #include "libs/log.h" diff --git a/sc2/src/uqm/planets/genmyc.c b/sc2/src/uqm/planets/genmyc.c index 7d6432acf..5430fe865 100644 --- a/sc2/src/uqm/planets/genmyc.c +++ b/sc2/src/uqm/planets/genmyc.c @@ -16,15 +16,12 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "build.h" -#include "encount.h" -#include "globdata.h" -#include "ipdisp.h" -#include "nameref.h" -#include "resinst.h" -#include "setup.h" -#include "state.h" -#include "planets/genall.h" +#include "genall.h" +#include "../build.h" +#include "../encount.h" +#include "../ipdisp.h" +#include "../setup.h" +#include "../state.h" #include "libs/mathlib.h" diff --git a/sc2/src/uqm/planets/genorz.c b/sc2/src/uqm/planets/genorz.c index d286f2082..f731c7ff3 100644 --- a/sc2/src/uqm/planets/genorz.c +++ b/sc2/src/uqm/planets/genorz.c @@ -16,17 +16,14 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "build.h" -#include "encount.h" -#include "globdata.h" +#include "genall.h" #include "lander.h" -#include "ipdisp.h" -#include "nameref.h" -#include "resinst.h" -#include "setup.h" -#include "state.h" -#include "sounds.h" -#include "planets/genall.h" +#include "../build.h" +#include "../encount.h" +#include "../ipdisp.h" +#include "../setup.h" +#include "../state.h" +#include "../sounds.h" #include "libs/mathlib.h" diff --git a/sc2/src/uqm/planets/genpet.c b/sc2/src/uqm/planets/genpet.c index 8d3a78819..abbbad8bb 100644 --- a/sc2/src/uqm/planets/genpet.c +++ b/sc2/src/uqm/planets/genpet.c @@ -16,15 +16,12 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "build.h" -#include "encount.h" -#include "globdata.h" -#include "ipdisp.h" -#include "nameref.h" -#include "resinst.h" -#include "setup.h" -#include "state.h" -#include "planets/genall.h" +#include "genall.h" +#include "../build.h" +#include "../encount.h" +#include "../ipdisp.h" +#include "../setup.h" +#include "../state.h" #include "libs/mathlib.h" diff --git a/sc2/src/uqm/planets/genpku.c b/sc2/src/uqm/planets/genpku.c index 6729b8b24..999b3df43 100644 --- a/sc2/src/uqm/planets/genpku.c +++ b/sc2/src/uqm/planets/genpku.c @@ -16,15 +16,12 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "build.h" -#include "encount.h" -#include "globdata.h" +#include "genall.h" #include "lander.h" -#include "ipdisp.h" -#include "nameref.h" -#include "resinst.h" -#include "state.h" -#include "planets/genall.h" +#include "../build.h" +#include "../encount.h" +#include "../ipdisp.h" +#include "../state.h" #include "libs/mathlib.h" diff --git a/sc2/src/uqm/planets/genrain.c b/sc2/src/uqm/planets/genrain.c index 82a106954..62a859693 100644 --- a/sc2/src/uqm/planets/genrain.c +++ b/sc2/src/uqm/planets/genrain.c @@ -16,9 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "encount.h" -#include "globdata.h" -#include "planets/genall.h" +#include "genall.h" +#include "../encount.h" void diff --git a/sc2/src/uqm/planets/gensam.c b/sc2/src/uqm/planets/gensam.c index 5728ef9e2..7013e1e41 100644 --- a/sc2/src/uqm/planets/gensam.c +++ b/sc2/src/uqm/planets/gensam.c @@ -16,14 +16,12 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "build.h" -#include "encount.h" -#include "globdata.h" -#include "resinst.h" -#include "races.h" -#include "state.h" -#include "grpinfo.h" -#include "planets/genall.h" +#include "genall.h" +#include "../build.h" +#include "../encount.h" +#include "../races.h" +#include "../state.h" +#include "../grpinfo.h" #include "libs/mathlib.h" diff --git a/sc2/src/uqm/planets/genshof.c b/sc2/src/uqm/planets/genshof.c index 411333dc9..d1a582413 100644 --- a/sc2/src/uqm/planets/genshof.c +++ b/sc2/src/uqm/planets/genshof.c @@ -16,11 +16,10 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "build.h" -#include "globdata.h" -#include "state.h" -#include "grpinfo.h" -#include "planets/genall.h" +#include "genall.h" +#include "../build.h" +#include "../state.h" +#include "../grpinfo.h" static void diff --git a/sc2/src/uqm/planets/gensly.c b/sc2/src/uqm/planets/gensly.c index 1614b9eb9..461b42477 100644 --- a/sc2/src/uqm/planets/gensly.c +++ b/sc2/src/uqm/planets/gensly.c @@ -16,9 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "encount.h" -#include "resinst.h" -#include "planets/genall.h" +#include "genall.h" +#include "../encount.h" void diff --git a/sc2/src/uqm/planets/gensol.c b/sc2/src/uqm/planets/gensol.c index 988080c25..df9ae69f8 100644 --- a/sc2/src/uqm/planets/gensol.c +++ b/sc2/src/uqm/planets/gensol.c @@ -16,18 +16,15 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "build.h" -#include "gamestr.h" -#include "globdata.h" +#include "genall.h" #include "lander.h" #include "lifeform.h" -#include "nameref.h" -#include "races.h" -#include "resinst.h" -#include "state.h" -#include "grpinfo.h" -#include "encount.h" -#include "planets/genall.h" +#include "../build.h" +#include "../gamestr.h" +#include "../races.h" +#include "../state.h" +#include "../grpinfo.h" +#include "../encount.h" #include "libs/mathlib.h" diff --git a/sc2/src/uqm/planets/genspa.c b/sc2/src/uqm/planets/genspa.c index a723fc93e..01e9daf5f 100644 --- a/sc2/src/uqm/planets/genspa.c +++ b/sc2/src/uqm/planets/genspa.c @@ -16,15 +16,12 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "build.h" -#include "encount.h" -#include "globdata.h" -#include "ipdisp.h" +#include "genall.h" #include "lifeform.h" -#include "nameref.h" -#include "resinst.h" -#include "state.h" -#include "planets/genall.h" +#include "../build.h" +#include "../encount.h" +#include "../ipdisp.h" +#include "../state.h" #include "libs/mathlib.h" diff --git a/sc2/src/uqm/planets/gensup.c b/sc2/src/uqm/planets/gensup.c index 23343d5f6..7299b2f7c 100644 --- a/sc2/src/uqm/planets/gensup.c +++ b/sc2/src/uqm/planets/gensup.c @@ -16,15 +16,12 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "build.h" -#include "encount.h" -#include "globdata.h" +#include "genall.h" #include "lander.h" -#include "ipdisp.h" -#include "nameref.h" -#include "resinst.h" -#include "state.h" -#include "planets/genall.h" +#include "../build.h" +#include "../encount.h" +#include "../ipdisp.h" +#include "../state.h" #include "libs/mathlib.h" void diff --git a/sc2/src/uqm/planets/gensyr.c b/sc2/src/uqm/planets/gensyr.c index b1cfd1ee5..694bd5fb6 100644 --- a/sc2/src/uqm/planets/gensyr.c +++ b/sc2/src/uqm/planets/gensyr.c @@ -16,9 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "encount.h" -#include "resinst.h" -#include "planets/genall.h" +#include "genall.h" +#include "../encount.h" static void diff --git a/sc2/src/uqm/planets/genthrad.c b/sc2/src/uqm/planets/genthrad.c index d54f8778a..830cd410f 100644 --- a/sc2/src/uqm/planets/genthrad.c +++ b/sc2/src/uqm/planets/genthrad.c @@ -16,15 +16,12 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "build.h" -#include "encount.h" -#include "globdata.h" -#include "ipdisp.h" -#include "nameref.h" -#include "resinst.h" -#include "setup.h" -#include "state.h" -#include "planets/genall.h" +#include "genall.h" +#include "../build.h" +#include "../encount.h" +#include "../ipdisp.h" +#include "../setup.h" +#include "../state.h" #include "libs/mathlib.h" diff --git a/sc2/src/uqm/planets/genutw.c b/sc2/src/uqm/planets/genutw.c index 5b995565a..cbe9bbc18 100644 --- a/sc2/src/uqm/planets/genutw.c +++ b/sc2/src/uqm/planets/genutw.c @@ -16,15 +16,12 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "build.h" -#include "encount.h" -#include "globdata.h" -#include "ipdisp.h" -#include "nameref.h" -#include "resinst.h" -#include "setup.h" -#include "state.h" -#include "planets/genall.h" +#include "genall.h" +#include "../build.h" +#include "../encount.h" +#include "../ipdisp.h" +#include "../setup.h" +#include "../state.h" #include "libs/mathlib.h" void diff --git a/sc2/src/uqm/planets/genvault.c b/sc2/src/uqm/planets/genvault.c index 483e35211..5465b41ad 100644 --- a/sc2/src/uqm/planets/genvault.c +++ b/sc2/src/uqm/planets/genvault.c @@ -16,13 +16,10 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "encount.h" -#include "globdata.h" +#include "genall.h" #include "lander.h" -#include "nameref.h" -#include "resinst.h" -#include "setup.h" -#include "planets/genall.h" +#include "../encount.h" +#include "../setup.h" #include "libs/mathlib.h" diff --git a/sc2/src/uqm/planets/genvux.c b/sc2/src/uqm/planets/genvux.c index 703a9aeb6..2b8a3e995 100644 --- a/sc2/src/uqm/planets/genvux.c +++ b/sc2/src/uqm/planets/genvux.c @@ -16,18 +16,15 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "build.h" -#include "encount.h" -#include "globdata.h" +#include "genall.h" #include "lander.h" -#include "ipdisp.h" #include "lifeform.h" -#include "nameref.h" -#include "resinst.h" -#include "setup.h" -#include "state.h" -#include "sounds.h" -#include "planets/genall.h" +#include "../build.h" +#include "../encount.h" +#include "../ipdisp.h" +#include "../setup.h" +#include "../state.h" +#include "../sounds.h" #include "libs/mathlib.h" diff --git a/sc2/src/uqm/planets/genwreck.c b/sc2/src/uqm/planets/genwreck.c index 35f7a5c39..9138e756d 100644 --- a/sc2/src/uqm/planets/genwreck.c +++ b/sc2/src/uqm/planets/genwreck.c @@ -16,11 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "globdata.h" +#include "genall.h" #include "lander.h" -#include "nameref.h" -#include "resinst.h" -#include "planets/genall.h" #include "libs/mathlib.h" diff --git a/sc2/src/uqm/planets/genyeh.c b/sc2/src/uqm/planets/genyeh.c index 78453902b..6b1b88123 100644 --- a/sc2/src/uqm/planets/genyeh.c +++ b/sc2/src/uqm/planets/genyeh.c @@ -16,14 +16,11 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "build.h" -#include "encount.h" -#include "globdata.h" -#include "ipdisp.h" -#include "nameref.h" -#include "resinst.h" -#include "state.h" -#include "planets/genall.h" +#include "genall.h" +#include "../build.h" +#include "../encount.h" +#include "../ipdisp.h" +#include "../state.h" #include "libs/mathlib.h" diff --git a/sc2/src/uqm/planets/genzoq.c b/sc2/src/uqm/planets/genzoq.c index 35a79872b..0a873bc61 100644 --- a/sc2/src/uqm/planets/genzoq.c +++ b/sc2/src/uqm/planets/genzoq.c @@ -16,14 +16,11 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "build.h" -#include "encount.h" -#include "globdata.h" -#include "nameref.h" -#include "resinst.h" -#include "state.h" -#include "grpinfo.h" -#include "planets/genall.h" +#include "genall.h" +#include "../build.h" +#include "../encount.h" +#include "../state.h" +#include "../grpinfo.h" #include "libs/mathlib.h" diff --git a/sc2/src/uqm/planets/lander.c b/sc2/src/uqm/planets/lander.c index 61f32510e..6c6fb0528 100644 --- a/sc2/src/uqm/planets/lander.c +++ b/sc2/src/uqm/planets/lander.c @@ -18,19 +18,19 @@ #include "lander.h" -#include "cons_res.h" -#include "controls.h" -#include "colors.h" -#include "encount.h" -#include "process.h" -#include "gamestr.h" #include "lifeform.h" #include "scan.h" -#include "nameref.h" -#include "resinst.h" -#include "setup.h" -#include "sounds.h" -#include "element.h" +#include "../cons_res.h" +#include "../controls.h" +#include "../colors.h" +#include "../encount.h" +#include "../process.h" +#include "../gamestr.h" +#include "../nameref.h" +#include "../resinst.h" +#include "../setup.h" +#include "../sounds.h" +#include "../element.h" #include "libs/graphics/gfx_common.h" #include "libs/mathlib.h" #include "libs/log.h" diff --git a/sc2/src/uqm/planets/lander.h b/sc2/src/uqm/planets/lander.h index d44505b21..affa378ea 100644 --- a/sc2/src/uqm/planets/lander.h +++ b/sc2/src/uqm/planets/lander.h @@ -19,12 +19,12 @@ #ifndef _LANDER_H #define _LANDER_H -#include "planets/elemdata.h" +#include "elemdata.h" #include "libs/compiler.h" #include "libs/gfxlib.h" #include "libs/sndlib.h" -#include "menustat.h" -#include "element.h" +#include "../menustat.h" +#include "../element.h" #define NUM_TEXT_FRAMES 32 diff --git a/sc2/src/uqm/planets/orbits.c b/sc2/src/uqm/planets/orbits.c index afabf38a1..76ce2e485 100644 --- a/sc2/src/uqm/planets/orbits.c +++ b/sc2/src/uqm/planets/orbits.c @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "encount.h" -#include "planets/planets.h" +#include "planets.h" +#include "../encount.h" #include "libs/compiler.h" #include "libs/mathlib.h" #include "libs/log.h" diff --git a/sc2/src/uqm/planets/oval.c b/sc2/src/uqm/planets/oval.c index f5bdcd6d6..720316ca1 100644 --- a/sc2/src/uqm/planets/oval.c +++ b/sc2/src/uqm/planets/oval.c @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "units.h" +#include "../units.h" #include "libs/gfxlib.h" #include "libs/graphics/context.h" #include "libs/graphics/drawable.h" diff --git a/sc2/src/uqm/planets/pl_stuff.c b/sc2/src/uqm/planets/pl_stuff.c index 33e551b65..651af0b68 100644 --- a/sc2/src/uqm/planets/pl_stuff.c +++ b/sc2/src/uqm/planets/pl_stuff.c @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "planets/planets.h" -#include "setup.h" +#include "planets.h" +#include "../setup.h" #include "libs/graphics/gfx_common.h" #include "libs/graphics/drawable.h" -#include "planets/scan.h" +#include "scan.h" #include diff --git a/sc2/src/uqm/planets/planets.c b/sc2/src/uqm/planets/planets.c index 6dc9f0799..f1ca33b62 100644 --- a/sc2/src/uqm/planets/planets.c +++ b/sc2/src/uqm/planets/planets.c @@ -16,15 +16,15 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "element.h" #include "scan.h" #include "lander.h" -#include "settings.h" -#include "setup.h" -#include "uqmdebug.h" +#include "../element.h" +#include "../settings.h" +#include "../setup.h" +#include "../uqmdebug.h" +#include "../resinst.h" +#include "../nameref.h" #include "libs/graphics/gfx_common.h" -#include "resinst.h" -#include "nameref.h" extern int rotate_planet_task (void *data); diff --git a/sc2/src/uqm/planets/planets.h b/sc2/src/uqm/planets/planets.h index a49b1cca4..5929e84c3 100644 --- a/sc2/src/uqm/planets/planets.h +++ b/sc2/src/uqm/planets/planets.h @@ -19,8 +19,8 @@ #ifndef _PLANETS_H #define _PLANETS_H -#include "menustat.h" -#include "units.h" +#include "../menustat.h" +#include "../units.h" #define END_INTERPLANETARY START_INTERPLANETARY diff --git a/sc2/src/uqm/planets/plangen.c b/sc2/src/uqm/planets/plangen.c index 9c310ad0a..978df9ea5 100644 --- a/sc2/src/uqm/planets/plangen.c +++ b/sc2/src/uqm/planets/plangen.c @@ -16,12 +16,12 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "nameref.h" -#include "resinst.h" -#include "setup.h" +#include "planets.h" +#include "scan.h" +#include "../nameref.h" +#include "../resinst.h" +#include "../setup.h" #include "options.h" -#include "planets/planets.h" -#include "planets/scan.h" #include "libs/graphics/gfx_common.h" #include "libs/graphics/drawable.h" #include "libs/mathlib.h" diff --git a/sc2/src/uqm/planets/pstarmap.c b/sc2/src/uqm/planets/pstarmap.c index 286dfde46..f84bf32d6 100644 --- a/sc2/src/uqm/planets/pstarmap.c +++ b/sc2/src/uqm/planets/pstarmap.c @@ -16,20 +16,20 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "colors.h" -#include "controls.h" -#include "encount.h" -#include "gameopt.h" -#include "gamestr.h" -#include "globdata.h" -#include "options.h" #include "scan.h" -#include "shipcont.h" -#include "settings.h" -#include "setup.h" -#include "sounds.h" -#include "state.h" -#include "uqmdebug.h" +#include "../colors.h" +#include "../controls.h" +#include "../encount.h" +#include "../gameopt.h" +#include "../gamestr.h" +#include "../globdata.h" +#include "../shipcont.h" +#include "../settings.h" +#include "../setup.h" +#include "../sounds.h" +#include "../state.h" +#include "../uqmdebug.h" +#include "options.h" #include "libs/inplib.h" #include "libs/strlib.h" #include "libs/graphics/gfx_common.h" diff --git a/sc2/src/uqm/planets/report.c b/sc2/src/uqm/planets/report.c index 7261dc9f1..982e09b0f 100644 --- a/sc2/src/uqm/planets/report.c +++ b/sc2/src/uqm/planets/report.c @@ -16,15 +16,15 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "colors.h" -#include "controls.h" -#include "gamestr.h" +#include "lander.h" +#include "planets.h" +#include "../colors.h" +#include "../controls.h" +#include "../gamestr.h" +#include "../setup.h" +#include "../sounds.h" +#include "../uqmdebug.h" #include "options.h" -#include "setup.h" -#include "sounds.h" -#include "planets/lander.h" -#include "planets/planets.h" -#include "uqmdebug.h" #include "libs/inplib.h" #include diff --git a/sc2/src/uqm/planets/roster.c b/sc2/src/uqm/planets/roster.c index 42772631f..9e4a2395a 100644 --- a/sc2/src/uqm/planets/roster.c +++ b/sc2/src/uqm/planets/roster.c @@ -16,13 +16,13 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "build.h" -#include "colors.h" -#include "controls.h" -#include "races.h" -#include "shipcont.h" -#include "setup.h" -#include "sounds.h" +#include "../build.h" +#include "../colors.h" +#include "../controls.h" +#include "../races.h" +#include "../shipcont.h" +#include "../setup.h" +#include "../sounds.h" #include "libs/gfxlib.h" #include "libs/tasklib.h" diff --git a/sc2/src/uqm/planets/scan.c b/sc2/src/uqm/planets/scan.c index 66519dcc7..63093a788 100644 --- a/sc2/src/uqm/planets/scan.c +++ b/sc2/src/uqm/planets/scan.c @@ -16,23 +16,23 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "build.h" -#include "cons_res.h" -#include "controls.h" -#include "encount.h" -#include "gamestr.h" -#include "lifeform.h" -#include "nameref.h" -#include "options.h" -#include "resinst.h" -#include "settings.h" -#include "load.h" -#include "util.h" #include "lander.h" -#include "process.h" -#include "setup.h" -#include "sounds.h" -#include "state.h" +#include "lifeform.h" +#include "../build.h" +#include "../cons_res.h" +#include "../controls.h" +#include "../encount.h" +#include "../gamestr.h" +#include "../nameref.h" +#include "../resinst.h" +#include "../settings.h" +#include "../load.h" +#include "../util.h" +#include "../process.h" +#include "../setup.h" +#include "../sounds.h" +#include "../state.h" +#include "options.h" #include "libs/graphics/gfx_common.h" #include "libs/inplib.h" #include "libs/mathlib.h" diff --git a/sc2/src/uqm/planets/solarsys.c b/sc2/src/uqm/planets/solarsys.c index b1e279f1c..6741c581a 100644 --- a/sc2/src/uqm/planets/solarsys.c +++ b/sc2/src/uqm/planets/solarsys.c @@ -16,23 +16,23 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "colors.h" -#include "controls.h" -#include "encount.h" -#include "gamestr.h" -#include "globdata.h" -#include "init.h" -#include "nameref.h" -#include "resinst.h" -#include "settings.h" #include "lander.h" -#include "ipdisp.h" -#include "process.h" -#include "load.h" -#include "setup.h" -#include "sounds.h" -#include "state.h" -#include "uqmdebug.h" +#include "../colors.h" +#include "../controls.h" +#include "../encount.h" +#include "../gamestr.h" +#include "../globdata.h" +#include "../init.h" +#include "../nameref.h" +#include "../resinst.h" +#include "../settings.h" +#include "../ipdisp.h" +#include "../process.h" +#include "../load.h" +#include "../setup.h" +#include "../sounds.h" +#include "../state.h" +#include "../uqmdebug.h" #include "libs/graphics/gfx_common.h" #include "libs/mathlib.h" #include "libs/inplib.h" diff --git a/sc2/src/uqm/planets/sundata.h b/sc2/src/uqm/planets/sundata.h index 717c7099f..db6139969 100644 --- a/sc2/src/uqm/planets/sundata.h +++ b/sc2/src/uqm/planets/sundata.h @@ -19,7 +19,7 @@ #ifndef _SUNDATA_H #define _SUNDATA_H -#include "planets/plandata.h" +#include "plandata.h" #include "libs/compiler.h" diff --git a/sc2/src/uqm/ships/androsyn/androsyn.c b/sc2/src/uqm/ships/androsyn/androsyn.c index f5904ae0d..26f818b59 100644 --- a/sc2/src/uqm/ships/androsyn/androsyn.c +++ b/sc2/src/uqm/ships/androsyn/androsyn.c @@ -16,9 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "ships/ship.h" -#include "ships/androsyn/resinst.h" -#include "ship.h" +#include "../ship.h" +#include "resinst.h" #include "libs/mathlib.h" diff --git a/sc2/src/uqm/ships/arilou/arilou.c b/sc2/src/uqm/ships/arilou/arilou.c index 186d08802..30b9ad02a 100644 --- a/sc2/src/uqm/ships/arilou/arilou.c +++ b/sc2/src/uqm/ships/arilou/arilou.c @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "ships/ship.h" -#include "ships/arilou/resinst.h" +#include "../ship.h" +#include "resinst.h" #include "libs/mathlib.h" diff --git a/sc2/src/uqm/ships/blackurq/blackurq.c b/sc2/src/uqm/ships/blackurq/blackurq.c index b3330caa2..f6cf4a2bd 100644 --- a/sc2/src/uqm/ships/blackurq/blackurq.c +++ b/sc2/src/uqm/ships/blackurq/blackurq.c @@ -16,10 +16,10 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "ships/ship.h" -#include "ships/blackurq/resinst.h" +#include "../ship.h" +#include "resinst.h" -#include "globdata.h" +#include "uqm/globdata.h" #define MAX_CREW MAX_CREW_SIZE diff --git a/sc2/src/uqm/ships/chenjesu/chenjesu.c b/sc2/src/uqm/ships/chenjesu/chenjesu.c index b0213677d..63dd9443b 100644 --- a/sc2/src/uqm/ships/chenjesu/chenjesu.c +++ b/sc2/src/uqm/ships/chenjesu/chenjesu.c @@ -16,11 +16,10 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "ships/ship.h" -#include "ships/chenjesu/resinst.h" -#include "ship.h" +#include "../ship.h" +#include "resinst.h" -#include "globdata.h" +#include "uqm/globdata.h" #include "libs/mathlib.h" diff --git a/sc2/src/uqm/ships/chmmr/chmmr.c b/sc2/src/uqm/ships/chmmr/chmmr.c index 03ad4d1eb..e3c8329e1 100644 --- a/sc2/src/uqm/ships/chmmr/chmmr.c +++ b/sc2/src/uqm/ships/chmmr/chmmr.c @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "ships/ship.h" -#include "ships/chmmr/resinst.h" +#include "../ship.h" +#include "resinst.h" -#include "colors.h" -#include "globdata.h" +#include "uqm/colors.h" +#include "uqm/globdata.h" #include "libs/mathlib.h" diff --git a/sc2/src/uqm/ships/druuge/druuge.c b/sc2/src/uqm/ships/druuge/druuge.c index aa6cc3c10..5e5cea87e 100644 --- a/sc2/src/uqm/ships/druuge/druuge.c +++ b/sc2/src/uqm/ships/druuge/druuge.c @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "ships/ship.h" -#include "ships/druuge/resinst.h" +#include "../ship.h" +#include "resinst.h" #define MAX_CREW 14 #define MAX_ENERGY 32 diff --git a/sc2/src/uqm/ships/human/human.c b/sc2/src/uqm/ships/human/human.c index 263b882b6..951a9158b 100644 --- a/sc2/src/uqm/ships/human/human.c +++ b/sc2/src/uqm/ships/human/human.c @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "ships/ship.h" -#include "ships/human/resinst.h" +#include "../ship.h" +#include "resinst.h" -#include "colors.h" -#include "globdata.h" +#include "uqm/colors.h" +#include "uqm/globdata.h" #define MAX_CREW 18 diff --git a/sc2/src/uqm/ships/ilwrath/ilwrath.c b/sc2/src/uqm/ships/ilwrath/ilwrath.c index 53531d73e..eff46c65f 100644 --- a/sc2/src/uqm/ships/ilwrath/ilwrath.c +++ b/sc2/src/uqm/ships/ilwrath/ilwrath.c @@ -16,12 +16,11 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "ships/ship.h" -#include "ships/ilwrath/resinst.h" -#include "ship.h" +#include "../ship.h" +#include "resinst.h" -#include "colors.h" -#include "globdata.h" +#include "uqm/colors.h" +#include "uqm/globdata.h" #define MAX_CREW 22 diff --git a/sc2/src/uqm/ships/lastbat/lastbat.c b/sc2/src/uqm/ships/lastbat/lastbat.c index ac43a9d6e..096d85ebb 100644 --- a/sc2/src/uqm/ships/lastbat/lastbat.c +++ b/sc2/src/uqm/ships/lastbat/lastbat.c @@ -16,12 +16,12 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "ships/ship.h" -#include "ships/lastbat/resinst.h" +#include "../ship.h" +#include "resinst.h" -#include "colors.h" -#include "globdata.h" -#include "battle.h" +#include "uqm/colors.h" +#include "uqm/globdata.h" +#include "uqm/battle.h" // For BATTLE_FRAME_RATE #include "libs/mathlib.h" #include "libs/timelib.h" diff --git a/sc2/src/uqm/ships/melnorme/melnorme.c b/sc2/src/uqm/ships/melnorme/melnorme.c index 3ae46ab12..ee04f85cd 100644 --- a/sc2/src/uqm/ships/melnorme/melnorme.c +++ b/sc2/src/uqm/ships/melnorme/melnorme.c @@ -16,10 +16,10 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "ships/ship.h" -#include "ships/melnorme/resinst.h" +#include "../ship.h" +#include "resinst.h" -#include "globdata.h" +#include "uqm/globdata.h" #include "libs/mathlib.h" diff --git a/sc2/src/uqm/ships/mmrnmhrm/mmrnmhrm.c b/sc2/src/uqm/ships/mmrnmhrm/mmrnmhrm.c index 66c51138d..353481167 100644 --- a/sc2/src/uqm/ships/mmrnmhrm/mmrnmhrm.c +++ b/sc2/src/uqm/ships/mmrnmhrm/mmrnmhrm.c @@ -16,10 +16,10 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "ships/ship.h" -#include "ships/mmrnmhrm/resinst.h" +#include "../ship.h" +#include "resinst.h" -#include "init.h" +#include "uqm/init.h" #define MAX_CREW 20 diff --git a/sc2/src/uqm/ships/mycon/mycon.c b/sc2/src/uqm/ships/mycon/mycon.c index 0e5febb57..180446142 100644 --- a/sc2/src/uqm/ships/mycon/mycon.c +++ b/sc2/src/uqm/ships/mycon/mycon.c @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "ships/ship.h" -#include "ships/mycon/resinst.h" +#include "../ship.h" +#include "resinst.h" #define MAX_CREW 20 #define MAX_ENERGY 40 diff --git a/sc2/src/uqm/ships/orz/orz.c b/sc2/src/uqm/ships/orz/orz.c index 2aa7e1114..c01c2ce48 100644 --- a/sc2/src/uqm/ships/orz/orz.c +++ b/sc2/src/uqm/ships/orz/orz.c @@ -16,12 +16,11 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "ships/ship.h" -#include "ships/orz/resinst.h" -#include "ship.h" +#include "../ship.h" +#include "resinst.h" -#include "colors.h" -#include "globdata.h" +#include "uqm/colors.h" +#include "uqm/globdata.h" #include "libs/mathlib.h" diff --git a/sc2/src/uqm/ships/pkunk/pkunk.c b/sc2/src/uqm/ships/pkunk/pkunk.c index febf166a6..bc2d6d68f 100644 --- a/sc2/src/uqm/ships/pkunk/pkunk.c +++ b/sc2/src/uqm/ships/pkunk/pkunk.c @@ -16,10 +16,10 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "ships/ship.h" -#include "ships/pkunk/resinst.h" +#include "../ship.h" +#include "resinst.h" -#include "globdata.h" +#include "uqm/globdata.h" #include "libs/mathlib.h" diff --git a/sc2/src/uqm/ships/probe/probe.c b/sc2/src/uqm/ships/probe/probe.c index 00fc138b7..300a22e21 100644 --- a/sc2/src/uqm/ships/probe/probe.c +++ b/sc2/src/uqm/ships/probe/probe.c @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "ships/ship.h" -#include "ships/probe/resinst.h" +#include "../ship.h" +#include "resinst.h" #define MAX_CREW 1 #define MAX_ENERGY 1 diff --git a/sc2/src/uqm/ships/ship.h b/sc2/src/uqm/ships/ship.h index 9a398e0f6..7020d5336 100644 --- a/sc2/src/uqm/ships/ship.h +++ b/sc2/src/uqm/ships/ship.h @@ -21,15 +21,17 @@ #ifndef _SHIP_H #define _SHIP_H -#include "collide.h" +#include "uqm/collide.h" // XXX: Do we really need this one? //#include "reslib.h" -#include "intel.h" -#include "races.h" -#include "status.h" -#include "sounds.h" -#include "weapon.h" +#include "uqm/intel.h" +#include "uqm/races.h" +#include "uqm/status.h" +#include "uqm/sounds.h" +#include "uqm/weapon.h" +#include "uqm/ship.h" + #endif /* _SHIP_H */ diff --git a/sc2/src/uqm/ships/shofixti/shofixti.c b/sc2/src/uqm/ships/shofixti/shofixti.c index ff1d7c3e2..6ee724e74 100644 --- a/sc2/src/uqm/ships/shofixti/shofixti.c +++ b/sc2/src/uqm/ships/shofixti/shofixti.c @@ -16,10 +16,10 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "ships/ship.h" -#include "ships/shofixti/resinst.h" +#include "../ship.h" +#include "resinst.h" -#include "globdata.h" +#include "uqm/globdata.h" #include "libs/mathlib.h" diff --git a/sc2/src/uqm/ships/sis_ship/sis_ship.c b/sc2/src/uqm/ships/sis_ship/sis_ship.c index e029fba49..64bfd9052 100644 --- a/sc2/src/uqm/ships/sis_ship/sis_ship.c +++ b/sc2/src/uqm/ships/sis_ship/sis_ship.c @@ -16,12 +16,12 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "ships/ship.h" -#include "ships/sis_ship/resinst.h" +#include "../ship.h" +#include "resinst.h" -#include "colors.h" -#include "controls.h" -#include "globdata.h" +#include "uqm/colors.h" +#include "uqm/controls.h" +#include "uqm/globdata.h" #include "libs/mathlib.h" diff --git a/sc2/src/uqm/ships/slylandr/slylandr.c b/sc2/src/uqm/ships/slylandr/slylandr.c index a48421357..8fe2a15a7 100644 --- a/sc2/src/uqm/ships/slylandr/slylandr.c +++ b/sc2/src/uqm/ships/slylandr/slylandr.c @@ -16,10 +16,10 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "ships/ship.h" -#include "ships/slylandr/resinst.h" +#include "../ship.h" +#include "resinst.h" -#include "globdata.h" +#include "uqm/globdata.h" #include "libs/mathlib.h" diff --git a/sc2/src/uqm/ships/spathi/spathi.c b/sc2/src/uqm/ships/spathi/spathi.c index 945bd56d7..60273fd81 100644 --- a/sc2/src/uqm/ships/spathi/spathi.c +++ b/sc2/src/uqm/ships/spathi/spathi.c @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "ships/ship.h" -#include "ships/spathi/resinst.h" +#include "../ship.h" +#include "resinst.h" #define MAX_CREW 30 #define MAX_ENERGY 10 diff --git a/sc2/src/uqm/ships/supox/supox.c b/sc2/src/uqm/ships/supox/supox.c index 300533f91..b8ac0aa07 100644 --- a/sc2/src/uqm/ships/supox/supox.c +++ b/sc2/src/uqm/ships/supox/supox.c @@ -16,9 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "ships/ship.h" -#include "ships/supox/resinst.h" -#include "ship.h" +#include "../ship.h" +#include "resinst.h" #include "libs/mathlib.h" diff --git a/sc2/src/uqm/ships/syreen/syreen.c b/sc2/src/uqm/ships/syreen/syreen.c index 81db2dc2c..843305d7c 100644 --- a/sc2/src/uqm/ships/syreen/syreen.c +++ b/sc2/src/uqm/ships/syreen/syreen.c @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "ships/ship.h" -#include "ships/syreen/resinst.h" +#include "../ship.h" +#include "resinst.h" #include "libs/mathlib.h" diff --git a/sc2/src/uqm/ships/thradd/thradd.c b/sc2/src/uqm/ships/thradd/thradd.c index 75c14e0be..b405370ee 100644 --- a/sc2/src/uqm/ships/thradd/thradd.c +++ b/sc2/src/uqm/ships/thradd/thradd.c @@ -16,11 +16,10 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "ships/ship.h" -#include "ships/thradd/resinst.h" -#include "ship.h" +#include "../ship.h" +#include "resinst.h" -#include "globdata.h" +#include "uqm/globdata.h" #define MAX_CREW 8 diff --git a/sc2/src/uqm/ships/umgah/umgah.c b/sc2/src/uqm/ships/umgah/umgah.c index 49cacbf9a..22da34fbe 100644 --- a/sc2/src/uqm/ships/umgah/umgah.c +++ b/sc2/src/uqm/ships/umgah/umgah.c @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "ships/ship.h" -#include "ships/umgah/resinst.h" +#include "../ship.h" +#include "resinst.h" #include "libs/mathlib.h" diff --git a/sc2/src/uqm/ships/urquan/urquan.c b/sc2/src/uqm/ships/urquan/urquan.c index 57a44d716..7c0a06619 100644 --- a/sc2/src/uqm/ships/urquan/urquan.c +++ b/sc2/src/uqm/ships/urquan/urquan.c @@ -16,10 +16,10 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "ships/ship.h" -#include "ships/urquan/resinst.h" +#include "../ship.h" +#include "resinst.h" -#include "globdata.h" +#include "uqm/globdata.h" #include diff --git a/sc2/src/uqm/ships/utwig/utwig.c b/sc2/src/uqm/ships/utwig/utwig.c index 90b16293b..ba3318a1b 100644 --- a/sc2/src/uqm/ships/utwig/utwig.c +++ b/sc2/src/uqm/ships/utwig/utwig.c @@ -16,11 +16,10 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "ships/ship.h" -#include "ships/utwig/resinst.h" -#include "ship.h" +#include "../ship.h" +#include "resinst.h" -#include "globdata.h" +#include "uqm/globdata.h" #include "libs/mathlib.h" diff --git a/sc2/src/uqm/ships/vux/vux.c b/sc2/src/uqm/ships/vux/vux.c index b45b54314..444e7418f 100644 --- a/sc2/src/uqm/ships/vux/vux.c +++ b/sc2/src/uqm/ships/vux/vux.c @@ -16,10 +16,10 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "ships/ship.h" -#include "ships/vux/resinst.h" +#include "../ship.h" +#include "resinst.h" -#include "globdata.h" +#include "uqm/globdata.h" #include "libs/mathlib.h" diff --git a/sc2/src/uqm/ships/yehat/yehat.c b/sc2/src/uqm/ships/yehat/yehat.c index 6bcc71b75..221526d47 100644 --- a/sc2/src/uqm/ships/yehat/yehat.c +++ b/sc2/src/uqm/ships/yehat/yehat.c @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "ships/ship.h" -#include "ships/yehat/resinst.h" +#include "../ship.h" +#include "resinst.h" #include "libs/mathlib.h" diff --git a/sc2/src/uqm/ships/zoqfot/zoqfot.c b/sc2/src/uqm/ships/zoqfot/zoqfot.c index 771cc9a45..14d2b04bb 100644 --- a/sc2/src/uqm/ships/zoqfot/zoqfot.c +++ b/sc2/src/uqm/ships/zoqfot/zoqfot.c @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "ships/ship.h" -#include "ships/zoqfot/resinst.h" +#include "../ship.h" +#include "resinst.h" #include "libs/mathlib.h"