Various include file cleanups

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3198 8092fc87-c524-0410-9efc-e669fe64eaf9

sc2/Makeproject

@@ -16,7 +16,7 @@ case "$HOST_SYSTEM" in
 		uqm_NAME="$uqm_NAME.exe"
 		;;
 esac
-uqm_CFLAGS="$uqm_CFLAGS -Isrc -Isrc/sc2code -Isrc/sc2code/libs"
+uqm_CFLAGS="$uqm_CFLAGS -Isrc -Isrc/sc2code"
 if [ "$uqm_HAVE_REGEX" = 0 ]; then
 	uqm_CFLAGS="$uqm_CFLAGS -Isrc/regex"
 fi

sc2/src/msvc++/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 "." /I ".." /I "..\sc2code" /I "..\sc2code\libs" /I "..\sc2code\ships" /I "..\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 ".." /I "..\sc2code" /I "..\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 "." /I ".." /I "..\sc2code" /I "..\sc2code\libs" /I "..\sc2code\ships" /I "..\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 ".." /I "..\sc2code" /I "..\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"
@@ -102,7 +102,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /I "." /I ".." /I "..\sc2code" /I "..\sc2code\libs" /I "..\sc2code\ships" /I "..\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 "ZLIB_DLL" /D "USE_PLATFORM_ACCEL" /FR /FD /GZ /c
 # SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "." /I ".." /I "..\sc2code" /I "..\sc2code\libs" /I "..\sc2code\ships" /I "..\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 ".." /I "..\sc2code" /I "..\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"
@@ -130,7 +130,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MD /W3 /GX /Zi /O2 /I "." /I ".." /I "..\sc2code" /I "..\sc2code\libs" /I "..\sc2code\ships" /I "..\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 "ZLIB_DLL" /D "USE_PLATFORM_ACCEL" /FD /c
 # SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "." /I ".." /I "..\sc2code" /I "..\sc2code\libs" /I "..\sc2code\ships" /I "..\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 ".." /I "..\sc2code" /I "..\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"
@@ -331,6 +331,10 @@ SOURCE=..\sc2code\libs\graphics\sdl\dcqueue.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\sc2code\libs\graphics\sdl\dcqueue.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\sc2code\libs\graphics\sdl\hq2x.c
 # End Source File
 # Begin Source File
@@ -4116,6 +4120,10 @@ SOURCE=..\sc2code\ipdisp.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\sc2code\ipdisp.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\sc2code\ires_ind.h
 # End Source File
 # Begin Source File
@@ -4200,6 +4208,10 @@ SOURCE=..\sc2code\pickship.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\sc2code\pickship.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\sc2code\plandata.c
 # End Source File
 # Begin Source File
@@ -4208,6 +4220,10 @@ SOURCE=..\sc2code\process.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\sc2code\process.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\sc2code\races.h
 # End Source File
 # Begin Source File
@@ -4268,6 +4284,10 @@ SOURCE=..\sc2code\ship.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\sc2code\ship.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\sc2code\shipcont.h
 # End Source File
 # Begin Source File
@@ -4328,6 +4348,10 @@ SOURCE=..\sc2code\status.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\sc2code\status.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\sc2code\tactrans.c
 # End Source File
 # Begin Source File

sc2/src/options.c

@@ -23,7 +23,7 @@
 
 #include "port.h"
 #include "libs/graphics/gfx_common.h"
-#include "file.h"
+#include "libs/file.h"
 #include "config.h"
 #include "libs/compiler.h"
 #include "libs/uio.h"

sc2/src/sc2code/battle.c

@@ -21,6 +21,11 @@
 #include "battlecontrols.h"
 #include "controls.h"
 #include "init.h"
+#include "element.h"
+#include "ship.h"
+#include "process.h"
+#include "tactrans.h"
+		// for flee_preprocess()
 #include "intel.h"
 #ifdef NETPLAY
 #	include "netplay/netmelee.h"
@@ -39,7 +44,6 @@
 #include "libs/mathlib.h"
 
 
-QUEUE disp_q;
 BYTE battle_counter[NUM_SIDES];
 		// The number of ships still available for battle to each side.
 		// A ship that has warped out is no longer available.
