Merge pull request #60 from UnavailableDev/dev

random shop items + animation (slimes)

1 files changed, 8 insertions, 7 deletions

diff --git a/src/game_loop/shop.h b/src/game_loop/shop.h
index 6f8f5a7..c4f3ced 100644
--- a/src/game_loop/shop.h
+++ b/src/game_loop/shop.h
@@ -3,6 +3,7 @@
 #include "input.h"
 #include "engine/draw_screen.h"
 #include "engine/level_const.h"
+#include "engine/sprite_controller.h"
 
 
 #include <stdint.h>
@@ -20,18 +21,18 @@ typedef enum {
 #define HH_SHOP_UPG_DISPLAY 4
 /** @brief all possible upgrades */
 typedef enum {
-	hh_e_upg_jump,
-	hh_e_upg_speed,
-	hh_e_upg_damage,
+	hh_e_NULL = -1,
 	hh_e_upg_heal,
 	hh_e_upg_max_health,
+	hh_e_upg_jump,
+	hh_e_upg_damage,
+	hh_e_upg_max_ammo,
+	hh_e_upg_speed,
 } hh_e_upgrades;
 
 /** @brief init */
-void hh_shop_init(hh_e_upgrades* in);
+void hh_shop_upg_init(hh_e_upgrades* in, int seed);
 /** @brief deals with displayed entity rendering */
 void hh_shop_display(uint8_t selected, hh_e_upgrades* upgrades);
-/** @brief moves 'cursor' through selection field */
-void hh_shift_selected(uint8_t* pos, bool dir, uint8_t min, uint8_t max);
 
-void hh_shop(hh_e_game_state* ,hh_level_entity* );
+hh_e_upgrades hh_shop(hh_e_game_state* ,hh_g_all_levels* , int);