Stat Progress Bar removed from options and made permanently active.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9307 3b4a5df2-a311-0410-b5c6-a8a6f20db521

GameSettings.cpp

@@ -335,7 +335,6 @@ BOOLEAN LoadGameSettings()
 		else
 			gGameSettings.fOptions[TOPTION_TOGGLE_TURN_MODE]			= FALSE;
 
-		gGameSettings.fOptions[TOPTION_STAT_PROGRESS_BARS]              = iniReader.ReadBoolean("JA2 Game Settings","TOPTION_STAT_PROGRESS_BARS"               ,  TRUE ); // HEADROCK HAM 3.6: Progress Bars
 		gGameSettings.fOptions[TOPTION_MERCENARY_FORMATIONS]            = iniReader.ReadBoolean("JA2 Game Settings","TOPTION_MERCENARY_FORMATIONS"             ,  TRUE ); // Flugente: mercenary formations
 		gGameSettings.fOptions[TOPTION_REPORT_MISS_MARGIN]				= iniReader.ReadBoolean("JA2 Game Settings","TOPTION_REPORT_MISS_MARGIN"			   ,  FALSE ); // HEADROCK HAM 4: Shot offset report
 		gGameSettings.fOptions[TOPTION_USE_LOGICAL_BODYTYPES]			= iniReader.ReadBoolean("JA2 Game Settings","TOPTION_USE_LOGICAL_BODYTYPES"			   ,  FALSE );
@@ -599,7 +598,6 @@ BOOLEAN	SaveGameSettings()
 		settings << "TOPTION_SILENT_SKYRIDER                  = " << (gGameSettings.fOptions[TOPTION_SILENT_SKYRIDER]					?    "TRUE" : "FALSE" ) << endl;
 		settings << "TOPTION_ENHANCED_DESC_BOX                = " << (gGameSettings.fOptions[TOPTION_ENHANCED_DESC_BOX]					?    "TRUE" : "FALSE" ) << endl;
 		settings << "TOPTION_TOGGLE_TURN_MODE                 = " << (gGameSettings.fOptions[TOPTION_TOGGLE_TURN_MODE]					?    "TRUE" : "FALSE" ) << endl;
-		settings << "TOPTION_STAT_PROGRESS_BARS               = " << (gGameSettings.fOptions[TOPTION_STAT_PROGRESS_BARS]				?    "TRUE" : "FALSE" ) << endl; // HEADROCK HAM 3.6: Progress Bars
 		settings << "TOPTION_ALT_MAP_COLOR					  = " << (gGameSettings.fOptions[TOPTION_ALT_MAP_COLOR]						?	 "TRUE" : "FALSE" ) << endl; // HEADROCK HAM 4: Alt Map Colors
 		settings << "TOPTION_ALTERNATE_BULLET_GRAPHICS        = " << (gGameSettings.fOptions[TOPTION_ALTERNATE_BULLET_GRAPHICS]			?    "TRUE" : "FALSE" ) << endl;
 		settings << "TOPTION_SHOW_MERC_RANKS				  = " << (gGameSettings.fOptions[TOPTION_SHOW_MERC_RANKS]					?	 "TRUE"	: "FALSE" ) << endl;
@@ -812,9 +810,6 @@ void InitGameSettings()
 	// arynn 
 	gGameSettings.fOptions[ TOPTION_TOGGLE_TURN_MODE ]					= FALSE;
 
-	// HEADROCK HAM 3.6:
-	gGameSettings.fOptions[ TOPTION_STAT_PROGRESS_BARS ]				= FALSE;
-
 	// HEADROCK HAM 4:
 	gGameSettings.fOptions[ TOPTION_ALT_MAP_COLOR ]						= FALSE;
 

GameSettings.h

@@ -65,11 +65,6 @@ enum
 	// arynn
 	TOPTION_TOGGLE_TURN_MODE,
 
-	// HEADROCK HAM 3.6:
-	TOPTION_STAT_PROGRESS_BARS,
-
-	
-
 	// HEADROCK HAM 4:
 	TOPTION_ALT_MAP_COLOR,
 

Strategic/mapscreen.cpp

@@ -3309,8 +3309,7 @@ void DisplayCharacterInfo( void )
 	// is displayed behind the current stat value, as see on the character's info panel.
 	// This section draws STRATEGIC info pages. Another section is in Interface Panels.cpp and draws TACTICAL info pages.
 	// The feature is toggled by Options-Menu switch, and its color is determined in the INI files.
-	if ( gGameSettings.fOptions[TOPTION_STAT_PROGRESS_BARS] )
+	{ 
-	{
 		SOLDIERTYPE *pSoldier = MercPtrs[ gCharactersList[bSelectedInfoChar].usSolID ];
 	
 		UINT8	*pDestBuf;
@@ -6244,8 +6243,7 @@ void DrawAssignment(INT16 sCharNumber, INT16 sRowIndex, INT32 iFont)
 		}
 	}
 
