Patches by Christian Ohm:

034 - Reorganized src-warcam.c
036 - Cleanup includes and function declarations


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@884 4a71c877-e1ca-e34f-864e-861f7616d084

lib/ivis_common/piefunc.h

@@ -10,30 +10,10 @@
 #ifndef _piefunc_h
 #define _piefunc_h
 
-/***************************************************************************/
-
 #include "lib/framework/frame.h"
+#include "lib/ivis_common/piedef.h"
 
 
-
-
-/***************************************************************************/
-/*
- *	Global Definitions
- */
-/***************************************************************************/
-
-/***************************************************************************/
-/*
- *	Global Variables
- */
-/***************************************************************************/
-
-/***************************************************************************/
-/*
- *	Global ProtoTypes
- */
-/***************************************************************************/
 extern void pie_DownLoadBufferToScreen(void *srcData, UDWORD destX, UDWORD
 							destY,UDWORD srcWidth,UDWORD srcHeight,UDWORD srcStride);
 extern void pie_RectFilter(SDWORD x0, SDWORD y0, SDWORD x1, SDWORD y1, UDWORD colour);

lib/ivis_common/piemode.h

@@ -36,7 +36,7 @@ typedef	enum	CLEAR_MODE
  */
 /***************************************************************************/
 
-extern int32	_iVPRIM_DIVTABLE[];
+extern Sint32	_iVPRIM_DIVTABLE[];
 
 /***************************************************************************/
 /*

lib/ivis_common/rendmode.h

@@ -9,21 +9,14 @@
 //*************************************************************************
 //patch
 
-#define iV_RenderBegin			pie_LocalRenderBegin
+#define	iV_Line				pie_Line
-#define iV_RenderEnd			pie_LocalRenderEnd
+#define	iV_Box				pie_Box
-#define	iV_Line				pie_Line	
-#define	iV_Box				pie_Box	
 #define	iV_BoxFill			pie_BoxFillIndex
-#define	iV_TransBoxFill			pie_TransBoxFill		
+#define	iV_TransBoxFill			pie_TransBoxFill
-#define	iV_UniTransBoxFill		pie_UniTransBoxFill		
 #define	iV_DrawImage			pie_ImageFileID
 #define	iV_DrawImageRect		pie_ImageFileIDTile
 #define	iV_DrawTransImage		pie_ImageFileID
 #define	iV_DrawTransImageRect		pie_ImageFileIDTile
-#define	iV_DrawStretchImage		pie_ImageFileIDStretch
-#define iV_UploadDisplayBuffer		pie_UploadDisplayBuffer
-#define iV_DownloadDisplayBuffer	pie_DownloadDisplayBuffer
-#define iV_ScaleBitmapRGB		pie_ScaleBitmapRGB
 
 //*************************************************************************
 
@@ -47,7 +40,7 @@
 #define PIE_NO_CULL			0x00002000
 //#define PIE_TEXANIM			0x00004000	// PIE_TEX must be set also
 #define PIE_PSXTEX			0x00008000	// - use playstation texture allocation method
-#define PIE_BSPFRESH			0x00010000	// Freshly created by the BSP 
+#define PIE_BSPFRESH			0x00010000	// Freshly created by the BSP
 #define PIE_NOHALFPSXTEX		0x00020000
 #define PIE_ALPHA			0x00040000
 
@@ -90,7 +83,7 @@ extern char* (*iV_ScreenDumpToDisk)(void);
 extern void (*iV_ppBitmap)(iBitmap *bmp, int x, int y, int w, int h, int ow);
 extern void (*iV_ppBitmapTrans)(iBitmap *bmp, int x, int y, int w, int h, int ow);
 extern void (*iV_SetTransFilter)(UDWORD rgb,UDWORD tablenumber);
-extern void (*iV_UniBitmapDepth)(int texPage, int u, int v, int srcWidth, int srcHeight, 
+extern void (*iV_UniBitmapDepth)(int texPage, int u, int v, int srcWidth, int srcHeight,
 							int x, int y, int destWidth, int destHeight, unsigned char brightness, int depth);
 
 extern void (*iV_SetTransImds)(BOOL trans);

src/action.c

@@ -7,32 +7,24 @@
 #include <string.h>
 
 #include "lib/framework/frame.h"
-#include "lib/framework/trig.h"
-
-#include "objects.h"
-#include "action.h"
-#include "map.h"
-#include "combat.h"
-#include "geometry.h"
 #include "lib/gamelib/gtime.h"
-#include "lib/ivis_common/ivisdef.h"
-#include "visibility.h"
-#include "projectile.h"
-#include "order.h"
-#include "hci.h"
-#include "transporter.h"
-#include "console.h"
-#include "research.h"
-#include "drive.h"
-#include "mission.h"
-#include "audio_id.h"
-#include "multiplay.h"
-#include "formation.h"
-#include "intdisplay.h"
-#include "fpath.h"
 #include "lib/script/script.h"
-#include "scripttabs.h"
+
+#include "action.h"
+#include "audio_id.h"
+#include "combat.h"
+#include "formation.h"
+#include "geometry.h"
+#include "hci.h"
+#include "intdisplay.h"
+#include "mission.h"
+#include "multiplay.h"
+#include "projectile.h"
+#include "research.h"
 #include "scriptcb.h"
+#include "scripttabs.h"
+#include "transporter.h"
+#include "visibility.h"
 
 /* attack run distance */
 #define	VTOL_ATTACK_LENGTH		1000

