Cleanup misc stuff

Tactical/Item Types.cpp

@@ -3,11 +3,8 @@
 #include "DEBUG.H"
 #include "Items.h"
 #include "GameSettings.h"
-#include "screenids.h"
 #include "Action Items.h"	// added by Flugente for the ACTION_ITEM_BLOW_UP value
-#include "random.h"			// added by Flugente
 #include "message.h"		// added by BOB for missing LBE info messages
-#include "Overhead.h"		// added by BOB for missing LBE info messages
 #include "Map Screen Interface.h" // added by BOB for missing LBE info messages
 
 
@@ -27,7 +24,7 @@ extern UINT32			guiCurrentItemDescriptionScreen;
 extern BOOLEAN			fShowMapInventoryPool;
 //extern BOOLEAN AutoPlaceObjectInInventoryStash( OBJECTTYPE *pItemPtr, INT32 sGridNo );
 
-bool checkObjectLBEIntegrity(OBJECTTYPE * object) {
+static bool checkObjectLBEIntegrity(OBJECTTYPE * object) {
 	bool integrityCheck = TRUE;
 
 

TileEngine/SaveLoadMap.cpp

@@ -7,7 +7,6 @@
 	#include "worldman.h"
 	#include "strategicmap.h"
 	#include "Campaign Types.h"
-	#include "renderworld.h"
 	#include "Render Fun.h"
 	#include "fov.h"
 	#include "worlddef.h"
@@ -16,7 +15,6 @@
 	#include "GameSettings.h"
 	#include "Smell.h"
 
-#include <vfs/Core/vfs.h>
 //SB: make size of gpRevealedMap dependable from variable tactical map dimensions
 #define			NUM_REVEALED_BYTES			(WORLD_MAX/8)
 
@@ -175,7 +173,7 @@ typedef std::map<ModifiedMapFile::Key, ModifiedMapFile, ltMMF> ModifiedMapFileSe
 ModifiedMapFileSet g_mapFileSet;
 BOOLEAN g_useSaveCache;
 
-void ClearTempFileSets()
+static void ClearTempFileSets()
 {
 	//for (ModifiedMapFileSet::iterator itr = g_mapFileSet.begin(), end = g_mapFileSet.end(); itr != end; ++itr )
 	//{
@@ -195,7 +193,7 @@ BOOLEAN EnableModifiedFileSetCache(BOOLEAN value)
 	return previousValue;
 }
 
-bool TryGetModifiedMapFile( UINT32 uiType, INT16 sMapX, INT16 sMapY, INT8 bMapZ, ModifiedMapFile** ppMMF )
+static bool TryGetModifiedMapFile( UINT32 uiType, INT16 sMapX, INT16 sMapY, INT8 bMapZ, ModifiedMapFile** ppMMF )
 {
 	if (ppMMF == NULL)
 		return false;
@@ -211,7 +209,7 @@ bool TryGetModifiedMapFile( UINT32 uiType, INT16 sMapX, INT16 sMapY, INT8 bMapZ,
 	return true;
 }
 
-ModifiedMapFile& GetOrCreateModifiedMapFile(UINT32 uiType, INT16 sMapX, INT16 sMapY, INT8 bMapZ)
+static ModifiedMapFile& GetOrCreateModifiedMapFile(UINT32 uiType, INT16 sMapX, INT16 sMapY, INT8 bMapZ)
 {
 	ModifiedMapFile* pResult = NULL;
 	if ( TryGetModifiedMapFile(uiType, sMapX, sMapY, bMapZ, &pResult) )

TileEngine/Tactical Placement GUI.cpp

@@ -133,7 +133,7 @@ void SelectNextUnplacedUnit();
 BOOLEAN gfNorthValid, gfEastValid, gfSouthValid, gfWestValid;
 BOOLEAN gfChangedEntrySide = FALSE;
 
-void FindValidInsertionCode( UINT8 *pubStrategicInsertionCode )
+static void FindValidInsertionCode( UINT8 *pubStrategicInsertionCode )
 {
 	if( gMapInformation.sNorthGridNo == -1 &&
 			gMapInformation.sEastGridNo == -1 &&
@@ -202,7 +202,7 @@ void FindValidInsertionCode( UINT8 *pubStrategicInsertionCode )
 	}
 }
 
-void CheckForValidMapEdge( UINT8 *pubStrategicInsertionCode )
+static void CheckForValidMapEdge( UINT8 *pubStrategicInsertionCode )
 {
 	switch( *pubStrategicInsertionCode )
 	{
@@ -1464,7 +1464,7 @@ void RenderTacticalPlacementGUI()
 	}
 }
 
-void EnsureDoneButtonStatus()
+static void EnsureDoneButtonStatus()
 {
 	INT32 i;
 	//static BOOLEAN fInside = FALSE;
@@ -1783,7 +1783,7 @@ void KillTacticalPlacementGUI()
 	MemFree( gMercPlacement);
 }
 
-void ChooseRandomEdgepoints()
+static void ChooseRandomEdgepoints()
 {
 	INT32 i;
 	UINT8	lastValidICode = INSERTION_CODE_GRIDNO;

TileEngine/renderworld.cpp

@@ -571,8 +571,6 @@ void RenderGridNoVisibleDebugInfo( INT16 sStartPointX_M, INT16 sStartPointY_M, I
 
 void DeleteFromWorld( UINT16 usTileIndex, UINT32 uiRenderTiles, UINT16 usIndex );
 
-void RenderHighlight( INT16 sMouseX_M, INT16 sMouseY_M, INT16 sStartPointX_M, INT16 sStartPointY_M, INT16 sStartPointX_S, INT16 sStartPointY_S, INT16 sEndXS, INT16 sEndYS );
-BOOLEAN CheckRenderCenter( INT16 sNewCenterX, INT16 sNewCenterY );
 
 // Flugente: display a riot shield
 static void ShowRiotShield( SOLDIERTYPE* pSoldier, UINT16 *pBuffer, UINT32 uiDestPitchBYTES, UINT16 *pZBuffer, UINT16 usZValue )

TileEngine/structure.cpp

@@ -1,52 +1,39 @@
-	#include <string.h>
-	#include "types.h"
-	#include "WCheck.h"
-	#include "DEBUG.H"
-	#include "FileMan.h"
-	#include "MemMan.h"
-	#include "structure.h"
-	#include "tiledef.h"
-	#include "worlddef.h"
-	#include "worldman.h"
-
-	#include "Interface.h"
-
-	#include "Isometric Utils.h"
-	#include "Font.h"
-	#include "Font Control.h"
-	#include "LOS.h"
-
-	#include "lighting.h"
-	#include "Smell.h"
-	#include "SaveLoadMap.h"
-	#include "strategicmap.h"
-	#include "sgp_logger.h"
-
-	#include "Sys Globals.h"	//for access to gfEditMode flag
-
-	//Kris:
-	#ifdef JA2EDITOR
-	#include "Editor Undo.h"	//for access to AddToUndoList( iMapIndex )
-	#endif
-
-	#include "Explosion Control.h"
-	#include "Sound Control.h"
-
-	#include "Buildings.h"
-
-	#include "random.h"
-
-	#include "Tile Animation.h"
-	#include "Explosion Control.h"	// added by Flugente
-
-	// anv: for ramming people with vehicles
-	#include "Soldier macros.h"
-	#include "Overhead.h"
-	#include "Soldier Functions.h"
-	#include "Animation Control.h"
-	#include "Soldier Ani.h"
-	#include "ASD.h"		// added by Flugente
-	#include "renderworld.h"		// added by Flugente for SetRenderFlags( RENDER_FLAG_FULL );
+#include <string.h>
+#include "types.h"
+#include "WCheck.h"
+#include "DEBUG.H"
+#include "FileMan.h"
+#include "MemMan.h"
+#include "structure.h"
+#include "tiledef.h"
+#include "worlddef.h"
+#include "worldman.h"
+#include "Interface.h"
+#include "Isometric Utils.h"
+#include "Font.h"
+#include "Font Control.h"
+#include "Smell.h"
+#include "SaveLoadMap.h"
+#include "strategicmap.h"
+#include "sgp_logger.h"
+#include "Sys Globals.h"	//for access to gfEditMode flag
+//Kris:
+#ifdef JA2EDITOR
+#include "Editor Undo.h"	//for access to AddToUndoList( iMapIndex )
+#endif
+#include "Explosion Control.h"
+#include "Sound Control.h"
+#include "Buildings.h"
+#include "random.h"
+#include "Tile Animation.h"
+// anv: for ramming people with vehicles
+#include "Soldier macros.h"
+#include "Overhead.h"
+#include "Animation Control.h"
+#include "ASD.h"		// added by Flugente
+#include "renderworld.h"		// added by Flugente for SetRenderFlags( RENDER_FLAG_FULL );
+#include <vfs/Core/vfs.h>
+#include "XML_StructureData.hpp"
 
 #ifdef COUNT_PATHS
 	extern UINT32 guiSuccessfulPathChecks;
@@ -162,7 +149,7 @@ index 25, indestructable metal
 };
 
 // Function operating on a structure tile
-UINT8 FilledTilePositions( DB_STRUCTURE_TILE * pTile )
+static UINT8 FilledTilePositions( DB_STRUCTURE_TILE * pTile )
 {
 	UINT8				ubFilled = 0, ubShapeValue;
 	INT8				bLoopX, bLoopY, bLoopZ;
@@ -267,7 +254,7 @@ BOOLEAN FreeStructureFile( STRUCTURE_FILE_REF * pStructureFile )
 	return( TRUE );
 }
 
-BOOLEAN LoadStructureData( STR szFileName, STRUCTURE_FILE_REF *	pFileRef, UINT32 * puiStructureDataSize )
+static BOOLEAN LoadStructureData( STR szFileName, STRUCTURE_FILE_REF *	pFileRef, UINT32 * puiStructureDataSize )
 //UINT8 **ppubStructureData, UINT32 * puiDataSize, STRUCTURE_FILE_HEADER * pHeader )
 {
 	// Loads a structure file's data as a honking chunk o' memory
@@ -367,7 +354,7 @@ BOOLEAN LoadStructureData( STR szFileName, STRUCTURE_FILE_REF *	pFileRef, UINT32
 	return( TRUE );
 }
 
-BOOLEAN CreateFileStructureArrays( STRUCTURE_FILE_REF * pFileRef, UINT32 uiDataSize )
+static BOOLEAN CreateFileStructureArrays( STRUCTURE_FILE_REF * pFileRef, UINT32 uiDataSize )
 {
 	// Based on a file chunk, creates all the dynamic arrays for the
 	// structure definitions contained within
@@ -438,11 +425,8 @@ BOOLEAN CreateFileStructureArrays( STRUCTURE_FILE_REF * pFileRef, UINT32 uiDataS
 	return( TRUE );
 }
 
-#include <vfs/Core/vfs_file_raii.h>
-#include <vfs/Core/vfs.h>
-#include "XML_StructureData.hpp"
 
-void checkStructureValidity(STRUCTURE_FILE_REF *str1, STRUCTURE_FILE_REF* str2, UINT32 size1, UINT32 size2)
+static void checkStructureValidity(STRUCTURE_FILE_REF *str1, STRUCTURE_FILE_REF* str2, UINT32 size1, UINT32 size2)
 {
 	if(str1 == str2 && str1 == NULL)
 	{
@@ -579,7 +563,7 @@ STRUCTURE_FILE_REF * LoadStructureFile( STR szFileName )
 //
 
 
-STRUCTURE * CreateStructureFromDB( DB_STRUCTURE_REF * pDBStructureRef, UINT8 ubTileNum )
+static STRUCTURE * CreateStructureFromDB( DB_STRUCTURE_REF * pDBStructureRef, UINT8 ubTileNum )
 {
 	// Creates a STRUCTURE struct for one tile of a structure
 	STRUCTURE	*						pStructure;
@@ -632,7 +616,7 @@ STRUCTURE * CreateStructureFromDB( DB_STRUCTURE_REF * pDBStructureRef, UINT8 ubT
 
 extern SoldierID gusTempDragBuildSoldierID;
 
-BOOLEAN OkayToAddStructureToTile( INT32 sBaseGridNo, INT16 sCubeOffset, DB_STRUCTURE_REF * pDBStructureRef, UINT8 ubTileIndex, INT16 sExclusionID, BOOLEAN fAddingForReal = FALSE, SoldierID sSoldierID = NOBODY )
+static BOOLEAN OkayToAddStructureToTile( INT32 sBaseGridNo, INT16 sCubeOffset, DB_STRUCTURE_REF * pDBStructureRef, UINT8 ubTileIndex, INT16 sExclusionID, BOOLEAN fAddingForReal = FALSE, SoldierID sSoldierID = NOBODY )
 {
 	// Verifies whether a structure is blocked from being added to the map at a particular point
 	DB_STRUCTURE *	pDBStructure;
@@ -1006,7 +990,7 @@ BOOLEAN OkayToAddStructureToWorld( INT32 sBaseGridNo, INT8 bLevel, DB_STRUCTURE_
 	return( InternalOkayToAddStructureToWorld( sBaseGridNo, bLevel, pDBStructureRef, sExclusionID, fAddingForReal, sSoldierID ) );
 }
 
-BOOLEAN AddStructureToTile( MAP_ELEMENT * pMapElement, STRUCTURE * pStructure, UINT16 usStructureID )
+static BOOLEAN AddStructureToTile( MAP_ELEMENT * pMapElement, STRUCTURE * pStructure, UINT16 usStructureID )
 {
 	// adds a STRUCTURE to a MAP_ELEMENT (adds part of a structure to a location on the map)
 	STRUCTURE *		pStructureTail;
@@ -1033,7 +1017,7 @@ BOOLEAN AddStructureToTile( MAP_ELEMENT * pMapElement, STRUCTURE * pStructure, U
 }
 
 
-STRUCTURE * InternalAddStructureToWorld( INT32 sBaseGridNo, INT8 bLevel, DB_STRUCTURE_REF * pDBStructureRef, LEVELNODE * pLevelNode )
+static STRUCTURE * InternalAddStructureToWorld( INT32 sBaseGridNo, INT8 bLevel, DB_STRUCTURE_REF * pDBStructureRef, LEVELNODE * pLevelNode )
 {
 	// Adds a complete structure to the world at a location plus all other locations covered by the structure
 	INT32				sGridNo;
@@ -1335,7 +1319,7 @@ BOOLEAN DeleteStructureFromWorld( STRUCTURE * pStructure )
 	return( TRUE );
 }
 
-STRUCTURE * InternalSwapStructureForPartner( INT32 sGridNo, STRUCTURE * pStructure, BOOLEAN fFlipSwitches, BOOLEAN fStoreInMap )
+static STRUCTURE * InternalSwapStructureForPartner( INT32 sGridNo, STRUCTURE * pStructure, BOOLEAN fFlipSwitches, BOOLEAN fStoreInMap )
 {
 	// switch structure
 	LEVELNODE *				pLevelNode;
@@ -2519,13 +2503,13 @@ BOOLEAN AddZStripInfoToVObject( HVOBJECT hVObject, STRUCTURE_FILE_REF * pStructu
 	return( TRUE );
 }
 
-BOOLEAN InitStructureDB( void )
+static BOOLEAN InitStructureDB( void )
 {
 	gusNextAvailableStructureID = FIRST_AVAILABLE_STRUCTURE_ID;
 	return( TRUE );
 }
 
-BOOLEAN FiniStructureDB( void )
+static BOOLEAN FiniStructureDB( void )
 {
 	gusNextAvailableStructureID = FIRST_AVAILABLE_STRUCTURE_ID;
 	return( TRUE );