1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-09 14:46:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

cleaned up code: some comiler-warnings fixed, obsolete code removed (oops..and some whitespace stuff) (by CleaningWoman)

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6102 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2013-05-27 21:01:04 +00:00
parent f92f70c78d
commit 9bd26015e5
33 changed files with 167 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Standard Gaming Platform/Compression.cpp
+2 -2
View File
@@ -21,7 +21,7 @@ void ZFree( voidpf opaque, voidpf address )
MemFree( address );
}
PTR DecompressInit( BYTE * pCompressedData, UINT32 uiDataSize )
PTR DecompressInit( PTR pCompressedData, UINT32 uiDataSize )
{
z_stream * pZStream;
int iZRetCode;
@@ -47,7 +47,7 @@ PTR DecompressInit( BYTE * pCompressedData, UINT32 uiDataSize )
}
// set up our parameters
pZStream->next_in = pCompressedData;
pZStream->next_in = (BYTE*)pCompressedData;
pZStream->avail_in = uiDataSize;
return( (PTR) pZStream );
}
Standard Gaming Platform/DirectDraw Calls.cpp
+1 -1
View File
@@ -504,7 +504,7 @@ HRESULT BltDDSurfaceUsingSoftware( LPDIRECTDRAWSURFACE2 pDestSurface, LPRECT pDe
else if ( uiFlags & DDBLT_KEYSRC )
{
// Get 16 bpp color key.....
ReturnCode = IDirectDrawSurface2_GetColorKey( pSrcSurface, DDCKEY_SRCBLT, &ColorKey);
ReturnCode = IDirectDrawSurface2_GetColorKey( pSrcSurface, DDCKEY_SRCBLT, &ColorKey); // FIXME: pSrcSurface might be NULL
if (ReturnCode == DD_OK)
{
Standard Gaming Platform/LibraryDataBase.cpp
+2 -2
View File
@@ -569,7 +569,7 @@ INT CompareFileNames( CHAR8 *arg1[], FileHeaderStruct **arg2 )
TempFileHeader = ( FileHeaderStruct * ) arg2;
sprintf( sSearchKey, "%s", arg1);
sprintf( sSearchKey, "%s", arg1); // FIXME: arg1 must be a string pointer
sprintf( sFileNameWithPath, "%s%s", gFileDataBase.pLibraries[ gsCurrentLibrary ].sLibraryPath, TempFileHeader->pFileName );
@@ -1111,7 +1111,7 @@ INT32 CompareDirEntryFileNames( CHAR8 *arg1[], DIRENTRY **arg2 )
TempDirEntry = ( DIRENTRY * ) arg2;
sprintf( sSearchKey, "%s", arg1);
sprintf( sSearchKey, "%s", arg1); // FIXME: arg1 must be a string pointer
sprintf( sFileNameWithPath, "%s", TempDirEntry->sFileName );
Standard Gaming Platform/himage.cpp
+2 -2
View File
@@ -426,7 +426,7 @@ BOOLEAN CopyImageToBuffer( HIMAGE hImage, UINT32 fBufferType, BYTE *pDestBuf, UI
if ( hImage->ubBitDepth == 24 && fBufferType == BUFFER_16BPP )
{
DbgMessage( TOPIC_HIMAGE, DBG_LEVEL_3, "Copying 24 BPP Imagery to 16BPP Buffer." );
SGP_THROW("not yet implemented");
AssertMsg(false,"not yet implemented");
return( FALSE );
}
@@ -583,7 +583,7 @@ BOOLEAN Copy8BPPCompressedImageTo16BPPBuffer( HIMAGE hImage, BYTE *pDestBuf, UIN
CHECKF( pDecompPtr );
// Allocate memory for one scanline
pScanLine = MemAlloc( hImage->usWidth );
pScanLine = (UINT8*) MemAlloc( hImage->usWidth );
CHECKF( pScanLine );
memset( pScanLine, 0, hImage->usWidth );
Standard Gaming Platform/vsurface.cpp
+2 -2
View File
@@ -1852,13 +1852,13 @@ BOOLEAN RemoveVSurfaceRegion( HVSURFACE hVSurface, UINT16 usIndex )
BOOLEAN ClearAllVSurfaceRegions( HVSURFACE hVSurface )
{
UINT32 uiListSize, cnt;
UINT32 uiListSize;
Assert( hVSurface != NULL );
uiListSize = ListSize( hVSurface->RegionList );
for ( cnt = uiListSize - 1; cnt >= 0; cnt-- )
for ( INT32 cnt = uiListSize - 1; cnt >= 0; cnt-- )
{
RemoveVSurfaceRegion( hVSurface, (UINT16)cnt );
}