Ported over Bugfixes from SAX

main
DodoBirb 4 years ago
parent 245202f7b0
commit 03753a0313

@ -1,6 +1,6 @@
if oControl.widescreen
{
if (x < (-(oControl.widescreen_space / 2)) || x > (room_width + (oControl.widescreen_space / 2)))
if (x < (-((oControl.widescreen_space / 2))) || x > (room_width + (oControl.widescreen_space / 2)))
instance_destroy()
}
else

@ -21,10 +21,10 @@ if (frozen == 0)
{
if (facing == 1)
{
if (!collision_line((x - 8), (y + 12), (x + 8), (y + 12), oSolid, true, true))
if (!(collision_line((x - 8), (y + 12), (x + 8), (y + 12), oSolid, true, true)))
direction = 270
}
else if (!collision_line((x - 8), (y - 12), (x + 8), (y - 12), oSolid, true, true))
else if (!(collision_line((x - 8), (y - 12), (x + 8), (y - 12), oSolid, true, true)))
direction = 90
}
}
@ -43,10 +43,10 @@ if (frozen == 0)
{
if (facing == 1)
{
if (!collision_line((x + 12), (y - 8), (x + 12), (y + 8), oSolid, true, true))
if (!(collision_line((x + 12), (y - 8), (x + 12), (y + 8), oSolid, true, true)))
direction = 0
}
else if (!collision_line((x - 12), (y - 8), (x - 12), (y + 8), oSolid, true, true))
else if (!(collision_line((x - 12), (y - 8), (x - 12), (y + 8), oSolid, true, true)))
direction = 180
}
}
@ -65,10 +65,10 @@ if (frozen == 0)
{
if (facing == 1)
{
if (!collision_line((x - 8), (y - 12), (x + 8), (y - 12), oSolid, true, true))
if (!(collision_line((x - 8), (y - 12), (x + 8), (y - 12), oSolid, true, true)))
direction = 90
}
else if (!collision_line((x - 8), (y + 12), (x + 8), (y + 12), oSolid, true, true))
else if (!(collision_line((x - 8), (y + 12), (x + 8), (y + 12), oSolid, true, true)))
direction = 270
}
}
@ -87,14 +87,14 @@ if (frozen == 0)
{
if (facing == 1)
{
if (!collision_line((x - 12), (y - 8), (x - 12), (y + 8), oSolid, true, true))
if (!(collision_line((x - 12), (y - 8), (x - 12), (y + 8), oSolid, true, true)))
direction = 180
}
else if (!collision_line((x + 12), (y - 8), (x + 12), (y + 8), oSolid, true, true))
else if (!(collision_line((x + 12), (y - 8), (x + 12), (y + 8), oSolid, true, true)))
direction = 0
}
}
if (turnedges && (!collision_rectangle((x - 12), (y - 12), (x + 12), (y + 12), oSolid, 1, 1)))
if (turnedges && (!(collision_rectangle((x - 12), (y - 12), (x + 12), (y + 12), oSolid, 1, 1))))
turnedges = 0
if (facing != 1)
image_xscale = -1

@ -1,6 +1,6 @@
if (!instance_exists(oBoss1Head))
return 0;
image_speed = (-(oBoss1Head.hspeed / 4))
image_speed = (-((oBoss1Head.hspeed / 4)))
if (image_index > 4)
image_index -= 4
if (image_index < 0)

