Made SC not disable radar, fixed Supers not unfreezing

pull/9/head
DodoBirb 4 years ago
parent 9b65a1f9e1
commit a059cddd60

@ -18,8 +18,11 @@ if (invincible == 0)
event_user(0)
exit
}
if (otherOBJ == 440 && global.playerFreeze > 0 && global.playerFreeze <= 151 && (!global.frozenByRollback) && (!other.icemissiles))
global.playerFreeze = 1
if (otherOBJ == 440 && global.playerFreeze > 0 && global.playerFreeze <= 151 && (!global.frozenByRollback))
{
if ((!other.icemissiles) || other.smissile)
global.playerFreeze = 1
}
if global.frozenByRollback
show_debug_message("rollback freeze")
if (global.playerFreeze == 0 && (!global.frozenByRollback))

@ -1,10 +1,5 @@
if (global.saxmode && global.enemyNearby)
exit
if instance_exists(oCharacter)
{
if (oCharacter.state == 27 && global.saxmode)
exit
}
if (global.ingame == 1 && global.enablecontrol == 1 && room != rm_transition && ((!keyboard_check(vk_alt)) || os_type == os_linux))
{
event_user(3)

@ -514,8 +514,6 @@ if (global.classicmode == 0 && global.opshowhud)
}
}
}
if (oCharacter.sball == 1)
global.scannerSprite = 1883
if global.ophudshowmetrcount
{
if (global.saxmode && global.sax)
@ -565,7 +563,7 @@ if (global.classicmode == 0 && global.opshowhud)
else if (abs(xDiff) <= 2 && abs(yDiff) <= 1)
draw_sprite_ext(sMultitroidMapIconMiepee, 0, (((276 + widescreen_space) + 16) - (xDiff * 8)), (12 - (yDiff * 8)), 1, 1, direction, c_white, oControl.malpha)
}
else if (abs(xDiff) <= 2 && abs(yDiff) <= 1 && oCharacter.sball != 1)
else if (abs(xDiff) <= 2 && abs(yDiff) <= 1)
{
if ((!spectator) || sax)
{

Loading…
Cancel
Save