Stop using the weird coord struct and add a hit method

Author: EttyKitty

objects/obj_enunit/Create_0.gml

@@ -20,7 +20,10 @@ composition_string="";
 pos = 880;
 centerline_offset = 0;
 draw_size = 0;
-
+x1 = pos + (centerline_offset * 2);
+y1 = 450 - (draw_size / 2);
+x2 = pos + (centerline_offset * 2) + 10;
+y2 = 450 + (draw_size / 2);
 
 enemy=0;
 enemy2=0;
@@ -79,3 +82,7 @@ if (obj_ncombat.enemy=1) then alarm[6]=10;
 
 // if (obj_ncombat.enemy=1){alarm[1]=8;alarm[5]=10;}
 
+
+hit = function() {
+    return scr_hit(x1, y1, x2, y2) && obj_ncombat.fadein <= 0;
+};

objects/obj_enunit/Draw_0.gml

@@ -8,21 +8,18 @@ if (draw_size > 0){
         centerline_offset=x-obj_centerline.x;
     }
 
-    var _draw_coords = {
-        x1: pos + (centerline_offset * 2),
-        y1: 450 - (draw_size / 2),
-        x2: pos + (centerline_offset * 2) + 10,
-        y2: 450 + (draw_size / 2)
-    };
+    x1 = pos + (centerline_offset * 2);
+    y1 = 450 - (draw_size / 2);
+    x2 = pos + (centerline_offset * 2) + 10;
+    y2 = 450 + (draw_size / 2);
 
-    var _hit = scr_hit(_draw_coords.x1, _draw_coords.y1, _draw_coords.x2, _draw_coords.y2) && obj_ncombat.fadein <= 0;
-
-    if (_hit) {
+    if (hit()) {
         draw_set_alpha(0.8);
     }
-    draw_rectangle(_draw_coords.x1, _draw_coords.y1, _draw_coords.x2, _draw_coords.y2, 0);
 
-    if (_hit) {
+    draw_rectangle(x1, y1, x2, y2, 0);
+
+    if (hit()) {
         if (unit_count != unit_count_old) {
             unit_count_old = unit_count;
             if (obj_ncombat.enemy!=1){
@@ -74,7 +71,7 @@ if (draw_size > 0){
             } 
         }
 
-        draw_block_composition(_draw_coords.x1, composition_string);
+        draw_block_composition(x1, composition_string);
     }
 
     draw_block_fadein();

objects/obj_pnunit/Create_0.gml

@@ -20,6 +20,11 @@ column_size = 0;
 centerline_offset = 0;
 pos = 880;
 draw_size = 0;
+x1 = pos + (centerline_offset * 2);
+y1 = 450 - (draw_size / 2);
+x2 = pos + (centerline_offset * 2) + 10;
+y2 = 450 + (draw_size / 2);
+
 // let="";let=string_delete(obj_ini.psy_powers,2,string_length(obj_ini.psy_powers)-1);let=string_upper(let);
 // LET might be different for each marine; need a way of determining this
 
@@ -117,3 +122,7 @@ hostile_splash=0;
 alarm[1]=4;
 
 action_set_alarm(1, 3);
+
+hit = function() {
+    return scr_hit(x1, y1, x2, y2) && obj_ncombat.fadein <= 0;
+};

objects/obj_pnunit/Draw_0.gml

@@ -15,26 +15,23 @@ if (draw_size > 0){
         draw_set_color(c_gray);
     }
 
-    var _draw_coords = {
-        x1: pos + (centerline_offset * 2),
-        y1: 450 - (draw_size / 2),
-        x2: pos + (centerline_offset * 2) + 10,
-        y2: 450 + (draw_size / 2)
-    };
+    x1 = pos + (centerline_offset * 2);
+    y1 = 450 - (draw_size / 2);
+    x2 = pos + (centerline_offset * 2) + 10;
+    y2 = 450 + (draw_size / 2);
 
-    var _hit = scr_hit(_draw_coords.x1, _draw_coords.y1, _draw_coords.x2, _draw_coords.y2) && obj_ncombat.fadein <= 0;
-
-    if (_hit) {
+    if (hit()) {
         draw_set_alpha(0.8);
     }
-    draw_rectangle(_draw_coords.x1, _draw_coords.y1, _draw_coords.x2, _draw_coords.y2, 0);
 
-    if (_hit) {
+    draw_rectangle(x1, y1, x2, y2, 0);
+
+    if (hit()) {
         if (unit_count != unit_count_old) {
             unit_count_old = unit_count;
             composition_string = block_composition_string();
         }
-        draw_block_composition(_draw_coords.x1, composition_string);
+        draw_block_composition(x1, composition_string);
     }
 
     draw_block_fadein()