walkero
/
breakhack
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Prepared for more skills

This commit is contained in:
Linus Probert 2018-05-04 18:14:44 +02:00
parent fcf1f24547
commit f290a0dc1c
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/skillbar.c
View File

@ -35,14 +35,14 @@ load_texture(SkillBar *bar, const char *path, SDL_Renderer *renderer)
t->dim.width = 16; t->dim.width = 16;
t->dim.height = 16; t->dim.height = 16;
for (unsigned int i = 0; i < 5; ++i) { for (unsigned int i = 0; i < 10; ++i) {
char buffer[4]; char buffer[4];
Sprite *s = sprite_create(); Sprite *s = sprite_create();
s->pos = (Position) { i * 32 + 20, 20 }; s->pos = (Position) { i * 32 + 20, 20 };
s->dim = (Dimension) { 8, 8 }; s->dim = (Dimension) { 8, 8 };
s->fixed = true; s->fixed = true;
sprite_load_text_texture(s, "GUI/SDS_8x8.ttf", 0, 8); sprite_load_text_texture(s, "GUI/SDS_8x8.ttf", 0, 8);
m_sprintf(buffer, 4, "%u", i+1); m_sprintf(buffer, 4, "%u", i+1 < 10 ? i+1 : 0);
texture_load_from_text(s->textures[0], buffer, c_yellow, renderer); texture_load_from_text(s->textures[0], buffer, c_yellow, renderer);
linkedlist_append(&bar->sprites, s); linkedlist_append(&bar->sprites, s);
} }
@ -256,16 +256,13 @@ skillbar_handle_event(SkillBar *bar, SDL_Event *event)
return; return;
unsigned int key = 0; unsigned int key = 0;
if (keyboard_press(SDLK_1, event)) for (SDL_Keycode keysym = SDLK_0; keysym <= SDLK_9; ++keysym) {
key = 1; if (!keyboard_press(keysym, event))
else if (keyboard_press(SDLK_2, event)) continue;
key = 2; key = (int)(keysym - SDLK_0);
else if (keyboard_press(SDLK_3, event)) if (key == 0) key = 10;
key = 3; break;
else if (keyboard_press(SDLK_4, event)) }
key = 4;
else if (keyboard_press(SDLK_5, event))
key = 5;
if (key != 0) { if (key != 0) {
bar->lastActivation = key; bar->lastActivation = key;