@@ -81,8 +85,6 @@ DoRunAway (STARSHIP *StarShipPtr)
 			&& ElementPtr->mass_points != MAX_SHIP_MASS * 10
 			&& !(ElementPtr->state_flags & APPEARING))
 	{
-		extern void flee_preprocess (ELEMENT *);
-
 		battle_counter[0]--;
 
 		ElementPtr->turn_wait = 3;

sc2/src/sc2code/battle.h

@@ -23,8 +23,6 @@
 typedef DWORD BattleFrameCounter;
 #endif
 
-#include "displist.h"
-		// for QUEUE
 #include "init.h"
 		// For NUM_SIDES
 
@@ -35,11 +33,6 @@ typedef struct battlestate_struct {
 	DWORD NextTime;
 } BATTLE_STATE;
 
-extern QUEUE disp_q;
-// The maximum number of elements is chosen to provide a slight margin.
-// Currently, it is maximum *known used* in Melee + 30
-#define MAX_DISPLAY_ELEMENTS 150
-
 extern BYTE battle_counter[NUM_SIDES];
 extern BOOLEAN instantVictory;
 #if defined (NETPLAY)
@@ -54,5 +47,9 @@ COUNT GetPlayerOrder (COUNT i);
 
 BOOLEAN Battle (void);
 
-#endif  /* _BATTLE_H */
+#define BATTLE_FRAME_RATE (ONE_SECOND / 24)
 
+extern void BattleSong (BOOLEAN DoPlay);
+extern void FreeBattleSong (void);
+
+#endif  /* _BATTLE_H */

sc2/src/sc2code/build.h

@@ -23,13 +23,6 @@
 #include "displist.h"
 #include "libs/compiler.h"
 
-#define CREW_XOFFS 4
-#define ENERGY_XOFFS 52
-#define GAUGE_YOFFS (SHIP_INFO_HEIGHT - 10)
-#define UNIT_WIDTH 2
-#define UNIT_HEIGHT 1
-#define STAT_WIDTH (1 + UNIT_WIDTH + 1 + UNIT_WIDTH + 1)
-
 #define NAME_OFFSET 5
 #define NUM_CAPTAINS_NAMES 16
 
@@ -67,14 +60,5 @@ extern RACE_DESC *load_ship (SPECIES_ID SpeciesID, BOOLEAN LoadBattleData);
 extern void free_ship (RACE_DESC *RaceDescPtr, BOOLEAN FreeIconData,
 		BOOLEAN FreeBattleData);
 
-extern void DrawCrewFuelString (COORD y, SIZE state);
-extern void ClearShipStatus (COORD y);
-extern void OutlineShipStatus (COORD y);
-extern void InitShipStatus (SHIP_INFO *ShipInfoPtr, BYTE captains_name_index,
-		RECT *pClipRect);
-extern void DeltaStatistics (SHIP_INFO *ShipInfoPtr, SIZE crew_delta,
-		SIZE energy_delta);
-extern void DrawBattleCrewAmount (SHIP_INFO *ShipInfoPtr);
-
 #endif /* _BUILD_H */
 

sc2/src/sc2code/cleanup.c

@@ -16,12 +16,12 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "battle.h"
 #include "master.h"
 #include "nameref.h"
-#include "reslib.h"
+#include "libs/reslib.h"
 #include "gamestr.h"
 #include "init.h"
+#include "element.h"
 #include "hyper.h"
 #include "planets/lander.h"
 #include "starcon.h"

sc2/src/sc2code/coderes.h

@@ -19,7 +19,7 @@
 #ifndef _CODERES_H
 #define _CODERES_H
 
-#include "reslib.h"
+#include "libs/reslib.h"
 
 extern BOOLEAN InstallCodeResType (void);
 extern void *LoadCodeResInstance (RESOURCE res);

sc2/src/sc2code/comm/commall.h

@@ -21,7 +21,7 @@
 #include "comm.h"
 #include "commglue.h"
 #include "encount.h"
-#include "reslib.h"
+#include "libs/reslib.h"
 
 #endif  /* _COMMALL_H */
 

sc2/src/sc2code/cons_res.h

@@ -17,8 +17,8 @@
 #ifndef CONS_RES_H_
 #define CONS_RES_H_
 
-#include "gfxlib.h"
+#include "libs/gfxlib.h"
-#include "sndlib.h"
+#include "libs/sndlib.h"
 
 void load_gravity_well (BYTE selector);
 void free_gravity_well (void);

sc2/src/sc2code/controls.h

@@ -147,7 +147,7 @@ typedef struct textentry_state
 	
 } TEXTENTRY_STATE;
 
-BOOLEAN DoTextEntry (TEXTENTRY_STATE *pTES);
+extern BOOLEAN DoTextEntry (TEXTENTRY_STATE *pTES);
 
 #endif
 

sc2/src/sc2code/cyborg.c

@@ -16,10 +16,10 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "battle.h"
 #include "colors.h"
 #include "collide.h"
 #include "element.h"
+#include "ship.h"
 #include "globdata.h"
 #include "intel.h"
 #include "setup.h"

sc2/src/sc2code/demo.c

@@ -17,7 +17,8 @@
  */
 
 #include "demo.h"
-#include "declib.h"
+#include "libs/declib.h"
+#include "setup.h"
 
 #if DEMO_MODE || CREATE_JOURNAL
 static DECODE_REF journal_fh;

sc2/src/sc2code/displist.h

@@ -21,8 +21,8 @@
 
 #include <assert.h>
 #include "port.h"
-#include "compiler.h"
+#include "libs/compiler.h"
-#include "misc.h"
+#include "libs/misc.h"
 
 // Note that we MUST use the QUEUE_TABLE variant at this time, because
 // certain gameplay elements depend on it. Namely, the maximum number

sc2/src/sc2code/element.h

@@ -19,25 +19,11 @@
 #ifndef _ELEMENT_H
 #define _ELEMENT_H
 
-#include "battle.h"
 #include "displist.h"
 #include "units.h"
 #include "velocity.h"
 #include "libs/gfxlib.h"
 
-#define BATTLE_FRAME_RATE (ONE_SECOND / 24)
-
-#define SHIP_INFO_HEIGHT 65
-#define CAPTAIN_XOFFS 4
-#define CAPTAIN_YOFFS (SHIP_INFO_HEIGHT + 4)
-#define SHIP_STATUS_HEIGHT (STATUS_HEIGHT >> 1)
-#define BAD_GUY_YOFFS 0
-#define GOOD_GUY_YOFFS SHIP_STATUS_HEIGHT
-#define STARCON_TEXT_HEIGHT 7
-#define TINY_TEXT_HEIGHT 9
-
-#define BATTLE_CREW_X 10
-#define BATTLE_CREW_Y (64 - SAFE_Y)
 
 #define NORMAL_LIFE 1
 
@@ -157,6 +143,11 @@ struct element
 	HELEMENT hTarget;
 };
 
