diff --git a/objects/obj_controller.object.gmx b/objects/obj_controller.object.gmx
index 2f5a501..850b39f 100644
--- a/objects/obj_controller.object.gmx
+++ b/objects/obj_controller.object.gmx
@@ -58,7 +58,12 @@ if(!global.debug)
draw_healthbar(10,40,300,60,(obj_player.hp/obj_player.hp_max)*100,c_gray,c_red,c_green,0,true,false);
draw_text(11,43,string(obj_player.hp)+" / "+string(obj_player.hp_max));
+
+ // Draw hotbar
+ draw_sprite(spr_hotbar,0,960/2,544);
}
+
+
diff --git a/objects/obj_player.object.gmx b/objects/obj_player.object.gmx
index 7daf2f6..f486e7f 100644
--- a/objects/obj_player.object.gmx
+++ b/objects/obj_player.object.gmx
@@ -33,7 +33,6 @@ is_moving = false;
dead = false;
invuln_counter_max = 1*room_speed;
invuln_counter = invuln_counter_max;
-s_pressed = false;
energy_max = 500;
energy = energy_max
@@ -247,39 +246,6 @@ speed = -20;
direction = image_angle
speed += 5
-
-
-
-
-
-
-
- 1
- 603
- 7
- 0
- 0
- -1
- 2
-
-
- self
- 0
- 0
-
-
- 1
- if(dead == true || speed < 0)
-{
- return 0;
-}
-if(!s_pressed){
-s_pressed = true
-image_angle+=180
-}
-direction = image_angle
-speed += 5
-
@@ -465,37 +431,6 @@ instance_create(view_xview[0]+(view_wview[0]/2),view_yview[0]+(view_hview[0]/2),
is_moving = true;
audio_play_sound(snd_engine,1,true);
image_index = ship_type+1;
-
-
-
-
-
-
-
- 1
- 603
- 7
- 0
- 0
- -1
- 2
-
-
- self
- 0
- 0
-
-
- 1
- if(dead == true)
-{
- return 0;
-}
-
-is_moving = true;
-audio_play_sound(snd_engine,1,true);
-image_index = ship_type+1;
-
@@ -523,36 +458,6 @@ image_index = ship_type+1;
return 0;
}
-is_moving = false;
-audio_stop_sound(snd_engine)
-image_index = ship_type;
-
-
-
-
-
-
-
- 1
- 603
- 7
- 0
- 0
- -1
- 2
-
-
- self
- 0
- 0
-
-
- 1
- if(dead == true)
-{
- return 0;
-}
-s_pressed = false
is_moving = false;
audio_stop_sound(snd_engine)
image_index = ship_type;
diff --git a/sprites/images/spr_hotbar_0.png b/sprites/images/spr_hotbar_0.png
index d12d786..b1db597 100644
Binary files a/sprites/images/spr_hotbar_0.png and b/sprites/images/spr_hotbar_0.png differ
diff --git a/sprites/spr_hotbar.sprite.gmx b/sprites/spr_hotbar.sprite.gmx
index 3e3e22d..924bcc2 100644
--- a/sprites/spr_hotbar.sprite.gmx
+++ b/sprites/spr_hotbar.sprite.gmx
@@ -1,24 +1,24 @@
0
- 0
- 0
+ 194
+ 59
1
0
0
0
- 31
- 0
- 31
- 0
+ 0
+ 388
+ 0
+ 58
0
0
0
0
- 960
- 544
+ 389
+ 59
images\spr_hotbar_0.png