From 382fc965d300b1d1e3f86cf6414f0de76e9dbed1 Mon Sep 17 00:00:00 2001 From: SilicaAndPina Date: Wed, 29 Jul 2020 11:43:59 +1200 Subject: [PATCH] Commit Message --- objects/obj_hotbar.object.gmx | 1 - objects/obj_inventory.object.gmx | 50 ++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 1 deletion(-) diff --git a/objects/obj_hotbar.object.gmx b/objects/obj_hotbar.object.gmx index a8694eb..57cdb7b 100644 --- a/objects/obj_hotbar.object.gmx +++ b/objects/obj_hotbar.object.gmx @@ -66,7 +66,6 @@ if((mouse_x >= x && mouse_x <= x+424) && (mouse_y >= y i++; } - } diff --git a/objects/obj_inventory.object.gmx b/objects/obj_inventory.object.gmx index 6fe8bc0..8aec95a 100644 --- a/objects/obj_inventory.object.gmx +++ b/objects/obj_inventory.object.gmx @@ -8,6 +8,29 @@ <undefined> <undefined> + + + 1 + 603 + 7 + 0 + 0 + -1 + 2 + + + self + 0 + 0 + + + 1 + selected_slot = 0; + + + + + 1 @@ -27,6 +50,24 @@ 1 x = view_xview[0]+view_wview[0]/2 - (424/2); y = view_yview[0]+view_hview[0]/2 - (254/2); + + +var i = 0; +if((mouse_x >= x && mouse_x <= x+424) && (mouse_y >= y && mouse_y <= y+59)) +{ + for(yy = 8; yy < (5*44); yy+=45+1) + { + for(xx = 6; xx < (9*45); xx+=45+1) + { + if((mouse_x >= x+xx && mouse_x <= x+xx+45) && (mouse_x >= x+yy && mouse_x <= x+yy+44)) + { + selected_slot = i; + } + i++; + } + } + +} @@ -59,9 +100,18 @@ for(yy = 8; yy < (5*44); yy+=45+1) { draw_sprite(spr_blocks,obj_inv_controller.inventory[i],x+xx+6,y+yy+7); var count = obj_inv_controller.inventoryCount[i]; + if(i == selected_slot) + { + draw_set_color(make_colour_rgb(100,100,100)); + draw_rectangle(x+xx,y+yy,x+xx+45,y+yy+44,false) + } + var xoffset = string_width(string(count)) if(count > 1) + { + draw_set_color(c_white); draw_text(x+xx+45-xoffset,y+yy+30,string(count)); + } i++ } }