crash fix

Vortex2Oblivion · Dec 15, 2023 · 907aba1 · 907aba1
1 parent 053984c
commit 907aba1
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 3 deletions.
diff --git a/source/game/Character.hx b/source/game/Character.hx
@@ -462,6 +462,14 @@ class Character extends FlxSprite {
 		if (!animation.exists(AnimName))
 			return;
 
+
+		if (singAnimPrefix != 'sing' && AnimName.contains('sing')){
+			var anim = AnimName;
+			anim = anim.replace('sing', singAnimPrefix);
+			if (animation.getByName(anim) != null) //check if it exists so no broken anims
+				AnimName = anim;
+		}
+
 		preventDanceForAnim = false; //reset it
 
 		if(useTextureAtlas){

diff --git a/source/states/FreeplayState.hx b/source/states/FreeplayState.hx
@@ -566,7 +566,9 @@ class FreeplayState extends MusicBeatState {
 					iconArray[i].animation.curAnim.curFrame = 0;
 			}
 
-			iconArray[curSelected].alpha = 1;
+			if (curSelected >= 0 && (curSelected <= iconArray.length)){
+				iconArray[curSelected].alpha = 1;
+			}
 
 			if (iconArray[curSelected].animation.curAnim != null && !iconArray[curSelected].animatedIcon) {
 				iconArray[curSelected].animation.curAnim.curFrame = 2;

diff --git a/source/states/PlayState.hx b/source/states/PlayState.hx
@@ -2629,9 +2629,14 @@ class PlayState extends MusicBeatState {
 				if (!daNote.mustPress && daNote.strumTime <= Conductor.songPosition && daNote.shouldHit) {
 					camZooming = true;
 
+					var singAnim:String = NoteVariables.Character_Animation_Arrays[getCorrectKeyCount(false) - 1][Std.int(Math.abs(daNote.noteData))] + (characterPlayingAs == 0 ? altAnim : "") + daNote.singAnimSuffix;
+					if (daNote.singAnimPrefix != 'sing'){
+						singAnim = singAnim.replace('sing', daNote.singAnimPrefix);
+					}
+
 					if (characterPlayingAs == 0) {
 						if (dad.otherCharacters == null || dad.otherCharacters.length - 1 < daNote.character)
-							dad.playAnim(NoteVariables.Character_Animation_Arrays[SONG.keyCount - 1][Std.int(Math.abs(daNote.noteData))] + altAnim, true);
+							dad.playAnim(singAnim, true);
 						else {
 							if (daNote.characters.length <= 1)
 								dad.otherCharacters[daNote.character].playAnim(NoteVariables.Character_Animation_Arrays[SONG.keyCount - 1][Std.int(Math.abs(daNote.noteData))]
@@ -2679,7 +2684,7 @@ class PlayState extends MusicBeatState {
 						}
 					} else {
 						if (boyfriend.otherCharacters == null || boyfriend.otherCharacters.length - 1 < daNote.character)
-							boyfriend.playAnim(NoteVariables.Character_Animation_Arrays[SONG.keyCount - 1][Std.int(Math.abs(daNote.noteData))], true);
+							boyfriend.playAnim(singAnim, true);
 						else if (daNote.characters.length <= 1)
 							boyfriend.otherCharacters[daNote.character].playAnim(NoteVariables.Character_Animation_Arrays[SONG.keyCount - 1][Std.int(Math.abs(daNote.noteData))],
 								true);
@@ -4010,6 +4015,11 @@ class PlayState extends MusicBeatState {
 
 			var lua_Data:Array<Dynamic> = [note.noteData, Conductor.songPosition, note.arrow_Type, note.strumTime, note.character];
 
+			var singAnim:String = NoteVariables.Character_Animation_Arrays[getCorrectKeyCount(true) - 1][Std.int(Math.abs(note.noteData % getCorrectKeyCount(true)))] + (characterPlayingAs == 1 ? altAnim : "") + note.singAnimSuffix;
+			if (note.singAnimPrefix != 'sing'){
+				singAnim = singAnim.replace('sing', note.singAnimPrefix);
+			}
+
 			if (characterPlayingAs == 0) {
 				if (boyfriend.otherCharacters != null && !(boyfriend.otherCharacters.length - 1 < note.character))
 					if (note.characters.length <= 1)
@@ -5181,6 +5191,15 @@ class PlayState extends MusicBeatState {
 					scripts.push(noteScript);
 				}
 		}
+	function getCorrectKeyCount(player:Bool)
+	{
+		var kc = SONG.keyCount;
+		if ((player && characterPlayingAs == 0) || (characterPlayingAs == 1 && !player))
+		{
+			kc = SONG.playerKeyCount;
+		}
+		return kc;
+	}
 }
 
 enum Execute_On {