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

Little Alien

Browse Source 
- Game version string changed
- Militia control: deduct points only when a command is issued





git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@81 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
lalien
2006-05-25 12:30:57 +00:00
parent b01ab97aaa
commit 00adecd129
3 changed files with 73 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Militia Control.cpp
+68
View File
@@ -1174,6 +1174,11 @@ void MilitiaControlMenuBtnCallBack( MOUSE_REGION * pRegion, INT32 iReason )
} }
} }
if ( GetSoldier( &pSoldier, gusSelectedSoldier ) )
{
DeductPoints( pSoldier, AP_TALK, 0 );
}
// stop showing menu // stop showing menu
fShowMilitiaControlMenu = FALSE; fShowMilitiaControlMenu = FALSE;
giAssignHighLine = -1; giAssignHighLine = -1;
@@ -1194,6 +1199,11 @@ void MilitiaControlMenuBtnCallBack( MOUSE_REGION * pRegion, INT32 iReason )
//pTMilitiaSoldier->bAttitude = DEFENSIVE; //pTMilitiaSoldier->bAttitude = DEFENSIVE;
} }
if ( GetSoldier( &pSoldier, gusSelectedSoldier ) )
{
DeductPoints( pSoldier, AP_TALK, 0 );
}
// stop showing menu // stop showing menu
fShowMilitiaControlMenu = FALSE; fShowMilitiaControlMenu = FALSE;
giAssignHighLine = -1; giAssignHighLine = -1;
@@ -1234,6 +1244,12 @@ void MilitiaControlMenuBtnCallBack( MOUSE_REGION * pRegion, INT32 iReason )
SendGetNewSoldierPathEvent( pTMilitiaSoldier, sActionGridNo, pTMilitiaSoldier->usUIMovementMode ); SendGetNewSoldierPathEvent( pTMilitiaSoldier, sActionGridNo, pTMilitiaSoldier->usUIMovementMode );
} }
} }
if ( GetSoldier( &pSoldier, gusSelectedSoldier ) )
{
DeductPoints( pSoldier, AP_TALK, 0 );
}
// stop showing menu // stop showing menu
fShowMilitiaControlMenu = FALSE; fShowMilitiaControlMenu = FALSE;
giAssignHighLine = -1; giAssignHighLine = -1;
@@ -1276,6 +1292,12 @@ void MilitiaControlMenuBtnCallBack( MOUSE_REGION * pRegion, INT32 iReason )
} }
} }
} }
if ( GetSoldier( &pSoldier, gusSelectedSoldier ) )
{
DeductPoints( pSoldier, AP_TALK, 0 );
}
// stop showing menu // stop showing menu
fShowMilitiaControlMenu = FALSE; fShowMilitiaControlMenu = FALSE;
giAssignHighLine = -1; giAssignHighLine = -1;
@@ -1297,6 +1319,11 @@ void MilitiaControlMenuBtnCallBack( MOUSE_REGION * pRegion, INT32 iReason )
} }
} }
if ( GetSoldier( &pSoldier, gusSelectedSoldier ) )
{
DeductPoints( pSoldier, AP_TALK, 0 );
}
// stop showing menu // stop showing menu
fShowMilitiaControlMenu = FALSE; fShowMilitiaControlMenu = FALSE;
giAssignHighLine = -1; giAssignHighLine = -1;
@@ -1331,6 +1358,12 @@ void MilitiaControlMenuBtnCallBack( MOUSE_REGION * pRegion, INT32 iReason )
} }
} }
} }
if ( GetSoldier( &pSoldier, gusSelectedSoldier ) )
{
DeductPoints( pSoldier, AP_TALK, 0 );
}
// stop showing menu // stop showing menu
fShowMilitiaControlMenu = FALSE; fShowMilitiaControlMenu = FALSE;
giAssignHighLine = -1; giAssignHighLine = -1;
@@ -1359,6 +1392,11 @@ void MilitiaControlMenuBtnCallBack( MOUSE_REGION * pRegion, INT32 iReason )
} }
} }
if ( GetSoldier( &pSoldier, gusSelectedSoldier ) )
{
DeductPoints( pSoldier, AP_TALK, 0 );
}
// stop showing menu // stop showing menu
fShowMilitiaControlMenu = FALSE; fShowMilitiaControlMenu = FALSE;
giAssignHighLine = -1; giAssignHighLine = -1;
@@ -1385,6 +1423,11 @@ void MilitiaControlMenuBtnCallBack( MOUSE_REGION * pRegion, INT32 iReason )
} }
} }
if ( GetSoldier( &pSoldier, gusSelectedSoldier ) )
{
DeductPoints( pSoldier, AP_TALK, 0 );
}
// stop showing menu // stop showing menu
fShowMilitiaControlMenu = FALSE; fShowMilitiaControlMenu = FALSE;
giAssignHighLine = -1; giAssignHighLine = -1;
@@ -1442,6 +1485,11 @@ void MilitiaControlMenuBtnCallBack( MOUSE_REGION * pRegion, INT32 iReason )
} }
} }
if ( GetSoldier( &pSoldier, gusSelectedSoldier ) )
{
DeductPoints( pSoldier, AP_TALK, 0 );
}
// stop showing menu // stop showing menu
fShowMilitiaControlMenu = FALSE; fShowMilitiaControlMenu = FALSE;
giAssignHighLine = -1; giAssignHighLine = -1;
@@ -1490,6 +1538,11 @@ void MilitiaControlMenuBtnCallBack( MOUSE_REGION * pRegion, INT32 iReason )
} }
} }
if ( GetSoldier( &pSoldier, gusSelectedSoldier ) )
{
DeductPoints( pSoldier, AP_TALK, 0 );
}
// stop showing menu // stop showing menu
fShowMilitiaControlMenu = FALSE; fShowMilitiaControlMenu = FALSE;
giAssignHighLine = -1; giAssignHighLine = -1;
@@ -1519,6 +1572,11 @@ void MilitiaControlMenuBtnCallBack( MOUSE_REGION * pRegion, INT32 iReason )
} }
} }
if ( GetSoldier( &pSoldier, gusSelectedSoldier ) )
{
DeductPoints( pSoldier, AP_TALK, 0 );
}
// stop showing menu // stop showing menu
fShowMilitiaControlMenu = FALSE; fShowMilitiaControlMenu = FALSE;
giAssignHighLine = -1; giAssignHighLine = -1;
@@ -1588,6 +1646,11 @@ void MilitiaControlMenuBtnCallBack( MOUSE_REGION * pRegion, INT32 iReason )
} }
} }
if ( GetSoldier( &pSoldier, gusSelectedSoldier ) )
{
DeductPoints( pSoldier, AP_TALK, 0 );
}
// stop showing menu // stop showing menu
fShowMilitiaControlMenu = FALSE; fShowMilitiaControlMenu = FALSE;
giAssignHighLine = -1; giAssignHighLine = -1;
@@ -1640,6 +1703,11 @@ void MilitiaControlMenuBtnCallBack( MOUSE_REGION * pRegion, INT32 iReason )
// } // }
// } // }
// } // }
//if ( GetSoldier( &pSoldier, gusSelectedSoldier ) )
//{
// DeductPoints( pSoldier, AP_TALK, 0 );
//}
// // stop showing menu // // stop showing menu
// fShowMilitiaControlMenu = FALSE; // fShowMilitiaControlMenu = FALSE;
Tactical/Soldier Control.cpp
+3 -3
View File
@@ -10794,9 +10794,6 @@ BOOLEAN PlayerSoldierStartTalking( SOLDIERTYPE *pSoldier, UINT8 ubTargetID, BOOL
// Get APs... // Get APs...
sAPCost = AP_TALK; sAPCost = AP_TALK;
// Deduct points from our guy....
DeductPoints( pSoldier, sAPCost, 0 );
if ( !(gTacticalStatus.uiFlags & INCOMBAT) || (gTacticalStatus.uiFlags & REALTIME) ) //lal if ( !(gTacticalStatus.uiFlags & INCOMBAT) || (gTacticalStatus.uiFlags & REALTIME) ) //lal
{ {
ConvertGridNoToXY( pTSoldier->sGridNo, &sXPos, &sYPos ); ConvertGridNoToXY( pTSoldier->sGridNo, &sXPos, &sYPos );
@@ -10828,6 +10825,9 @@ BOOLEAN PlayerSoldierStartTalking( SOLDIERTYPE *pSoldier, UINT8 ubTargetID, BOOL
} }
else else
{ {
// Deduct points from our guy....
DeductPoints( pSoldier, sAPCost, 0 );
StartCivQuote( pTSoldier ); StartCivQuote( pTSoldier );
return( FALSE ); return( FALSE );
} }
jascreens.cpp
+2 -2
View File
@@ -390,9 +390,9 @@ UINT32 InitScreenHandle(void)
//mprintf( 10, 420, zVersionLabel ); //mprintf( 10, 420, zVersionLabel );
#ifdef _DEBUG #ifdef _DEBUG
mprintf( 10, 10, L"%s: %s (Debug %S)", pMessageStrings[ MSG_VERSION ], zVersionLabel, czVersionNumber ); mprintf( 10, 10, L"%s: %s Debug %S", pMessageStrings[ MSG_VERSION ], zVersionLabel, czVersionNumber );
#else #else
mprintf( 10, 10, L"%s: %s (%S)", pMessageStrings[ MSG_VERSION ], zVersionLabel, czVersionNumber ); mprintf( 10, 10, L"%s: %s %S", pMessageStrings[ MSG_VERSION ], zVersionLabel, czVersionNumber );
#endif #endif
#ifdef CRIPPLED_VERSION #ifdef CRIPPLED_VERSION