@ -1,7 +1,5 @@
if (other.sax != global.sax && state != IDLE && state != SAVING && state != SAVINGFX && state != SAVINGSHIPFX && state != SAVINGSHIP && state != ELEVATOR && state != GFELEVATOR)
{
if (global.playerFreeze > 0)
other.damage /= 2
event_user(2)
if (!global.spectator)
global.showHealthIndicatorsTimer = 900

@ -7,7 +7,7 @@ if (invincible == 0)
damageDir = -1
knockbackY = -3
combo = 0
if ((!(global.item[5] && global.currentsuit == 2)) && other.ibeam && otherOBJ == 439)
if ((!((global.item[5] && global.currentsuit == 2))) && other.ibeam && otherOBJ == 439)
other.damage *= 0.8
global.multiDamageCollision = 1
if (other.direction > 90 && other.direction < 270)
@ -24,9 +24,9 @@ if (invincible == 0)
show_debug_message("rollback freeze")
if (global.playerFreeze == 0 && (!global.frozenByRollback))
{
if (otherOBJ == 439 && other.ibeam && (!(global.currentsuit == 2 && global.item[5] == 1)) && global.playerFreeze == 0 && invincible == 0 && canbehit && state != IDLE && state != SAVING && state != SAVINGFX && state != SAVINGSHIPFX && state != SAVINGSHIP && state != ELEVATOR && state != GFELEVATOR)
if (otherOBJ == 439 && other.ibeam && (!((global.currentsuit == 2 && global.item[5] == 1))) && global.playerFreeze == 0 && invincible == 0 && canbehit && state != IDLE && state != SAVING && state != SAVINGFX && state != SAVINGSHIPFX && state != SAVINGSHIP && state != ELEVATOR && state != GFELEVATOR)
{
global.playerFreeze = 156
global.playerFreeze = 120
damageDir = 0
knockbackY = 0
global.frozenNormally = 1
@ -38,9 +38,9 @@ if (invincible == 0)
kDown = 0
}
}
if (otherOBJ == 440 && other.icemissiles && (!other.smissile) && (!(global.currentsuit == 2 && global.item[5] == 1)) && global.playerFreeze == 0 && invincible == 0 && canbehit && state != IDLE && state != SAVING && state != SAVINGFX && state != SAVINGSHIPFX && state != SAVINGSHIP && state != ELEVATOR && state != GFELEVATOR)
if (otherOBJ == 440 && other.icemissiles && (!other.smissile) && (!((global.currentsuit == 2 && global.item[5] == 1))) && global.playerFreeze == 0 && invincible == 0 && canbehit && state != IDLE && state != SAVING && state != SAVINGFX && state != SAVINGSHIPFX && state != SAVINGSHIP && state != ELEVATOR && state != GFELEVATOR)
{
global.playerFreeze = 156
global.playerFreeze = 120
damageDir = 0
knockbackY = 0
global.frozenNormally = 1

@ -386,9 +386,9 @@ switch type_event
show_debug_message("normal freeze")
if (checkFreeze && global.playerFreeze == 0 && (!global.frozenNormally))
{
if (checkBeam && (!(global.currentsuit == 2 && global.item[5] == 1)) && global.playerFreeze == 0 && invincible == 0 && canbehit && state != IDLE && state != SAVING && state != SAVINGFX && state != SAVINGSHIPFX && state != SAVINGSHIP && state != ELEVATOR && state != GFELEVATOR)
if (checkBeam && (!((global.currentsuit == 2 && global.item[5] == 1))) && global.playerFreeze == 0 && invincible == 0 && canbehit && state != IDLE && state != SAVING && state != SAVINGFX && state != SAVINGSHIPFX && state != SAVINGSHIP && state != ELEVATOR && state != GFELEVATOR)
{
global.playerFreeze = 156
global.playerFreeze = 120
damageDir = 0
knockbackY = 0
global.frozenByRollback = 1
@ -400,9 +400,9 @@ switch type_event
kDown = 0
}
}
if (checkMissile && (checkDamage == 10 || checkDamage == 20) && (!(global.currentsuit == 2 && global.item[5] == 1)) && global.playerFreeze == 0 && invincible == 0 && canbehit && state != IDLE && state != SAVING && state != SAVINGFX && state != SAVINGSHIPFX && state != SAVINGSHIP && state != ELEVATOR && state != GFELEVATOR)
if (checkMissile && (checkDamage == 10 || checkDamage == 20) && (!((global.currentsuit == 2 && global.item[5] == 1))) && global.playerFreeze == 0 && invincible == 0 && canbehit && state != IDLE && state != SAVING && state != SAVINGFX && state != SAVINGSHIPFX && state != SAVINGSHIP && state != ELEVATOR && state != GFELEVATOR)
{
global.playerFreeze = 156
global.playerFreeze = 120
damageDir = 0
knockbackY = 0
global.frozenByRollback = 1

@ -1,4 +1,4 @@
var size, type, alignment, sax, bufferSize, result, i, arr, ID, findID, h, arrList, arrID, arrX, arrY, arrName, findHatchlingID, hatchling, lowestPosX, lowestPosY, enemyCount, arrData, xDiff, yDiff, spectator, playerInBossRoom, arrMapIcon, playerRoom;
var size, type, alignment, sax, bufferSize, result, i, arr, ID, findID, h, arrList, arrID, arrX, arrY, arrName, findHatchlingID, hatchling, lowestPosX, lowestPosY, enemyCount, arrData, xDiff, yDiff, spectator, playerInBossRoom, arrMapIcon, playerRoom, dist, lowestDist;
if (!connected)
{
if (isConnected >= 0)
@ -719,8 +719,7 @@ if (oControl.mod_monstersextremecheck != elm)
oControl.mod_monstersextremecheck = elm
if (((!global.ingame) || (!global.opshowhud)) && instance_exists(oClient))
{
lowestPosX = 1000
lowestPosY = 1000
lowestDist = 1000
enemyCount = 0
for (i = 0; i < ds_list_size(oClient.posData); i++)
{
@ -730,21 +729,16 @@ if (((!global.ingame) || (!global.opshowhud)) && instance_exists(oClient))
yDiff = (oClient.posY - arrData[2])
sax = arrData[3]
spectator = arrData[5]
if ((abs(xDiff) < lowestPosX || abs(yDiff) < lowestPosY) && sax != global.sax && ID != global.clientID)
dist = max(abs(xDiff), abs(yDiff))
if (sax != global.sax && ID != global.clientID)
{
if spectator
{
if sax
{
lowestPosX = abs(xDiff)
lowestPosY = abs(yDiff)
}
lowestDist = min(lowestDist, dist)
}
else
{
lowestPosX = abs(xDiff)
lowestPosY = abs(yDiff)
}
lowestDist = min(lowestDist, dist)
}
if (sax != global.sax)
enemyCount++
@ -757,36 +751,36 @@ if (((!global.ingame) || (!global.opshowhud)) && instance_exists(oClient))
}
if (enemyCount > 0)
{
if (abs(lowestPosX) > 5 || abs(lowestPosY) > 5)
if (lowestDist > 5)
global.inMusSAXRange = 0
if (abs(lowestPosX) <= 5 && abs(lowestPosY) <= 5)
if (lowestDist <= 5)
global.inMusSAXRange = 1
if (abs(lowestPosX) > 4 || abs(lowestPosY) > 4)
if (lowestDist > 4)
{
global.enemyNearby = 0
global.scannerSprite = 1883
}
if (abs(lowestPosX) <= 4 && abs(lowestPosY) <= 4)
if (lowestDist <= 4)
{
global.enemyNearby = 0
global.scannerSpeedMax = 5
global.scannerSprite = 1882
}
if (abs(lowestPosX) <= 3 && abs(lowestPosY) <= 3)
if (lowestDist <= 3)
global.enemyNearby = 1
if (abs(lowestPosX) <= 2 && abs(lowestPosY) <= 2)
if (lowestDist <= 2)
{
global.enemyNearby = 1
global.scannerSpeedMax = 4
global.scannerSprite = 1881
}
if (abs(lowestPosX) <= 1 && abs(lowestPosY) <= 1)
if (lowestDist <= 1)
{
global.enemyNearby = 1
global.scannerSpeedMax = 3
global.scannerSprite = 1880
}
if (abs(lowestPosX) == 0 && abs(lowestPosY) == 0)
if (lowestDist == 0)
{
global.enemyNearby = 1
global.scannerSpeedMax = 2

File diff suppressed because one or more lines are too long

@ -1,5 +1,5 @@
if (widescreen && (room == rm_options || room == rm_controller))
{
draw_rectangle_colour(0, 0, (-(ceil((widescreen_space / 2)) + 1)), room_height, c_black, c_black, c_black, c_black, 0)
draw_rectangle_colour(0, 0, (-((ceil((widescreen_space / 2)) + 1))), room_height, c_black, c_black, c_black, c_black, 0)
draw_rectangle_colour(room_width, 0, (room_width + (ceil((widescreen_space / 2)) + 1)), room_height, c_black, c_black, c_black, c_black, 0)
}

@ -1,10 +1,10 @@
if (!directory_exists((working_directory + "snap")))
if (!(directory_exists((working_directory + "snap"))))
directory_create((working_directory + "snap"))
i = -1
do
{
i += 1
} until ((!file_exists((((working_directory + "snap/snap 0") + string(i)) + ".png"))) && (!file_exists((((working_directory + "snap/snap 00") + string(i)) + ".png"))) && (!file_exists((((working_directory + "snap/snap 000") + string(i)) + ".png"))));
} until ((!(file_exists((((working_directory + "snap/snap 0") + string(i)) + ".png")))) && (!(file_exists((((working_directory + "snap/snap 00") + string(i)) + ".png")))) && (!(file_exists((((working_directory + "snap/snap 000") + string(i)) + ".png")))));
sname = ((working_directory + "snap/snap ") + string(i))
if (i < 1000)
sname = ((working_directory + "snap/snap 0") + string(i))

@ -14,7 +14,7 @@ else
}
if (place_meeting(x, (y - 1), oCharacter) && oCharacter.state != oCharacter.JUMPING)
{
if (!place_meeting(x, (y + 1), oSolid))
if (!(place_meeting(x, (y + 1), oSolid)))
{
if (lift <= 0)
{
@ -48,7 +48,7 @@ else
{
if (y > ystart)
{
yVel = (-min((abs((y - ystart)) / 15), max_up_speed))
yVel = (-(min((abs((y - ystart)) / 15), max_up_speed)))
timer = 0
grounded = 0
}

@ -1,2 +1,2 @@
if (!((!other.smissile) && global.icemissiles))
if (!(((!other.smissile) && global.icemissiles)))
event_user(0)

@ -1,4 +1,4 @@
if (canbehit && (!((!other.smissile) && global.icemissiles)))
if (canbehit && (!(((!other.smissile) && global.icemissiles))))
{
if (stun == 0 && hitmissileexpl)
event_user(0)

@ -105,6 +105,7 @@ else if (followplayer && myid != 0)
{
if (ds_list_size(oClient.roomListData) > 0)
{
instance_destroy()
for (h = 0; h < ds_list_size(oClient.roomListData); h++)
{
arrList = ds_list_find_value(oClient.roomListData, h)

@ -2,7 +2,7 @@ event_inherited()
global.SuitChange = 1
if collision_line((x + 8), (y - 8), (x + 8), (y - 32), oSolid, false, true)
global.SuitChange = 0
if (!collision_point((x + 8), (y + 8), oSolid, 0, 1))
if (!(collision_point((x + 8), (y + 8), oSolid, 0, 1)))
global.SuitChange = 0
global.SuitChangeX = x
global.SuitChangeY = y

@ -2,7 +2,7 @@ event_inherited()
global.SuitChange = 1
if collision_line((x + 8), (y - 8), (x + 8), (y - 32), oSolid, false, true)
global.SuitChange = 0
if (!collision_point((x + 8), (y + 8), oSolid, 0, 1))
if (!(collision_point((x + 8), (y + 8), oSolid, 0, 1)))
global.SuitChange = 0
global.SuitChangeX = x
global.SuitChangeY = y

@ -2,7 +2,7 @@ if (state == 3)
{
if oControl.widescreen
{
if (x < (-(oControl.widescreen_space / 2)) || x > (room_width + (oControl.widescreen_space / 2)))
if (x < (-((oControl.widescreen_space / 2))) || x > (room_width + (oControl.widescreen_space / 2)))
instance_destroy()
}
else

@ -4,7 +4,7 @@ i = -1
do
{
i += 1
} until ((!file_exists((((working_directory + "/scrmap/scrmap 0") + string(i)) + ".png"))) && (!file_exists((((working_directory + "/scrmap/scrmap 00") + string(i)) + ".png"))) && (!file_exists((((working_directory + "/scrmap/scrmap 000") + string(i)) + ".png"))));
} until ((!(file_exists((((working_directory + "/scrmap/scrmap 0") + string(i)) + ".png")))) && (!(file_exists((((working_directory + "/scrmap/scrmap 00") + string(i)) + ".png")))) && (!(file_exists((((working_directory + "/scrmap/scrmap 000") + string(i)) + ".png")))));
sname = ("scrmap/scrmap " + string(i))
if (i < 1000)
sname = ("scrmap/scrmap 0" + string(i))

@ -6,55 +6,60 @@ if instance_exists(oClient)
{
if (ds_list_size(oClient.roomListData) > 0)
{
if (ds_list_find_index(oClient.roomList, myid) < 0)
{
ds_list_delete(global.hitboxList, findID)
instance_destroy()
}
for (i = 0; i < ds_list_size(oClient.roomListData); i++)
{
arrDraw = ds_list_find_value(oClient.roomListData, i)
arrID = arrDraw[0]
arrX = arrDraw[1]
arrY = arrDraw[2]
arrSprite = arrDraw[3]
arrImage = arrDraw[4]
arrState = arrDraw[19]
arrSAX = arrDraw[20]
arrSJBall = arrDraw[22]
arrInvincible = arrDraw[27]
if (arrID == myid)
{
arrX = arrDraw[1]
arrY = arrDraw[2]
arrSprite = arrDraw[3]
arrImage = arrDraw[4]
arrState = arrDraw[19]
arrSAX = arrDraw[20]
arrSJBall = arrDraw[22]
arrInvincible = arrDraw[27]
if (!absorb)
x = arrX
if (!absorb)
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 && global.saxmode)
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 && global.saxmode)
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)
}
}
}
}

@ -1,4 +1,4 @@
if (!(oCharacter.state == oCharacter.GRABBEDQUEENBELLY && instance_exists(oPBomb)))
if (!((oCharacter.state == oCharacter.GRABBEDQUEENBELLY && instance_exists(oPBomb))))
myhealth -= dmg
flashing = flashtime
if (myhealth <= 0 && state != 100 && state != 50)

@ -4,7 +4,7 @@ i = -1
do
{
i += 1
} until ((!file_exists((((working_directory + "/vidframes/frame 0") + string(i)) + ".png"))) && (!file_exists((((working_directory + "/vidframes/frame 00") + string(i)) + ".png"))) && (!file_exists((((working_directory + "/vidframes/frame 000") + string(i)) + ".png"))));
} until ((!(file_exists((((working_directory + "/vidframes/frame 0") + string(i)) + ".png")))) && (!(file_exists((((working_directory + "/vidframes/frame 00") + string(i)) + ".png")))) && (!(file_exists((((working_directory + "/vidframes/frame 000") + string(i)) + ".png")))));
sname = ("vidframes/frame " + string(i))
if (i < 1000)
sname = ("vidframes/frame 0" + string(i))

@ -9,18 +9,23 @@ if (myid != 0)
{
if (ds_list_size(oClient.roomListData) > 0)
{
if (ds_list_find_index(oClient.roomList, myid) < 0)
{
ds_list_delete(global.screwList, findID)
instance_destroy()
}
for (i = 0; i < ds_list_size(oClient.roomListData); i++)
{
arrDraw = ds_list_find_value(oClient.roomListData, i)
arrID = arrDraw[0]
arrX = arrDraw[1]
arrY = arrDraw[2]
arrSprite = arrDraw[3]
mirror = arrDraw[12]
arrRoom = arrDraw[14]
arrState = arrDraw[19]
if (arrID == myid)
{
arrX = arrDraw[1]
arrY = arrDraw[2]
arrSprite = arrDraw[3]
mirror = arrDraw[12]
arrRoom = arrDraw[14]
arrState = arrDraw[19]
x = arrX
y = arrY
if (arrRoom != room)

@ -8,6 +8,11 @@ if (myid != 0)
{
if (ds_list_size(oClient.roomListData) > 0)
{
if (ds_list_find_index(oClient.roomList, myid) < 0)
{
ds_list_delete(global.speedList, findID)
instance_destroy()
}
for (i = 0; i < ds_list_size(oClient.roomListData); i++)
{
arrDraw = ds_list_find_value(oClient.roomListData, i)

@ -103,7 +103,7 @@ else if device_mouse_check_button(jump_pressed[0], mb_left)
{
tx = scr_mouse_gui_x(device_mouse_raw_x(jump_pressed[0]))
ty = scr_mouse_gui_y(device_mouse_raw_y(jump_pressed[0]))
if (!point_in_rectangle(tx, ty, btn_jump[0], btn_jump[1], btn_jump[2], btn_jump[3]))
if (!(point_in_rectangle(tx, ty, btn_jump[0], btn_jump[1], btn_jump[2], btn_jump[3])))
jump_pressed[0] = -1
}
else
@ -147,7 +147,7 @@ else if device_mouse_check_button(fire_pressed[0], mb_left)
{
tx = scr_mouse_gui_x(device_mouse_raw_x(fire_pressed[0]))
ty = scr_mouse_gui_y(device_mouse_raw_y(fire_pressed[0]))
if (!point_in_rectangle(tx, ty, btn_fire[0], btn_fire[1], btn_fire[2], btn_fire[3]))
if (!(point_in_rectangle(tx, ty, btn_fire[0], btn_fire[1], btn_fire[2], btn_fire[3])))
fire_pressed[0] = -1
}
else
@ -191,7 +191,7 @@ else if device_mouse_check_button(missile_pressed[0], mb_left)
{
tx = scr_mouse_gui_x(device_mouse_raw_x(missile_pressed[0]))
ty = scr_mouse_gui_y(device_mouse_raw_y(missile_pressed[0]))
if (!point_in_rectangle(tx, ty, btn_missile[0], btn_missile[1], btn_missile[2], btn_missile[3]))
if (!(point_in_rectangle(tx, ty, btn_missile[0], btn_missile[1], btn_missile[2], btn_missile[3])))
missile_pressed[0] = -1
}
else
@ -235,7 +235,7 @@ else if device_mouse_check_button(morph_pressed[0], mb_left)
{
tx = scr_mouse_gui_x(device_mouse_raw_x(morph_pressed[0]))
ty = scr_mouse_gui_y(device_mouse_raw_y(morph_pressed[0]))
if (!point_in_rectangle(tx, ty, btn_morph[0], btn_morph[1], btn_morph[2], btn_morph[3]))
if (!(point_in_rectangle(tx, ty, btn_morph[0], btn_morph[1], btn_morph[2], btn_morph[3])))
morph_pressed[0] = -1
}
else
@ -279,7 +279,7 @@ else if device_mouse_check_button(pause_pressed[0], mb_left)
{
tx = scr_mouse_gui_x(device_mouse_raw_x(pause_pressed[0]))
ty = scr_mouse_gui_y(device_mouse_raw_y(pause_pressed[0]))
if (!point_in_rectangle(tx, ty, btn_pause[0], btn_pause[1], btn_pause[2], btn_pause[3]))
if (!(point_in_rectangle(tx, ty, btn_pause[0], btn_pause[1], btn_pause[2], btn_pause[3])))
pause_pressed[0] = -1
}
else
@ -319,7 +319,7 @@ if (aimupleft_pressed[0] == -1 && aimdownleft_pressed[0] == -1 && aimupright_pre
}
}
}
if ((!device_mouse_check_button(aimupleft_pressed[0], mb_left)) || st_pressed[0] != -1)
if ((!(device_mouse_check_button(aimupleft_pressed[0], mb_left))) || st_pressed[0] != -1)
aimupleft_pressed[0] = -1
if (aimupleft_pressed[0] == -1 && aimdownleft_pressed[0] == -1 && aimupright_pressed[0] == -1 && aimdownright_pressed[0] == -1 && st_pressed[0] == -1)
{
@ -356,7 +356,7 @@ if (aimupleft_pressed[0] == -1 && aimdownleft_pressed[0] == -1 && aimupright_pre
}
}
}
if ((!device_mouse_check_button(aimdownleft_pressed[0], mb_left)) || st_pressed[0] != -1)
if ((!(device_mouse_check_button(aimdownleft_pressed[0], mb_left))) || st_pressed[0] != -1)
aimdownleft_pressed[0] = -1
if (aimupleft_pressed[0] == -1 && aimdownleft_pressed[0] == -1 && aimupright_pressed[0] == -1 && aimdownright_pressed[0] == -1 && st_pressed[0] == -1)
{
@ -393,7 +393,7 @@ if (aimupleft_pressed[0] == -1 && aimdownleft_pressed[0] == -1 && aimupright_pre
}
}
}
if ((!device_mouse_check_button(aimupright_pressed[0], mb_left)) || st_pressed[0] != -1)
if ((!(device_mouse_check_button(aimupright_pressed[0], mb_left))) || st_pressed[0] != -1)
aimupright_pressed[0] = -1
if (aimupleft_pressed[0] == -1 && aimdownleft_pressed[0] == -1 && aimupright_pressed[0] == -1 && aimdownright_pressed[0] == -1 && st_pressed[0] == -1)
{
@ -430,7 +430,7 @@ if (aimupleft_pressed[0] == -1 && aimdownleft_pressed[0] == -1 && aimupright_pre
}
}
}
if ((!device_mouse_check_button(aimdownright_pressed[0], mb_left)) || st_pressed[0] != -1)
if ((!(device_mouse_check_button(aimdownright_pressed[0], mb_left))) || st_pressed[0] != -1)
aimdownright_pressed[0] = -1
if (up_pressed[0] == -1)
{
@ -471,7 +471,7 @@ else if device_mouse_check_button(up_pressed[0], mb_left)
{
tx = scr_mouse_gui_x(device_mouse_raw_x(up_pressed[0]))
ty = scr_mouse_gui_y(device_mouse_raw_y(up_pressed[0]))
if (!point_in_triangle(tx, ty, btn_aimu[0], btn_aimu[1], btn_aimu[2], btn_aimu[3], btn_aimu[4], btn_aimu[5]))
if (!(point_in_triangle(tx, ty, btn_aimu[0], btn_aimu[1], btn_aimu[2], btn_aimu[3], btn_aimu[4], btn_aimu[5])))
up_pressed[0] = -1
}
else
@ -515,7 +515,7 @@ else if device_mouse_check_button(down_pressed[0], mb_left)
{
tx = scr_mouse_gui_x(device_mouse_raw_x(down_pressed[0]))
ty = scr_mouse_gui_y(device_mouse_raw_y(down_pressed[0]))
if (!point_in_triangle(tx, ty, btn_aimd[0], btn_aimd[1], btn_aimd[2], btn_aimd[3], btn_aimd[4], btn_aimd[5]))
if (!(point_in_triangle(tx, ty, btn_aimd[0], btn_aimd[1], btn_aimd[2], btn_aimd[3], btn_aimd[4], btn_aimd[5])))
down_pressed[0] = -1
}
else
@ -561,7 +561,7 @@ if (!global.ingame)
{
tx = scr_mouse_gui_x(device_mouse_raw_x(right_pressed[0]))
ty = scr_mouse_gui_y(device_mouse_raw_y(right_pressed[0]))
if (!point_in_triangle(tx, ty, btn_aimr[0], btn_aimr[1], btn_aimr[2], btn_aimr[3], btn_aimr[4], btn_aimr[5]))
if (!(point_in_triangle(tx, ty, btn_aimr[0], btn_aimr[1], btn_aimr[2], btn_aimr[3], btn_aimr[4], btn_aimr[5])))
right_pressed[0] = -1
}
else
@ -605,7 +605,7 @@ if (!global.ingame)
{
tx = scr_mouse_gui_x(device_mouse_raw_x(left_pressed[0]))
ty = scr_mouse_gui_y(device_mouse_raw_y(left_pressed[0]))
if (!point_in_triangle(tx, ty, btn_aiml[0], btn_aiml[1], btn_aiml[2], btn_aiml[3], btn_aiml[4], btn_aiml[5]))
if (!(point_in_triangle(tx, ty, btn_aiml[0], btn_aiml[1], btn_aiml[2], btn_aiml[3], btn_aiml[4], btn_aiml[5])))
left_pressed[0] = -1
}
else
@ -659,7 +659,7 @@ if (global.gamestarted == 0 || room == gameintroroom || room == rm_credits)
{
tx = scr_mouse_gui_x(device_mouse_raw_x(pause_pressed[0]))
ty = scr_mouse_gui_y(device_mouse_raw_y(pause_pressed[0]))
if (!point_in_rectangle(tx, ty, 0, 0, display_get_width(), display_get_width()))
if (!(point_in_rectangle(tx, ty, 0, 0, display_get_width(), display_get_width())))
pause_pressed[0] = -1
}
else

@ -3,6 +3,6 @@ if (active == 1)
instance_activate_region((x - 16), (y - 16), 32, 32, true)
if (room_width <= 320)
{
if (x < ((-(oControl.widescreen_space / 2)) - 8) || x > ((room_width + (oControl.widescreen_space / 2)) + 8) || y < 0 || y > room_height)
if (x < ((-((oControl.widescreen_space / 2))) - 8) || x > ((room_width + (oControl.widescreen_space / 2)) + 8) || y < 0 || y > room_height)
instance_destroy()
}

@ -54,7 +54,7 @@ if (kFire && kFirePushedSteps == 1 && (state == 23 || state == 24 || state == 27
instance_create(x, (y - 5), oBomb)
sfx_play(sndBombSet)
}
if (((global.opmslstyle == 0 && armmsl == 1) || (global.opmslstyle == 1 && global.currentweapon == 3)) && global.pbombs > 0 && instance_number(oQueenFinalExplosion) == 0 && state != GRABBEDQUEENMORPH && (!(state == GRABBEDQUEENBELLY && distance_to_point((oQueenFront.x + 81), y) > 4)))
if (((global.opmslstyle == 0 && armmsl == 1) || (global.opmslstyle == 1 && global.currentweapon == 3)) && global.pbombs > 0 && instance_number(oQueenFinalExplosion) == 0 && state != GRABBEDQUEENMORPH && (!((state == GRABBEDQUEENBELLY && distance_to_point((oQueenFront.x + 81), y) > 4))))
{
if global.saxmode
{

@ -249,7 +249,7 @@ if global.spectator
}
if (absorbTime > 2 && global.beingAbsorbed)
{
if ((!global.absorbDone) && (!approximatelyZero(abs((x - targetAbsorbX)))) && (!approximatelyZero(abs((y - targetAbsorbY)))))
if ((!global.absorbDone) && (!(approximatelyZero(abs((x - targetAbsorbX))))) && (!(approximatelyZero(abs((y - targetAbsorbY))))))
{
x = round(lerp(x, targetAbsorbX, 0.1))
y = round(lerp(y, (targetAbsorbY - relativeSpriteHeight), 0.1))
@ -2320,7 +2320,7 @@ if (state == GRIP && facing == RIGHT)
canclimb += 1
else
canclimb = 0
if (((kJump && kJumpPushedSteps == 1 && kRight > 0) || (kUp && canclimb > 30 && statetime > 30)) && ((!position_meeting((x + 7), (y - 46), oSolid)) || (position_meeting((x + 7), (y - 46), oSolid) && global.morphball)))
if (((kJump && kJumpPushedSteps == 1 && kRight > 0) || (kUp && canclimb > 30 && statetime > 30)) && ((!(position_meeting((x + 7), (y - 46), oSolid))) || (position_meeting((x + 7), (y - 46), oSolid) && global.morphball)))
{
state = CLIMBING
statetime = 0
@ -2328,7 +2328,7 @@ if (state == GRIP && facing == RIGHT)
image_index = 0
sfx_play(sndPullUp)
}
if (!position_meeting((x + 7), (y - 26), oSolid))
if (!(position_meeting((x + 7), (y - 26), oSolid)))
{
state = JUMPING
statetime = 0
@ -2371,7 +2371,7 @@ if (state == GRIP && facing == LEFT)
canclimb += 1
else
canclimb = 0
if (((kJump && kJumpPushedSteps == 1 && kLeft > 0) || (kUp && canclimb > 30 && statetime > 30)) && ((!position_meeting((x - 8), (y - 46), oSolid)) || (position_meeting((x - 8), (y - 46), oSolid) && global.morphball)))
if (((kJump && kJumpPushedSteps == 1 && kLeft > 0) || (kUp && canclimb > 30 && statetime > 30)) && ((!(position_meeting((x - 8), (y - 46), oSolid))) || (position_meeting((x - 8), (y - 46), oSolid) && global.morphball)))
{
state = CLIMBING
statetime = 0
@ -2379,7 +2379,7 @@ if (state == GRIP && facing == LEFT)
image_index = 0
sfx_play(sndPullUp)
}
if (!position_meeting((x - 8), (y - 26), oSolid))
if (!(position_meeting((x - 8), (y - 26), oSolid)))
{
state = JUMPING
statetime = 0

@ -1,41 +1,41 @@
if (argument0 == 0)
{
if (joystick_xpos(global.opjoyid) < ((-(global.opdeadzone / 100)) / 2))
if (joystick_xpos(global.opjoyid) < ((-((global.opdeadzone / 100))) / 2))
return joystick_xpos(global.opjoyid);
if (joystick_xpos(global.opjoyid) > ((global.opdeadzone / 100) / 2))
return joystick_xpos(global.opjoyid);
}
if (argument0 == 1)
{
if (joystick_ypos(global.opjoyid) < ((-(global.opdeadzone / 100)) / 2))
if (joystick_ypos(global.opjoyid) < ((-((global.opdeadzone / 100))) / 2))
return joystick_ypos(global.opjoyid);
if (joystick_ypos(global.opjoyid) > ((global.opdeadzone / 100) / 2))
return joystick_ypos(global.opjoyid);
}
if (argument0 == 2)
{
if (joystick_zpos(global.opjoyid) < ((-(global.opdeadzone / 100)) / 2))
if (joystick_zpos(global.opjoyid) < ((-((global.opdeadzone / 100))) / 2))
return joystick_zpos(global.opjoyid);
if (joystick_zpos(global.opjoyid) > ((global.opdeadzone / 100) / 2))
return joystick_zpos(global.opjoyid);
}
if (argument0 == 3)
{
if (joystick_rpos(global.opjoyid) < ((-(global.opdeadzone / 100)) / 2))
if (joystick_rpos(global.opjoyid) < ((-((global.opdeadzone / 100))) / 2))
return joystick_rpos(global.opjoyid);
if (joystick_rpos(global.opjoyid) > ((global.opdeadzone / 100) / 2))
return joystick_rpos(global.opjoyid);
}
if (argument0 == 4)
{
if (joystick_upos(global.opjoyid) < ((-(global.opdeadzone / 100)) / 2))
if (joystick_upos(global.opjoyid) < ((-((global.opdeadzone / 100))) / 2))
return joystick_upos(global.opjoyid);
if (joystick_upos(global.opjoyid) > ((global.opdeadzone / 100) / 2))
return joystick_upos(global.opjoyid);
}
if (argument0 == 5)
{
if (joystick_vpos(global.opjoyid) < ((-(global.opdeadzone / 100)) / 2))
if (joystick_vpos(global.opjoyid) < ((-((global.opdeadzone / 100))) / 2))
return joystick_vpos(global.opjoyid);
if (joystick_vpos(global.opjoyid) > ((global.opdeadzone / 100) / 2))
return joystick_vpos(global.opjoyid);

@ -107,7 +107,7 @@ if gamepad_is_supported()
walk_zone = 1
if is_past_deadzone(xjoyx, xjoyy, 1)
{
if (ctrl_Left == 0 && ctrl_Right == 0 && xjoyx < (-(global.opxjoydz / 200)))
if (ctrl_Left == 0 && ctrl_Right == 0 && xjoyx < (-((global.opxjoydz / 200))))
{
ctrl_Left = (-xjoyx)
global.controltype = 2
@ -117,7 +117,7 @@ if gamepad_is_supported()
ctrl_Right = xjoyx
global.controltype = 2
}
if (ctrl_Up == 0 && ctrl_Down == 0 && xjoyy < (-(global.opxjoydz / 200)))
if (ctrl_Up == 0 && ctrl_Down == 0 && xjoyy < (-((global.opxjoydz / 200))))
{
ctrl_Up = 1
global.controltype = 2

@ -55,7 +55,7 @@ if (global.playerhealth > 0)
currState = state
if (((state != HURT && invincible == 0) || (argument4 == 1 && statetime > 2)) && (!global.ignoreKnockback))
{
if (canbehit && state != IDLE && state != SAVING && state != SAVINGFX && state != SAVINGSHIPFX && state != SAVINGSHIP && state != ELEVATOR && state != GFELEVATOR)
if (canbehit && state != IDLE && state != SAVING && state != SAVINGFX && state != SAVINGSHIPFX && state != SAVINGSHIP && state != ELEVATOR && state != GFELEVATOR && state != WATERJET)
{
if (state == BALL || state == AIRBALL || state == SPIDERBALL || sjball == 1)
{

@ -1,4 +1,4 @@
var scaleMult, f, arrList, ID, _x, _y, xoffNew, lowestPosX, lowestPosY, enemyCount, i, arrData, xDiff, yDiff, sax, spectator;
var scaleMult, f, arrList, ID, _x, _y, xoffNew, lowestPosX, lowestPosY, enemyCount, i, arrData, xDiff, yDiff, sax, spectator, lowestDist, dist;
if (global.classicmode == 0 && global.opshowhud)
{
xoff = 33
@ -439,8 +439,7 @@ if (global.classicmode == 0 && global.opshowhud)
draw_set_color(c_white)
draw_set_halign(fa_left)
draw_sprite(global.scannerSprite, global.scannerIndex, ((xoffNew + 4) + oControl.widescreen_space), 4)
lowestPosX = 1000
lowestPosY = 1000
lowestDist = 1000
enemyCount = 0
for (i = 0; i < ds_list_size(oClient.posData); i++)
{
@ -450,21 +449,16 @@ if (global.classicmode == 0 && global.opshowhud)
yDiff = (oClient.posY - arrData[2])
sax = arrData[3]
spectator = arrData[5]
if ((abs(xDiff) < lowestPosX || abs(yDiff) < lowestPosY) && sax != global.sax && ID != global.clientID)
dist = max(abs(xDiff), abs(yDiff))
if (sax != global.sax && ID != global.clientID)
{
if spectator
{
if sax
{
lowestPosX = abs(xDiff)
lowestPosY = abs(yDiff)
}
lowestDist = min(lowestDist, dist)
}
else
{
lowestPosX = abs(xDiff)
lowestPosY = abs(yDiff)
}
lowestDist = min(lowestDist, dist)
}
if (sax != global.sax)
enemyCount++
@ -477,36 +471,36 @@ if (global.classicmode == 0 && global.opshowhud)
}
if (enemyCount > 0)
{
if (abs(lowestPosX) > 5 || abs(lowestPosY) > 5)
if (lowestDist > 5)
global.inMusSAXRange = 0
if (abs(lowestPosX) <= 5 && abs(lowestPosY) <= 5)
if (lowestDist <= 5)
global.inMusSAXRange = 1
if (abs(lowestPosX) > 4 || abs(lowestPosY) > 4)
if (lowestDist > 4)
{
global.enemyNearby = 0
global.scannerSprite = 1883
}
if (abs(lowestPosX) <= 4 && abs(lowestPosY) <= 4)
if (lowestDist <= 4)
{
global.enemyNearby = 0
global.scannerSpeedMax = 5
global.scannerSprite = 1882
}
if (abs(lowestPosX) <= 3 && abs(lowestPosY) <= 3)
if (lowestDist <= 3)
global.enemyNearby = 1
if (abs(lowestPosX) <= 2 && abs(lowestPosY) <= 2)
if (lowestDist <= 2)
{
global.enemyNearby = 1
global.scannerSpeedMax = 4
global.scannerSprite = 1881
}
if (abs(lowestPosX) <= 1 && abs(lowestPosY) <= 1)
if (lowestDist <= 1)
{
global.enemyNearby = 1
global.scannerSpeedMax = 3
global.scannerSprite = 1880
}
if (abs(lowestPosX) == 0 && abs(lowestPosY) == 0)
if (lowestDist == 0)
{
global.enemyNearby = 1
global.scannerSpeedMax = 2

@ -123,7 +123,7 @@ if (gamepad_is_supported() && (!global.compatibilitymode))
walk_zone = 1
if is_past_deadzone(xjoyx, xjoyy, 1)
{
if (ctrl_Left == 0 && ctrl_Right == 0 && xjoyx < (-(global.opxjoydz / 200)))
if (ctrl_Left == 0 && ctrl_Right == 0 && xjoyx < (-((global.opxjoydz / 200))))
{
ctrl_Left = (-xjoyx)
global.controltype = 2
@ -133,7 +133,7 @@ if (gamepad_is_supported() && (!global.compatibilitymode))
ctrl_Right = xjoyx
global.controltype = 2
}
if (ctrl_Up == 0 && ctrl_Down == 0 && xjoyy < (-(global.opxjoydz / 200)))
if (ctrl_Up == 0 && ctrl_Down == 0 && xjoyy < (-((global.opxjoydz / 200))))
{
ctrl_Up = 1
global.controltype = 2
@ -240,7 +240,7 @@ if gamepad_is_supported()
{
if is_walkzone(xjoyx, xjoyy, 0)
walk_zone = 1
if (ctrl_Left == 0 && ctrl_Right == 0 && xjoyx < (-(global.opxjoydz / 200)))
if (ctrl_Left == 0 && ctrl_Right == 0 && xjoyx < (-((global.opxjoydz / 200))))
{
ctrl_Left = (-xjoyx)
global.controltype = 1
@ -250,7 +250,7 @@ if gamepad_is_supported()
ctrl_Right = xjoyx
global.controltype = 1
}
if (ctrl_Up == 0 && ctrl_Down == 0 && xjoyy < (-(global.opxjoydz / 200)))
if (ctrl_Up == 0 && ctrl_Down == 0 && xjoyy < (-((global.opxjoydz / 200))))
{
ctrl_Up = 1
global.controltype = 1

@ -82,13 +82,13 @@ repeat beams
beam.damage = 5
beam.chargebeam = 0
if wbeam
beam.damage *= 0.6
beam.damage *= 1.5
if ibeam
beam.damage *= 1
if sbeam
beam.damage *= 1.5
if sbeam
beam.damage *= 0.8
if pbeam
beam.damage *= 1
beam.damage *= 1.2
if (argument3 >= 1)
{
beam.damage *= 3

@ -2,8 +2,8 @@
DECOMPILER FAILED!
System.NullReferenceException: Object reference not set to an instance of an object.
at UndertaleModLib.Decompiler.Decompiler.ComputeReverseDominators(Dictionary`2 blocks, Block entryBlock) in D:\a\UndertaleModTool\UndertaleModTool\UndertaleModLib\Decompiler\Decompiler.cs:line 3004
at UndertaleModLib.Decompiler.Decompiler.HLDecompile(DecompileContext context, Dictionary`2 blocks, Block entryPoint, Block rootExitPoint) in D:\a\UndertaleModTool\UndertaleModTool\UndertaleModLib\Decompiler\Decompiler.cs:line 3346
at UndertaleModLib.Decompiler.Decompiler.Decompile(UndertaleCode code, GlobalDecompileContext globalContext) in D:\a\UndertaleModTool\UndertaleModTool\UndertaleModLib\Decompiler\Decompiler.cs:line 3436
at UndertaleModLib.Decompiler.Decompiler.ComputeReverseDominators(Dictionary`2 blocks, Block entryBlock) in D:\a\UndertaleModTool\UndertaleModTool\UndertaleModLib\Decompiler\Decompiler.cs:line 3124
at UndertaleModLib.Decompiler.Decompiler.HLDecompile(DecompileContext context, Dictionary`2 blocks, Block entryPoint, Block rootExitPoint) in D:\a\UndertaleModTool\UndertaleModTool\UndertaleModLib\Decompiler\Decompiler.cs:line 3466
at UndertaleModLib.Decompiler.Decompiler.Decompile(UndertaleCode code, GlobalDecompileContext globalContext) in D:\a\UndertaleModTool\UndertaleModTool\UndertaleModLib\Decompiler\Decompiler.cs:line 3556
at Submission#0.DumpCode(UndertaleCode code) in :line 89
*/

@ -126,7 +126,7 @@ if (instance_exists(oTouchControls) && (global.joydetected == 0 || global.ingame
{
if is_walkzone(xjoyx, xjoyy, 2)
walk_zone = 1
if (ctrl_Left == 0 && ctrl_Right == 0 && xjoyx < (-(global.opxjoydz / 100)) && oTouchControls.up_pressed[0] == -1 && oTouchControls.down_pressed[0] == -1)
if (ctrl_Left == 0 && ctrl_Right == 0 && xjoyx < (-((global.opxjoydz / 100))) && oTouchControls.up_pressed[0] == -1 && oTouchControls.down_pressed[0] == -1)
{
ctrl_Left = (-xjoyx)
global.controltype = 2
@ -136,7 +136,7 @@ if (instance_exists(oTouchControls) && (global.joydetected == 0 || global.ingame
ctrl_Right = xjoyx
global.controltype = 2
}
if (ctrl_Up == 0 && ctrl_Down == 0 && xjoyy < (-(global.opxjoydz / 100)) && oTouchControls.left_pressed[0] == -1 && oTouchControls.right_pressed[0] == -1)
if (ctrl_Up == 0 && ctrl_Down == 0 && xjoyy < (-((global.opxjoydz / 100))) && oTouchControls.left_pressed[0] == -1 && oTouchControls.right_pressed[0] == -1)
{
ctrl_Up = 1
global.controltype = 2
@ -158,7 +158,7 @@ if gamepad_is_supported()
{
if is_walkzone(xjoyx, xjoyy, 2)
walk_zone = 1
if (ctrl_Left == 0 && ctrl_Right == 0 && xjoyx < (-(global.opxjoydz / 200)))
if (ctrl_Left == 0 && ctrl_Right == 0 && xjoyx < (-((global.opxjoydz / 200))))
{
ctrl_Left = (-xjoyx)
global.controltype = 2
@ -168,7 +168,7 @@ if gamepad_is_supported()
ctrl_Right = xjoyx
global.controltype = 2
}
if (ctrl_Up == 0 && ctrl_Down == 0 && xjoyy < (-(global.opxjoydz / 200)))
if (ctrl_Up == 0 && ctrl_Down == 0 && xjoyy < (-((global.opxjoydz / 200))))
{
ctrl_Up = 1
global.controltype = 2
@ -296,7 +296,7 @@ if gamepad_is_supported()
{
if is_walkzone(xjoyx, xjoyy, 0)
walk_zone = 1
if (ctrl_Left == 0 && ctrl_Right == 0 && xjoyx < (-(global.opxjoydz / 200)))
if (ctrl_Left == 0 && ctrl_Right == 0 && xjoyx < (-((global.opxjoydz / 200))))
{
ctrl_Left = (-xjoyx)
global.controltype = 1
@ -306,7 +306,7 @@ if gamepad_is_supported()
ctrl_Right = xjoyx
global.controltype = 1
}
if (ctrl_Up == 0 && ctrl_Down == 0 && xjoyy < (-(global.opxjoydz / 200)))
if (ctrl_Up == 0 && ctrl_Down == 0 && xjoyy < (-((global.opxjoydz / 200))))
{
ctrl_Up = 1
global.controltype = 1

Loading…
Cancel
Save