From ffe1736792f0a0df3f0be30413847e85e670d3f3 Mon Sep 17 00:00:00 2001 From: Linus Probert Date: Tue, 21 Aug 2018 22:27:45 +0200 Subject: [PATCH] Minor buggfixes and typos - Mention level in "new skill tooltip" - Fix a msvc compiler warning - Prevent level 2 artifact first pickup from bugging rendering --- src/main.c | 2 +- src/skillbar.c | 5 ++--- src/tooltip.c | 1 + 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main.c b/src/main.c index 5b0be05..547e848 100644 --- a/src/main.c +++ b/src/main.c @@ -78,7 +78,7 @@ static char *artifacts_tooltip[] = { static char *skills_tooltip[] = { "CONGRATULATIONS!", "", - " You have aquired a new skill!", + " You have aquired a new level and a new skill!", "", " Skills are listed in the bar below the game screen.", "", diff --git a/src/skillbar.c b/src/skillbar.c index cd01a9c..9f91a72 100644 --- a/src/skillbar.c +++ b/src/skillbar.c @@ -374,8 +374,6 @@ skillbar_update(SkillBar *bar, UpdateData *data) if (data->player->equipment.artifacts[i].level == bar->artifacts[i].lvl) continue; - bar->artifacts[i].lvl = data->player->equipment.artifacts[i].level; - char lvl[4]; m_sprintf(lvl, 4, "%u", bar->artifacts[i].lvl); @@ -383,13 +381,14 @@ skillbar_update(SkillBar *bar, UpdateData *data) lvl, C_BLUE, C_WHITE, data->cam->renderer); // Only update position if this is the first pickup - if (bar->artifacts[i].lvl == 1) { + if (bar->artifacts[i].lvl == 0) { bar->artifacts[i].lvlSprite->pos.x = bar->artifactDisplayOffset + 12; bar->artifacts[i].lvlSprite->pos.y = 16; bar->artifacts[i].aSprite->pos.x = bar->artifactDisplayOffset; bar->artifacts[i].aSprite->pos.y = 8; bar->artifactDisplayOffset += 32; } + bar->artifacts[i].lvl = data->player->equipment.artifacts[i].level; } } diff --git a/src/tooltip.c b/src/tooltip.c index 4c46740..0957426 100644 --- a/src/tooltip.c +++ b/src/tooltip.c @@ -16,6 +16,7 @@ * along with this program. If not, see . */ +#include #include "tooltip.h" #include "gui_util.h" #include "defines.h"