Fixed crash on start

pull/9/head
DodoBirb 4 years ago
parent 71f9e8aadc
commit df417f40d1

@ -31,35 +31,35 @@ if instance_exists(oClient)
y = arrY y = arrY
sax = arrSAX sax = arrSAX
spectator = arrDraw[26] spectator = arrDraw[26]
} mask_index = sMask1
mask_index = sMask1 if (arrState == DUCKING)
if (arrState == DUCKING) mask_index = sMask3
mask_index = sMask3 if (arrState == BALL || arrState == AIRBALL || arrState == SPIDERBALL || arrState == WATERJET)
if (arrState == BALL || arrState == AIRBALL || arrState == SPIDERBALL || arrState == WATERJET) mask_index = sMask4
mask_index = sMask4 if (arrSJBall == 1 && (arrState == SUPERJUMP || arrState == SJSTART || arrState == SJEND || arrState == BRAKING))
if (arrSJBall == 1 && (arrState == SUPERJUMP || arrState == SJSTART || arrState == SJEND || arrState == BRAKING)) mask_index = sMask4
mask_index = sMask4 if (instance_exists(oCharacter) && distance_to_object(oCharacter) <= 500 && arrState == RUNNING && ((abs(arrImage) >= 4 && abs(arrImage) < 4.9) || (abs(arrImage) >= 9 && abs(arrImage) < 9.9)) && arrSAX)
if (instance_exists(oCharacter) && distance_to_object(oCharacter) <= 500 && arrState == RUNNING && ((abs(arrImage) >= 4 && abs(arrImage) < 4.9) || (abs(arrImage) >= 9 && abs(arrImage) < 9.9)) && arrSAX) PlayFootstepSAX(get_floor_material())
PlayFootstepSAX(get_floor_material()) if (arrSprite == 1915)
if (arrSprite == 1915)
{
if (place_meeting(x, y, oCharacter) && arrInvincible == 0 && (!global.spectator))
{ {
if (!absorb) if (place_meeting(x, y, oCharacter) && arrInvincible == 0 && (!global.spectator))
{ {
PlaySoundMono(sndAbsorbX) if (!absorb)
with (instance_create(oCharacter.x, (oCharacter.y - (oCharacter.sprite_height / 2)), oAbsorbX)) {
core = 1 PlaySoundMono(sndAbsorbX)
relativeX = (x - oCharacter.x) with (instance_create(oCharacter.x, (oCharacter.y - (oCharacter.sprite_height / 2)), oAbsorbX))
relativeY = (y - (oCharacter.y - (oCharacter.sprite_height / 2))) core = 1
screwattackpickupfx = oCharacter.fxtimer relativeX = (x - oCharacter.x)
absorb = 1 relativeY = (y - (oCharacter.y - (oCharacter.sprite_height / 2)))
global.otherAbsorbID = myid screwattackpickupfx = oCharacter.fxtimer
global.otherAbsorbRelativeX = oCharacter.x absorb = 1
global.otherAbsorbRelativeY = oCharacter.y global.otherAbsorbID = myid
global.otherAbsorbSpriteHeight = (oCharacter.sprite_height / 2) global.otherAbsorbRelativeX = oCharacter.x
with (oClient) global.otherAbsorbRelativeY = oCharacter.y
event_user(4) global.otherAbsorbSpriteHeight = (oCharacter.sprite_height / 2)
with (oClient)
event_user(4)
}
} }
} }
} }

Loading…
Cancel
Save