diff --git a/GameSettings.cpp b/GameSettings.cpp index 5175c7ca..83f28964 100644 --- a/GameSettings.cpp +++ b/GameSettings.cpp @@ -253,6 +253,7 @@ void InitGameSettings() //lalien gGameSettings.fOptions[ TOPTION_SPACE_SELECTS_NEXT_SQUAD ] = TRUE; gGameSettings.fOptions[ TOPTION_SHOW_ITEM_SHADOW ] = TRUE; + gGameSettings.fOptions[ TOPTION_SHOW_WEAPON_RANGE_IN_TILES ] = TRUE; gGameSettings.ubSizeOfDisplayCover = 4; gGameSettings.ubSizeOfLOS = 4; diff --git a/GameSettings.h b/GameSettings.h index c8d6f70a..d5dc4d99 100644 --- a/GameSettings.h +++ b/GameSettings.h @@ -47,6 +47,7 @@ enum TOPTION_AIM_LEVEL_RESTRICTION, TOPTION_SPACE_SELECTS_NEXT_SQUAD, TOPTION_SHOW_ITEM_SHADOW, + TOPTION_SHOW_WEAPON_RANGE_IN_TILES, NUM_GAME_OPTIONS, //Toggle up this will be able to be Toggled by the player //These options will NOT be toggable by the Player diff --git a/GameVersion.cpp b/GameVersion.cpp index 9833675b..a3c3b56e 100644 --- a/GameVersion.cpp +++ b/GameVersion.cpp @@ -23,7 +23,7 @@ INT16 zVersionLabel[256] = { L"Beta v. 0.98" }; #else //RELEASE BUILD VERSION - INT16 zVersionLabel[256] = { L"Release v1.13.233" }; + INT16 zVersionLabel[256] = { L"Release v1.13.234" }; #endif diff --git a/JA2.vcproj b/JA2.vcproj index 4d530bbb..abbd0bf3 100644 --- a/JA2.vcproj +++ b/JA2.vcproj @@ -43,7 +43,7 @@ 16 ) || ( sY < 1 ) || ( sY > 16 ) || ( ubZ > 3 ) ) @@ -3825,17 +3825,21 @@ BOOLEAN CanGoToTacticalInSector( INT16 sX, INT16 sY, UINT8 ubZ ) } - cnt = gTacticalStatus.Team[ gbPlayerNum ].bFirstID; + //cnt = gTacticalStatus.Team[ gbPlayerNum ].bFirstID; - // look for all living, fighting mercs on player's team. Robot and EPCs qualify! - for ( pSoldier = MercPtrs[ cnt ]; cnt <= gTacticalStatus.Team[ gbPlayerNum ].bLastID; cnt++, pSoldier++) + // look for all living, fighting mercs on player's team. Robot and EPCs qualify! + //for ( pSoldier = MercPtrs[ cnt ]; cnt <= gTacticalStatus.Team[ gbPlayerNum ].bLastID; cnt++, pSoldier++) { // ARM: now allows loading of sector with all mercs below OKLIFE as long as they're alive - if ( ( pSoldier->bActive && pSoldier->bLife ) && !( pSoldier->uiStatusFlags & SOLDIER_VEHICLE ) && - ( pSoldier->bAssignment != IN_TRANSIT ) && ( pSoldier->bAssignment != ASSIGNMENT_POW ) && - ( pSoldier->bAssignment != ASSIGNMENT_DEAD ) && !SoldierAboardAirborneHeli( pSoldier ) ) + //if( ( pSoldier->bActive && pSoldier->bLife ) && !( pSoldier->uiStatusFlags & SOLDIER_VEHICLE ) && + // ( pSoldier->bAssignment != IN_TRANSIT ) && ( pSoldier->bAssignment != ASSIGNMENT_POW ) && + // ( pSoldier->bAssignment != ASSIGNMENT_DEAD ) && !SoldierAboardAirborneHeli( pSoldier ) + // ) + + //if( (SectorInfo[ SECTOR( gWorldSectorX,gWorldSectorY) ].uiFlags & SF_ALREADY_VISITED) ) + if( GetSectorFlagStatus( sSelMapX, sSelMapY, ( UINT8 )iCurrentMapSectorZ, SF_ALREADY_VISITED ) == TRUE ) { - if ( !pSoldier->fBetweenSectors && pSoldier->sSectorX == sX && pSoldier->sSectorY == sY && pSoldier->bSectorZ == ubZ ) + //if ( !pSoldier->fBetweenSectors && pSoldier->sSectorX == sX && pSoldier->sSectorY == sY && pSoldier->bSectorZ == ubZ ) { return( TRUE ); } diff --git a/Tactical/Interface Items.cpp b/Tactical/Interface Items.cpp index f830ef55..58f8d681 100644 --- a/Tactical/Interface Items.cpp +++ b/Tactical/Interface Items.cpp @@ -7361,8 +7361,8 @@ void GetHelpTextForItem( INT16 * pzStr, OBJECTTYPE *pObject, SOLDIERTYPE *pSoldi gWeaponStatsDesc[ 11 ], //Damage String GetDamage(pObject), gWeaponStatsDesc[ 10 ], //Range String - GunRange( pObject )/10, //Modified Range - Weapon[ usItem ].usRange/10, //Gun Range + gGameSettings.fOptions[ TOPTION_SHOW_WEAPON_RANGE_IN_TILES ] ? GunRange( pObject )/10 : GunRange( pObject ), //Modified Range + gGameSettings.fOptions[ TOPTION_SHOW_WEAPON_RANGE_IN_TILES ] ? Weapon[ usItem ].usRange/10 : Weapon[ usItem ].usRange, //Gun Range gWeaponStatsDesc[ 5 ], //AP String apStr, //AP's gWeaponStatsDesc[ 12 ], //Weight String @@ -7410,8 +7410,8 @@ void GetHelpTextForItem( INT16 * pzStr, OBJECTTYPE *pObject, SOLDIERTYPE *pSoldi gWeaponStatsDesc[ 11 ], //Damage String GetDamage(pObject), gWeaponStatsDesc[ 10 ], //Range String - GunRange( pObject )/10, //Modified Range - Weapon[ usItem ].usRange/10, //Gun Range + gGameSettings.fOptions[ TOPTION_SHOW_WEAPON_RANGE_IN_TILES ] ? GunRange( pObject )/10 : GunRange( pObject ), //Modified Range + gGameSettings.fOptions[ TOPTION_SHOW_WEAPON_RANGE_IN_TILES ] ? Weapon[ usItem ].usRange/10 : Weapon[ usItem ].usRange, //Gun Range gWeaponStatsDesc[ 5 ], //AP String apStr, //AP's gWeaponStatsDesc[ 12 ], //Weight String diff --git a/Utils/_EnglishText.cpp b/Utils/_EnglishText.cpp index 1ba9b2a3..bfb346a1 100644 --- a/Utils/_EnglishText.cpp +++ b/Utils/_EnglishText.cpp @@ -3418,6 +3418,7 @@ STR16 zOptionsToggleText[] = L"Restrict Extra Aim Levels to Rifles", L"Space selects next squad", L"Show Item Shadow", + L"Show Weapon Ranges in Tiles", }; //This is the help text associated with the above toggles. @@ -3490,6 +3491,7 @@ STR16 zOptionsScreenHelpText[] = L"Aim levels beyond 4 are restricted to rifles and sniper rifles.", L"When enabled |S|p|a|c|e selects next squad automatically.", L"When enabled item shadows will be shown.", + L"When enabled weapon ranges will be shown in tiles.", }; diff --git a/Utils/_GermanText.cpp b/Utils/_GermanText.cpp index 7565f5a1..c9f834e6 100644 --- a/Utils/_GermanText.cpp +++ b/Utils/_GermanText.cpp @@ -3222,6 +3222,7 @@ STR16 zOptionsToggleText[] = L"Restrict Extra Aim Levels to Rifles", L"Space selects next squad", L"Show Item Shadow", + L"Show Weapon Ranges in Tiles", }; //This is the help text associated with the above toggles. @@ -3294,6 +3295,7 @@ STR16 zOptionsScreenHelpText[] = L"Aim levels beyond 4 are restricted to rifles and sniper rifles.", L"When enabled |S|p|a|c|e selects next squad automatically.", L"When enabled item shadows will be shown.", + L"When enabled weapon ranges will be shown in tiles.", }; STR16 gzGIOScreenText[] = diff --git a/Utils/_RussianText.cpp b/Utils/_RussianText.cpp index c25d4c95..a9abf9ab 100644 --- a/Utils/_RussianText.cpp +++ b/Utils/_RussianText.cpp @@ -3407,6 +3407,7 @@ STR16 zOptionsToggleText[] = L"Restrict Extra Aim Levels to Rifles", L"Space selects next squad", L"Show Item Shadow", + L"Show Weapon Ranges in Tiles", }; //This is the help text associated with the above toggles. @@ -3479,6 +3480,7 @@ STR16 zOptionsScreenHelpText[] = L"Aim levels beyond 4 are restricted to rifles and sniper rifles.", L"When enabled |S|p|a|c|e selects next squad automatically.", L"When enabled item shadows will be shown.", + L"When enabled weapon ranges will be shown in tiles.", };