From df417f40d1edb942e870cad8f3abbc30ede08802 Mon Sep 17 00:00:00 2001 From: DodoBirb Date: Wed, 8 Jun 2022 15:19:56 +1000 Subject: [PATCH] Fixed crash on start --- .../gml_Object_oMultiHitbox_Step_0.gml | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/Export_Code/gml_Object_oMultiHitbox_Step_0.gml b/Export_Code/gml_Object_oMultiHitbox_Step_0.gml index 215e69c..09b7715 100644 --- a/Export_Code/gml_Object_oMultiHitbox_Step_0.gml +++ b/Export_Code/gml_Object_oMultiHitbox_Step_0.gml @@ -31,35 +31,35 @@ if instance_exists(oClient) y = arrY sax = arrSAX spectator = arrDraw[26] - } - mask_index = sMask1 - if (arrState == DUCKING) - mask_index = sMask3 - if (arrState == BALL || arrState == AIRBALL || arrState == SPIDERBALL || arrState == WATERJET) - mask_index = sMask4 - if (arrSJBall == 1 && (arrState == SUPERJUMP || arrState == SJSTART || arrState == SJEND || arrState == BRAKING)) - 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) - PlayFootstepSAX(get_floor_material()) - if (arrSprite == 1915) - { - if (place_meeting(x, y, oCharacter) && arrInvincible == 0 && (!global.spectator)) + mask_index = sMask1 + if (arrState == DUCKING) + mask_index = sMask3 + if (arrState == BALL || arrState == AIRBALL || arrState == SPIDERBALL || arrState == WATERJET) + mask_index = sMask4 + if (arrSJBall == 1 && (arrState == SUPERJUMP || arrState == SJSTART || arrState == SJEND || arrState == BRAKING)) + 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) + PlayFootstepSAX(get_floor_material()) + if (arrSprite == 1915) { - if (!absorb) + if (place_meeting(x, y, oCharacter) && arrInvincible == 0 && (!global.spectator)) { - PlaySoundMono(sndAbsorbX) - with (instance_create(oCharacter.x, (oCharacter.y - (oCharacter.sprite_height / 2)), oAbsorbX)) - core = 1 - relativeX = (x - oCharacter.x) - relativeY = (y - (oCharacter.y - (oCharacter.sprite_height / 2))) - screwattackpickupfx = oCharacter.fxtimer - absorb = 1 - global.otherAbsorbID = myid - global.otherAbsorbRelativeX = oCharacter.x - global.otherAbsorbRelativeY = oCharacter.y - global.otherAbsorbSpriteHeight = (oCharacter.sprite_height / 2) - with (oClient) - event_user(4) + if (!absorb) + { + PlaySoundMono(sndAbsorbX) + with (instance_create(oCharacter.x, (oCharacter.y - (oCharacter.sprite_height / 2)), oAbsorbX)) + core = 1 + relativeX = (x - oCharacter.x) + relativeY = (y - (oCharacter.y - (oCharacter.sprite_height / 2))) + screwattackpickupfx = oCharacter.fxtimer + absorb = 1 + global.otherAbsorbID = myid + global.otherAbsorbRelativeX = oCharacter.x + global.otherAbsorbRelativeY = oCharacter.y + global.otherAbsorbSpriteHeight = (oCharacter.sprite_height / 2) + with (oClient) + event_user(4) + } } } }