mirror of
https://github.com/1dot13/source.git
synced 2026-08-12 14:10:23 +02:00
bug fixes from Overhaul:
- Data type changes - Templates removed git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@871 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -30,7 +30,7 @@
|
||||
|
||||
BOOLEAN SetPcxPalette( PcxObject *pCurrentPcxObject, HIMAGE hImage );
|
||||
BOOLEAN BlitPcxToBuffer( PcxObject *pCurrentPcxObject, UINT8 *pBuffer, UINT16 usBufferWidth, UINT16 usBufferHeight, UINT16 usX, UINT16 usY, BOOLEAN fTransp);
|
||||
PcxObject *LoadPcx(UINT8 *pFilename);
|
||||
PcxObject *LoadPcx(STR8 pFilename);
|
||||
|
||||
|
||||
BOOLEAN LoadPCXFileToImage( HIMAGE hImage, UINT16 fContents )
|
||||
@@ -38,7 +38,7 @@ BOOLEAN LoadPCXFileToImage( HIMAGE hImage, UINT16 fContents )
|
||||
PcxObject *pPcxObject;
|
||||
|
||||
// First Load a PCX Image
|
||||
pPcxObject = LoadPcx( (UINT8 *)hImage->ImageFile );
|
||||
pPcxObject = LoadPcx( hImage->ImageFile );
|
||||
|
||||
if ( pPcxObject == NULL )
|
||||
{
|
||||
@@ -81,7 +81,7 @@ BOOLEAN LoadPCXFileToImage( HIMAGE hImage, UINT16 fContents )
|
||||
}
|
||||
|
||||
|
||||
PcxObject *LoadPcx(UINT8 *pFilename)
|
||||
PcxObject *LoadPcx(STR8 pFilename)
|
||||
{
|
||||
PcxHeader Header;
|
||||
PcxObject *pCurrentPcxObject;
|
||||
@@ -90,7 +90,7 @@ PcxObject *LoadPcx(UINT8 *pFilename)
|
||||
UINT8 *pPcxBuffer;
|
||||
|
||||
// Open and read in the file
|
||||
if ((hFileHandle = FileOpen((STR)pFilename, FILE_ACCESS_READ | FILE_OPEN_EXISTING, FALSE)) == 0)
|
||||
if ((hFileHandle = FileOpen(pFilename, FILE_ACCESS_READ | FILE_OPEN_EXISTING, FALSE)) == 0)
|
||||
{ // damn we failed to open the file
|
||||
return NULL;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user