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

- Fix: wrong print format in militia battlereports

Browse Source 
- Added flag for militia desertion

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8547 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2018-03-14 19:46:43 +00:00
parent 524fc502f8
commit 56f9864441
12 changed files with 72 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Laptop/MilitiaInterface.cpp
+9 -3
View File
@@ -131,7 +131,7 @@ MilitiaPersonalDataTableFireConfirmationCallback( UINT8 val )
MILITIA militia;
if ( GetMilitia( gusCurrentMilitia, &militia ) )
{
if ( !(militia.flagmask & (MILITIAFLAG_DEAD | MILITIAFLAG_FIRED)) )
if ( !(militia.flagmask & (MILITIAFLAG_DEAD | MILITIAFLAG_FIRED | MILITIAFLAG_DESERTION )) )
{
militia.Fire();
@@ -154,7 +154,7 @@ void MilitiaPersonalDataTableFireCallback( GUI_BUTTON *btn, INT32 reason )
MILITIA militia;
if ( GetMilitia( gusCurrentMilitia, &militia ) )
{
if ( !(militia.flagmask & (MILITIAFLAG_DEAD | MILITIAFLAG_FIRED)) )
if ( !(militia.flagmask & (MILITIAFLAG_DEAD | MILITIAFLAG_FIRED | MILITIAFLAG_DESERTION )) )
{
CHAR16 sString[256];
swprintf( sString, szIdividualMilitiaWebsiteText[1], militia.GetName( ) );
@@ -277,6 +277,12 @@ MilitiaPersonalDataTable::Display( )
DrawTextToScreen( sText, usPosX, usPosY + 5, GetWidth( ), FONT12ARIAL, FONT_MCOLOR_DKGRAY, FONT_MCOLOR_BLACK, FALSE, 0 );
usPosY += 20;
}
else if ( militia.flagmask & MILITIAFLAG_DESERTION )
{
swprintf( sText, szIdividualMilitiaWebsiteText[19] );
DrawTextToScreen( sText, usPosX, usPosY + 5, GetWidth(), FONT12ARIAL, FONT_MCOLOR_DKGRAY, FONT_MCOLOR_BLACK, FALSE, 0 );
usPosY += 20;
}
else
{
swprintf( sText, szIdividualMilitiaWebsiteText[7] );
@@ -311,7 +317,7 @@ MilitiaPersonalDataTable::Display( )
}
// if we can still fire this guy, set up the button
if ( !(militia.flagmask & (MILITIAFLAG_DEAD | MILITIAFLAG_FIRED)) )
if ( !(militia.flagmask & (MILITIAFLAG_DEAD | MILITIAFLAG_FIRED | MILITIAFLAG_DESERTION )) )
{
// we can't fire someone if they are in combat
if ( SectorOursAndPeaceful( SECTORX( militia.sector ), SECTORY( militia.sector ), 0 ) )