+extern QUEUE disp_q;
+// The maximum number of elements is chosen to provide a slight margin.
+// Currently, it is maximum *known used* in Melee + 30
+#define MAX_DISPLAY_ELEMENTS 150
+
 #define MAX_DISPLAY_PRIMS 330
 extern COUNT DisplayFreeList;
 extern PRIMITIVE DisplayArray[MAX_DISPLAY_PRIMS];
@@ -200,19 +191,10 @@ extern void FreeElement (HELEMENT hElement);
 #define GetSuccElement(l) _GetSuccLink (l)
 extern void RemoveElement (HLINK hLink);
 
-extern void RedrawQueue (BOOLEAN clear);
+// XXX: The following functions should not really be here
-extern BOOLEAN DeltaEnergy (ELEMENT *ElementPtr, SIZE energy_delta);
-extern BOOLEAN DeltaCrew (ELEMENT *ElementPtr, SIZE crew_delta);
-
-extern void PreProcessStatus (ELEMENT *ShipPtr);
-extern void PostProcessStatus (ELEMENT *ShipPtr);
-
 extern void spawn_planet (void);
 extern void spawn_asteroid (ELEMENT *ElementPtr);
-extern void animation_preprocess (ELEMENT *ElementPtr);
 extern void do_damage (ELEMENT *ElementPtr, SIZE damage);
-extern void collision (ELEMENT *ElementPtr0, POINT *pPt0,
-		ELEMENT *ElementPtr1, POINT *pPt1);
 extern void crew_preprocess (ELEMENT *ElementPtr);
 extern void crew_collision (ELEMENT *ElementPtr0, POINT *pPt0,
 		ELEMENT *ElementPtr1, POINT *pPt1);