src/action.h

@@ -7,6 +7,8 @@
 #ifndef _action_h
 #define _action_h
 
+#include "droiddef.h"
+
 // What a droid is currently doing
 // Not necessarily the same as it's order as the AI may get a droid to do
 // something else whilst carrying out an order

src/advvis.c

@@ -3,16 +3,12 @@
 /* Makes smooth transitions for terrain visibility */
 
 #include "lib/framework/frame.h"
-#include "objects.h"
-#include "base.h"
-#include "map.h"
 #include "lib/gamelib/gtime.h"
-#include "display3d.h"
+
 #include "advvis.h"
+#include "display3d.h"
 #include "hci.h"
-#include "lib/ivis_common/piestate.h"
+#include "map.h"
-#include "component.h"
-#include "geometry.h"
 
 /* This uses oodles of memory and so can only be done on the PC */
 
@@ -20,18 +16,11 @@
 #define FADE_IN_TIME	(GAME_TICKS_PER_SEC/10)
 #define	START_DIVIDE	(8)
 
-UDWORD	avConsidered;
+static UDWORD avConsidered;
-UDWORD	avCalculated;
+static UDWORD avCalculated;
-UDWORD	avIgnored;
+static UDWORD avIgnored;
 
-// ------------------------------------------------------------------------------------
+static BOOL bRevealActive = FALSE;
-BOOL	bRevealActive = FALSE;
-// ------------------------------------------------------------------------------------
-void	avInformOfChange(SDWORD x, SDWORD y);
-void	avUpdateTiles( void );
-void	processAVTile(UDWORD x, UDWORD y );
-UDWORD	avGetObjLightLevel(BASE_OBJECT *psObj,UDWORD origLevel);
-void	avGetStats(UDWORD *considered, UDWORD *ignored, UDWORD *calculated);
 
 
 // ------------------------------------------------------------------------------------
@@ -73,6 +62,34 @@ SDWORD	lowerX,upperX,lowerY,upperY;
 	}
 }
 
+
+// ------------------------------------------------------------------------------------
+static void processAVTile(UDWORD x, UDWORD y)
+{
+	FRACT time;
+	MAPTILE *psTile;
+	UDWORD newLevel;
+
+	psTile = mapTile(x, y);
+	if (psTile->level == UBYTE_MAX OR psTile->bMaxed)
+	{
+		return;
+	}
+
+	time = (MAKEFRACT(frameTime) / GAME_TICKS_PER_SEC);
+	newLevel = MAKEINT(psTile->level + (time * FADE_IN_TIME));
+	if (newLevel >= psTile->illumination)
+	{
+		psTile->level = psTile->illumination;
+		psTile->bMaxed = TRUE;
+	}
+	else
+	{
+		psTile->level = (UBYTE)newLevel;
+	}
+}
+
+
 // ------------------------------------------------------------------------------------
 void	avUpdateTiles( void )
 {
@@ -125,32 +142,6 @@ UDWORD	i,j;
 }
 
 
