diff --git a/objects/oClient.object.gmx b/objects/oClient.object.gmx index 7d052532..608d254c 100644 --- a/objects/oClient.object.gmx +++ b/objects/oClient.object.gmx @@ -70,12 +70,14 @@ resetTimer = -1; teleport = false; noName = false; syncedDifficulty = 0; +elm = 0; state = undefined; seed = undefined; var type; type = network_socket_tcp; syncedDifficulty = global.difficulty; +elm = oControl.mod_monstersextremecheck; ini_open(working_directory + "\mod_settings.ini"); ipaddress = ini_read_string("ModSettings", "ipaddress", "127.0.0.1"); @@ -1777,6 +1779,8 @@ switch(syncedDifficulty){ if(oControl.mod_diffmult != 4) oControl.mod_diffmult = 4; break; } + +if(oControl.mod_monstersextremecheck != elm) oControl.mod_monstersextremecheck = elm; @@ -2819,6 +2823,23 @@ switch(type_event){ } if(instance_exists(oOptionsMod) && oOptionsMod.menuDifficulty != syncedDifficulty) oOptionsMod.menuDifficulty = syncedDifficulty; break; + case 30: + var syncELM = buffer_read(_buffer, buffer_u8); + if(syncELM != elm){ + elm = syncELM; + var str; + switch(elm){ + case 0: + str = "ELM Disabled"; + break; + case 1: + str = "ELM Enabled"; + break; + } + popup_text(str); + } + if(instance_exists(oOptionsMod) && oOptionsMod.elm != elm) oOptionsMod.elm = elm; + break; case 50: var resend = false; for(var i=0; i<array_length_1d(global.item); i++){ @@ -3372,6 +3393,43 @@ switch(type_event){ break; } } + + + + + + + + 1 + 603 + 7 + 0 + 0 + -1 + 2 + + + self + 0 + 0 + + + 1 + buffer_delete(buffer); +var size, type, alignment; +size = 1024; +type = buffer_grow; +alignment = 1; +buffer = buffer_create(size, type, alignment); +buffer_seek(buffer, buffer_seek_start, 0); +buffer_write(buffer, buffer_u8, 30); +buffer_write(buffer, buffer_u8, elm); +var bufferSize = buffer_tell(buffer); +buffer_seek(buffer, buffer_seek_start, 0); +buffer_write(buffer, buffer_s32, bufferSize); +buffer_write(buffer, buffer_u8, 30); +buffer_write(buffer, buffer_u8, elm); +var result = network_send_packet(socket, buffer, buffer_tell(buffer)); diff --git a/objects/oOptionsMod.object.gmx b/objects/oOptionsMod.object.gmx index add7c41d..2bd26c96 100644 --- a/objects/oOptionsMod.object.gmx +++ b/objects/oOptionsMod.object.gmx @@ -303,6 +303,11 @@ if (active) { //} //if (global.curropt == num_exmonsters) oControl.mod_monstersextremecheck = !oControl.mod_monstersextremecheck; //if (global.curropt == num_IGT) oControl.mod_IGT = !oControl.mod_IGT; + if (global.curropt == num_elm && instance_exists(oClient)){ + oClient.elm = !oClient.elm; + elm = !elm; + with(oClient) event_user(1); + } sfx_play(sndMenuMove); event_user(2); @@ -494,6 +499,15 @@ if(!done){ op[num_difficulty].optext = "Fusion"; break; } + + switch(elm){ + case 0: + op[num_elm].optext = "Disabled"; + break; + case 1: + op[num_elm].optext = "Enabled"; + break; + } } @@ -773,14 +787,6 @@ op[num_ip] = instance_create(x, y + sep * tempcount++, oOptionLRMod); op[num_ip].label = "IP Address"; op[num_ip].optionid = num_ip; -/*op[num_exmonsters] = instance_create(x, y + sep * tempcount++, oOptionLR); -op[num_exmonsters].label = get_text("ExtrasMenu", "ExtremeMonsters"); -op[num_exmonsters].optionid = num_exmonsters; -if (global.mod_gamebeaten == 0) { - op[num_exmonsters].enabled = 0; - canedit[num_exmonsters] = 0; -}*/ - op[num_port] = instance_create(x, y + sep * tempcount++, oOptionLRMod); op[num_port].label = "Port"; op[num_port].optionid = num_port;