Fix two crashes from previous fixes, fixes #85

main
Lojemiru 5 years ago
parent 2eb85507dd
commit 178a2da60f

@ -71,7 +71,7 @@ vulnerable = 0;
var inst = instance_place(x, y, oBeam); var inst = instance_place(x, y, oBeam);
if(inst != noone) { if(inst != noone) {
if(inst.ibeam) exit if(inst.ibeam) exit;
} }
repeat (2) { repeat (2) {

@ -28,7 +28,7 @@
<string>alarm[0] = 180; <string>alarm[0] = 180;
txt = get_text("Title", "ControllerRecommended"); 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 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 &amp;&amp; global.opfullscreen) {
window_set_fullscreen(false); window_set_fullscreen(false);
window_set_fullscreen(true); window_set_fullscreen(true);
} }

@ -1,6 +1,7 @@
/// draw_character(sprite, x, y, sprite2, s2ox, s2oy, sprite3, s3ox, s3oy, s3angle, facing, color, alpha, s3show) /// 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 (!oControl.msr_fusionsuit) {
if ((oControl.mod_fusion)) { // Fusion suit
if (global.currentsuit == 0) { // Power if (global.currentsuit == 0) { // Power
pal_swap_set(sPalFusion0, 1, false); pal_swap_set(sPalFusion0, 1, false);
} else if (global.currentsuit == 1) { // Varia } else if (global.currentsuit == 1) { // Varia
@ -8,14 +9,15 @@ if ((oControl.mod_fusion) && (!oControl.msr_fusionsuit)) { // Fusion suit
} else if (global.currentsuit == 2) { // Gravity } else if (global.currentsuit == 2) { // Gravity
pal_swap_set(sPalFusion2, 1, false); pal_swap_set(sPalFusion2, 1, false);
} }
} else if (os_type != os_android) { // Custom color swaps } else if (os_type != os_android) { // Custom color swaps
if (global.currentsuit == 0) { // Power if (global.currentsuit == 0 && oControl.PowerPalette != -1) { // Power
pal_swap_set(oControl.PowerPalette, 1, false); pal_swap_set(oControl.PowerPalette, 1, false);
} else if (global.currentsuit == 1) { // Varia } else if (global.currentsuit == 1 && oControl.VariaPalette != -1) { // Varia
pal_swap_set(oControl.VariaPalette, 1, false); pal_swap_set(oControl.VariaPalette, 1, false);
} else if (global.currentsuit == 2) { // Gravity } else if (global.currentsuit == 2 && oControl.GravityPalette != -1) { // Gravity
pal_swap_set(oControl.GravityPalette, 1, false); pal_swap_set(oControl.GravityPalette, 1, false);
} }
}
} }
draw_sprite_ext(argument0, argument14, argument1, argument2, argument10, 1, 0, argument11, argument12); draw_sprite_ext(argument0, argument14, argument1, argument2, argument10, 1, 0, argument11, argument12);

Loading…
Cancel
Save