Disabled G-LOC text when stock G limits are enabled

SerTheGreat · Jan 18, 2017 · b90696a · b90696a
1 parent 4100090
commit b90696a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/G-Effects/G-Effects.cs b/G-Effects/G-Effects.cs
@@ -361,7 +361,8 @@ void loseConsciousness(ProtoCrewMember crewMember, KerbalGState kerbalGData, boo
 				kerbalGData.gLocFadeAmount = G_Effects.MAX_GLOC_FADE;
 				if (isCommander) {
 					GEffectsAudio.prepareAudioSources(FindObjectsOfType(typeof(AudioSource)) as AudioSource[]); //a barbarian way to prevent audiosources from being immune to G-LOC mute
-					if (outputAllowed && (conf.gLocScreenWarning != null) && (conf.gLocScreenWarning.Length > 0) ) {
+					if (outputAllowed && (conf.gLocScreenWarning != null) && (conf.gLocScreenWarning.Length > 0) &&
+					   !HighLogic.CurrentGame.Parameters.CustomParams<GameParameters.AdvancedParams>().GKerbalLimits) {
 						ScreenMessages.PostScreenMessage(conf.gLocScreenWarning);
 					}
 					Vessel vessel = crewMember.KerbalRef.InVessel;

diff --git a/GameData/G-Effects/Plugins/G-Effects.dll b/GameData/G-Effects/Plugins/G-Effects.dll