diff --git a/Tactical/Militia Control.cpp b/Tactical/Militia Control.cpp index 139dd3cc..4f882434 100644 --- a/Tactical/Militia Control.cpp +++ b/Tactical/Militia Control.cpp @@ -1174,6 +1174,11 @@ void MilitiaControlMenuBtnCallBack( MOUSE_REGION * pRegion, INT32 iReason ) } } + if ( GetSoldier( &pSoldier, gusSelectedSoldier ) ) + { + DeductPoints( pSoldier, AP_TALK, 0 ); + } + // stop showing menu fShowMilitiaControlMenu = FALSE; giAssignHighLine = -1; @@ -1194,6 +1199,11 @@ void MilitiaControlMenuBtnCallBack( MOUSE_REGION * pRegion, INT32 iReason ) //pTMilitiaSoldier->bAttitude = DEFENSIVE; } + if ( GetSoldier( &pSoldier, gusSelectedSoldier ) ) + { + DeductPoints( pSoldier, AP_TALK, 0 ); + } + // stop showing menu fShowMilitiaControlMenu = FALSE; giAssignHighLine = -1; @@ -1234,6 +1244,12 @@ void MilitiaControlMenuBtnCallBack( MOUSE_REGION * pRegion, INT32 iReason ) SendGetNewSoldierPathEvent( pTMilitiaSoldier, sActionGridNo, pTMilitiaSoldier->usUIMovementMode ); } } + + if ( GetSoldier( &pSoldier, gusSelectedSoldier ) ) + { + DeductPoints( pSoldier, AP_TALK, 0 ); + } + // stop showing menu fShowMilitiaControlMenu = FALSE; 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 fShowMilitiaControlMenu = FALSE; 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 fShowMilitiaControlMenu = FALSE; 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 fShowMilitiaControlMenu = FALSE; 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 fShowMilitiaControlMenu = FALSE; 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 fShowMilitiaControlMenu = FALSE; 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 fShowMilitiaControlMenu = FALSE; 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 fShowMilitiaControlMenu = FALSE; 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 fShowMilitiaControlMenu = FALSE; 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 fShowMilitiaControlMenu = FALSE; 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 // fShowMilitiaControlMenu = FALSE; diff --git a/Tactical/Soldier Control.cpp b/Tactical/Soldier Control.cpp index c298c8ae..467ff800 100644 --- a/Tactical/Soldier Control.cpp +++ b/Tactical/Soldier Control.cpp @@ -10794,9 +10794,6 @@ BOOLEAN PlayerSoldierStartTalking( SOLDIERTYPE *pSoldier, UINT8 ubTargetID, BOOL // Get APs... sAPCost = AP_TALK; - // Deduct points from our guy.... - DeductPoints( pSoldier, sAPCost, 0 ); - if ( !(gTacticalStatus.uiFlags & INCOMBAT) || (gTacticalStatus.uiFlags & REALTIME) ) //lal { ConvertGridNoToXY( pTSoldier->sGridNo, &sXPos, &sYPos ); @@ -10828,6 +10825,9 @@ BOOLEAN PlayerSoldierStartTalking( SOLDIERTYPE *pSoldier, UINT8 ubTargetID, BOOL } else { + // Deduct points from our guy.... + DeductPoints( pSoldier, sAPCost, 0 ); + StartCivQuote( pTSoldier ); return( FALSE ); } diff --git a/jascreens.cpp b/jascreens.cpp index 9d22d826..b8744748 100644 --- a/jascreens.cpp +++ b/jascreens.cpp @@ -390,9 +390,9 @@ UINT32 InitScreenHandle(void) //mprintf( 10, 420, zVersionLabel ); #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 - 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 #ifdef CRIPPLED_VERSION