diff --git a/objects/oBlobThrowerLand.object.gmx b/objects/oBlobThrowerLand.object.gmx index 3dcd816..d47ee30 100644 --- a/objects/oBlobThrowerLand.object.gmx +++ b/objects/oBlobThrowerLand.object.gmx @@ -71,7 +71,7 @@ vulnerable = 0; var inst = instance_place(x, y, oBeam); if(inst != noone) { - if(inst.ibeam) exit + if(inst.ibeam) exit; } repeat (2) { diff --git a/objects/oIntroController.object.gmx b/objects/oIntroController.object.gmx index c188ed6..5726fe8 100644 --- a/objects/oIntroController.object.gmx +++ b/objects/oIntroController.object.gmx @@ -28,7 +28,7 @@ alarm[0] = 180; txt = get_text("Title", "ControllerRecommended"); // If on Linux, quickly toggle fullscreen to get rid of GM:S mess. Seemed to be the best place to do that. -if (os_type == os_linux && global.opfullscreen) { +if (os_type == os_linux && global.opfullscreen) { window_set_fullscreen(false); window_set_fullscreen(true); } diff --git a/scripts/draw_character.gml b/scripts/draw_character.gml index 6d8bb25..addd613 100644 --- a/scripts/draw_character.gml +++ b/scripts/draw_character.gml @@ -1,20 +1,22 @@ /// draw_character(sprite, x, y, sprite2, s2ox, s2oy, sprite3, s3ox, s3oy, s3angle, facing, color, alpha, s3show) -if ((oControl.mod_fusion) && (!oControl.msr_fusionsuit)) { // Fusion suit - if (global.currentsuit == 0) { // Power - pal_swap_set(sPalFusion0, 1, false); - } else if (global.currentsuit == 1) { // Varia - pal_swap_set(sPalFusion1, 1, false); - } else if (global.currentsuit == 2) { // Gravity - pal_swap_set(sPalFusion2, 1, false); - } -} else if (os_type != os_android) { // Custom color swaps - if (global.currentsuit == 0) { // Power - pal_swap_set(oControl.PowerPalette, 1, false); - } else if (global.currentsuit == 1) { // Varia - pal_swap_set(oControl.VariaPalette, 1, false); - } else if (global.currentsuit == 2) { // Gravity - pal_swap_set(oControl.GravityPalette, 1, false); +if (!oControl.msr_fusionsuit) { + if ((oControl.mod_fusion)) { // Fusion suit + if (global.currentsuit == 0) { // Power + pal_swap_set(sPalFusion0, 1, false); + } else if (global.currentsuit == 1) { // Varia + pal_swap_set(sPalFusion1, 1, false); + } else if (global.currentsuit == 2) { // Gravity + pal_swap_set(sPalFusion2, 1, false); + } + } else if (os_type != os_android) { // Custom color swaps + if (global.currentsuit == 0 && oControl.PowerPalette != -1) { // Power + pal_swap_set(oControl.PowerPalette, 1, false); + } else if (global.currentsuit == 1 && oControl.VariaPalette != -1) { // Varia + pal_swap_set(oControl.VariaPalette, 1, false); + } else if (global.currentsuit == 2 && oControl.GravityPalette != -1) { // Gravity + pal_swap_set(oControl.GravityPalette, 1, false); + } } }