-// ------------------------------------------------------------------------------------
-void	processAVTile(UDWORD x, UDWORD y )
-{
-FRACT	time;
-MAPTILE	*psTile;
-UDWORD	newLevel;
-
-	psTile = mapTile(x,y);
-	if(psTile->level == UBYTE_MAX OR psTile->bMaxed)
-	{
-		return;
-	}
-
-	time = (MAKEFRACT(frameTime)/GAME_TICKS_PER_SEC);
-	newLevel = MAKEINT(psTile->level + (time*FADE_IN_TIME));
-	if(newLevel >= psTile->illumination)
-	{
-		psTile->level = psTile->illumination;
-		psTile->bMaxed = TRUE;
-	}
-	else
-	{
-		psTile->level =(UBYTE)newLevel;
-	}
-}
-
 // ------------------------------------------------------------------------------------
 UDWORD	avGetObjLightLevel(BASE_OBJECT *psObj,UDWORD origLevel)
 {

src/ai.c

@@ -5,27 +5,17 @@
  *
  */
 
-/* Droid attack printf's */
 #include "lib/framework/frame.h"
-#include "objects.h"
-#include "map.h"
-#include "findpath.h"
-#include "visibility.h"
-#include "lib/gamelib/gtime.h"
-#include "combat.h"
-#include "hci.h"
-#include "player.h"
-#include "power.h"
-#include "geometry.h"
-#include "order.h"
-#include "action.h"
-#include "mapgrid.h"
-#include "drive.h"
-#include "projectile.h"
-#include "cmddroid.h"
-#include "group.h"
 
+#include "action.h"
+#include "cmddroid.h"
+#include "combat.h"
+#include "drive.h"
+#include "map.h"
+#include "mapgrid.h"
 #include "multiplay.h"
+#include "player.h"
+#include "projectile.h"
 
 // alliances
 UBYTE	alliances[MAX_PLAYERS][MAX_PLAYERS];

src/clparse.c

@@ -34,7 +34,6 @@
 
 extern BOOL NETsetupTCPIP(void ** addr, char * machine);
 
-extern char	SaveGamePath[];
 extern char	datadir[MAX_PATH];
 extern char * global_mods[MAX_MODS];
 extern char * campaign_mods[MAX_MODS];

src/cluster.h

@@ -7,6 +7,9 @@
 #ifndef _cluster_h
 #define _cluster_h
 
+#include "droiddef.h"
+#include "structuredef.h"
+
 // maximum number of clusters in a game
 #define CLUSTER_MAX		UBYTE_MAX
 

src/cmddroid.h

@@ -8,6 +8,7 @@
 #define _cmddroid_h
 
 #include "cmddroiddef.h"
+#include "droiddef.h"
 
 // The number of available command droids for each player
 //extern SWORD	numCommandDroids[MAX_PLAYERS];

src/cmddroiddef.h

@@ -7,6 +7,8 @@
 #ifndef _cmddroiddef_h
 #define _cmddroiddef_h
 
+#include "statsdef.h"
+
 // the maximum number of command droids per side
 #define MAX_CMDDROIDS	5
 

src/component.h

@@ -1,6 +1,9 @@
 #ifndef _component_h
 #define _component_h
 
+#include "droiddef.h"
+#include "structuredef.h"
+
 /*
 	Header file for component.c 
 	Pumpkin Studios, EIDOS Interactive. 

src/design.h

@@ -1,6 +1,8 @@
 #ifndef _design_h
 #define _design_h
 
+#include "lib/widget/widgbase.h"
+
 /* Design screen ID's */
 #define IDDES_FORM			5000		// The base form for the design screen
 #define IDDES_STATSFORM		5001		// The design screen stats form

src/droiddef.h

@@ -9,6 +9,12 @@
 #include "lib/gamelib/animobj.h"
 #include "lib/sound/audio.h"
 
+#include "base.h"
+#include "deliverance.h"
+#include "movedef.h"
+#include "statsdef.h"
+#include "weapons.h"
+
 /* The number of components in the asParts / asBits arrays */
 #define DROID_MAXCOMP		(COMP_NUMCOMPONENTS - 1)//(COMP_NUMCOMPONENTS - 2)
 

src/edit3d.h

@@ -1,6 +1,8 @@
 #ifndef _edit3d_h
 #define _edit3d_h
 
+#include "map.h"
+
 #define TILE_RAISE	1
 #define TILE_LOWER	-1
 #define MAX_TILE_HEIGHT 255

src/frontend.c

@@ -16,98 +16,42 @@
 #include "lib/framework/frame.h"
 #include "lib/framework/frameresource.h"
 #include "lib/framework/strres.h"
-#include "winmain.h"
-#include "objects.h"
-#include "display.h"
-#include "lib/widget/widget.h"
-/* Includes direct access to render library */
-#include "lib/ivis_common/ivisdef.h"
-#include "lib/ivis_common/piestate.h"
-
-#include "keyedit.h"
-#include "lib/ivis_common/piefunc.h"
-#include "warzoneconfig.h"
-
-// FIXME Direct iVis implementation include!
 #include "lib/ivis_common/rendmode.h"
-
+#include "lib/netplay/netplay.h"
-#include "display3d.h"
-#include "intdisplay.h"
-#include "lib/sound/audio.h"					// for sound.
-#include "audio_id.h"				// for sound..
-
-#include "lib/sound/cdaudio.h"
 #include "lib/sound/mixer.h"
-#include "configuration.h"
+#include "lib/widget/widget.h"
-
-
-#include "design.h"					// for intadddesign
-#include "hci.h"					// for intShowPower
-#include "text.h"					// to get at string resources.
-#include "frontend.h"
-#include "console.h"
-#include "wrappers.h"
-#include "component.h"
-#include "loadsave.h"
-#include "csnap.h"
-//#include "wrappers.h"				// for bUsingKeyboard.
-#include "frend.h"
-#include "game.h"
-#include "init.h"
-#include "difficulty.h"
-#include "ingameop.h"
-
 
 #include "advvis.h"
-#include "seqdisp.h"
+#include "component.h"
-#include "multiplay.h"
+#include "difficulty.h"
+#include "display.h"
+#include "frend.h"
+#include "frontend.h"
+#include "hci.h"
+#include "ingameop.h"
+#include "init.h"
+#include "intdisplay.h"
+#include "keyedit.h"
+#include "loadsave.h"
 #include "multiint.h"
 #include "multilimit.h"
-#include "multistat.h"
+#include "multiplay.h"
-#include "lib/netplay/netplay.h"
+#include "seqdisp.h"
+#include "text.h"
+#include "warzoneconfig.h"
+#include "winmain.h"
+#include "wrappers.h"
 
-extern BOOL bSubtitles;
+static int StartWithGame = 1; // New game starts in Cam 1.
-
-extern void intUpdateOptionText(struct _widget *psWidget, struct _w_context *psContext);
-extern void set_active_data_directory(int);
-
-extern CURSORSNAP InterfaceSnap;
-extern void ProcessCursorSnap(void);
-
-int StartWithGame = 1;	// New game starts in Cam 1.
-
-char OnString[]={"On "};
-char OffString[]={"Off"};
-
-
-char	strFog[MAX_STR_LENGTH];
-char	strTrans[MAX_STR_LENGTH];
 
 tMode titleMode;					// the global case
-
-
-// ////////////////////////////////////////////////////////////////////////////
-// Local Definitions
-// iPalette			titlePalette;
 int				FEFont;
-//int				FEBigFont;
 char			pLevelName[MAX_LEVEL_NAME_SIZE+1];	//256];			// vital! the wrf file to use.
 
 BOOL			bForceEditorLoaded = FALSE;
 BOOL			bUsingKeyboard = FALSE;		// to disable mouse pointer when using keys.
 BOOL			bUsingSlider   = FALSE;
 
-// ////////////////////////////////////////////////////////////////////////////
-// extern Definitions
-
-//extern W_SCREEN		*psWScreen;					//The widget screen
-
-extern char	SaveGamePath[];
-
-extern BOOL firstcall;
-extern IMAGEFILE *FrontImages;
-
-
 // ////////////////////////////////////////////////////////////////////////////
 // Function Definitions
 

src/frontend.h

@@ -42,6 +42,7 @@ extern tMode titleMode;					// the global case
 
 #define MAX_LEVEL_NAME_SIZE	(256)
 
+extern int FEFont;
 
 extern char	pLevelName[MAX_LEVEL_NAME_SIZE+1];	//256];			// vital! the wrf file to use.
 

src/hci.h

@@ -6,13 +6,12 @@
 #ifndef _hci_h
 #define _hci_h
 
+#include "lib/ivis_common/pieclip.h"
 #include "lib/widget/widget.h"
-#include "message.h"
 
 #include "cdspan.h"
-#include "lib/ivis_common/pieclip.h"
+#include "csnap.h"
-
+#include "message.h"
-//#include "intimage.h"
 
 // store the objects that are being used for the object bar
 #define			MAX_OBJECTS		15//10 we need at least 15 for the 3 different types of factory
@@ -306,6 +305,7 @@ as big as Pie View in Research Msg now*/
 /* pointer to hold the imd to use for a new template in the design screen */
 extern iIMDShape	*pNewDesignIMD;
 
+extern CURSORSNAP InterfaceSnap;
 
 extern char	*DisplayBuffer;
 extern UDWORD	displayBufferSize;

src/ingameop.c

@@ -9,40 +9,31 @@
 #include "lib/framework/frame.h"
 #include "lib/framework/strres.h"
 #include "lib/widget/widget.h"
+#include "lib/netplay/netplay.h"
+#include "lib/ivis_common/piestate.h"		// for getrendertype
+#include "lib/ivis_common/rendmode.h"
+#include "lib/sound/audio.h"					// for sound.
+#include "lib/sound/cdaudio.h"
+#include "lib/sound/mixer.h"
+
 #include "display3d.h"
 #include "intdisplay.h"
 #include "hci.h"			// for wFont def.& intmode.
 #include "loop.h"
 #include "text.h"
-#include "lib/ivis_common/piestate.h"		// for getrendertype
 #include "resource.h"
-//#include "display.h"		// for gammaValue.
 #include "frontend.h"		// for textdisplay function
 #include "loadsave.h"		// for textdisplay function
 #include "console.h"		// to add console message
-
 #include "scriptextern.h"	// for tutorial
-#include "lib/ivis_common/rendmode.h"
 #include "keybind.h"
-
-#include "lib/sound/audio.h"					// for sound.
-
-#include "lib/sound/cdaudio.h"
-#include "lib/sound/mixer.h"
 #include "multiplay.h"
-
-
 #include "csnap.h"
 #include "ingameop.h"
 #include "mission.h"
 #include "transporter.h"
-#include "lib/netplay/netplay.h"
+#include "winmain.h"
 
-
-extern char	SaveGamePath[];
-
-//extern W_SCREEN *psWScreen;
-extern CURSORSNAP InterfaceSnap;
 extern void addText(int FontID,UDWORD FormID,UDWORD id,  UDWORD PosX, UDWORD PosY, char *txt, UDWORD attachID,BOOL *State);
 
 //status bools.(for hci.h)

src/ingameop.h

@@ -14,7 +14,6 @@ extern void intProcessInGameOptions		(UDWORD);
 // status bools.
 extern BOOL	ClosingInGameOp;
 extern BOOL	InGameOpUp;
-extern BOOL	bSubtitles;
 
 // ////////////////////////////////////////////////////////////////////////////
 // defines

src/init.c

@@ -12,98 +12,68 @@
 #include "lib/framework/frameresource.h"
 #include "lib/framework/input.h"
 #include "lib/framework/strres.h"
-
-#include "init.h"
-#include "mechanics.h"
-#include "objects.h"
-#include "display.h"
-#include "ai.h"
-#include "astar.h"
-#include "disp2d.h"
-#include "hci.h"
-#include "lib/sound/audio.h"
-#include "csnap.h"
-#include "wrappers.h"
-#include <time.h>
-#include "game.h"
-#include "lib/gamelib/animobj.h"
 #include "lib/gamelib/ani.h"
-#include "drive.h"
-#include "bucket3d.h"
-#include "message.h"
-#include "data.h"
-#include "raycast.h"
-#include "text.h"
-#include "console.h"
-
-#include "lib/ivis_common/piedef.h"
-#include "lib/ivis_common/piestate.h"
-
-#include "configuration.h"
 #include "lib/ivis_common/piemode.h"
-#include "lib/ivis_common/tex.h"
+#include "lib/ivis_common/piestate.h"
-
-#include "resource.h"
 #include "lib/ivis_common/rendmode.h"
-#include "lib/ivis_common/ivi.h"
+#include "lib/ivis_common/tex.h"
-#include "group.h"
+#include "lib/netplay/netplay.h"
-#include "wrappers.h"
-#include "display3d.h"
-
-#include "atmos.h"
-#include "environ.h"
-#include "warzoneconfig.h"
-#include "multiplay.h"
-
 #include "lib/script/script.h"
+#include "lib/sound/cdaudio.h"
+
+#include "advvis.h"
+#include "astar.h"
+#include "atmos.h"
+#include "audio_id.h"
+#include "cluster.h"
+#include "cmddroid.h"
+#include "component.h"
+#include "configuration.h"
+#include "console.h"
+#include "data.h"
+#include "display.h"
+#include "display3d.h"
+#include "drive.h"
+#include "edit3d.h"
+#include "effects.h"
+#include "environ.h"
+#include "formation.h"
+#include "fpath.h"
+#include "frend.h"
+#include "frontend.h"
+#include "game.h"
+#include "gateway.h"
+#include "hci.h"
+#include "init.h"
+#include "intdisplay.h"
+#include "keymap.h"
+#include "levels.h"
+#include "lighting.h"
+#include "loop.h"
+#include "mapgrid.h"
+#include "mechanics.h"
+#include "miscimd.h"
+#include "mission.h"
+#include "modding.h"
+#include "multigifts.h"
+#include "multiplay.h"
+#include "projectile.h"
+#include "radar.h"
+#include "raycast.h"
+#include "resource.h"
+#include "scriptextern.h"
 #include "scripttabs.h"
 #include "scriptvals.h"
-#include "miscimd.h"
+#include "text.h"
-#include "keymap.h"
+#include "transporter.h"
-#include "edit3d.h"
+#include "warzoneconfig.h"
-#include "component.h"
-#include "fpath.h"
 #include "winmain.h"
+#include "wrappers.h"
 
 #ifdef ARROWS
 #include "arrow.h"
 #endif
 
-#include "texture.h"
-
-#include "frend.h"
-
-#include "intimage.h"
-#include "power.h"
-#include "deliverance.h"
-#include "radar.h"
-#include "audio_id.h"
-#include "intdisplay.h"
-#include "formationdef.h"
-#include "formation.h"
-
-#include "lib/sound/cdaudio.h"
-#include "lib/sound/mixer.h"
-#include "advvis.h"
-
-#include "mission.h"
-#include "transporter.h"
-#include "projectile.h"
-#include "levels.h"
-#include "loop.h"
-#include "cmddroid.h"
-#include "effects.h"
-#include "scriptextern.h"
-#include "mapgrid.h"
-#include "cluster.h"
-#include "gateway.h"
-#include "lighting.h"
-
-#include "modding.h"
-
-#include "lib/netplay/netplay.h"
-#include "multigifts.h"
-
 extern char UserMusicPath[];
 
 extern void statsInitVars(void);
@@ -682,11 +652,6 @@ IMAGEFILE *FrontImages;
 BOOL DirectControl = FALSE;
 
 
-
-extern int FEFont;
-//extern int FEBigFont;
-
-
 // Each module in the game should have a call from here to initialise
 // any globals and statics to there default values each time the game
 // or frontend restarts.

src/init.h

@@ -7,6 +7,8 @@
 #ifndef _init_h
 #define _init_h
 
+#include "lib/ivis_common/ivisdef.h"
+
 // the size of the file loading buffer
 #define FILE_LOAD_BUFF_SIZE		(1024*1024)
 
@@ -58,5 +60,7 @@ extern BLOCK_HEAP	*psMapHeap;
 // the block heap for the pre WRF data
 extern BLOCK_HEAP	*psMissionHeap;
 
+extern IMAGEFILE	*FrontImages;
+
 #endif
 

src/intdisplay.h

@@ -175,6 +175,8 @@ void intUpdateCommandFact(struct _widget *psWidget, struct _w_context *psContext
 
 void intUpdateProgressBar(struct _widget *psWidget, struct _w_context *psContext);
 
+void intUpdateOptionText(struct _widget *psWidget, struct _w_context *psContext);
+
 void intUpdateQuantity(struct _widget *psWidget, struct _w_context *psContext);
 //callback to display the factory number
 extern void intAddFactoryInc(struct _widget *psWidget, struct _w_context *psContext);

src/intelmap.c

@@ -46,7 +46,6 @@
 
 
 #include "csnap.h"
-extern CURSORSNAP InterfaceSnap;
 
 #define NO_VIDEO
 

src/intorder.c

@@ -428,7 +428,7 @@ BOOL intUpdateOrder(DROID *psDroid)
 //
 //changed to a BASE_OBJECT to accomodate the factories - AB 21/04/99
 //BOOL _intAddOrder(DROID *Droid)
-BOOL _intAddOrder(BASE_OBJECT *psObj)
+BOOL intAddOrder(BASE_OBJECT *psObj)
 {
 	W_FORMINIT			sFormInit;
 	W_BUTINIT			sButInit;
@@ -854,7 +854,7 @@ void intRunOrder(void)
 
 // Process the droid order screen.
 //
-void _intProcessOrder(UDWORD id)
+void intProcessOrder(UDWORD id)
 {
 	UWORD i;
 	UWORD OrdIndex;
@@ -1021,23 +1021,6 @@ BOOL intRefreshOrder(void)
 }
 
 
-//changed to a BASE_OBJECT to accomodate the factories - AB 21/04/99
-//BOOL intAddOrder(DROID *Droid)
-BOOL intAddOrder(BASE_OBJECT *psObj)
-{
-
-    //changed to a BASE_OBJECT to accomodate the factories - AB 21/04/99
-	//return _intAddOrder(Droid);
-    return _intAddOrder(psObj);
-}
-
-void intProcessOrder(UDWORD id)
-{
-
-	_intProcessOrder(id);
-}
-
-
 // Remove the droids order screen with animation.
 //
 void intRemoveOrder(void)

src/keyedit.c

@@ -20,6 +20,7 @@
 #include "text.h"
 #include "lib/ivis_common/textdraw.h"
 #include "hci.h"
+#include "init.h"
 #include "loadsave.h"
 #include "keymap.h"
 #include "csnap.h"
@@ -57,8 +58,6 @@
 
 // ////////////////////////////////////////////////////////////////////////////
 // variables
-extern IMAGEFILE	*FrontImages;
-extern CURSORSNAP	InterfaceSnap;
 
 static KEY_MAPPING	*selectedKeyMap;
 // ////////////////////////////////////////////////////////////////////////////

src/main.c

@@ -2,52 +2,43 @@
  * main.c
  *
  */
-#include "lib/framework/frame.h"
+
-#include "lib/framework/configfile.h"
+#include <SDL/SDL_main.h>
+#include <physfs.h>
+#include <string.h>
 
 /* For SHGetFolderPath */
 #ifdef WIN32
 # include <shlobj.h>
 #endif // WIN32
 
-#include <string.h>
+#include "lib/framework/frame.h"
-#include <SDL/SDL_main.h>
+#include "lib/framework/configfile.h"
-#include <physfs.h>
-
-#include "lib/widget/widget.h"
-#include "lib/script/script.h"
-#include "init.h"
-#include "loop.h"
-#include "objects.h"
-#include "display.h"
-#include "lib/ivis_common/piestate.h"
 #include "lib/gamelib/gtime.h"
+#include "lib/ivis_common/piestate.h"
+#include "lib/ivis_common/rendmode.h"
+#include "lib/ivis_opengl/screen.h"
+#include "lib/netplay/netplay.h"
+#include "lib/script/script.h"
+#include "lib/widget/widget.h"
+
+#include "clparse.h"
+#include "configuration.h"
+#include "display.h"
+#include "frontend.h"
+#include "game.h"
+#include "init.h"
+#include "levels.h"
+#include "lighting.h"
+#include "loadsave.h"
+#include "loop.h"
+#include "modding.h"
+#include "multiplay.h"
+#include "research.h"
+#include "seqdisp.h"
+#include "warzoneconfig.h"
 #include "winmain.h"
 #include "wrappers.h"
-#include "scripttabs.h"
-#include "deliverance.h"
-#include "frontend.h"
-#include "seqdisp.h"
-#include "lib/sound/audio.h"
-#include "console.h"
-#include "lib/ivis_common/rendmode.h"
-#include "lib/ivis_common/piemode.h"
-#include "levels.h"
-#include "research.h"
-#include "warzoneconfig.h"
-#include "clparse.h"
-#include "cdspan.h"
-#include "configuration.h"
-#include "multiplay.h"
-#include "lib/netplay/netplay.h"
-#include "loadsave.h"
-#include "game.h"
-#include "lighting.h"
-#include "lib/sound/mixer.h"
-// FIXME Direct iVis implementation include!
-#include "lib/ivis_opengl/screen.h"
-
-#include "modding.h"
 
 #ifndef DEFAULT_DATADIR
 # define DEFAULT_DATADIR "/usr/share/warzone2100/"

src/mission.c

@@ -31,6 +31,7 @@
 #include "frontend.h"		// for displaytextoption.
 #include "csnap.h"			// cursor snapping
 #include "intdisplay.h"
+#include "winmain.h"
 #include "display.h"
 #include "loadsave.h"
 #include "lib/script/script.h"
@@ -71,7 +72,6 @@
 #include "texture.h"
 
 
-extern CURSORSNAP InterfaceSnap;
 //DEFINES**************
 //#define		IDTIMER_FORM			11000		// has to be in the header..boohoo
 //#define		IDTIMER_DISPLAY			11001
@@ -150,10 +150,6 @@ extern CURSORSNAP InterfaceSnap;
 #define NOT_PLAYED_ACTIVATED    0x20
 
 
-//EXTERNALS*************
-
-extern char	SaveGamePath[];
-
 MISSION		mission;
 
 BOOL		offWorldKeepLists;

src/multiint.c

@@ -78,8 +78,6 @@ extern char	MultiForcesPath[255];
 extern char	MultiCustomMapsPath[255];
 extern char	MultiPlayersPath[255];
 
-extern IMAGEFILE			*FrontImages;
-extern CURSORSNAP			InterfaceSnap;
 extern BOOL				bSendingMap;
 
 extern void intDisplayTemplateButton(struct _widget *psWidget, UDWORD xOffset, UDWORD yOffset, UDWORD *pColours);
@@ -122,8 +120,6 @@ static UDWORD hideTime=0;
 #define DEFAULTSKIRMISHMAP	"Sk-Rush"
 
 
-extern int FEFont;
-
 /// end of globals.
 // ////////////////////////////////////////////////////////////////////////////
 // Function protos

src/multilimit.c

@@ -38,8 +38,6 @@
 
 // ////////////////////////////////////////////////////////////////////////////
 // externs
-extern IMAGEFILE	*FrontImages;
-extern CURSORSNAP	InterfaceSnap;
 extern void			intDisplayPlainForm	(struct _widget *psWidget, UDWORD xOffset,
 										 UDWORD yOffset, UDWORD *pColours);
 

src/multimenu.c

@@ -21,6 +21,7 @@
 #include "objmem.h"		 	//for droid lists.
 #include "component.h"		// for disaplycomponentobj.
 #include "hci.h"			// for wFont def.& intmode.
+#include "init.h"
 //#include "intfac.h"		// for images.
 #include "power.h"
 #include "loadsave.h"		// for drawbluebox
@@ -47,9 +48,6 @@ W_SCREEN  *psRScreen;			// requester stuff.
 
 extern char	MultiCustomMapsPath[255];
 
-extern CURSORSNAP InterfaceSnap;
-//extern W_SCREEN *psWScreen;
-extern IMAGEFILE *FrontImages;
 extern void	displayMultiBut(struct _widget *psWidget, UDWORD xOffset, UDWORD yOffset, UDWORD *pColours);
 
 BOOL	MultiMenuUp			= FALSE;

src/scriptfuncs.c

@@ -1243,7 +1243,6 @@ BOOL scrApproxRoot(void)
 }
 
 // -----------------------------------------------------------------------------------------
-extern void intShowReticuleButton(UDWORD id,BOOL Show);
 // Add a reticule button to the interface
 BOOL scrAddReticuleButton(void)
 {

src/structuredef.h

@@ -7,6 +7,10 @@
 #ifndef _structuredef_h
 #define _structuredef_h
 
+#include "lib/gamelib/animobj.h"
+#include "statsdef.h"
+#include "weapons.h"
+
 #define NUM_FACTORY_MODULES	2
 #define NUM_RESEARCH_MODULES 4
 #define NUM_POWER_MODULES 4

src/transporter.c

@@ -40,8 +40,6 @@
 
 #include "csnap.h"
 
-extern CURSORSNAP InterfaceSnap;
-
 //#define IDTRANS_FORM			9000	//The Transporter base form
 #define IDTRANS_TABFORM			9001	//The Transporter tabbed form
 #define IDTRANS_CLOSE			9002	//The close button icon

src/winmain.h

@@ -18,4 +18,6 @@ extern	BOOL	bDisableLobby;
 extern	UDWORD GetGameMode(void);
 extern	void SetGameMode(UDWORD status);
 
+extern char SaveGamePath[];
+
 #endif

src/wrappers.c

@@ -72,7 +72,6 @@ STAR	stars[30];	// quick hack for loading stuff
 #define LOAD_BOX_SHADES	6
 
 
-extern IMAGEFILE	*FrontImages;
 extern int WFont;
 extern BOOL bLoadSaveUp;