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

cleaned up code: various stuff (out-of-bounds, null-pointer, uninitialized vars,...) (by CleaningWoman)

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6101 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2013-05-27 20:38:52 +00:00
parent 921394b24c
commit f92f70c78d
39 changed files with 167 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Handle UI.cpp
+1 -17
View File
@@ -1604,23 +1604,7 @@ UINT32 UIHandleMOnTerrain( UI_EVENT *pUIEvent )
{
if ( !UIHandleInteractiveTilesAndItemsOnTerrain( pSoldier, usMapPos, FALSE, TRUE ) )
{
// Are we in combat?
if ( (gTacticalStatus.uiFlags & INCOMBAT ) && ( gTacticalStatus.uiFlags & TURNBASED ) )
{
// If so, draw path, etc
fSetCursor = HandleUIMovementCursor( pSoldier, uiCursorFlags, usMapPos, 0 );
}
else
{
// Donot draw path until confirm
fSetCursor = TRUE;
// If so, draw path, etc
fSetCursor = HandleUIMovementCursor( pSoldier, uiCursorFlags, usMapPos, 0 );
//ErasePath( TRUE );
}
fSetCursor = HandleUIMovementCursor( pSoldier, uiCursorFlags, usMapPos, 0 );
}
else
{
Tactical/Interface Enhanced.cpp
+3 -3
View File
@@ -6235,7 +6235,7 @@ void DrawWeaponValues( OBJECTTYPE * gpItemDescObject )
}
else
{
swprintf( pStr, L"--", iToHitValue );
swprintf( pStr, L"--" );
}
FindFontCenterCoordinates( sLeft, sTop, sWidth, sHeight, pStr, BLOCKFONT2, &usX, &usY);
mprintf( usX, usY, pStr );
@@ -6298,7 +6298,7 @@ void DrawWeaponValues( OBJECTTYPE * gpItemDescObject )
}
else
{
swprintf( pStr, L"--", iBestLaserRangeValue );
swprintf( pStr, L"--" );
}
FindFontCenterCoordinates( sLeft, sTop, sWidth, sHeight, pStr, BLOCKFONT2, &usX, &usY);
mprintf( usX, usY, pStr );
@@ -10122,7 +10122,7 @@ void DrawAdvancedValues( OBJECTTYPE *gpItemDescObject )
if (iModifier[cnt2])
{
SetFontForeground( ITEMDESC_FONTPOSITIVE );
swprintf( pStr, L"Y", iModifier[cnt2] );
swprintf( pStr, L"Y", iModifier[cnt2] ); // FIXME: unused param
FindFontCenterCoordinates( sLeft, sTop, sWidth, sHeight, pStr, BLOCKFONT2, &usX, &usY);
}
else
Tactical/Interface Items.cpp
+3 -3
View File
@@ -4408,7 +4408,7 @@ void MAPINVRenderItem( UINT32 uiBuffer, SOLDIERTYPE * pSoldier, OBJECTTYPE *pOb
if ( (gTacticalStatus.uiFlags & TURNBASED) && (gTacticalStatus.uiFlags & INCOMBAT) )
{
// Soldier doesn't know.
swprintf( pStr, L"%s", "??" );
swprintf( pStr, L"%s", L"??" );
}
else
{
@@ -4490,7 +4490,7 @@ void MAPINVRenderItem( UINT32 uiBuffer, SOLDIERTYPE * pSoldier, OBJECTTYPE *pOb
if ( (gTacticalStatus.uiFlags & TURNBASED) && (gTacticalStatus.uiFlags & INCOMBAT) )
{
// Soldier doesn't know.
swprintf( pStr, L"%s", "??" );
swprintf( pStr, L"%s", L"??" );
}
else
{
@@ -6501,7 +6501,7 @@ void RenderItemDescriptionBox( )
sOffsetX = hVObject->p16BPPObject->sOffsetX;
sOffsetY = hVObject->p16BPPObject->sOffsetY;
}
else if(hVObject->ubBitDepth == 32)
else //if(hVObject->ubBitDepth == 32)
{
usHeight = hVObject->p16BPPObject->usHeight;
usWidth = hVObject->p16BPPObject->usWidth;
Tactical/Overhead.cpp
+1 -1
View File
@@ -7930,7 +7930,7 @@ void HandleSuppressionFire( UINT8 ubTargetedMerc, UINT8 ubCausedAttacker )
UINT32 uiLoop;
UINT8 ubLoop2;
// Flag to determine if the target is cowering (if allowed)
BOOLEAN fCower;
BOOLEAN fCower=FALSE;
SOLDIERTYPE * pSoldier;
// External options
Tactical/Soldier Create.cpp
+11 -5
View File
@@ -1019,7 +1019,7 @@ SOLDIERTYPE* TacticalCreateSoldier( SOLDIERCREATE_STRUCT *pCreateStruct, UINT8 *
case ELDORADO:
case ICECREAMTRUCK:
case JEEP:
if ( Soldier.ubProfile != HELICOPTER || Soldier.ubProfile != 0 || Soldier.ubProfile != NO_PROFILE || Soldier.ubProfile != TANK_CAR )
if ( Soldier.ubProfile != HELICOPTER && Soldier.ubProfile != 0 && Soldier.ubProfile != NO_PROFILE && Soldier.ubProfile != TANK_CAR )
{
ubVehicleID = Soldier.ubProfile;
Soldier.aiData.bNeutral = gNewVehicle[Soldier.ubProfile].bNewNeutral;
@@ -3251,7 +3251,7 @@ INT32 GetSittableGridNoInRoom(UINT16 usRoom, BOOLEAN fEnoughSpace)
UINT8 ubSectorId = SECTOR(gWorldSectorX, gWorldSectorY);
if ( ubSectorId >= 0 && ubSectorId < 256 )
{
for ( UINT32 uiLoop = 0; uiLoop < WORLD_MAX; ++uiLoop )
for ( INT32 uiLoop = 0; uiLoop < WORLD_MAX; ++uiLoop )
{
if ( (gusWorldRoomInfo[ uiLoop ] == usRoom) )
{
@@ -3494,9 +3494,11 @@ extern void DistributeInitialGear(MERCPROFILESTRUCT *pProfile);
void CopyProfileItems( SOLDIERTYPE *pSoldier, SOLDIERCREATE_STRUCT *pCreateStruct )
{
UINT32 cnt, cnt2;
MERCPROFILESTRUCT * pProfile;
BOOLEAN success, fRet;
UINT32 cnt, cnt2;
MERCPROFILESTRUCT* pProfile;
BOOLEAN success;
BOOLEAN fRet;
pProfile = &(gMercProfiles[pCreateStruct->ubProfile]);
@@ -3582,10 +3584,14 @@ void CopyProfileItems( SOLDIERTYPE *pSoldier, SOLDIERCREATE_STRUCT *pCreateStruc
}
else
{
fRet=FALSE;
for ( cnt = 0; cnt < NUM_INV_SLOTS; cnt++ )
{
if ( pProfile->inv[ cnt ] != NOTHING )
{
if ( Item[ pProfile->inv[ cnt ] ].usItemClass == IC_KEY )
{
// since keys depend on 2 values, they pretty much have to be hardcoded.
Tactical/XML_Drugs.cpp
+1 -1
View File
@@ -230,7 +230,7 @@ BOOLEAN WriteDrugsStats()
UINT32 cnt;
FilePrintf(hFile,"<DRUGSLIST>\r\n");
for(cnt = 0;cnt < MAXITEMS;cnt++)
for(cnt = 0;cnt < DRUG_TYPE_MAX;cnt++)
{
FilePrintf(hFile,"\t<DRUG>\r\n");
Tactical/XML_Food.cpp
+1 -1
View File
@@ -224,7 +224,7 @@ BOOLEAN WriteFoodStats()
UINT32 cnt;
FilePrintf(hFile,"<FOODSLIST>\r\n");
for(cnt = 0; cnt < MAXITEMS; ++cnt)
for(cnt = 0; cnt < FOOD_TYPE_MAX; ++cnt)
{
FilePrintf(hFile,"\t<FOOD>\r\n");
Tactical/XML_NewFaceGear.cpp
+1 -1
View File
@@ -123,7 +123,7 @@ faceGearEndElementHandle(void *userData, const XML_Char *name)
else
{
strncpy(pData->curFaceGear.szFile,pData->szCharData,MAX_FACE_GERA_CHARS);
pData->curFaceGear.szFile[MAX_FACE_GERA_CHARS] = '\0';
pData->curFaceGear.szFile[MAX_FACE_GERA_CHARS-1] = '\0';
}
for(int i=0;i<min((int)strlen(pData->szCharData),MAX_FACE_GERA_CHARS);i++)
Tactical/XML_SectorLoadscreens.cpp
+6 -6
View File
@@ -118,7 +118,7 @@ sectorLoadscreensEndElementHandle(void *userData, const XML_Char *name)
else
{
strncpy(pData->curSectorLoadscreens.szLocation,pData->szCharData,MAX_LOCATION_CHARS);
pData->curSectorLoadscreens.szLocation[MAX_LOCATION_CHARS] = '\0';
pData->curSectorLoadscreens.szLocation[MAX_LOCATION_CHARS-1] = '\0';
}
for(int i=0;i<min((int)strlen(pData->szCharData),MAX_LOCATION_CHARS);i++)
@@ -142,7 +142,7 @@ sectorLoadscreensEndElementHandle(void *userData, const XML_Char *name)
else
{
strncpy(pData->curSectorLoadscreens.szImageFormat,pData->szCharData,MAX_IMAGE_FORMAT_CHARS);
pData->curSectorLoadscreens.szImageFormat[MAX_IMAGE_FORMAT_CHARS] = '\0';
pData->curSectorLoadscreens.szImageFormat[MAX_IMAGE_FORMAT_CHARS-1] = '\0';
}
for(int i=0;i<min((int)strlen(pData->szCharData),MAX_IMAGE_FORMAT_CHARS);i++)
@@ -161,7 +161,7 @@ sectorLoadscreensEndElementHandle(void *userData, const XML_Char *name)
else
{
strncpy(pData->curSectorLoadscreens.szDay,pData->szCharData,MAX_IMAGE_PATH_CHARS);
pData->curSectorLoadscreens.szDay[MAX_IMAGE_PATH_CHARS] = '\0';
pData->curSectorLoadscreens.szDay[MAX_IMAGE_PATH_CHARS-1] = '\0';
}
for(int i=0;i<min((int)strlen(pData->szCharData),MAX_IMAGE_PATH_CHARS);i++)
@@ -180,7 +180,7 @@ sectorLoadscreensEndElementHandle(void *userData, const XML_Char *name)
else
{
strncpy(pData->curSectorLoadscreens.szNight,pData->szCharData,MAX_IMAGE_PATH_CHARS);
pData->curSectorLoadscreens.szNight[MAX_IMAGE_PATH_CHARS] = '\0';
pData->curSectorLoadscreens.szNight[MAX_IMAGE_PATH_CHARS-1] = '\0';
}
for(int i=0;i<min((int)strlen(pData->szCharData),MAX_IMAGE_PATH_CHARS);i++)
@@ -199,7 +199,7 @@ sectorLoadscreensEndElementHandle(void *userData, const XML_Char *name)
else
{
strncpy(pData->curSectorLoadscreens.szDayAlt,pData->szCharData,MAX_IMAGE_PATH_CHARS);
pData->curSectorLoadscreens.szDayAlt[MAX_IMAGE_PATH_CHARS] = '\0';
pData->curSectorLoadscreens.szDayAlt[MAX_IMAGE_PATH_CHARS-1] = '\0';
}
for(int i=0;i<min((int)strlen(pData->szCharData),MAX_IMAGE_PATH_CHARS);i++)
@@ -218,7 +218,7 @@ sectorLoadscreensEndElementHandle(void *userData, const XML_Char *name)
else
{
strncpy(pData->curSectorLoadscreens.szNightAlt,pData->szCharData,MAX_IMAGE_PATH_CHARS);
pData->curSectorLoadscreens.szNightAlt[MAX_IMAGE_PATH_CHARS] = '\0';
pData->curSectorLoadscreens.szNightAlt[MAX_IMAGE_PATH_CHARS-1] = '\0';
}
for(int i=0;i<min((int)strlen(pData->szCharData),MAX_IMAGE_PATH_CHARS);i++)
Tactical/XML_Vehicles.cpp
+4 -4
View File
@@ -296,10 +296,10 @@ void InitNewVehicles ()
gNewVehicle[ iCount ].bNewVehicle = FALSE;
gNewVehicle[ iCount ].NewPilot = -1;
gNewVehicle[ iCount ].NewCarPortraits = -1;
gNewVehicle[ iCount ].szIconFace[MAX_MAIN_VEHICLE_CHARS] = '\0';
gNewVehicle[ iCount ].NewVehicleStrings[128] = '\0';
gNewVehicle[ iCount ].NewVehicleName[128] = '\0';
gNewVehicle[ iCount ].NewShortVehicleStrings[128] = '\0';
gNewVehicle[ iCount ].szIconFace[MAX_MAIN_VEHICLE_CHARS-1] = '\0';
gNewVehicle[ iCount ].NewVehicleStrings[127] = '\0';
gNewVehicle[ iCount ].NewVehicleName[127] = '\0';
gNewVehicle[ iCount ].NewShortVehicleStrings[127] = '\0';
gNewVehicle[ iCount ].NewUsed = FALSE;
}
}