Fix Issue #1 and #2, Newgame+ has softlock prevention

main
DodoBirb 4 years ago
parent 805ed45920
commit e38b7768d0
No known key found for this signature in database
GPG Key ID: 361CA687D5E39154

@ -717,7 +717,7 @@ switch syncedDifficulty
if (oControl.mod_monstersextremecheck != elm) if (oControl.mod_monstersextremecheck != elm)
oControl.mod_monstersextremecheck = elm oControl.mod_monstersextremecheck = elm
if ((!global.ingame) || (!global.opshowhud)) if (((!global.ingame) || (!global.opshowhud)) && instance_exists(oClient))
{ {
lowestPosX = 1000 lowestPosX = 1000
lowestPosY = 1000 lowestPosY = 1000

@ -256,7 +256,7 @@ if file_exists("lang/fonts/Glasstown_NBP.ttf")
ini_close() ini_close()
global.fontVersion = font_add_sprite_ext(sVersionFont, "V.0123456789", 1, 1) global.fontVersion = font_add_sprite_ext(sVersionFont, "V.0123456789", 1, 1)
global.am2r_version = "V1.5.2" global.am2r_version = "V1.5.2"
global.multitroid_version = "V1.9.2" global.multitroid_version = "V1.9.3"
global.gamestarted = 0 global.gamestarted = 0
global.wave_height = 1 global.wave_height = 1
global.sand_map = ds_map_create() global.sand_map = ds_map_create()

@ -5,3 +5,8 @@ global.watertype = 0
global.floormaterial = 1 global.floormaterial = 1
global.objdeactivate = 1 global.objdeactivate = 1
make_escape_sequence_fx(2) make_escape_sequence_fx(2)
if (global.item[0] == 0 && global.maxpbombs == 0)
{
with (oBlockBombChain)
instance_destroy()
}

@ -24,8 +24,7 @@ if (global.gamemode == 2 || global.gamemode == 3 || global.gamemode == 4 || glob
scr_rand_split_powerups() scr_rand_split_powerups()
scr_randomizer_split_items() scr_randomizer_split_items()
} }
if (global.gamemode != 2) oControl.mod_randomgamebool = 1
oControl.mod_randomgamebool = 1
} }
else else
global.gamemode = 1 global.gamemode = 1

Loading…
Cancel
Save