From 8d8c420fcf70d89e0763a6906a715897a7d0e9fd Mon Sep 17 00:00:00 2001 From: DodoBirb Date: Thu, 16 Feb 2023 09:25:03 +1100 Subject: [PATCH] Made missile direction use a 16 bit instead of an 8 bit integer --- Export_Code/gml_Object_oClient_Other_13.gml | 2 ++ Export_Code/gml_Object_oIGT_Step_0.gml | 22 +++++++++++++++---- .../gml_Object_oServer_Other_68.gml | 2 +- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/Export_Code/gml_Object_oClient_Other_13.gml b/Export_Code/gml_Object_oClient_Other_13.gml index b40463f..d6f80f9 100644 --- a/Export_Code/gml_Object_oClient_Other_13.gml +++ b/Export_Code/gml_Object_oClient_Other_13.gml @@ -13,6 +13,7 @@ buffer_write(buffer5, buffer_u8, global.checkBeam) buffer_write(buffer5, buffer_u8, global.checkMissile) buffer_write(buffer5, buffer_u8, global.checkDamage) buffer_write(buffer5, buffer_u8, global.checkFreeze) +buffer_write(buffer5, buffer_s16, global.checkDir) bufferSize = buffer_tell(buffer5) buffer_seek(buffer5, buffer_seek_start, 0) buffer_write(buffer5, buffer_s32, bufferSize) @@ -24,5 +25,6 @@ buffer_write(buffer5, buffer_u8, global.checkBeam) buffer_write(buffer5, buffer_u8, global.checkMissile) buffer_write(buffer5, buffer_u8, global.checkDamage) buffer_write(buffer5, buffer_u8, global.checkFreeze) +buffer_write(buffer5, buffer_s16, global.checkDir) result = network_send_packet(socket, buffer5, buffer_tell(buffer5)) buffer_delete(buffer5) diff --git a/Export_Code/gml_Object_oIGT_Step_0.gml b/Export_Code/gml_Object_oIGT_Step_0.gml index 71d73e0..cff3df2 100644 --- a/Export_Code/gml_Object_oIGT_Step_0.gml +++ b/Export_Code/gml_Object_oIGT_Step_0.gml @@ -1,4 +1,4 @@ -var compl; +var compl, metcount, i, yoff; if (!oControl.mod_IGT) instance_destroy() if (surface_exists(igt_surface) && surface_get_width(igt_surface) < (320 + oControl.widescreen_space)) @@ -20,10 +20,24 @@ if surface_exists(igt_surface) draw_cool_text(4, 16, steps_to_time2(global.gametime), c_black, c_white, c_gray, 1) if instance_exists(oClient) { - draw_cool_text(4, 27, ("ping: " + string(global.ping)), c_black, c_white, c_gray, 1) + yoff = 27 + draw_cool_text(4, yoff, ("ping: " + string(global.ping)), c_black, c_white, c_gray, 1) + yoff += 11 + metcount = 0 + for (i = 0; i <= 40; i++) + { + if (global.metdead[i] == 1) + metcount += 1 + } + if ((global.MetCount - metcount) > 0) + { + draw_cool_text(4, yoff, ("Metroids to A6: " + string((global.MetCount - metcount))), c_black, c_white, c_gray, 1) + yoff += 11 + } + draw_cool_text(4, yoff, ("X-Power: " + string(global.damageMult)), c_black, c_aqua, make_colour_rgb(79, 146, 255), 1) + yoff += 11 if (global.saveStationCooldown > 0) - draw_cool_text(4, 49, ("Save Cooldown: " + string((global.saveStationCooldown / 60))), c_black, c_white, c_gray, 1) - draw_cool_text(4, 38, ("X-Power: " + string(global.damageMult)), c_black, c_aqua, make_colour_rgb(79, 146, 255), 1) + draw_cool_text(4, yoff, ("Save Cooldown: " + string((global.saveStationCooldown / 60))), c_black, c_white, c_gray, 1) } if (oControl.mod_collecteditemsmap == 1) { diff --git a/Export_CodeServer/gml_Object_oServer_Other_68.gml b/Export_CodeServer/gml_Object_oServer_Other_68.gml index 2379213..34ab08d 100644 --- a/Export_CodeServer/gml_Object_oServer_Other_68.gml +++ b/Export_CodeServer/gml_Object_oServer_Other_68.gml @@ -804,7 +804,7 @@ switch type_event checkMissile = buffer_read(_buffer, buffer_u8) checkDamage = buffer_read(_buffer, buffer_u8) checkFreeze = buffer_read(_buffer, buffer_u8) - checkDir = buffer_read(_buffer, buffer_u8) + checkDir = buffer_read(_buffer, buffer_s16) tempSocket = -100 for (i = 0; i < ds_list_size(idList); i++) {