@@ -221,42 +203,11 @@ extern void AbandonShip (ELEMENT *ShipPtr, ELEMENT *TargetPtr,
 extern BOOLEAN TimeSpaceMatterConflict (ELEMENT *ElementPtr);
 extern COUNT PlotIntercept (ELEMENT *ElementPtr0,
 		ELEMENT *ElementPtr1, COUNT max_turns, COUNT margin_of_error);
-extern BOOLEAN LoadKernel (int argc, char *argv[]);
-extern void FreeKernel (void);
-
-extern void InitDisplayList (void);
 
 extern void InitGalaxy (void);
 extern void MoveGalaxy (VIEW_STATE view_state, SIZE dx, SIZE dy);
-extern void ship_preprocess (ELEMENT *ElementPtr);
-extern void ship_postprocess (ELEMENT *ElementPtr);
-extern void ship_death (ELEMENT *ShipPtr);
-extern BOOLEAN hyper_transition (ELEMENT *ElementPtr);
 
 extern BOOLEAN CalculateGravity (ELEMENT *ElementPtr);
-extern void SetUpElement (ELEMENT *ElementPtr);
-
-extern void BattleSong (BOOLEAN DoPlay);
-extern void FreeBattleSong (void);
-
-extern void InsertPrim (PRIM_LINKS *pLinks, COUNT primIndex, COUNT iPI);
-
-
-typedef UWORD STATUS_FLAGS;
-
-/* STATUS_FLAGS - heat of battle specific flags */
-#define LEFT                   (1 << 0)
-#define RIGHT                  (1 << 1)
-#define THRUST                 (1 << 2)
-#define WEAPON                 (1 << 3)
-#define SPECIAL                (1 << 4)
-#define LOW_ON_ENERGY          (1 << 5)
-#define SHIP_BEYOND_MAX_SPEED  (1 << 6)
-#define SHIP_AT_MAX_SPEED      (1 << 7)
-#define SHIP_IN_GRAVITY_WELL   (1 << 8)
-#define PLAY_VICTORY_DITTY     (1 << 9)
-
-extern STATUS_FLAGS inertial_thrust (ELEMENT *ElementPtr);
 
 
 #endif /* _ELEMENT_H */

sc2/src/sc2code/encount.c

@@ -28,6 +28,7 @@
 #include "gamestr.h"
 #include "globdata.h"
 #include "init.h"
+#include "pickship.h"
 #include "intel.h"
 #include "nameref.h"
 #include "resinst.h"

sc2/src/sc2code/fmv.c

@@ -26,7 +26,7 @@
 #include "nameref.h"
 #include "settings.h"
 #include "setup.h"
-#include "vidlib.h"
+#include "libs/vidlib.h"
 #include "libs/graphics/gfx_common.h"
 #include "libs/inplib.h"
 

sc2/src/sc2code/galaxy.c

@@ -21,6 +21,7 @@
 #include "element.h"
 #include "globdata.h"
 #include "init.h"
+#include "process.h"
 #include "units.h"
 #include "options.h"
 #include "libs/compiler.h"

sc2/src/sc2code/gameopt.c

@@ -25,7 +25,7 @@
 #include "encount.h"
 #include "planets/lander.h"
 #include "gamestr.h"
-#include "inplib.h"
+#include "libs/inplib.h"
 #include "load.h"
 #include "options.h"
 #include "save.h"

sc2/src/sc2code/gameopt.h

@@ -16,7 +16,7 @@
 #ifndef _GAMEOPT_H
 #define _GAMEOPT_H
 
-#include "compiler.h"
+#include "libs/compiler.h"
 #include "libs/gfxlib.h"
 
 extern void ConfirmSaveLoad (STAMP *MsgStamp);

sc2/src/sc2code/grpinfo.c

@@ -18,7 +18,7 @@
 
 #include "build.h"
 #include "encount.h"
-#include "file.h"
+#include "libs/file.h"
 #include "globdata.h"
 #include "intel.h"
 #include "sis.h"

sc2/src/sc2code/hyper.c

@@ -23,6 +23,8 @@
 #include "colors.h"
 #include "controls.h"
 #include "encount.h"
+#include "ship.h"
+#include "process.h"
 #include "globdata.h"
 #include "init.h"
 #include "nameref.h"

sc2/src/sc2code/hyper.h

@@ -19,9 +19,11 @@
 #ifndef _HYPER_H
 #define _HYPER_H
 
+#include "element.h"
 
 extern void FreeHyperData (void);
 extern void check_hyperspace_encounter (void);
+extern BOOLEAN hyper_transition (ELEMENT *ElementPtr);
 
 #endif /* _HYPER_H */
 

sc2/src/sc2code/init.c

@@ -19,12 +19,16 @@
 #include "build.h"
 #include "colors.h"
 #include "cons_res.h"
+#include "races.h"
 #include "element.h"
+#include "tactrans.h"
+#include "pickship.h"
+#include "process.h"
 #include "globdata.h"
 #include "init.h"
 #include "port.h"
 #include "resinst.h"
-#include "reslib.h"
+#include "libs/reslib.h"
 #include "nameref.h"
 #include "setup.h"
 #include "units.h"
@@ -281,7 +285,6 @@ UninitShips (void)
 			hElement != 0; hElement = hNextElement)
 	{
 		ELEMENT *ElementPtr;
-		extern void new_ship (ELEMENT *ElementPtr);
 
 		LockElement (hElement, &ElementPtr);
 		hNextElement = GetSuccElement (ElementPtr);

sc2/src/sc2code/init.h

@@ -18,6 +18,7 @@
 #define _INIT_H
 
 #include "libs/gfxlib.h"
+#include "libs/reslib.h"
 
 #define NUM_PLAYERS 2
 #define NUM_SIDES 2
@@ -30,5 +31,9 @@ extern void UninitSpace (void);
 extern SIZE InitShips (void);
 extern void UninitShips (void);
 
+extern BOOLEAN load_animation (FRAME *pixarray, RESOURCE big_res,
+		RESOURCE med_res, RESOURCE sml_res);
+extern BOOLEAN free_image (FRAME *pixarray);
+
 #endif  /* _INIT_H */
 

sc2/src/sc2code/ipdisp.c

@@ -16,10 +16,13 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#include "ipdisp.h"
+
 #include "collide.h"
 #include "globdata.h"
 #include "init.h"
 #include "races.h"
+#include "process.h"
 #include "grpinfo.h"
 #include "encount.h"
 #include "libs/mathlib.h"

sc2/src/sc2code/ipdisp.h

@@ -0,0 +1,25 @@
+/*
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef UQM_IPDISP_H_INCL_
+#define UQM_IPDISP_H_INCL_
+
+#include "libs/compiler.h"
+
+extern void NotifyOthers (COUNT which_race, BYTE target_loc);
+extern void DoMissions (void);
+
+#endif  /* UQM_IPDISP_H_INCL_ */

sc2/src/sc2code/libs/decomp/lzdecode.c

@@ -29,7 +29,7 @@
 #include <string.h>
 #include <ctype.h>
 #include "libs/decomp/lzh.h"
-#include "reslib.h"
+#include "libs/reslib.h"
 
 PLZHCODE_DESC _lpCurCodeDesc;
 STREAM_TYPE _StreamType;

sc2/src/sc2code/libs/decomp/lzencode.c

@@ -26,7 +26,7 @@
 
 #include <stdio.h>
 #include "lzh.h"
-#include "reslib.h"
+#include "libs/reslib.h"
 
 static UWORD match_position, match_length;
 static SWORD *lson;

sc2/src/sc2code/libs/decomp/lzh.h

@@ -19,8 +19,8 @@
 #ifndef _LZH_H
 #define _LZH_H
 
-#include "declib.h"
+#include "libs/declib.h"
-#include "misc.h"
+#include "libs/misc.h"
 
 /* LZSS Parameters */
 

sc2/src/sc2code/libs/file/dirs.c

@@ -25,8 +25,8 @@
 #include "port.h"
 #include "config.h"
 #include "filintrn.h"
-#include "compiler.h"
+#include "libs/compiler.h"
-#include "misc.h"
+#include "libs/misc.h"
 #include "libs/log.h"
 
 #ifdef HAVE_DRIVE_LETTERS

sc2/src/sc2code/libs/file/files.c

@@ -22,11 +22,11 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include "port.h"
-#include "uio.h"
+#include "libs/uio.h"
 #include "config.h"
 #include "types.h"
 #include "filintrn.h"
-#include "misc.h"
+#include "libs/misc.h"
 #include "libs/log.h"
 
 static int copyError(uio_Handle *srcHandle, uio_Handle *dstHandle,

sc2/src/sc2code/libs/gfxlib.h

@@ -19,8 +19,8 @@
 #ifndef _GFXLIB_H
 #define _GFXLIB_H
 
-#include "compiler.h"
+#include "libs/compiler.h"
-#include "reslib.h"
+#include "libs/reslib.h"
 
 typedef struct context_desc CONTEXT_DESC;
 typedef struct frame_desc FRAME_DESC;

sc2/src/sc2code/libs/graphics/drawable.c

@@ -17,7 +17,7 @@
  */
 
 #include "gfxintrn.h"
-#include "misc.h"
+#include "libs/misc.h"
 #include "tfb_draw.h"
 #include "units.h"
 #include "libs/mathlib.h"

sc2/src/sc2code/libs/graphics/drawcmd.h

@@ -19,7 +19,7 @@
 #ifndef DRAWCMD_H
 #define DRAWCMD_H
 
-#include "graphics/tfb_draw.h"
+#include "libs/graphics/tfb_draw.h"
 
 enum
 {

sc2/src/sc2code/libs/graphics/frame.c

@@ -17,7 +17,6 @@
  */
 
 #include "gfxintrn.h"
-#include "declib.h"
 #include "gfx_common.h"
 #include "tfb_draw.h"
 #include "tfb_prim.h"

sc2/src/sc2code/libs/graphics/gfxintrn.h

@@ -22,8 +22,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "gfxlib.h"
+#include "libs/gfxlib.h"
-#include "reslib.h"
+#include "libs/reslib.h"
 #include "context.h"
 #include "drawable.h"
 #include "font.h"

sc2/src/sc2code/libs/graphics/sdl/3do_blt.c

@@ -19,7 +19,7 @@
 #ifdef GFXMODULE_SDL
 
 #include "sdl_common.h"
-#include "graphics/tfb_draw.h"
+#include "libs/graphics/tfb_draw.h"
 #include "libs/log.h"
 
 static void

sc2/src/sc2code/libs/graphics/sdl/3do_funcs.c

@@ -23,8 +23,8 @@
 #include "opengl.h"
 #include "primitives.h"
 #include "units.h"
-#include "graphics/drawcmd.h"
+#include "libs/graphics/drawcmd.h"
-#include "graphics/tfb_draw.h"
+#include "libs/graphics/tfb_draw.h"
 
 
 int batch_depth = 0;

sc2/src/sc2code/libs/graphics/sdl/bbox.h

@@ -14,9 +14,9 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "gfxlib.h"
+#include "libs/gfxlib.h"
-#include "graphics/tfb_draw.h"
+#include "libs/graphics/tfb_draw.h"
-#include "graphics/gfx_common.h"
+#include "libs/graphics/gfx_common.h"
 
 #ifndef _BBOX_H_
 #define _BBOX_H_

sc2/src/sc2code/libs/graphics/sdl/rotozoom.c

@@ -13,7 +13,7 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include "misc.h"
+#include "libs/misc.h"
 #include "port.h"
 #include "rotozoom.h"
 

sc2/src/sc2code/libs/graphics/sdl/sdl_common.c

@@ -32,7 +32,7 @@
 #include "libs/uio.h"
 #include "libs/log.h"
 #include "controls.h"
-#include "vidlib.h"
+#include "libs/vidlib.h"
 		// XXX: Should not be included from here.
 #include "uqmdebug.h"
 #include SDL_INCLUDE(SDL_thread.h)

sc2/src/sc2code/libs/graphics/tfb_draw.h

@@ -40,7 +40,7 @@ typedef struct tfb_palette
 	UBYTE unused;
 } TFB_Palette;
 
-#include "graphics/gfx_common.h"
+#include "libs/graphics/gfx_common.h"
 #include "cmap.h"
 
 typedef struct tfb_image

sc2/src/sc2code/libs/graphics/tfb_prim.h

@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "gfxlib.h"
+#include "libs/gfxlib.h"
 #include "tfb_draw.h"
 
 

sc2/src/sc2code/libs/graphics/widgets.c

@@ -14,10 +14,10 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "graphics/gfx_common.h"
+#include "gfx_common.h"
-#include "graphics/widgets.h"
+#include "widgets.h"
 #include "colors.h"
-#include "strlib.h"
+#include "libs/strlib.h"
 #include "setup.h"
 #include "units.h"
 

sc2/src/sc2code/libs/inplib.h

@@ -20,7 +20,7 @@
 #define _INPLIB_H
 
 #include <stddef.h>
-#include "compiler.h"
+#include "libs/compiler.h"
 #include "libs/uio.h"
 
 typedef DWORD INPUT_STATE;

sc2/src/sc2code/libs/input/inpintrn.h

@@ -19,7 +19,7 @@
 #ifndef _INPINTRN_H
 #define _INPINTRN_H
 
-#include "inplib.h"
+#include "libs/inplib.h"
 
 
 #endif /* _INPINTRN_H */

sc2/src/sc2code/libs/input/sdl/input.c

@@ -24,7 +24,7 @@
 #include "libs/input/input_common.h"
 #include "libs/input/sdl/vcontrol.h"
 #include "libs/input/sdl/keynames.h"
-#include "misc.h"
+#include "libs/misc.h"
 #include "controls.h"
 #include "libs/file.h"
 #include "libs/log.h"

sc2/src/sc2code/libs/input/sdl/vcontrol.c

@@ -20,7 +20,7 @@
 #include <string.h>
 #include <ctype.h>
 #include "vcontrol.h"
-#include "misc.h"
+#include "libs/misc.h"
 #include "keynames.h"
 #include "libs/log.h"
 #include "libs/reslib.h"

sc2/src/sc2code/libs/list/list.c

@@ -25,7 +25,7 @@
 #	include "list.h"
 #endif
 
-#include "misc.h"
+#include "libs/misc.h"
 #define malloc HMalloc
 #define free HFree
 #define realloc HRealloc

sc2/src/sc2code/libs/math/mthintrn.h

@@ -19,7 +19,7 @@
 #ifndef _MTHINTRN_H
 #define _MTHINTRN_H
 
-#include "mathlib.h"
+#include "libs/mathlib.h"
 
 #endif /* _MTHINTRN_H */
 

sc2/src/sc2code/libs/mathlib.h

@@ -19,7 +19,7 @@
 #ifndef _MATHLIB_H
 #define _MATHLIB_H
 
-#include "compiler.h"
+#include "libs/compiler.h"
 #include "math/random.h"
 
 extern COUNT square_root (DWORD value);

sc2/src/sc2code/libs/memlib.h

@@ -19,7 +19,7 @@
 #ifndef _MEMLIB_H
 #define _MEMLIB_H
 
-#include "compiler.h"
+#include "libs/compiler.h"
 
 extern BOOLEAN mem_init (void);
 extern BOOLEAN mem_uninit (void);

sc2/src/sc2code/libs/memory/w_memlib.c

@@ -24,7 +24,7 @@
 //#include "tool.h"
 //#include "utils.h"
 //#include "pcwin.h"
-#include "compiler.h"
+#include "libs/compiler.h"
 #ifdef LEGACY_HANDLE_ALLOCATOR
 #include "libs/threadlib.h"
 #endif

sc2/src/sc2code/libs/reslib.h

@@ -20,9 +20,9 @@
 #define _RESLIB_H
 
 //#include <stdio.h>
-#include "compiler.h"
+#include "libs/compiler.h"
 #include "port.h"
-#include "misc.h"
+#include "libs/misc.h"
 #include "libs/uio.h"
 
 typedef struct resource_index_desc RESOURCE_INDEX_DESC;
@@ -59,6 +59,7 @@ long LengthResFile (uio_Stream *fp);
 BOOLEAN res_CloseResFile (uio_Stream *fp);
 BOOLEAN DeleteResFile (uio_DirHandle *dir, const char *filename);
 
+RESOURCE_INDEX InitResourceSystem (void);
 void UninitResourceSystem (void);
 BOOLEAN InstallResTypeVectors (const char *res_type, ResourceLoadFun *loadFun, ResourceFreeFun *freeFun, ResourceStringFun *stringFun);
 void *res_GetResource (RESOURCE res);

sc2/src/sc2code/libs/resource/direct.c

@@ -17,7 +17,7 @@
  */
 
 #include "libs/strings/strintrn.h"
-#include "misc.h"
+#include "libs/misc.h"
 #include "port.h"
 #include "libs/uio.h"
 #include <sys/stat.h>

sc2/src/sc2code/libs/resource/index.h

@@ -20,7 +20,7 @@
 #define _INDEX_H
 
 #include <stdio.h>
-#include "reslib.h"
+#include "libs/reslib.h"
 #include "libs/uio/charhashtable.h"
 
 typedef struct resource_handlers

sc2/src/sc2code/libs/resource/loadres.c

@@ -17,7 +17,7 @@
  */
 
 #include "resintrn.h"
-#include "declib.h"
+#include "libs/declib.h"
 
 void *
 GetResourceData (uio_Stream *fp, DWORD length)

sc2/src/sc2code/libs/resource/propfile.c

@@ -21,7 +21,7 @@
 #include <ctype.h>
 #include "libs/log.h"
 #include "propfile.h"
-#include "reslib.h"
+#include "libs/reslib.h"
 
 void
 PropFile_from_string (char *d, PROPERTY_HANDLER handler, const char *prefix)

sc2/src/sc2code/libs/resource/propfile.h

@@ -19,7 +19,7 @@
 #ifndef PROPFILE_H_
 #define PROPFILE_H_
 
-#include "uio.h"
+#include "libs/uio.h"
 
 typedef void (*PROPERTY_HANDLER) (const char *, const char *);
 

sc2/src/sc2code/libs/resource/resinit.c

@@ -17,7 +17,7 @@
  */
 
 #include "resintrn.h"
-#include "misc.h"
+#include "libs/misc.h"
 #include "options.h"
 #include "nameref.h"
 #include "types.h"

sc2/src/sc2code/libs/resource/resintrn.h

@@ -20,7 +20,7 @@
 #define _RESINTRN_H
 
 #include <string.h>
-#include "reslib.h"
+#include "libs/reslib.h"
 #include "index.h"
 
 ResourceDesc *lookupResourceDesc (RESOURCE_INDEX idx, RESOURCE res);

sc2/src/sc2code/libs/sndlib.h

@@ -19,7 +19,7 @@
 #ifndef _SNDLIB_H
 #define _SNDLIB_H
 
-#include "strlib.h"
+#include "libs/strlib.h"
 
 typedef STRING_TABLE SOUND_REF;
 typedef STRING SOUND;

sc2/src/sc2code/libs/sound/decoders/aiffaud.c

@@ -31,7 +31,7 @@
 #include <string.h>
 #include "port.h"
 #include "types.h"
-#include "uio.h"
+#include "libs/uio.h"
 #include "endian_uqm.h"
 #include "libs/misc.h"
 #include "libs/log.h"

sc2/src/sc2code/libs/sound/decoders/decoder.h

@@ -23,7 +23,7 @@
 
 #include "port.h"
 #include "types.h"
-#include "uio.h"
+#include "libs/uio.h"
 
 #ifndef OVCODEC_NONE
 #	ifdef _MSC_VER

sc2/src/sc2code/libs/sound/decoders/dukaud.c

@@ -23,7 +23,7 @@
 #include "libs/misc.h"
 #include "port.h"
 #include "types.h"
-#include "uio.h"
+#include "libs/uio.h"
 #include "dukaud.h"
 #include "decoder.h"
 #include "endian_uqm.h"

sc2/src/sc2code/libs/sound/decoders/modaud.c

@@ -24,7 +24,7 @@
 #include "port.h"
 #include "types.h"
 #include "endian_uqm.h"
-#include "uio.h"
+#include "libs/uio.h"
 #include "decoder.h"
 #include "libs/sound/audiocore.h"
 #include "libs/log.h"

sc2/src/sc2code/libs/sound/decoders/oggaud.c

@@ -24,7 +24,7 @@
 #include "libs/log.h"
 #include "port.h"
 #include "types.h"
-#include "uio.h"
+#include "libs/uio.h"
 #include "decoder.h"
 #ifdef OVCODEC_TREMOR
 #	include <tremor/ivorbiscodec.h>

sc2/src/sc2code/libs/sound/decoders/wav.c

@@ -22,7 +22,7 @@
 #include <errno.h>
 #include "port.h"
 #include "types.h"
-#include "uio.h"
+#include "libs/uio.h"
 #include "endian_uqm.h"
 #include "libs/misc.h"
 #include "libs/log.h"

sc2/src/sc2code/libs/sound/fileinst.c

@@ -18,7 +18,7 @@
 
 #include "sndintrn.h"
 #include "options.h"
-#include "reslib.h"
+#include "libs/reslib.h"
 #include <string.h>
 
 

sc2/src/sc2code/libs/sound/music.c

@@ -15,7 +15,7 @@
  */
 
 #include <string.h>
-#include "file.h"
+#include "libs/file.h"
 #include "options.h"
 #include "sound.h"
 #include "libs/reslib.h"

sc2/src/sc2code/libs/sound/sndintrn.h

@@ -20,8 +20,8 @@
 #define _SNDINTRN_H
 
 #include <stdio.h>
-#include "sndlib.h"
+#include "libs/sndlib.h"
-#include "reslib.h"
+#include "libs/reslib.h"
 
 extern void *_GetMusicData (uio_Stream *fp, DWORD length);
 extern BOOLEAN _ReleaseMusicData (void *handle);

sc2/src/sc2code/libs/sound/sound.h

@@ -17,7 +17,7 @@
 #ifndef _UQM_SOUND_H // try avoiding collisions on id
 #define _UQM_SOUND_H
 
-#include "misc.h"
+#include "libs/misc.h"
 #include "sndintrn.h"
 #include "audiocore.h"
 #include "decoders/decoder.h"

sc2/src/sc2code/libs/sound/trackplayer.h

@@ -19,7 +19,7 @@
 #ifndef TRACKPLAYER_H
 #define TRACKPLAYER_H
 
-#include "compiler.h"
+#include "libs/compiler.h"
 
 
 typedef void (*TFB_TrackCB) (void);

sc2/src/sc2code/libs/strings/sfileins.c

@@ -18,7 +18,7 @@
 
 #include "port.h"
 #include "strintrn.h"
-#include "uio.h"
+#include "libs/uio.h"
 #include "libs/reslib.h"
 
 

sc2/src/sc2code/libs/strings/strings.c

@@ -17,7 +17,7 @@
  */
 
 #include "strintrn.h"
-#include "misc.h"
+#include "libs/misc.h"
 
 STRING_TABLE
 AllocStringTable (int num_entries, int flags)

sc2/src/sc2code/libs/strings/strintrn.h

@@ -21,8 +21,8 @@
 
 #include <stdio.h>
 #include <string.h>
-#include "strlib.h"
+#include "libs/strlib.h"
-#include "reslib.h"
+#include "libs/reslib.h"
 
 struct string_table_entry
 {

sc2/src/sc2code/libs/strings/unicode.c

@@ -20,7 +20,7 @@
 #include <stddef.h>
 #include <stdio.h>
 #include <string.h>
-#include "strlib.h"
+#include "libs/strlib.h"
 #include "libs/log.h"
 
 

sc2/src/sc2code/libs/strlib.h

@@ -19,7 +19,7 @@
 #ifndef _STRLIB_H
 #define _STRLIB_H
 
-#include "compiler.h"
+#include "libs/compiler.h"
 #include "port.h"
 #include "libs/uio.h"
 

sc2/src/sc2code/libs/threads/sdl/sdlthreads.c

@@ -15,7 +15,7 @@
  */
 
 #include <stdlib.h>
-#include "misc.h"
+#include "libs/misc.h"
 #include "sdlthreads.h"
 #ifdef PROFILE_THREADS
 #include <signal.h>

sc2/src/sc2code/libs/video/vfileins.c

@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "vidlib.h"
+#include "libs/vidlib.h"
 #include "video.h"
 
 VIDEO_REF

sc2/src/sc2code/libs/video/video.h

@@ -18,8 +18,8 @@
 #define _UQM_VIDEO_H
 
 #include "options.h"
-#include "misc.h"
+#include "libs/misc.h"
-#include "vidlib.h"
+#include "libs/vidlib.h"
 #include "libs/graphics/tfb_draw.h"
 #include "types.h"
 #include "videodec.h"

sc2/src/sc2code/libs/video/videodec.h

@@ -17,9 +17,9 @@
 #ifndef _VIDEODEC_H
 #define _VIDEODEC_H
 
-#include "vidlib.h"
+#include "libs/vidlib.h"
 #include "libs/video/video.h"
-#include "reslib.h"
+#include "libs/reslib.h"
 
 // forward-declare
 typedef struct tfb_videodecoder TFB_VideoDecoder;

sc2/src/sc2code/load.c

@@ -21,9 +21,9 @@
 #include "load.h"
 
 #include "build.h"
-#include "declib.h"
+#include "libs/declib.h"
 #include "encount.h"
-#include "file.h"
+#include "libs/file.h"
 #include "globdata.h"
 #include "load.h"
 #include "options.h"

sc2/src/sc2code/loadship.c

@@ -22,6 +22,7 @@
 #include "globdata.h"
 #include "nameref.h"
 #include "races.h"
+#include "init.h"
 
 static RESOURCE code_resources[] = {
 		NULL_RESOURCE,

sc2/src/sc2code/melee.c

@@ -19,12 +19,13 @@
 #include "melee.h"
 
 #include "build.h"
+#include "status.h"
 #include "colors.h"
 #include "comm.h"
 		// for getLineWithinWidth
 #include "cons_res.h"
 #include "controls.h"
-#include "file.h"
+#include "libs/file.h"
 #include "fmv.h"
 #include "gamestr.h"
 #include "globdata.h"

sc2/src/sc2code/misc.c

@@ -19,6 +19,8 @@
 #include "element.h"
 #include "init.h"
 #include "races.h"
+#include "ship.h"
+#include "status.h"
 #include "setup.h"
 #include "sounds.h"
 #include "weapon.h"

sc2/src/sc2code/nameref.h

@@ -19,7 +19,7 @@
 #ifndef _NAMEREF_H
 #define _NAMEREF_H
 
-#include "reslib.h"
+#include "libs/reslib.h"
 
 #define LoadCodeRes     LoadCodeResInstance
 #define LoadGraphic     (DRAWABLE)LoadGraphicInstance

sc2/src/sc2code/netplay/checksum.c

@@ -28,6 +28,8 @@
 		// for DUMP_CRC_OPS
 #include "netconnection.h"
 #include "netmelee.h"
+#include "tactrans.h"
+		// for new_ship
 #include "libs/log.h"
 #include "libs/mathlib.h"
 #include "libs/misc.h"
@@ -125,7 +127,6 @@ crc_processELEMENT(crc_State *state, const ELEMENT *val) {
 		// the side this ship is on. This must be excluded from the checksum
 		// as this does not have to be the same for both sides.
 		{
-			extern void new_ship(ELEMENT *ElementPtr);
 			BYTE turn_wait = val->turn_wait;
 			
 			if (val->preprocess_func == new_ship)

sc2/src/sc2code/netplay/netmisc.h

@@ -26,7 +26,7 @@ typedef struct BattleStateData BattleStateData;
 #include "types.h"
 
 #include "battle.h"
-		// for BattleFrameCounter
+		// for BattleFrameCounter, BATTLE_FRAME_RATE
 
 struct BattleStateData {
 	NETCONNECTION_STATE_DATA_COMMON

sc2/src/sc2code/pickmele.c

@@ -23,6 +23,7 @@
 #include "controls.h"
 #include "flash.h"
 #include "intel.h"
+#include "battle.h"
 #include "melee.h"
 #ifdef NETPLAY
 #	include "netplay/netmelee.h"

sc2/src/sc2code/pickmele.h

@@ -41,6 +41,7 @@ BOOLEAN selectShipNetwork (NetworkInputContext *context, GETMELEE_STATE *gms);
 
 #include "flash.h"
 #include "libs/timelib.h"
+#include "init.h"
 
 struct getmelee_struct {
 	BOOLEAN (*InputFunc) (struct getmelee_struct *pInputState);

sc2/src/sc2code/pickship.c

@@ -16,10 +16,13 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#include "pickship.h"
+
 #include "build.h"
 #include "colors.h"
 #include "controls.h"
 #include "pickmele.h"
+#include "battle.h"
 #include "races.h"
 #include "resinst.h"
 #include "nameref.h"

sc2/src/sc2code/pickship.h

@@ -0,0 +1,27 @@
+/*
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef UQM_PICKSHIP_H_INCL_
+#define UQM_PICKSHIP_H_INCL_
+
+#include "libs/compiler.h"
+#include "races.h"
+
+extern HSTARSHIP GetEncounterStarShip (STARSHIP *LastStarShipPtr,
+		COUNT which_player);
+extern void DrawArmadaPickShip (BOOLEAN draw_salvage_frame, RECT *pPickRect);
+
+#endif  /* UQM_PICKSHIP_H_INCL_ */

sc2/src/sc2code/planets/devices.c

@@ -28,7 +28,7 @@
 #include "grpinfo.h"
 #include "sounds.h"
 #include "util.h"
-#include "strlib.h"
+#include "libs/strlib.h"
 
 
 // If DEBUG_DEVICES is defined, the device list shown in the game will

sc2/src/sc2code/planets/gendru.c

@@ -20,6 +20,7 @@
 #include "encount.h"
 #include "globdata.h"
 #include "lander.h"
+#include "ipdisp.h"
 #include "nameref.h"
 #include "resinst.h"
 #include "state.h"

sc2/src/sc2code/planets/genilw.c

@@ -19,6 +19,7 @@
 #include "build.h"
 #include "encount.h"
 #include "globdata.h"
+#include "ipdisp.h"
 #include "nameref.h"
 #include "resinst.h"
 #include "state.h"

sc2/src/sc2code/planets/genmyc.c

@@ -19,6 +19,7 @@
 #include "build.h"
 #include "encount.h"
 #include "globdata.h"
+#include "ipdisp.h"
 #include "nameref.h"
 #include "resinst.h"
 #include "setup.h"

sc2/src/sc2code/planets/genorz.c

@@ -20,6 +20,7 @@
 #include "encount.h"
 #include "globdata.h"
 #include "lander.h"
+#include "ipdisp.h"
 #include "nameref.h"
 #include "resinst.h"
 #include "setup.h"

sc2/src/sc2code/planets/genpet.c

@@ -19,6 +19,7 @@
 #include "build.h"
 #include "encount.h"
 #include "globdata.h"
+#include "ipdisp.h"
 #include "nameref.h"
 #include "resinst.h"
 #include "setup.h"