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

Fix: compiler warnings

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8814 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2020-05-30 14:26:16 +00:00
parent e932393eae
commit b25a4be4e7
15 changed files with 49 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Handle Items.cpp
+1 -1
View File
@@ -4563,7 +4563,7 @@ void HandleFlashingItems( )
{
UINT32 cnt;
ITEM_POOL *pItemPool;
LEVELNODE *pObject;
//LEVELNODE *pObject;
ITEM_POOL_LOCATOR *pLocator;
BOOLEAN fDoLocator = FALSE;
Tactical/Interface Enhanced.cpp
+2 -2
View File
@@ -14198,13 +14198,13 @@ void DrawAdvancedValues( OBJECTTYPE *gpItemDescObject )
{
SetFontForeground( a ? ITEMDESC_FONTPOSITIVE : ITEMDESC_FONTNEGATIVE );
swprintf( pStr, L"%s/%s", a ? "Y" : "N", b ? "Y" : "N" );
swprintf( pStr, L"%s/%s", a ? L"Y" : L"N", b ? L"Y" : L"N" );
}
else
{
SetFontForeground( 5 );
swprintf( pStr, L"%s", a ? "Y" : "N" );
swprintf( pStr, L"%s", a ? L"Y" : L"N" );
}
FindFontCenterCoordinates( sLeft, sTop, sWidth, sHeight, pStr, BLOCKFONT2, &usX, &usY );
Tactical/Overhead.cpp
+1 -2
View File
@@ -10678,11 +10678,10 @@ void HandleTurncoatAttempt( SOLDIERTYPE* pSoldier )
// remember the target's ID
prisonerdialoguetargetID = pSoldier->ubID;
CHAR16 buf[256];
UINT8 ubCurrentProgress = CurrentPlayerProgressPercentage();
std::vector<std::pair<INT16, STR16> > dropdownvector_1;
int cnt = 1;
INT16 cnt = 1;
UINT8 chance = MercPtrs[gusSelectedSoldier]->GetTurncoatConvinctionChance( prisonerdialoguetargetID, cnt );
swprintf( gTurncoatDropdownText[cnt-1], szTurncoatText[3], chance );
Tactical/Soldier Control.cpp
+10 -17
View File
@@ -19921,10 +19921,8 @@ FLOAT SOLDIERTYPE::GetConstructionPoints( )
UINT32 val = EffectiveStrength( this, FALSE );
ReducePointsForFatigue( this, &val );
FLOAT dval = val;
dval = dval * (100 + this->GetBackgroundValue( BG_FORTIFY_ASSIGNMENT )) / 100.0f;
FLOAT dval = val * (100 + this->GetBackgroundValue( BG_FORTIFY_ASSIGNMENT )) / 100.0f;
dval = (dval * this->stats.bLife / this->stats.bLifeMax);
@@ -19935,8 +19933,7 @@ FLOAT SOLDIERTYPE::GetConstructionPoints( )
BOOLEAN SOLDIERTYPE::HasItem(UINT16 usItem)
{
INT8 invsize = (INT8)inv.size( );
for ( INT8 bLoop = 0; bLoop < invsize; ++bLoop )
for ( size_t bLoop = 0, invsize = inv.size(); bLoop < invsize; ++bLoop )
{
if ( inv[bLoop].exists( ) == true && inv[bLoop].usItem == usItem )
return TRUE;
@@ -19951,8 +19948,7 @@ BOOLEAN SOLDIERTYPE::SelfDetonate( )
if ( !(this->flags.uiStatusFlags & SOLDIER_UNDERAICONTROL) )
return FALSE;
INT8 invsize = (INT8)inv.size( );
for ( INT8 bLoop = 0; bLoop < invsize; ++bLoop )
for ( size_t bLoop = 0, invsize = inv.size(); bLoop < invsize; ++bLoop )
{
if ( inv[bLoop].exists( ) == true && inv[bLoop].usItem == this->aiData.usActionData )
{
@@ -19980,8 +19976,7 @@ UINT8 SOLDIERTYPE::GetWaterSnakeDefenseChance()
val += this->GetBackgroundValue( BG_SNAKEDEFENSE );
// bonus if we have a knife, extra if it is in our hands
INT8 invsize = (INT8)inv.size( ); // remember inventorysize, so we don't call size() repeatedly
for ( INT8 bLoop = 0; bLoop < invsize; ++bLoop )
for ( size_t bLoop = 0, invsize = inv.size(); bLoop < invsize; ++bLoop )
{
if ( inv[bLoop].exists( ) )
{
@@ -20026,9 +20021,7 @@ UINT16 SOLDIERTYPE::GetInteractiveActionSkill( INT32 sGridNo, UINT8 usLevel, UIN
OBJECTTYPE* pObj = NULL;
INT8 invsize = (INT8)inv.size( ); // remember inventorysize, so we don't call size() repeatedly
for ( INT8 bLoop = 0; bLoop < invsize; ++bLoop ) // ... for all items in our inventory ...
for ( size_t bLoop = 0, invsize = inv.size(); bLoop < invsize; ++bLoop )
{
if ( inv[bLoop].exists( ) == true && Item[inv[bLoop].usItem].usHackingModifier )
{
@@ -20191,7 +20184,7 @@ BOOLEAN SOLDIERTYPE::CanDragInPrinciple()
return TRUE;
}
BOOLEAN SOLDIERTYPE::CanDragPerson( UINT8 usID )
BOOLEAN SOLDIERTYPE::CanDragPerson( UINT16 usID )
{
if ( !CanDragInPrinciple() )
return FALSE;
@@ -20288,7 +20281,7 @@ void SOLDIERTYPE::SetDragOrderPerson( UINT16 usID )
{
// sevenfm: if someone is dragging this soldier, cancel drag
SOLDIERTYPE *pSoldier;
for (UINT32 uiLoop = 0; uiLoop < guiNumMercSlots; uiLoop++)
for (UINT32 uiLoop = 0; uiLoop < guiNumMercSlots; ++uiLoop)
{
pSoldier = MercPtrs[uiLoop];
if (pSoldier && pSoldier->usDragPersonID == usID)
@@ -20813,7 +20806,7 @@ BOOLEAN SOLDIERTYPE::InPositionForTurncoatAttempt( UINT16 usID )
return FALSE;
}
UINT8 SOLDIERTYPE::GetTurncoatConvinctionChance( UINT16 usID, UINT8 usApproach )
UINT8 SOLDIERTYPE::GetTurncoatConvinctionChance( UINT16 usID, INT16 sApproach )
{
if ( usID >= NOBODY )
return 0;
@@ -20875,7 +20868,7 @@ UINT8 SOLDIERTYPE::GetTurncoatConvinctionChance( UINT16 usID, UINT8 usApproach
ReducePointsForFatigue( pSoldier, &enemyresistancerating );
switch ( usApproach )
switch ( sApproach )
{
// base approach
case 1:
Tactical/Soldier Control.h
+2 -2
View File
@@ -2004,7 +2004,7 @@ public:
// Flugente: drag people
BOOLEAN CanDragInPrinciple();
BOOLEAN CanDragPerson( UINT8 usID );
BOOLEAN CanDragPerson( UINT16 usID );
BOOLEAN CanDragCorpse( UINT16 usCorpseNum );
BOOLEAN IsDraggingSomeone();
void SetDragOrderPerson( UINT16 usID );
@@ -2034,7 +2034,7 @@ public:
// Flugente: turncoats
BOOLEAN InPositionForTurncoatAttempt( UINT16 usID );
UINT8 GetTurncoatConvinctionChance( UINT16 usID, UINT8 usApproach );
UINT8 GetTurncoatConvinctionChance( UINT16 usID, INT16 usApproach );
void AttemptToCreateTurncoat( UINT16 usID );
BOOLEAN OrderTurnCoatToSwitchSides( UINT16 usID );
void OrderAllTurnCoatToSwitchSides();
Tactical/Soldier Init List.cpp
-1
View File
@@ -2074,7 +2074,6 @@ void AddSoldierInitListCreatures( BOOLEAN fQueen, UINT8 ubNumLarvae, UINT8 ubNum
void AddSoldierInitListOtherCreatures( UINT8 usNum )
{
SOLDIERINITNODE *curr;
INT32 iRandom;
UINT8 ubFreeSlots;
BOOLEAN fDoPlacement;
UINT8 ubNumCreatures = usNum;