*** Merged Code from Multiplayer Branch Revision 2960 ***

- Virtual File System (VFS) by birdflu. This is needed for Multiplayer and is also used for Single Player. Very neat system :-)
- Multiplayer Version 1.1 + some additional features and bugfixes
* INFO: If you compile a new EXE and want to test, be sure to also use the latest SVN GameDir files in your JA2 install directory *




git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2961 3b4a5df2-a311-0410-b5c6-a8a6f20db521

Standard Gaming Platform/himage.h

@@ -19,6 +19,8 @@
 #define TGA_FILE_READER					0x2
 #define STCI_FILE_READER				0x4
 #define TRLE_FILE_READER				0x8
+#define PNG_FILE_READER					0x10
+#define JPC_FILE_READER					0x20
 #define UNKNOWN_FILE_READER			0x200
 
 // Defines for buffer bit depth
@@ -93,41 +95,29 @@ typedef struct
 {
 	UINT16					usWidth;
 	UINT16					usHeight;
-	UINT8						ubBitDepth;
+	UINT8					ubBitDepth;
 	UINT16					fFlags;
-	SGPFILENAME			ImageFile;
+	SGPFILENAME				ImageFile;
 	UINT32					iFileLoader;
-	SGPPaletteEntry *pPalette;
-	UINT16					*pui16BPPPalette;
-	UINT8 *					pAppData;
+	SGPPaletteEntry*		pPalette;
+	UINT16*					pui16BPPPalette;
+	UINT8*					pAppData;
 	UINT32					uiAppDataSize;
 	// This union is used to describe each data type and is flexible to include the
 	// data strucutre of the compresssed format, once developed.
 	union 
 	{
-		//struct
-		//{
-			PTR		pImageData;
-		//};
-		//struct
-		//{
-			PTR		pCompressedImageData;
-		//};
-		//struct 
-		//{
-			UINT8						*p8BPPData;
-		//};
-		//struct
-		//{
-		
-			UINT16 *p16BPPData;
-		//};
+		PTR				pImageData;
+		PTR				pCompressedImageData;
+		UINT8*			p8BPPData;
+		UINT16*			p16BPPData;
+		UINT32*			p32BPPData;
 		struct
 		{
-			UINT8 *					pPixData8;
-			UINT32					uiSizePixData;
-			ETRLEObject *		pETRLEObject;
-			UINT16					usNumberOfObjects;
+			UINT8*			pPixData8;
+			UINT32			uiSizePixData;
+			ETRLEObject*	pETRLEObject;
+			UINT16			usNumberOfObjects;
 		};
 	};