mirror of
https://github.com/1dot13/source.git
synced 2026-07-22 13:40:22 +02:00
Setup failsafe to block NIV Mode if "Data" is specified as the CUSTOM_DATA_LOCATION.
Setup language specific files to be optional. Setup code to accept all language specific files for items.xml, pockets.xml and ammostrings.xml. git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1953 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -474,7 +474,7 @@ BOOLEAN EnterGIOScreen()
|
||||
}
|
||||
|
||||
// CHRISL: New inventory options
|
||||
if(iResolution != 0 && gCustomDataCat.GetRootDir() != ""){
|
||||
if(IsNIVModeValid() == TRUE){
|
||||
usPosY = GIO_INV_SETTING_Y - GIO_OFFSET_TO_TOGGLE_BOX_Y;
|
||||
for( cnt=0; cnt<NUM_INV_OPTIONS; cnt++)
|
||||
{
|
||||
@@ -612,7 +612,7 @@ BOOLEAN ExitGIOScreen()
|
||||
RemoveButton( guiBROptionToggles[ cnt ] );
|
||||
|
||||
// CHRISL
|
||||
if(iResolution != 0 && gCustomDataCat.GetRootDir() != ""){
|
||||
if(IsNIVModeValid() == TRUE){
|
||||
for( cnt=0; cnt<NUM_INV_OPTIONS; cnt++)
|
||||
RemoveButton( guiINVOptionToggles[ cnt ] );
|
||||
}
|
||||
@@ -775,7 +775,7 @@ BOOLEAN RenderGIOScreen()
|
||||
DisplayWrappedString( (UINT16)(GIO_BR_SETTING_X+GIO_OFFSET_TO_TEXT), usPosY, GIO_DIF_SETTINGS_WIDTH, 2, GIO_TOGGLE_TEXT_FONT, GIO_TOGGLE_TEXT_COLOR, gzGIOScreenText[ GIO_BR_AWESOME_TEXT ], FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED );
|
||||
|
||||
// CHRISL
|
||||
if(iResolution != 0 && gCustomDataCat.GetRootDir() != ""){
|
||||
if(IsNIVModeValid() == TRUE){
|
||||
DisplayWrappedString( GIO_INV_SETTING_X, (UINT16)(GIO_INV_SETTING_Y-GIO_GAP_BN_SETTINGS), GIO_DIF_SETTINGS_WIDTH + 20, 2, GIO_TOGGLE_TEXT_FONT, GIO_TOGGLE_TEXT_COLOR, gzGIOScreenText[ GIO_INV_TEXT ], FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED );
|
||||
usPosY = GIO_INV_SETTING_Y+2;
|
||||
|
||||
@@ -1329,7 +1329,7 @@ void RestoreGIOButtonBackGrounds()
|
||||
}
|
||||
// CHRISL
|
||||
|
||||
if(iResolution != 0 && gCustomDataCat.GetRootDir() != ""){
|
||||
if(IsNIVModeValid() == TRUE){
|
||||
usPosY = GIO_INV_SETTING_Y-GIO_OFFSET_TO_TOGGLE_BOX_Y;
|
||||
for( cnt=0; cnt<NUM_INV_OPTIONS; cnt++)
|
||||
{
|
||||
@@ -1369,7 +1369,7 @@ void DoneFadeOutForExitGameInitOptionScreen( void )
|
||||
}
|
||||
|
||||
// CHRISL:
|
||||
if(iResolution != 0 && gCustomDataCat.GetRootDir() != ""){
|
||||
if(IsNIVModeValid() == TRUE){
|
||||
switch ( GetCurrentINVOptionButtonSetting() )
|
||||
{
|
||||
case GIO_INV_OLD:
|
||||
|
||||
Reference in New Issue
Block a user