Merge pull request #15332 from LarryFrosty/cameraFromString

allow cameraFromString to use custom cameras
ShadowMario · Aug 17, 2024 · 16e32ab · 16e32ab
2 parents 71284db + dc5fa4b
commit 16e32ab
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/source/psychlua/LuaUtils.hx b/source/psychlua/LuaUtils.hx
@@ -496,9 +496,12 @@ class LuaUtils
 
 	public static function cameraFromString(cam:String):FlxCamera {
 		switch(cam.toLowerCase()) {
+			case 'camgame' | 'game': return PlayState.instance.camGame;
 			case 'camhud' | 'hud': return PlayState.instance.camHUD;
 			case 'camother' | 'other': return PlayState.instance.camOther;
 		}
-		return PlayState.instance.camGame;
+		var camera:FlxCamera = MusicBeatState.getVariables().get(cam);
+		if (camera == null || !Std.isOfType(camera, FlxCamera)) camera = PlayState.instance.camGame;
+		return camera;
 	}
 }