1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-05 14:00: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
Laptop/BobbyRMailOrder.cpp
+4 -4
View File
@@ -1104,7 +1104,7 @@ void DisplayPurchasedItems( BOOLEAN fCalledFromOrderPage, UINT16 usGridX, UINT16
if( pBobbyRayPurchase[i].fUsed )
{
LoadBRName(pBobbyRayPurchase[i].usItemIndex,sBack);
swprintf(sText, L"%s %s", "*", sBack);
swprintf(sText, L"%s %s", L"*", sBack);
}
else
LoadBRName(pBobbyRayPurchase[i].usItemIndex,sText);
@@ -1309,7 +1309,7 @@ void DisplayShippingCosts( BOOLEAN fCalledFromOrderPage, INT32 iSubTotal, UINT16
while(spi != gShipmentTable[iOrderNum]->ShipmentPackages.end())
{
uiPackageWeight += Item[((ShipmentPackageStruct&)*spi).usItemIndex].ubWeight;
spi++;
++spi;
}
uiPackageWeight = uiPackageWeight > 20 ? uiPackageWeight : 20;
@@ -2883,13 +2883,13 @@ BOOLEAN NewWayOfLoadingBobbyRMailOrdersToSaveGameFile( HWFILE hFile )
{
//Allocate memory for the list
gpNewBobbyrShipments = (NewBobbyRayOrderStruct *) MemAlloc( sizeof( NewBobbyRayOrderStruct ) * giNumberOfNewBobbyRShipment );
memset(gpNewBobbyrShipments, 0, (sizeof( NewBobbyRayOrderStruct ) * giNumberOfNewBobbyRShipment) );
if( gpNewBobbyrShipments == NULL )
if( gpNewBobbyrShipments == NULL )
{
Assert(0);
return(FALSE );
}
memset(gpNewBobbyrShipments, 0, (sizeof( NewBobbyRayOrderStruct ) * giNumberOfNewBobbyRShipment) );
//loop through and load all the mail order slots
for( iCnt=0; iCnt<giNumberOfNewBobbyRShipment; iCnt++ )