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

Items.cpp: MAXATTACHMENTS limit

Browse Source 
lighting.cpp: check return values

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8258 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Sevenfm
2016-06-25 09:18:47 +00:00
parent d2c1579786
commit fea2a0d12b
2 changed files with 60 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Items.cpp
+5 -3
View File
@@ -2332,7 +2332,8 @@ BOOLEAN ValidItemAttachmentSlot( OBJECTTYPE * pObj, UINT16 usAttachment, BOOLEAN
} }
if ( !fSameItem ) //Nav: why is this check here? fSameItem can only be false here, doesn't hurt I guess... if ( !fSameItem ) //Nav: why is this check here? fSameItem can only be false here, doesn't hurt I guess...
{ {
for(int i = 0;i<sizeof(IncompatibleAttachments);i++) //for(int i = 0;i<sizeof(IncompatibleAttachments);i++)
for(int i = 0; i < MAXATTACHMENTS; i++)
{ {
if ( FindAttachment(pObj, usAttachment, subObject) != 0 && !IsAttachmentClass(usAttachment, (AC_GRENADE|AC_ROCKET|AC_MODPOUCH) ) ) if ( FindAttachment(pObj, usAttachment, subObject) != 0 && !IsAttachmentClass(usAttachment, (AC_GRENADE|AC_ROCKET|AC_MODPOUCH) ) )
{//Search for identical attachments unless we're dealing with rifle grenades {//Search for identical attachments unless we're dealing with rifle grenades
@@ -2516,7 +2517,8 @@ BOOLEAN ValidItemAttachment( OBJECTTYPE * pObj, UINT16 usAttachment, BOOLEAN fAt
if ( !fSameItem ) if ( !fSameItem )
{ {
for(int i = 0;i<sizeof(IncompatibleAttachments);i++) //for(int i = 0;i<sizeof(IncompatibleAttachments);i++)
for(int i = 0; i < MAXATTACHMENTS; i++)
{ {
if ( FindAttachment(pObj, usAttachment, subObject) != 0 ) if ( FindAttachment(pObj, usAttachment, subObject) != 0 )
{ {
@@ -14946,7 +14948,7 @@ OBJECTTYPE* GetExternalFeedingObject(SOLDIERTYPE* pSoldier, OBJECTTYPE * pObject
// remember the caliber, magsize (TODO: really?) and type of ammo. They all have to fit // remember the caliber, magsize (TODO: really?) and type of ammo. They all have to fit
UINT8 ubCalibre = Weapon[usItem].ubCalibre; UINT8 ubCalibre = Weapon[usItem].ubCalibre;
UINT16 ubMagSize = Weapon[usItem].ubMagSize; UINT16 ubMagSize = Weapon[usItem].ubMagSize;
UINT8 ubAmmoType = ubAmmoType = (*pObject)[0]->data.gun.ubGunAmmoType; UINT8 ubAmmoType = (*pObject)[0]->data.gun.ubGunAmmoType;
// now we now that this gun CAN be belt fed in the current situation. We now have to check if it IS // now we now that this gun CAN be belt fed in the current situation. We now have to check if it IS
// we will first check for other mercs who might feed us. Afterwards we look into our own inventory // we will first check for other mercs who might feed us. Afterwards we look into our own inventory
TileEngine/lighting.cpp
+55 -48
View File
@@ -2098,18 +2098,18 @@ INT16 iCountY, iCountX;
***************************************************************************************/ ***************************************************************************************/
INT32 LightCreateOmni(UINT8 ubIntensity, INT16 iRadius) INT32 LightCreateOmni(UINT8 ubIntensity, INT16 iRadius)
{ {
INT32 iLight; INT32 iLight;
CHAR8 usName[14]; CHAR8 usName[14];
iLight=LightGetFree(); iLight=LightGetFree();
if(iLight!=(-1)) if(iLight!=(-1))
{ {
LightGenerateElliptical(iLight, ubIntensity, (INT16)(iRadius*DISTANCE_SCALE), (INT16)(iRadius*DISTANCE_SCALE)); LightGenerateElliptical(iLight, ubIntensity, (INT16)(iRadius*DISTANCE_SCALE), (INT16)(iRadius*DISTANCE_SCALE));
}
sprintf(usName, "LTO%d.LHT", iRadius); sprintf(usName, "LTO%d.LHT", iRadius);
pLightNames[iLight]= (STR) MemAlloc(strlen(usName)+1); pLightNames[iLight]= (STR) MemAlloc(strlen(usName)+1);
strcpy(pLightNames[iLight], usName); strcpy(pLightNames[iLight], usName);
}
return(iLight); return(iLight);
} }
@@ -2122,18 +2122,18 @@ CHAR8 usName[14];
***************************************************************************************/ ***************************************************************************************/
INT32 LightCreateSquare(UINT8 ubIntensity, INT16 iRadius1, INT16 iRadius2) INT32 LightCreateSquare(UINT8 ubIntensity, INT16 iRadius1, INT16 iRadius2)
{ {
INT32 iLight; INT32 iLight;
CHAR8 usName[14]; CHAR8 usName[14];
iLight=LightGetFree(); iLight=LightGetFree();
if(iLight!=(-1)) if(iLight!=(-1))
{ {
LightGenerateSquare(iLight, ubIntensity, (INT16)(iRadius1*DISTANCE_SCALE), (INT16)(iRadius2*DISTANCE_SCALE)); LightGenerateSquare(iLight, ubIntensity, (INT16)(iRadius1*DISTANCE_SCALE), (INT16)(iRadius2*DISTANCE_SCALE));
}
sprintf(usName, "LTS%d-%d.LHT", iRadius1, iRadius2); sprintf(usName, "LTS%d-%d.LHT", iRadius1, iRadius2);
pLightNames[iLight]= (STR) MemAlloc(strlen(usName)+1); pLightNames[iLight]= (STR) MemAlloc(strlen(usName)+1);
strcpy(pLightNames[iLight], usName); strcpy(pLightNames[iLight], usName);
}
return(iLight); return(iLight);
} }
@@ -2146,16 +2146,18 @@ CHAR8 usName[14];
***************************************************************************************/ ***************************************************************************************/
INT32 LightCreateElliptical(UINT8 ubIntensity, INT16 iRadius1, INT16 iRadius2) INT32 LightCreateElliptical(UINT8 ubIntensity, INT16 iRadius1, INT16 iRadius2)
{ {
INT32 iLight; INT32 iLight;
CHAR8 usName[14]; CHAR8 usName[14];
iLight=LightGetFree(); iLight=LightGetFree();
if(iLight!=(-1)) if(iLight!=(-1))
{
LightGenerateElliptical(iLight, ubIntensity, (INT16)(iRadius1*DISTANCE_SCALE), (INT16)(iRadius2*DISTANCE_SCALE)); LightGenerateElliptical(iLight, ubIntensity, (INT16)(iRadius1*DISTANCE_SCALE), (INT16)(iRadius2*DISTANCE_SCALE));
sprintf(usName, "LTE%d-%d.LHT", iRadius1, iRadius2); sprintf(usName, "LTE%d-%d.LHT", iRadius1, iRadius2);
pLightNames[iLight]= (STR) MemAlloc(strlen(usName)+1); pLightNames[iLight]= (STR) MemAlloc(strlen(usName)+1);
strcpy(pLightNames[iLight], usName); strcpy(pLightNames[iLight], usName);
}
return(iLight); return(iLight);
} }
@@ -3059,38 +3061,41 @@ INT32 LightLoad(STR pFilename)
HWFILE hFile; HWFILE hFile;
INT32 iLight; INT32 iLight;
if((iLight=LightGetFree())==(-1)) iLight=LightGetFree();
return(-1);
if( iLight == -1 )
return (-1);
if((hFile=FileOpen(pFilename, FILE_ACCESS_READ, FALSE))!=0)
{
FileRead(hFile, &usTemplateSize[iLight], sizeof(UINT16), NULL);
if((pLightList[iLight]= (LIGHT_NODE *) MemAlloc(usTemplateSize[iLight]*sizeof(LIGHT_NODE)))==NULL)
{
usTemplateSize[iLight]=0;
return(-1);
}
FileRead(hFile, pLightList[iLight], sizeof(LIGHT_NODE)*usTemplateSize[iLight], NULL);
FileRead(hFile, &usRaySize[iLight], sizeof(UINT16), NULL);
if((pLightRayList[iLight]= (UINT16 *) MemAlloc(usRaySize[iLight]*sizeof(UINT16)))==NULL)
{
usTemplateSize[iLight]=0;
usRaySize[iLight]=0;
MemFree(pLightList[iLight]);
return(-1);
}
FileRead(hFile, pLightRayList[iLight], sizeof(UINT16)*usRaySize[iLight], NULL);
FileClose(hFile);
pLightNames[iLight]= (STR) MemAlloc(strlen(pFilename)+1);
strcpy(pLightNames[iLight], pFilename);
}
else else
{ {
if((hFile=FileOpen(pFilename, FILE_ACCESS_READ, FALSE))!=0) return(-1);
{
FileRead(hFile, &usTemplateSize[iLight], sizeof(UINT16), NULL);
if((pLightList[iLight]= (LIGHT_NODE *) MemAlloc(usTemplateSize[iLight]*sizeof(LIGHT_NODE)))==NULL)
{
usTemplateSize[iLight]=0;
return(-1);
}
FileRead(hFile, pLightList[iLight], sizeof(LIGHT_NODE)*usTemplateSize[iLight], NULL);
FileRead(hFile, &usRaySize[iLight], sizeof(UINT16), NULL);
if((pLightRayList[iLight]= (UINT16 *) MemAlloc(usRaySize[iLight]*sizeof(UINT16)))==NULL)
{
usTemplateSize[iLight]=0;
usRaySize[iLight]=0;
MemFree(pLightList[iLight]);
return(-1);
}
FileRead(hFile, pLightRayList[iLight], sizeof(UINT16)*usRaySize[iLight], NULL);
FileClose(hFile);
pLightNames[iLight]= (STR) MemAlloc(strlen(pFilename)+1);
strcpy(pLightNames[iLight], pFilename);
}
else
return(-1);
} }
LightCalcRect(iLight); LightCalcRect(iLight);
return(iLight); return(iLight);
} }
@@ -3225,9 +3230,11 @@ INT32 iCount;
********************************************************************************/ ********************************************************************************/
INT32 LightSpriteCreate(STR pName, UINT32 uiLightType) INT32 LightSpriteCreate(STR pName, UINT32 uiLightType)
{ {
INT32 iSprite; INT32 iSprite;
if((iSprite=LightSpriteGetFree())!=(-1)) iSprite = LightSpriteGetFree();
if( iSprite != -1 )
{ {
memset(&LightSprites[iSprite], 0, sizeof(LIGHT_SPRITE)); memset(&LightSprites[iSprite], 0, sizeof(LIGHT_SPRITE));