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

- DIRT_GLOBAL_MODIFIER is a global modifier to dirt generation

Browse Source 
- second cleaning button in menu now orders entire team to clean their guns
- global overheating modifier now also multiplies attachment modifiers
- cleaning kits always use up 1% on use


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5913 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2013-03-10 01:15:19 +00:00
parent 16d0d1ea8a
commit 6c0d94dadd
17 changed files with 42 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Handle Items.cpp
+7 -7
View File
@@ -134,7 +134,7 @@ void StartBombMessageBox( SOLDIERTYPE * pSoldier, INT32 sGridNo );
// added by Flugente
void StartTacticalFunctionSelectionMessageBox( SOLDIERTYPE * pSoldier, INT32 sGridNo, INT8 bLevel );
void CleanWeapons( BOOLEAN fCleanAll );
void CleanWeapons( BOOLEAN fEntireTeam );
void Strip( SOLDIERTYPE * pSoldier );
void StartCorpseMessageBox( SOLDIERTYPE * pSoldier, INT32 sGridNo, INT8 bLevel );
@@ -4748,7 +4748,7 @@ void StartTacticalFunctionSelectionMessageBox( SOLDIERTYPE * pSoldier, INT32 sGr
DoMessageBox( MSG_BOX_BASIC_MEDIUM_BUTTONS, TacticalStr[ FUNCTION_SELECTION_STR ], GAME_SCREEN, MSG_BOX_FLAG_GENERIC_EIGHT_BUTTONS, TacticalFunctionSelectionMessageBoxCallBack, NULL );
}
void CleanWeapons( BOOLEAN fCleanAll )
void CleanWeapons( BOOLEAN fEntireTeam )
{
if ( !gGameExternalOptions.fDirtSystem )
return;
@@ -4758,7 +4758,7 @@ void CleanWeapons( BOOLEAN fCleanAll )
return;
// if in turnbased mode, perform this action only for the selected merc, and use up APs
if ( gTacticalStatus.uiFlags & TURNBASED )
if ( !fEntireTeam || gTacticalStatus.uiFlags & TURNBASED )
{
if ( gusSelectedSoldier == NOBODY )
return;
@@ -4766,7 +4766,7 @@ void CleanWeapons( BOOLEAN fCleanAll )
SOLDIERTYPE* pSoldier = MercPtrs[ gusSelectedSoldier ];
if ( pSoldier->bActive )
pSoldier->CleanWeapon(fCleanAll);
pSoldier->CleanWeapon(FALSE);
}
else // perform action for every merc in this sector
{
@@ -4782,7 +4782,7 @@ void CleanWeapons( BOOLEAN fCleanAll )
//if the merc is in this sector
if ( pSoldier->bActive && pSoldier->ubProfile != NO_PROFILE && pSoldier->bInSector && ( pSoldier->sSectorX == gWorldSectorX ) && ( pSoldier->sSectorY == gWorldSectorY ) && ( pSoldier->bSectorZ == gbWorldSectorZ) )
{
pSoldier->CleanWeapon(fCleanAll);
pSoldier->CleanWeapon(TRUE);
}
}
}
@@ -4905,11 +4905,11 @@ void TacticalFunctionSelectionMessageBoxCallBack( UINT8 ubExitValue )
SectorFillCanteens();
break;
case 2:
// clean a single weapon
// clean weapons of selected merc
CleanWeapons(FALSE);
break;
case 3:
// clean all weapons
// clean weapons of entire team
CleanWeapons(TRUE);
break;
case 4: