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

- Fixed a few Visual Studio compiler warnings

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3129 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2009-07-22 21:35:50 +00:00
parent 3a2db52065
commit 5c9f9e71f9
9 changed files with 51 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Utils/Cinematics.cpp
+3 -1
View File
@@ -193,7 +193,7 @@ SMKFLIC *pSmack;
SMKFLIC *SmkOpenFlic(CHAR8 *cFilename)
{
SMKFLIC *pSmack;
HANDLE hFile;
// Get an available flic slot from the list
if(!(pSmack=SmkGetFreeFlic()))
@@ -210,6 +210,8 @@ SMKFLIC *SmkOpenFlic(CHAR8 *cFilename)
return(NULL);
}
HANDLE hFile;
//Get the real file handle for the file man handle for the smacker file
hFile = GetRealFileHandleFromFileManFileHandle( pSmack->hFileHandle );
#else
Utils/STIConvert.cpp
+3 -1
View File
@@ -105,7 +105,7 @@ void ConvertRGBDistribution555To565( UINT16 * p16BPPData, UINT32 uiNumberOfPixel
void WriteSTIFile( INT8 *pData, SGPPaletteEntry *pPalette, INT16 sWidth, INT16 sHeight, STR cOutputName, UINT32 fFlags, UINT32 uiAppDataSize )
{
FILE * pOutput;
UINT32 uiOriginalSize;
UINT8 * pOutputBuffer = NULL;
@@ -167,6 +167,8 @@ void WriteSTIFile( INT8 *pData, SGPPaletteEntry *pPalette, INT16 sWidth, INT16 s
// save file
//
#ifndef USE_VFS
FILE * pOutput;
pOutput = fopen( cOutputName, "wb" );
if (pOutput == NULL )
{
Utils/XML_Items.cpp
+3 -3
View File
@@ -214,8 +214,8 @@ itemStartElementHandle(void *userData, const XML_Char *name, const XML_Char **at
strcmp(name, "SciFi") == 0 ||
strcmp(name, "NewInv") == 0 ||
//zilpin: pellet spread patterns externalized in XML
stricmp(name, "spreadPattern") == 0 ||
strcmp(name, "fFlags") == 0 ))
strcmp(name, "spreadPattern") == 0 ||
strcmp(name, "fFlags") == 0 ))
{
pData->curElement = ELEMENT_PROPERTY;
//DebugMsg(TOPIC_JA2, DBG_LEVEL_3, String("itemStartElementHandle: going into element, name = %s",name) );
@@ -1028,7 +1028,7 @@ itemEndElementHandle(void *userData, const XML_Char *name)
pData->curItem.bestlaserrange = (INT16) atol(pData->szCharData);
}
//zilpin: pellet spread patterns externalized in XML
else if(stricmp(name, "spreadPattern") == 0)
else if(strcmp(name, "spreadPattern") == 0)
{
pData->curElement = ELEMENT;
pData->curItem.spreadPattern = FindSpreadPatternIndex( pData->szCharData );