made SAX join as spectators if lobby locked

main
DodoBirb 3 years ago
parent 001747f304
commit d2b1d4e30f

@ -293,7 +293,7 @@ if instance_exists(oMapCursor)
arrY = arrMapIcon[2]
sax = arrMapIcon[3]
spectator = arrMapIcon[5]
if (global.spectator && (!global.sax))
if global.spectator
{
if (!sax)
{

@ -83,7 +83,6 @@ if (event > -1)
}
if (global.spectator && instance_exists(oCharacter) && distance_to_object(oCharacter) < 50 && room != rm_a2a03 && id != 114272 && room != rm_a4a06 && room != rm_a4a08 && room != rm_a5b02 && room != rm_a8a13)
{
greydoor = (global.saxmode && global.sax && lock == 4)
if ((!open) && (!greydoor))
if (!open)
open = 1
}

@ -2,11 +2,6 @@ if (global.lobbyLocked && global.lastroom != 2)
{
global.spectator = 1
global.spectatorIndex = -1
if global.sax
{
global.spectator = 0
global.spectatorIndex = -1
}
global.mosaic = 0
}
global.beingAbsorbed = 0

@ -389,28 +389,6 @@ if (global.classicmode == 0 && global.opshowhud)
scaleMult = (global.pbombCooldown / 600)
draw_sprite_ext(sPBombCooldownFull, 0, (xoff + 2), 17, scaleMult, 1, 0, c_white, 1)
}
if (instance_exists(oClient) && (!global.saxmode))
{
if oClient.connected
{
if (ds_list_size(global.idList) > 1 && ds_list_size(global.idList) <= 6)
{
for (f = 0; f < ds_list_size(global.idList); f++)
{
arrList = ds_list_find_value(global.idList, f)
ID = arrList[0, 0]
_x = (10 * floor((f / 2)))
_y = (10 * (f % 2))
if (ID == global.clientID)
draw_sprite(oControl.MultitroidIcon, (ID - 1), ((240 - _x) + widescreen_space), (5 + _y))
else
draw_sprite(oControl.MultitroidIconDark, (ID - 1), ((240 - _x) + widescreen_space), (5 + _y))
}
}
else if (ds_list_size(global.idList) == 1 || ds_list_size(global.idList) == 0)
draw_sprite(oControl.MultitroidIcon, clamp((global.clientID - 1), 0, 8), (240 + widescreen_space), 5)
}
}
if (global.ophudshowmap && global.ophudshowmetrcount)
{
draw_background(bgGUIMap, (250 + widescreen_space), 0)
@ -538,7 +516,7 @@ if (global.classicmode == 0 && global.opshowhud)
spectator = arrData[5]
playerState = arrData[6]
combatState = arrData[7]
if (global.spectator && (!global.sax))
if global.spectator
{
if (!sax)
{

Loading…
Cancel
Save