More unused stuff removal (#49)

* More unused stuff removal

delete:
- giant 'metaheaders' (JA2 All.h, Laptop All.h, etc), preferring to add #includes directly where needed
- unused ExceptionHandling and DbMan translation units
- unused WizShare.h, Bitmap.h, trle.h, video_private.h headers

* remove mentions from vc proj files too

* remove preprocessor conditionals for unused definitions

find . -iname '*.h' -o -iname '*.cpp' -exec unifdef.exe -m -UPRECOMPILED_HEADERS -UJA2_PRECOMPILED_HEADERS -UWIZ8_PRECOMPILED_HEADERS -UPRECOMPILEDHEADERS {} ';'

then manually fixed a couple files the tool errored out on

* yes, the comments too

as title

Standard Gaming Platform/Bitmap.h

@@ -1,63 +0,0 @@
-//**************************************************************************
-//
-// Filename :	bitmap.h
-//
-//	Purpose :	bitmap format
-//
-// Modification history :
-//
-//		20nov96:HJH				- Creation
-//
-//**************************************************************************
-
-#ifndef _bitmap_h
-#define _bitmap_h
-
-//**************************************************************************
-//
-//				Includes
-//
-//**************************************************************************
-
-#include "types.h"
-
-//**************************************************************************
-//
-//				Defines
-//
-//**************************************************************************
-
-//**************************************************************************
-//
-//				Typedefs
-//
-//**************************************************************************
-
-typedef struct sgpBmHeadertag
-{
-	UINT32	uiNumBytes;			//	number of bytes of the bitmap, including the
-										// memory for all variables in this structure plus
-										// all the memory in bitmap
-	UINT32	uiWidth;				// width of bitmap in pixels
-	UINT32	uiHeight;			// height of bitmap in pixels
-	UINT8		uiBitDepth;			// 8, 16, 24, or 32
-	UINT8		uiNumPalEntries;	// if uiBitDepth is 8, non-zero, else 0
-} SGPBmHeader;
-
-typedef struct sgpBitmaptag
-{
-	SGPBmHeader	header;
-	UINT8			uiData[1];	// if uiNumPalEntries != 0
-									//		uiNumPalEntries*3 (rgb) bytes for palette
-									// if uiBitDepth == 8
-									//		uiWidth * uiHeight bytes
-									// else if uiBitDepth == 16
-									//		uiWidth * uiHeight * 2 bytes
-									// else if uiBitDepth == 24
-									//		uiWidth * uiHeight * 3 bytes
-									// else if uiBitDepth == 32
-									//		uiWidth * uiHeight * 4 bytes
-} SGPBitmap;
-
-#endif
-

Standard Gaming Platform/Button Sound Control.cpp

@@ -1,14 +1,8 @@
-#ifdef JA2_PRECOMPILED_HEADERS
-	#include "JA2 SGP ALL.H"
-#elif defined( WIZ8_PRECOMPILED_HEADERS )
-	#include "WIZ8 SGP ALL.H"
-#else
 	#include "types.h"
 	#include "Button System.h"
 	#include "Button Sound Control.h"
 	#include "Sound Control.h"
 	#include "jascreens.h"
-#endif
 
 void SpecifyButtonSoundScheme( INT32 iButtonID, INT8 bSoundScheme )
 {

Standard Gaming Platform/Button System.cpp

@@ -4,11 +4,6 @@
 	Rewritten mostly by Kris Morness
 ***********************************************************************************************/
 
-#ifdef JA2_PRECOMPILED_HEADERS
-	#include "JA2 SGP ALL.H"
-#elif defined( WIZ8_PRECOMPILED_HEADERS )
-	#include "WIZ8 SGP ALL.H"
-#else
 	#include "types.h"
 	#include <windows.h>
 	#include <stdio.h>
@@ -35,7 +30,6 @@
 	#else
 		#include "video2.h"
 	#endif
-#endif
 #include <vector>
 
 

Standard Gaming Platform/Compression.cpp

@@ -1,12 +1,6 @@
-#ifdef JA2_PRECOMPILED_HEADERS
-	#include "JA2 SGP ALL.H"
-#elif defined( WIZ8_PRECOMPILED_HEADERS )
-	#include "WIZ8 SGP ALL.H"
-#else
 	#include "MemMan.h"
 	#include "debug.h"
 	#include "zlib.h"
-#endif
 
 
 // mem allocation functions for ZLIB's purposes

Standard Gaming Platform/Container.cpp

@@ -19,11 +19,6 @@
 //				this crap.	DON'T USE THIS -- NO MATTER WHAT!!!
 //*****************************************************************************
 
-#ifdef JA2_PRECOMPILED_HEADERS
-	#include "JA2 SGP ALL.H"
-#elif defined( WIZ8_PRECOMPILED_HEADERS )
-	#include "WIZ8 SGP ALL.H"
-#else
 	#include "types.h"
 	#include <stdlib.h>
 	#include <malloc.h>
@@ -35,7 +30,6 @@
 	#if _MSC_VER < 1300 //(iostream.h was removed from VC.NET2003)
 	#include <iostream.h>
 	#endif
-#endif
 
 
 //*****************************************************************************

Standard Gaming Platform/Cursor Control.cpp

@@ -1,8 +1,3 @@
-#ifdef JA2_PRECOMPILED_HEADERS
-	#include "JA2 SGP ALL.H"
-#elif defined( WIZ8_PRECOMPILED_HEADERS )
-	#include "WIZ8 SGP ALL.H"
-#else
 	#include "Cursor Control.h"
 
 	#if defined( JA2 ) || defined( UTIL )
@@ -11,7 +6,6 @@
 	#include "video2.h"
 	#endif
 
-#endif
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 //

Standard Gaming Platform/DEBUG.cpp

@@ -29,7 +29,6 @@
 	#include <string>
 	#include <sstream>
 	#include "debug.h"
-	#include "WizShare.h"
 
 	//Kris addition
 	#ifdef JA2

Standard Gaming Platform/DbMan.h

@@ -1,87 +0,0 @@
-//**************************************************************************
-//
-// Filename :	DbMan.h
-//
-//	Purpose :	prototypes for the database manager
-//
-// Modification history :
-//
-//		08oct96:HJH				- Creation
-//
-//**************************************************************************
-
-#ifndef _DBMAN_H
-#define _DBMAN_H
-
-//**************************************************************************
-//
-//				Includes
-//
-//**************************************************************************
-
-#include "types.h"
-
-//**************************************************************************
-//
-//				Defines
-//
-//**************************************************************************
-
-#ifndef FILE_ACCESS_READ
-#define FILE_ACCESS_READ		0x01
-#endif
-
-#ifndef FILE_ACCESS_WRITE
-#define FILE_ACCESS_WRITE		0x02
-#endif
-
-#define FILE_SEEK_FROM_START		0x01	// keep in sync with fileman.h
-#define FILE_SEEK_FROM_END			0x02	// keep in sync with fileman.h
-#define FILE_SEEK_FROM_CURRENT	0x04	// keep in sync with fileman.h
-
-//**************************************************************************
-//
-//				Typedefs
-//
-//**************************************************************************
-
-typedef UINT8		BYTE;
-typedef UINT32		HDBFILE;
-typedef UINT16		HFILEINDEX;
-typedef UINT16		HDBINDEX;
-
-//**************************************************************************
-//
-//				Function Prototypes
-//
-//**************************************************************************
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-	
-extern BOOLEAN	InitializeDatabaseManager( STR strIndexFilename );
-extern void		ShutdownDatabaseManager( void );
-extern void		DbDebug( BOOLEAN f );
-
-extern BOOLEAN	DbExists( STR filename );
-
-extern HDBINDEX	DbOpen( STR filename );
-extern void		DbClose( HDBINDEX );
-
-extern HDBFILE	DbFileOpen( STR filename );
-extern void		DbFileClose( HDBFILE );
-
-extern BOOLEAN	DbFileRead( HDBFILE hFile, PTR pDest, UINT32 uiBytesToRead, UINT32 *puiBytesRead );
-extern BOOLEAN	DbFileLoad( STR filename, PTR pDest, UINT32 uiBytesToRead, UINT32 *puiBytesRead );
-extern BOOLEAN	DbFileSeek( HDBFILE hFile, UINT32 uiDistance, UINT8 uiHow );
-
-extern UINT32	DbFileGetPos( HDBFILE hFile );
-extern UINT32	DbFileGetSize( HDBFILE );
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif

Standard Gaming Platform/DirectDraw Calls.cpp

@@ -1,15 +1,9 @@
-#ifdef JA2_PRECOMPILED_HEADERS
-	#include "JA2 SGP ALL.H"
-#elif defined( WIZ8_PRECOMPILED_HEADERS )
-	#include "WIZ8 SGP ALL.H"
-#else
 	#include "DirectX Common.h"
 	#include "DirectDraw Calls.h"
 
 	#include <ddraw.h>
 	#include "debug.h"
 	#include "vobject_blitters.h"
-#endif
 
 // DirectDrawSurface2 Calls
 void

Standard Gaming Platform/DirectX Common.cpp

@@ -2,17 +2,11 @@
 #include <objbase.h>
 #include <initguid.h>
 
-#ifdef JA2_PRECOMPILED_HEADERS
-	#include "JA2 SGP ALL.H"
-#elif defined( WIZ8_PRECOMPILED_HEADERS )
-	#include "WIZ8 SGP ALL.H"
-#else
 	#include "types.h"
 	#include <ddraw.h>
 	#include "DirectX Common.h"
 	#include <windows.h>
 	#include "debug.h"
-#endif
 
 void	DirectXZeroMem ( void* pMemory, int nSize )
 {

Standard Gaming Platform/English.cpp

@@ -1,10 +1,4 @@
-#ifdef JA2_PRECOMPILED_HEADERS
-	#include "JA2 SGP ALL.H"
-#elif defined( WIZ8_PRECOMPILED_HEADERS )
-	#include "WIZ8 SGP ALL.H"
-#else
 	#include "english.h"
-#endif
 	
 // The gsKeyTranslationTable is used to return KEY values on the basis of the virtual key code and
 // SHIFT/ALT/CTRL key states. Range 0-255 is for normal keys, 256-511 is when SHIFT is pressed

Standard Gaming Platform/ExceptionHandling.h

@@ -1,32 +0,0 @@
-#ifndef _EXCEPTION_HANDLING__H_
-#define _EXCEPTION_HANDLING__H_
-
-#include <Windows.h>
-
-//uncomment this line if you want Exceptions to be handled
-#ifdef JA2
-
-#ifndef _DEBUG
-	#define ENABLE_EXCEPTION_HANDLING
-#endif
-
-#else
-	//Wizardry 
-//#define ENABLE_EXCEPTION_HANDLING
-#endif
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-
-INT32 RecordExceptionInfo( EXCEPTION_POINTERS *pExceptInfo );
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

Standard Gaming Platform/FileMan.cpp

@@ -24,11 +24,6 @@
 //				Includes
 //
 //**************************************************************************
-#ifdef JA2_PRECOMPILED_HEADERS
-	#include "JA2 SGP ALL.H"
-#elif defined( WIZ8_PRECOMPILED_HEADERS )
-	#include "WIZ8 SGP ALL.H"
-#else
 	#include "Types.h"
 	#include <stdlib.h>
 	#include <malloc.h>
@@ -39,14 +34,12 @@
 	#include "windows.h"
 	#include "FileMan.h"
 	#include "MemMan.h"
-	#include "DbMan.h"
 	#include "Debug.h"
 	#include "RegInst.h"
 	#include "Container.h"
 	#include "LibraryDataBase.h"
 	#include "io.h"
 	#include "sgp_logger.h"
-#endif
 
 using namespace std;
 
@@ -101,7 +94,6 @@ typedef struct FMFileInfoTag
 	UINT8		uiFileAccess;
 	UINT32	uiFilePosition;
 	HANDLE	hFileHandle;
-	HDBFILE	hDBFile;
 
 } FMFileInfo;	// for 'File Manager File Information'
 

Standard Gaming Platform/Font.cpp

@@ -1,9 +1,4 @@
 // font.c
-#ifdef JA2_PRECOMPILED_HEADERS
-	#include "JA2 SGP ALL.H"
-#elif defined( WIZ8_PRECOMPILED_HEADERS )
-	#include "WIZ8 SGP ALL.H"
-#else
 	#include "types.h"
 	#include <stdio.h>
 	#include <stdarg.h>
@@ -29,7 +24,6 @@
 	#include "vobject_blitters.h"
 
 	#include <sstream>
-#endif
 //*******************************************************
 //
 //	Defines

Standard Gaming Platform/Install.cpp

@@ -16,16 +16,10 @@
 //
 //**************************************************************************
 
-#ifdef JA2_PRECOMPILED_HEADERS
-	#include "JA2 SGP ALL.H"
-#elif defined( WIZ8_PRECOMPILED_HEADERS )
-	#include "WIZ8 SGP ALL.H"
-#else
 	#include "types.h"
 	#include <windows.h>
 	#include "Install.h"
 	#include "RegInst.h"
-#endif
 
 //**************************************************************************
 //

Standard Gaming Platform/JA2 SGP ALL.H

@@ -1,104 +0,0 @@
-/*
- * ChangeLog:
- *	10.12.2005 Lesh ripped out everything that refers to MSS
- *	10.12.2005 Lesh added fmod.h
- */ 
-#ifndef __JA2_SGP_ALL_H
-#define __JA2_SGP_ALL_H
-
-#pragma message("GENERATED PCH FOR JA2 SGP PROJECT.")
-
-//#ifndef INITGUID
-//	#define INITGUID
-//#endif
-
-
-#include "WordWrap.h"
-#include "video.h"
-#include "Button Sound Control.h"
-#include "Sound Control.h"
-#ifdef _JA2_RENDER_DIRTY
-	#include "Font Control.h"
-	#include "Render Dirty.h"
-	#include "utilities.h"
-#endif
-#include "input.h"
-#include "memman.h"
-#include "english.h"
-#include "vobject.h"
-#include "vobject_blitters.h"
-#include "soundman.h"
-#include "Button System.h"
-#include "line.h"
-#include <stdarg.h>
-#include "debug.h"
-#ifndef NO_ZLIB_COMPRESSION
-	#include "zlib.h"
-	#include "Compression.h"
-#endif
-#include "types.h"
-#include <stdlib.h>
-#include <malloc.h>
-#include <stdio.h>
-#include "Container.h"
-#if _MSC_VER < 1300 //(iostream.h was removed from VC.NET2003)
-#include <iostream.h>
-#endif
-#include "Cursor Control.h"
-#include "wcheck.h"
-#include "FileMan.h"
-#include "DbMan.h"
-#include <windows.h>
-#include <ddeml.h>
-#include "TopicIDs.h"
-#include "TopicOps.h"
-#include "WizShare.h"
-#include "screenids.h"
-#include "Sys Globals.h"
-#include "jascreens.h"
-#include "gameloop.h"
-#include "DirectX Common.h"
-#include "DirectDraw Calls.h"
-#include "video_private.h"
-#include <direct.h>
-#include "RegInst.h"
-#include "LibraryDataBase.h"
-#include "io.h"
-#include <wchar.h>
-#include "sgp.h"
-#include "pcx.h"
-#include "Font.h"
-#include "himage.h"
-#include <math.h>
-#include <string.h>
-#include "impTGA.h"
-#include "STCI.h"
-#include <memory.h>
-#include "local.h"
-#include <tchar.h>
-#include <assert.h>
-#include "Install.h"
-#include	"GameSettings.h"
-#ifdef _DEBUG
-	#include <crtdbg.h>
-#endif
-#include "mousesystem.h"
-#include "Random.h"
-#include <windowsx.h>
-#include "vobject_private.h"
-#include "shading.h"
-#include "imgfmt.h"
-#include "timer.h"
-#include "renderworld.h"
-#include "Isometric utils.h"
-#include "fade screen.h"
-#include "timer control.h"
-#include "vsurface.h"
-#include "vsurface_private.h"
-#include "Timer Control.h"
-
-// Lesh modifications
-#include "fmod.h"
-#include "fmod_errors.h"
-
-#endif

Standard Gaming Platform/LibraryDataBase.cpp

@@ -1,8 +1,3 @@
-#ifdef JA2_PRECOMPILED_HEADERS
-	#include "JA2 SGP ALL.H"
-#elif defined( WIZ8_PRECOMPILED_HEADERS )
-	#include "WIZ8 SGP ALL.H"
-#else
 	#include "Types.h"
 	#include "windows.h"
 	#include "FileMan.h"
@@ -17,7 +12,6 @@
 	#else
 		#include "video2.h"
 	#endif
-#endif
 
 //NUMBER_OF_LIBRARIES
 #ifdef JA2

Standard Gaming Platform/MemMan.cpp

@@ -18,11 +18,6 @@
 //
 //**************************************************************************
 
-//#ifdef JA2_PRECOMPILED_HEADERS
-//	#include "JA2 SGP ALL.H"
-//#elif defined( WIZ8_PRECOMPILED_HEADERS )
-//	#include "WIZ8 SGP ALL.H"
-//#else
 	#include "types.h"
 	#include <windows.h>
 	#include <malloc.h>
@@ -35,7 +30,6 @@
 	#ifdef _DEBUG
 		#include <crtdbg.h>
 	#endif
-//#endif
 
 
 #ifdef _DEBUG

Standard Gaming Platform/PCX.cpp

@@ -1,13 +1,7 @@
-#ifdef JA2_PRECOMPILED_HEADERS
-	#include "JA2 SGP ALL.H"
-#elif defined( WIZ8_PRECOMPILED_HEADERS )
-	#include "WIZ8 SGP ALL.H"
-#else
 	#include <stdio.h>
 	#include "pcx.h"
 	#include "memman.h"
 	#include "fileman.h"
-#endif
 
 // Local typedefs
 

Standard Gaming Platform/RegInst.cpp

@@ -16,15 +16,9 @@
 //
 //**************************************************************************
 
-#ifdef JA2_PRECOMPILED_HEADERS
-	#include "JA2 SGP ALL.H"
-#elif defined( WIZ8_PRECOMPILED_HEADERS )
-	#include "WIZ8 SGP ALL.H"
-#else
 	#include "types.h"
 	#include "RegInst.h"
 	#include "WCheck.h"
-#endif
 
 //**************************************************************************
 //

Standard Gaming Platform/SGP_VS2005.vcproj

@@ -394,10 +394,6 @@
 				RelativePath=".\english.h"
 				>
 			</File>
-			<File
-				RelativePath=".\ExceptionHandling.h"
-				>
-			</File>
 			<File
 				RelativePath=".\expat.h"
 				>
@@ -450,10 +446,6 @@
 				RelativePath=".\Ja2 Libs.h"
 				>
 			</File>
-			<File
-				RelativePath=".\JA2 SGP ALL.H"
-				>
-			</File>
 			<File
 				RelativePath=".\LibraryDataBase.h"
 				>
@@ -664,10 +656,6 @@
 				RelativePath=".\English.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\ExceptionHandling.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\FileCat.cpp"
 				>

Standard Gaming Platform/SGP_VS2008.vcproj

@@ -394,10 +394,6 @@
 				RelativePath="english.h"
 				>
 			</File>
-			<File
-				RelativePath="ExceptionHandling.h"
-				>
-			</File>
 			<File
 				RelativePath="expat.h"
 				>
@@ -450,10 +446,6 @@
 				RelativePath="Ja2 Libs.h"
 				>
 			</File>
-			<File
-				RelativePath="JA2 SGP ALL.H"
-				>
-			</File>
 			<File
 				RelativePath="LibraryDataBase.h"
 				>
@@ -662,10 +654,6 @@
 				RelativePath="English.cpp"
 				>
 			</File>
-			<File
-				RelativePath="ExceptionHandling.cpp"
-				>
-			</File>
 			<File
 				RelativePath="FileCat.cpp"
 				>

Standard Gaming Platform/SGP_VS2010.vcxproj

@@ -37,7 +37,6 @@
     <ClInclude Include="DirectX Common.h" />
     <ClInclude Include="dsound.h" />
     <ClInclude Include="english.h" />
-    <ClInclude Include="ExceptionHandling.h" />
     <ClInclude Include="expat.h" />
     <ClInclude Include="FileCat.h" />
     <ClInclude Include="FileMan.h" />
@@ -51,7 +50,6 @@
     <ClInclude Include="input.h" />
     <ClInclude Include="Install.h" />
     <ClInclude Include="Ja2 Libs.h" />
-    <ClInclude Include="JA2 SGP ALL.H" />
     <ClInclude Include="LibraryDataBase.h" />
     <ClInclude Include="line.h" />
     <ClInclude Include="MemMan.h" />
@@ -105,7 +103,6 @@
     <ClCompile Include="DirectDraw Calls.cpp" />
     <ClCompile Include="DirectX Common.cpp" />
     <ClCompile Include="English.cpp" />
-    <ClCompile Include="ExceptionHandling.cpp" />
     <ClCompile Include="FileCat.cpp" />
     <ClCompile Include="FileMan.cpp" />
     <ClCompile Include="Flic.cpp" />

Standard Gaming Platform/SGP_VS2010.vcxproj.filters

@@ -54,9 +54,6 @@
     <ClInclude Include="english.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="ExceptionHandling.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="expat.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -96,7 +93,6 @@
     <ClInclude Include="Ja2 Libs.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="JA2 SGP ALL.H">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="LibraryDataBase.h">
@@ -251,9 +247,6 @@
     <ClCompile Include="English.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="ExceptionHandling.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="FileCat.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>

Standard Gaming Platform/SGP_VS2013.vcxproj

@@ -37,7 +37,6 @@
     <ClInclude Include="DirectX Common.h" />
     <ClInclude Include="dsound.h" />
     <ClInclude Include="english.h" />
-    <ClInclude Include="ExceptionHandling.h" />
     <ClInclude Include="expat.h" />
     <ClInclude Include="FileCat.h" />
     <ClInclude Include="FileMan.h" />
@@ -51,7 +50,6 @@
     <ClInclude Include="input.h" />
     <ClInclude Include="Install.h" />
     <ClInclude Include="Ja2 Libs.h" />
-    <ClInclude Include="JA2 SGP ALL.H" />
     <ClInclude Include="LibraryDataBase.h" />
     <ClInclude Include="line.h" />
     <ClInclude Include="MemMan.h" />
@@ -105,7 +103,6 @@
     <ClCompile Include="DirectDraw Calls.cpp" />
     <ClCompile Include="DirectX Common.cpp" />
     <ClCompile Include="English.cpp" />
-    <ClCompile Include="ExceptionHandling.cpp" />
     <ClCompile Include="FileCat.cpp" />
     <ClCompile Include="FileMan.cpp" />
     <ClCompile Include="Flic.cpp" />

Standard Gaming Platform/SGP_VS2013.vcxproj.filters

@@ -54,9 +54,6 @@
     <ClInclude Include="english.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="ExceptionHandling.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="expat.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -96,7 +93,6 @@
     <ClInclude Include="Ja2 Libs.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="JA2 SGP ALL.H">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="LibraryDataBase.h">
@@ -251,9 +247,6 @@
     <ClCompile Include="English.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="ExceptionHandling.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="FileCat.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>

Standard Gaming Platform/SGP_VS2017.vcxproj

@@ -37,7 +37,6 @@
     <ClInclude Include="DirectX Common.h" />
     <ClInclude Include="dsound.h" />
     <ClInclude Include="english.h" />
-    <ClInclude Include="ExceptionHandling.h" />
     <ClInclude Include="expat.h" />
     <ClInclude Include="FileCat.h" />
     <ClInclude Include="FileMan.h" />
@@ -51,7 +50,6 @@
     <ClInclude Include="input.h" />
     <ClInclude Include="Install.h" />
     <ClInclude Include="Ja2 Libs.h" />
-    <ClInclude Include="JA2 SGP ALL.H" />
     <ClInclude Include="LibraryDataBase.h" />
     <ClInclude Include="line.h" />
     <ClInclude Include="MemMan.h" />
@@ -105,7 +103,6 @@
     <ClCompile Include="DirectDraw Calls.cpp" />
     <ClCompile Include="DirectX Common.cpp" />
     <ClCompile Include="English.cpp" />
-    <ClCompile Include="ExceptionHandling.cpp" />
     <ClCompile Include="FileCat.cpp" />
     <ClCompile Include="FileMan.cpp" />
     <ClCompile Include="Flic.cpp" />

Standard Gaming Platform/SGP_VS2019.vcxproj

@@ -49,7 +49,6 @@
     <ClInclude Include="Compression.h" />
     <ClInclude Include="Container.h" />
     <ClInclude Include="Cursor Control.h" />
-    <ClInclude Include="DbMan.h" />
     <ClInclude Include="ddraw.h" />
     <ClInclude Include="DEBUG.H" />
     <ClInclude Include="debug_util.h" />
@@ -57,7 +56,6 @@
     <ClInclude Include="DirectX Common.h" />
     <ClInclude Include="dsound.h" />
     <ClInclude Include="english.h" />
-    <ClInclude Include="ExceptionHandling.h" />
     <ClInclude Include="expat.h" />
     <ClInclude Include="FileCat.h" />
     <ClInclude Include="FileMan.h" />
@@ -71,7 +69,6 @@
     <ClInclude Include="input.h" />
     <ClInclude Include="Install.h" />
     <ClInclude Include="Ja2 Libs.h" />
-    <ClInclude Include="JA2 SGP ALL.H" />
     <ClInclude Include="LibraryDataBase.h" />
     <ClInclude Include="line.h" />
     <ClInclude Include="MemMan.h" />
@@ -118,14 +115,12 @@
     <ClCompile Include="Compression.cpp" />
     <ClCompile Include="Container.cpp" />
     <ClCompile Include="Cursor Control.cpp" />
-    <ClCompile Include="DbMan.cpp" />
     <ClCompile Include="DEBUG.cpp" />
     <ClCompile Include="debug_util.cpp" />
     <ClCompile Include="debug_win_util.cpp" />
     <ClCompile Include="DirectDraw Calls.cpp" />
     <ClCompile Include="DirectX Common.cpp" />
     <ClCompile Include="English.cpp" />
-    <ClCompile Include="ExceptionHandling.cpp" />
     <ClCompile Include="FileCat.cpp" />
     <ClCompile Include="FileMan.cpp" />
     <ClCompile Include="Flic.cpp" />

Standard Gaming Platform/SGP_VS2019.vcxproj.filters

@@ -6,14 +6,12 @@
     <ClCompile Include="Compression.cpp" />
     <ClCompile Include="Container.cpp" />
     <ClCompile Include="Cursor Control.cpp" />
-    <ClCompile Include="DbMan.cpp" />
     <ClCompile Include="DEBUG.cpp" />
     <ClCompile Include="debug_util.cpp" />
     <ClCompile Include="debug_win_util.cpp" />
     <ClCompile Include="DirectDraw Calls.cpp" />
     <ClCompile Include="DirectX Common.cpp" />
     <ClCompile Include="English.cpp" />
-    <ClCompile Include="ExceptionHandling.cpp" />
     <ClCompile Include="FileCat.cpp" />
     <ClCompile Include="FileMan.cpp" />
     <ClCompile Include="Flic.cpp" />
@@ -52,7 +50,6 @@
     <ClInclude Include="Compression.h" />
     <ClInclude Include="Container.h" />
     <ClInclude Include="Cursor Control.h" />
-    <ClInclude Include="DbMan.h" />
     <ClInclude Include="ddraw.h" />
     <ClInclude Include="DEBUG.H" />
     <ClInclude Include="debug_util.h" />
@@ -60,7 +57,6 @@
     <ClInclude Include="DirectX Common.h" />
     <ClInclude Include="dsound.h" />
     <ClInclude Include="english.h" />
-    <ClInclude Include="ExceptionHandling.h" />
     <ClInclude Include="expat.h" />
     <ClInclude Include="FileCat.h" />
     <ClInclude Include="FileMan.h" />
@@ -74,7 +70,6 @@
     <ClInclude Include="input.h" />
     <ClInclude Include="Install.h" />
     <ClInclude Include="Ja2 Libs.h" />
-    <ClInclude Include="JA2 SGP ALL.H" />
     <ClInclude Include="LibraryDataBase.h" />
     <ClInclude Include="line.h" />
     <ClInclude Include="MemMan.h" />

Standard Gaming Platform/STCI.cpp

@@ -1,8 +1,3 @@
-#ifdef JA2_PRECOMPILED_HEADERS
-	#include "JA2 SGP ALL.H"
-#elif defined( WIZ8_PRECOMPILED_HEADERS )
-	#include "WIZ8 SGP ALL.H"
-#else
 	#include <string.h>
 	#include "MemMan.h"
 	#include "FileMan.h"
@@ -11,7 +6,6 @@
 	#include "Types.h"
 	#include "Debug.h"
 	#include "WCheck.h"
-#endif
 
 BOOLEAN STCILoadRGB( HIMAGE hImage, UINT16 fContents, HWFILE hFile, STCIHeader * pHeader );
 BOOLEAN STCILoadIndexed( HIMAGE hImage, UINT16 fContents, HWFILE hFile, STCIHeader * pHeader );

Standard Gaming Platform/WizShare.h

@@ -1,54 +0,0 @@
-//**************************************************************************
-//
-// Filename :	WizShare.h
-//
-//	Purpose :	
-//
-// Modification history :
-//
-//		25nov96:HJH				- creation
-//
-//**************************************************************************
-
-#ifndef _WizShare_h
-#define _WizShare_h
-
-//**************************************************************************
-//
-//				Includes
-//
-//**************************************************************************
-
-#include "types.h"
-
-//**************************************************************************
-//
-//				Defines
-//
-//**************************************************************************
-
-#define MAX_MSG_LENGTH 128
-#define NUM_MESSAGES	100
-
-//**************************************************************************
-//
-//				Typedefs
-//
-//**************************************************************************
-
-#pragma pack(push, 1)
-
-typedef struct WizSharedtag
-{
-	BOOLEAN	fMessage;
-
-	INT32		iMessageIndex;		// index to 1st message 
-	INT32		iNumMessages;		// # messages 
-	INT32		iLastIndex;
-
-	CHAR		cMessages[NUM_MESSAGES][MAX_MSG_LENGTH];
-} WizShared;
-
-#pragma pack(pop)
-
-#endif

Standard Gaming Platform/himage.cpp

@@ -1,8 +1,3 @@
-#ifdef JA2_PRECOMPILED_HEADERS
-	#include "JA2 SGP ALL.H"
-#elif defined( WIZ8_PRECOMPILED_HEADERS )
-	#include "WIZ8 SGP ALL.H"
-#else
 	#include "builddefines.h"
 	#include <math.h>
 	#include <stdlib.h>
@@ -19,7 +14,6 @@
 	#include "Compression.h"
 	#include "vobject.h"
 	#include "vobject_blitters.h"
-#endif
 
 #include <vfs/Core/vfs.h>
 

Standard Gaming Platform/impTGA.cpp

@@ -16,11 +16,6 @@
 //
 //**************************************************************************
 
-#ifdef JA2_PRECOMPILED_HEADERS
-	#include "JA2 SGP ALL.H"
-#elif defined( WIZ8_PRECOMPILED_HEADERS )
-	#include "WIZ8 SGP ALL.H"
-#else
 	#include "types.h"
 	#include "Fileman.h"
 	#include "memman.h"
@@ -34,7 +29,6 @@
 		#include "video2.h"
 	#endif
 	#include "impTGA.h"
-#endif
 
 //**************************************************************************
 //

Standard Gaming Platform/input.cpp

@@ -3,11 +3,6 @@
 	#define _WIN32_WINNT WINVER
 #endif
 
-#ifdef JA2_PRECOMPILED_HEADERS
-	#include "JA2 SGP ALL.H"
-#elif defined( WIZ8_PRECOMPILED_HEADERS )
-	#include "WIZ8 SGP ALL.H"
-#else
 //** dd for defines that needed for additional mouse buttons
 #define _WIN32_WINNT 0x500
 
@@ -26,7 +21,6 @@
 		#include "video2.h"
 	#endif
 	#include "local.h"
-#endif
 
 
 // Make sure to refer to the translation table which is within one of the following files (depending

Standard Gaming Platform/line.cpp

@@ -1,10 +1,4 @@
-#ifdef JA2_PRECOMPILED_HEADERS
-	#include "JA2 SGP ALL.H"
-#elif defined( WIZ8_PRECOMPILED_HEADERS )
-	#include "WIZ8 SGP ALL.H"
-#else
 	#include "line.h"
-#endif
 
 //**************************************************************************
 //

Standard Gaming Platform/mousesystem.cpp

@@ -11,11 +11,6 @@
 //
 //=================================================================================================
 
-#ifdef JA2_PRECOMPILED_HEADERS
-	#include "JA2 SGP ALL.H"
-#elif defined( WIZ8_PRECOMPILED_HEADERS )
-	#include "WIZ8 SGP ALL.H"
-#else
 	#include "types.h"
 	#include <windows.h>
 	#include <stdio.h>
@@ -42,13 +37,7 @@
 	#include "Button System.h"
 	///***ddd
 	#include "GameSettings.h"
-#endif
 
-#ifdef JA2_PRECOMPILED_HEADERS
-	#define BASE_REGION_FLAGS		(MSYS_REGION_ENABLED | MSYS_SET_CURSOR)
-#elif defined( WIZ8_PRECOMPILED_HEADERS )
-	#define BASE_REGION_FLAGS		MSYS_REGION_ENABLED				// Wiz doesn't ever want MSYS_SET_CURSOR to be on...
-#endif
 
 
 

Standard Gaming Platform/sgp.cpp

@@ -1,12 +1,5 @@
 /* $Id: sgp.c,v 1.4 2004/03/19 06:16:04 digicrab Exp $ */
 //its test what doeas it do?
-#ifdef JA2_PRECOMPILED_HEADERS
-	#include "JA2 SGP ALL.H"
-	#include "JA2 Splash.h"
-	#include "utilities.h"
-#elif defined( WIZ8_PRECOMPILED_HEADERS )
-	#include "WIZ8 SGP ALL.H"
-#else
 	#include "types.h"
 	#include <windows.h>
 	#include <stdio.h>
@@ -31,7 +24,6 @@
 	#endif
 	#include "LibraryDataBase.h"
 	#include "utilities.h"
-#endif
 
 #include "GameSettings.h"
 #include "input.h"

Standard Gaming Platform/sgp.h

@@ -16,7 +16,6 @@
 #include "input.h"
 #include "memman.h"
 #include "fileman.h"
-#include "dbman.h"
 #include "soundman.h"
 #include "pcx.h"
 #include "line.h"

Standard Gaming Platform/shading.cpp

@@ -1,8 +1,3 @@
-#ifdef JA2_PRECOMPILED_HEADERS
-	#include "JA2 SGP ALL.H"
-#elif defined( WIZ8_PRECOMPILED_HEADERS )
-	#include "WIZ8 SGP ALL.H"
-#else
 	#include "DirectDraw Calls.h"
 	#include <stdio.h>
 	#include "debug.h"
@@ -15,7 +10,6 @@
 	#include "vobject.h"
 	#include "vobject_blitters.h"
 	#include "shading.h"
-#endif
 
 BOOLEAN ShadesCalculateTables(SGPPaletteEntry *p8BPPPalette);
 BOOLEAN ShadesCalculatePalette(SGPPaletteEntry *pSrcPalette, SGPPaletteEntry *pDestPalette, UINT16 usRed, UINT16 usGreen, UINT16 usBlue, BOOLEAN fMono);

Standard Gaming Platform/soundman.cpp

@@ -6,11 +6,6 @@
 * Derek Beland, May 28, 1997
 *
 *********************************************************************************/
-#ifdef JA2_PRECOMPILED_HEADERS
-	#include "JA2 SGP ALL.H"
-#elif defined( WIZ8_PRECOMPILED_HEADERS )
-	#include "WIZ8 SGP ALL.H"
-#else
 	#include "builddefines.h"
 	#include <stdio.h>
 	#include <string.h>
@@ -29,7 +24,6 @@
 	//#include "input.h"
 	#include <ctime>
 	#include <chrono>
-#endif
 
 // Uncomment this to disable the startup of sound hardware
 //#define SOUND_DISABLE

Standard Gaming Platform/timer.cpp

@@ -1,8 +1,3 @@
-#ifdef JA2_PRECOMPILED_HEADERS
-	#include "JA2 SGP ALL.H"
-#elif defined( WIZ8_PRECOMPILED_HEADERS )
-	#include "WIZ8 SGP ALL.H"
-#else
 	#include "types.h"
 	#include <windows.h>
 	#if defined( JA2 ) || defined( UTIL )
@@ -11,7 +6,6 @@
 		#include "video2.h"
 	#endif
 	#include "timer.h"
-#endif
 
 #ifndef WIN32_LEAN_AND_MEAN
 	#define WIN32_LEAN_AND_MEAN

Standard Gaming Platform/trle.h

@@ -1,31 +0,0 @@
-#ifndef __TRLE_H
-#define __TRLE_H
-
-
-typedef struct
-{
-	UINT32 uiOffset;
-	UINT32 uiWidth;
-	UINT32 uiOffLen;
-	INT16	sOffsetX;
-	INT16	sOffsetY;
-
-} TRLEObject;
-
-
-typedef struct
-{
-	UINT32			uiHeightEach;
-	UINT32			uiTotalElements;
-	TRLEObject		*pTRLEObject;			
-	PTR							pPixData;
-	UINT32					uiSizePixDataElem;
-	
-} TRLEData;
-
-
-BOOLEAN GetTRLEObjectData( UINT32 uiTotalElements, TRLEObject *pTRLEObject, INT16 ssIndex, UINT32 *pWidth, UINT32 *pOffset, UINT32 *pOffLen, UINT16 *pOffsetX, UINT16 *pOffsetY );
-
-BOOLEAN SetTRLEObjectOffset( UINT32 uiTotalElements, TRLEObject *pTRLEObject, INT16 ssIndex, INT16 sOffsetX, INT16 sOffsetY );
-
-#endif

Standard Gaming Platform/video.cpp

@@ -1,8 +1,3 @@
-#ifdef JA2_PRECOMPILED_HEADERS
-#include "JA2 SGP ALL.H"
-#elif defined( WIZ8_PRECOMPILED_HEADERS )
-#include "WIZ8 SGP ALL.H"
-#else
 #include "types.h"
 #include "Video.h"
 #include "vobject_blitters.h"
@@ -18,7 +13,6 @@
 #include "Input.h"
 #include "GameSettings.h"
 #include "sgp_logger.h"
-#endif
 
 #include "resource.h"
 #include <vfs/Core/vfs.h>

Standard Gaming Platform/video_private.h

@@ -1,21 +0,0 @@
-#ifndef __VIDEO_PRIVATE_
-#define __VIDEO_PRIVATE_
-
-// ***********************************************************************
-// 
-// PRIVATE, INTERNAL Header used by other SGP Internal modules
-//
-// Allows direct access to underlying Direct Draw Implementation
-//
-// ***********************************************************************
-
-
-LPDIRECTDRAW2 GetDirectDraw2Object( );
-LPDIRECTDRAWSURFACE2 GetPrimarySurfaceInterface( );
-LPDIRECTDRAWSURFACE2 GetBackbufferInterface( );
-
-BOOLEAN SetDirectDraw2Object( LPDIRECTDRAW2 pDirectDraw );
-BOOLEAN SetPrimarySurfaceInterface( LPDIRECTDRAWSURFACE2 pSurface );
-BOOLEAN SetBackbufferInterface(	LPDIRECTDRAWSURFACE2 pSurface );
-
-#endif

Standard Gaming Platform/vobject.cpp

@@ -1,8 +1,3 @@
-#ifdef JA2_PRECOMPILED_HEADERS
-	#include "JA2 SGP ALL.H"
-#elif defined( WIZ8_PRECOMPILED_HEADERS )
-	#include "WIZ8 SGP ALL.H"
-#else
 	#include "DirectDraw Calls.h"
 	#include <stdio.h>
 	#include "debug.h"
@@ -16,7 +11,6 @@
 	#include "wcheck.h"
 	#include "vobject_blitters.h"
 	#include "sgp.h"
-#endif
 
 #include <unordered_map>
 

Standard Gaming Platform/vobject_blitters.cpp

@@ -1,8 +1,3 @@
-#ifdef JA2_PRECOMPILED_HEADERS
-	#include "JA2 SGP ALL.H"
-#elif defined( WIZ8_PRECOMPILED_HEADERS )
-	#include "WIZ8 SGP ALL.H"
-#else
 	#include "DirectDraw Calls.h"
 	#include <stdio.h>
 	#include "debug.h"
@@ -18,7 +13,6 @@
 	#include "vobject_blitters.h"
 	#include "shading.h"
 	#include "sgp_logger.h"
-#endif
 
 #include <map>
 std::map<UINT32,ClipRectangle> g_SurfaceRectangle;

Standard Gaming Platform/vobject_private.h

@@ -1,4 +0,0 @@
-#ifndef __VOBJECT_PRIVATE_
-#define __VOBJECT_PRIVATE_
-
-#endif

Standard Gaming Platform/vsurface.cpp

@@ -1,8 +1,3 @@
-#ifdef JA2_PRECOMPILED_HEADERS
-#include "JA2 SGP ALL.H"
-#elif defined( WIZ8_PRECOMPILED_HEADERS )
-#include "WIZ8 SGP ALL.H"
-#else
 #include "DirectDraw Calls.h"
 #include <stdio.h>
 #include <stdlib.h>
@@ -17,7 +12,6 @@
 #include "vsurface_private.h"
 #include "wcheck.h"
 #include "vobject_blitters.h"
-#endif
 
 extern void SetClippingRect(SGPRect *clip);
 extern void GetClippingRect(SGPRect *clip);