Skull Icon implementiert + Korrekture Frames

Acknex · Jun 30, 2019 · c1c9018 · c1c9018
1 parent c065e21
commit c1c9018
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/game/src/ui_game.c b/game/src/ui_game.c
@@ -219,6 +219,7 @@ void ui_game_init()
 	ui_radial_counter = pan_create("", 2);
 	ui_radial_cbabe = ui_create_radial_button(ui_icon_cbabe, ui_spawn_event_sputnik);
 	ui_radial_sputnik = ui_create_radial_button(ui_icon_sputnik, ui_spawn_event_sputnik);
+	ui_radial_eye = ui_create_radial_button(ui_icon_eye, ui_spawn_event_sputnik);
 	ui_radial_skull = ui_create_radial_button(ui_icon_skull, ui_spawn_event_sputnik);
 	ui_radial_esel = ui_create_radial_button(ui_icon_esel, ui_spawn_event_sputnik);
 
@@ -343,6 +344,7 @@ void ui_game_close()
 	ui_hide_radial(ui_radial_sputnik);
 	ui_hide_radial(ui_radial_cbabe);
 	ui_hide_radial(ui_radial_skull);
+	ui_hide_radial(ui_radial_eye);
 	ui_hide_radial(ui_radial_esel);
 	ui_game_menu->flags &= ~SHOW;
 	ui_radial_counter->flags &= ~SHOW;
@@ -523,6 +525,9 @@ void ui_game_update()
 					ui_radial_esel->skill_y = 0;
 					break;
 					case UNIT_EYE:
+					ui_radial_active = ui_radial_eye;
+					ui_radial_eye->skill_y = 0;
+					break;
 					case UNIT_SKULL: //TODO: add me properly
 					ui_radial_active = ui_radial_skull;
 					ui_radial_skull->skill_y = 0;

diff --git a/game/src/ui_game.h b/game/src/ui_game.h
@@ -31,6 +31,7 @@ PANEL *ui_radial_delete;
 PANEL *ui_radial_counter;
 PANEL *ui_radial_cbabe;
 PANEL *ui_radial_skull;
+PANEL *ui_radial_eye;
 PANEL *ui_radial_esel;
 PANEL *ui_radial_sputnik;
 PANEL *ui_radial_active;
@@ -76,7 +77,8 @@ BMAP *ui_radial_progress = "#128x128x8888";
 
 BMAP *ui_icon_cbabe = "ui_H2.png";
 BMAP *ui_icon_sputnik = "ui_H1.png";
-BMAP *ui_icon_skull = "ui_H4.png";
+BMAP *ui_icon_eye = "ui_H4.png";
+BMAP *ui_icon_skull = "ui_H5.png";
 BMAP *ui_icon_esel = "ui_H3.png";
 
 BMAP *ui_icon_hammer = "ico_hammer_n.png";
@@ -143,7 +145,7 @@ var a_stupid_var = 1234;
 var a_dummy_var = 0;
 
 int ui_frame_order_norm[16] =    {15, 0, 1, 0, 1, 2, 1, 0, 1, 1, 2, 0, 2, 0, 0, 1};
-int ui_frame_order_spceial[15] = {14, 0, 1, 2, 3, 4, 5, 6, 7, 8, 7, 6, 5, 4, 3};
+int ui_frame_order_spceial[15] = {14, 0, 1, 2, 3, 4, 5, 6, 7, 7, 6, 5, 4, 3, 2};
 int ui_frame_noise_order[3] = {0, 1, 2};
 int *ui_frame_order;
 int ui_selected_max_type = 0;