Merge pull request #155 from gedehari/version-check-fix

Move version check screen to TitleState
FunkinCrew · Jan 15, 2021 · c3169fe · c3169fe
2 parents 8d4ff45 + 031fed6
commit c3169fe
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/source/MainMenuState.hx b/source/MainMenuState.hx
@@ -89,13 +89,6 @@ class MainMenuState extends MusicBeatState
 		versionShit.setFormat("VCR OSD Mono", 16, FlxColor.WHITE, LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK);
 		add(versionShit);
 
-		if (versionShit.text.trim() != NGio.GAME_VER.trim() && !OutdatedSubState.leftState)
-		{
-			trace('OLD VERSION!');
-
-			FlxG.switchState(new OutdatedSubState());
-		}
-
 		// NG.core.calls.event.logEvent('swag').send();
 
 		changeItem();

diff --git a/source/TitleState.hx b/source/TitleState.hx
@@ -20,9 +20,13 @@ import flixel.tweens.FlxEase;
 import flixel.tweens.FlxTween;
 import flixel.util.FlxColor;
 import flixel.util.FlxTimer;
+import io.newgrounds.NG;
+import lime.app.Application;
 import lime.utils.Assets;
 import polymod.Polymod;
 
+using StringTools;
+
 class TitleState extends MusicBeatState
 {
 	static var initialized:Bool = false;
@@ -261,7 +265,19 @@ class TitleState extends MusicBeatState
 
 			new FlxTimer().start(2, function(tmr:FlxTimer)
 			{
-				FlxG.switchState(new MainMenuState());
+				// Check if version is outdated
+
+				var version:String = "v" + Application.current.meta.get('version');
+
+				if (version.trim() != NGio.GAME_VER.trim() && !OutdatedSubState.leftState)
+				{
+					trace('OLD VERSION!');
+					FlxG.switchState(new OutdatedSubState());
+				}
+				else
+				{
+					FlxG.switchState(new MainMenuState());
+				}
 			});
 			// FlxG.sound.play('assets/music/titleShoot' + TitleState.soundExt, 0.7);
 		}