-	if ( gGameSettings.fOptions[TOPTION_STAT_PROGRESS_BARS] &&
+	if ( pSoldier->bAssignment >= TRAIN_SELF &&
-		pSoldier->bAssignment >= TRAIN_SELF &&
 		pSoldier->bAssignment <= TRAIN_BY_OTHER &&
 		pSoldier->bAssignment != TRAIN_TEAMMATE )
 	{

Tactical/Interface Panels.cpp

@@ -2590,7 +2590,6 @@ void RenderSMPanel( BOOLEAN *pfDirty )
 			// is displayed behind the current stat value, as see on the character's info panel.
 			// This section draws TACTICAL info pages. Another section is in mapscreen.cpp and draws STRATEGIC info pages.
 			// The feature is toggled by Options-Menu switch, and its color is determined in the INI files.
-			if ( gGameSettings.fOptions[TOPTION_STAT_PROGRESS_BARS] )
 			{
 				UINT8	*pDestBuf;
 				UINT32 uiDestPitchBYTES = 0;

Utils/_ChineseText.cpp

@@ -6538,7 +6538,6 @@ STR16		zOptionsToggleText[] =
 	L"沉默的Skyrider",	//"Silent Skyrider",
 	L"增强属性框(EDB)", //L"Enhanced Description Box",
 	L"强制回合制模式",						// add forced turn mode
-	L"属性进度条", //L"Stat Progress Bars", // Show progress towards stat increase //ham3.6
 	L"替代战略地图颜色", // Change color scheme of Strategic Map
 	L"替代子弹图像", // Show alternate bullet graphics (tracers)
 	L"佣兵外观造型", //L"Use Logical Bodytypes",

Utils/_DutchText.cpp

@@ -6526,7 +6526,6 @@ STR16		zOptionsToggleText[] =
 	L"Silent Skyrider",
 	L"Enhanced Description Box",
 	L"Forced Turn Mode",					// add forced turn mode
-	L"Stat Progress Bars",					// Show progress towards stat increase		// TODO.Translate
 	L"Alternate Strategy-Map Colors",		// Change color scheme of Strategic Map
 	L"Alternate bullet graphics",			// Show alternate bullet graphics (tracers) // TODO.Translate
 	L"Logical Bodytypes",

Utils/_EnglishText.cpp

@@ -6538,7 +6538,6 @@ STR16		zOptionsToggleText[] =
 	L"Silent Skyrider",
 	L"Enhanced Description Box",
 	L"Forced Turn Mode",					// add forced turn mode
-	L"Stat Progress Bars",					// Show progress towards stat increase
 	L"Alternate Strategy Map Colors",		// Change color scheme of Strategic Map
 	L"Alternate Bullet Graphics",			// Show alternate bullet graphics (tracers)
 	L"Logical Bodytypes",

Utils/_FrenchText.cpp

@@ -6531,7 +6531,6 @@ STR16		zOptionsToggleText[] =
 	L"Silence Skyrider !",
 	L"EDB (mod rajoutant info utiles)",
 	L"Mode tour par tour forcé",			// add forced turn mode
-	L"Afficher la progression",					// Show progress towards stat increase
 	L"Couleur alternative carte",		// Change color scheme of Strategic Map
 	L"Montrer tirs alternatifs",			// Show alternate bullet graphics (tracers)
 	L"Logical Bodytypes",

Utils/_GermanText.cpp

@@ -6397,7 +6397,6 @@ STR16 zOptionsToggleText[] =
 	L"Stummer Skyrider",
 	L"Erw. Gegenstandsinfo",
 	L"Erzwungener Runden-Modus",			// add forced turn mode
-	L"Status Trainingsfortschritt",			// Show progress towards stat increase
 	L"Alternatives Kartenfarbschema",		// Change color scheme of Strategic Map
 	L"Alternative Projektil-Grafik",			// Show alternate bullet graphics (tracers)
 	L"Logical Bodytypes",

Utils/_ItalianText.cpp

@@ -6509,7 +6509,6 @@ STR16		zOptionsToggleText[] =
 	L"Silent Skyrider",
 	L"Enhanced Description Box",
 	L"Forced Turn Mode",					// add forced turn mode
-	L"Stat Progress Bars",					// Show progress towards stat increase		// TODO.Translate
 	L"Alternate Strategy-Map Colors",		// Change color scheme of Strategic Map
 	L"Alternate bullet graphics",			// Show alternate bullet graphics (tracers) // TODO.Translate
 	L"Logical Bodytypes (WIP)",

Utils/_PolishText.cpp

@@ -6527,7 +6527,6 @@ STR16		zOptionsToggleText[] =
 	L"Cichy Skyrider",
 	L"Rozszerzone Okno Opisu (EDB)",	//Enhanced Description Box
 	L"Wymuś tryb turowy",					// add forced turn mode
-	L"Stat Progress Bars",					// Show progress towards stat increase		// TODO.Translate
 	L"Alternate Strategy-Map Colors",		// Change color scheme of Strategic Map
 	L"Alternate bullet graphics",			// Show alternate bullet graphics (tracers) // TODO.Translate
 	L"Logical Bodytypes",

Utils/_RussianText.cpp

@@ -6533,7 +6533,6 @@ STR16		zOptionsToggleText[] =
 	L"Молчаливый пилот вертолёта",
 	L"Подробное описание предметов",		//Enhanced Description Box
 	L"Только пошаговый режим",				// add forced turn mode
-	L"Подсветить навык к повышению",		//Stat Progress Bars	// Show progress towards stat increase
 	L"Новая расцветка стратег. карты",	//Alternate Strategy-Map Colors //Change color scheme of Strategic Map
 	L"Заметная летящая пуля",				// Show alternate bullet graphics (tracers)
 	L"Новая анимация экипировки",