diff --git a/GameSettings.cpp b/GameSettings.cpp index 2542d3d6..b913aefb 100644 --- a/GameSettings.cpp +++ b/GameSettings.cpp @@ -259,6 +259,7 @@ void InitGameSettings() gGameSettings.fOptions[ TOPTION_ALLOW_CROWS ] = TRUE; gGameSettings.fOptions[ TOPTION_USE_RANDOM_PERSONALITY ] = FALSE; gGameSettings.fOptions[ TOPTION_USE_AUTO_SAVE ] = FALSE; + gGameSettings.fOptions[ TOPTION_SILENT_SKYRIDER ] = FALSE; gGameSettings.ubSizeOfDisplayCover = 4; gGameSettings.ubSizeOfLOS = 4; diff --git a/GameSettings.h b/GameSettings.h index ada89a33..df899e9d 100644 --- a/GameSettings.h +++ b/GameSettings.h @@ -53,6 +53,7 @@ enum TOPTION_ALLOW_CROWS, TOPTION_USE_RANDOM_PERSONALITY, TOPTION_USE_AUTO_SAVE, + TOPTION_SILENT_SKYRIDER, NUM_GAME_OPTIONS, //Toggle up this will be able to be Toggled by the player diff --git a/GameVersion.cpp b/GameVersion.cpp index 8479f23a..f50b01e8 100644 --- a/GameVersion.cpp +++ b/GameVersion.cpp @@ -23,12 +23,12 @@ INT16 zVersionLabel[256] = { L"Beta v. 0.98" }; #else //RELEASE BUILD VERSION - INT16 zVersionLabel[256] = { L"Release v1.13.656" }; + INT16 zVersionLabel[256] = { L"Release v1.13.661" }; #endif -INT8 czVersionNumber[16] = { "Build 07.01.07" }; //YY.MM.DD +INT8 czVersionNumber[16] = { "Build 07.01.12" }; //YY.MM.DD INT16 zTrackingNumber[16] = { L"Z" }; diff --git a/JA2.vcproj b/JA2.vcproj index 9f5f3311..bbf9212f 100644 --- a/JA2.vcproj +++ b/JA2.vcproj @@ -546,7 +546,7 @@ 0 ) || !fHeliReturnStraightToBase ) { // arrived at destination - HeliCharacterDialogue( pSkyRider, ARRIVED_IN_NON_HOSTILE_SECTOR ); + if(gGameSettings.fOptions[ TOPTION_SILENT_SKYRIDER ] == FALSE) HeliCharacterDialogue( pSkyRider, ARRIVED_IN_NON_HOSTILE_SECTOR ); StopTimeCompression(); } @@ -361,7 +361,7 @@ BOOLEAN HandleHeliEnteringSector( INT16 sX, INT16 sY ) else { // Say quote: "Gonna have to abort. Enemies below" - HeliCharacterDialogue( pSkyRider, ARRIVED_IN_HOSTILE_SECTOR ); + if(gGameSettings.fOptions[ TOPTION_SILENT_SKYRIDER ] == FALSE) HeliCharacterDialogue( pSkyRider, ARRIVED_IN_HOSTILE_SECTOR ); StopTimeCompression(); } diff --git a/Strategic/mapscreen.cpp b/Strategic/mapscreen.cpp index 6bf41b33..fe05b6ae 100644 --- a/Strategic/mapscreen.cpp +++ b/Strategic/mapscreen.cpp @@ -12187,7 +12187,7 @@ BOOLEAN RequestGiveSkyriderNewDestination( void ) } // say Yo! - SkyRiderTalk( SKYRIDER_SAYS_HI ); + if(gGameSettings.fOptions[ TOPTION_SILENT_SKYRIDER ] == FALSE) SkyRiderTalk( SKYRIDER_SAYS_HI ); // start plotting helicopter movement fPlotForHelicopter = TRUE; @@ -12306,7 +12306,7 @@ void HandleNewDestConfirmation( INT16 sMapX, INT16 sMapY ) else { // ordinary confirmation quote - SkyRiderTalk( CONFIRM_DESTINATION ); + if(gGameSettings.fOptions[ TOPTION_SILENT_SKYRIDER ] == FALSE) SkyRiderTalk( CONFIRM_DESTINATION ); } } else diff --git a/Utils/_EnglishText.cpp b/Utils/_EnglishText.cpp index 22479401..1530a167 100644 --- a/Utils/_EnglishText.cpp +++ b/Utils/_EnglishText.cpp @@ -3482,6 +3482,7 @@ STR16 zOptionsToggleText[] = L"Allow crows", L"Random I.M.P personality", L"Auto save", + L"Silent Skyrider", }; //This is the help text associated with the above toggles. @@ -3560,6 +3561,7 @@ STR16 zOptionsScreenHelpText[] = L"When ON, the crows are present in game.", L"When ON, I.M.P characters will get random personality and attitude.", L"When ON, game will be saved after each players turn.", + L"When ON, Skyrider will not talk anymore.", }; diff --git a/Utils/_GermanText.cpp b/Utils/_GermanText.cpp index e4c57ffd..51b7e4af 100644 --- a/Utils/_GermanText.cpp +++ b/Utils/_GermanText.cpp @@ -3288,6 +3288,7 @@ STR16 zOptionsToggleText[] = L"Krähen erlauben", L"Zufällige B.S.E Personalität", L"Automatisch speichern", + L"Silent Skyrider", }; //This is the help text associated with the above toggles. @@ -3366,6 +3367,7 @@ STR16 zOptionsScreenHelpText[] = L"Wenn diese Funktion aktiviert ist, sind Krähen im Spiel vorhanden.", L"Wenn diese Funktion aktiviert ist, erhalten B.S.E Charaktere zufällige Persönlichkeit und Gesinnung.", L"Wenn diese Funktion aktiviert ist, wird nach jeder Runde automatisch gespeichert.", + L"Wenn diese Funktion aktiviert ist, wird Skyrider nicht mehr so viel sprechen.", }; STR16 gzGIOScreenText[] = diff --git a/Utils/_RussianText.cpp b/Utils/_RussianText.cpp index a12367be..cf05d1e1 100644 --- a/Utils/_RussianText.cpp +++ b/Utils/_RussianText.cpp @@ -3473,6 +3473,7 @@ STR16 zOptionsToggleText[] = L"Allow crows", L"Random I.M.P personality", L"Auto save", + L"Silent Skyrider", }; //This is the help text associated with the above toggles. @@ -3551,6 +3552,7 @@ STR16 zOptionsScreenHelpText[] = L"When ON, the crows are present in game.", L"When ON, I.M.P characters will get random personality and attitude.", L"When ON, game will be saved in tactical after each players turn.", + L"When ON, Skyrider will not talk anymore.", };