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

Minor buggfixes and typos 

- Mention level in "new skill tooltip"
- Fix a msvc compiler warning
- Prevent level 2 artifact first pickup from bugging rendering
This commit is contained in:
Linus Probert 2018-08-21 22:27:45 +02:00
parent 8bf9329b8c
commit ffe1736792
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main.c
View File

@ -78,7 +78,7 @@ static char *artifacts_tooltip[] = {
static char *skills_tooltip[] = { static char *skills_tooltip[] = {
"CONGRATULATIONS!", "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.", " Skills are listed in the bar below the game screen.",
"", "",

5
src/skillbar.c
View File

@ -374,8 +374,6 @@ skillbar_update(SkillBar *bar, UpdateData *data)
if (data->player->equipment.artifacts[i].level == bar->artifacts[i].lvl) if (data->player->equipment.artifacts[i].level == bar->artifacts[i].lvl)
continue; continue;
bar->artifacts[i].lvl = data->player->equipment.artifacts[i].level;
char lvl[4]; char lvl[4];
m_sprintf(lvl, 4, "%u", bar->artifacts[i].lvl); 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); lvl, C_BLUE, C_WHITE, data->cam->renderer);
// Only update position if this is the first pickup // 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.x = bar->artifactDisplayOffset + 12;
bar->artifacts[i].lvlSprite->pos.y = 16; bar->artifacts[i].lvlSprite->pos.y = 16;
bar->artifacts[i].aSprite->pos.x = bar->artifactDisplayOffset; bar->artifacts[i].aSprite->pos.x = bar->artifactDisplayOffset;
bar->artifacts[i].aSprite->pos.y = 8; bar->artifacts[i].aSprite->pos.y = 8;
bar->artifactDisplayOffset += 32; bar->artifactDisplayOffset += 32;
} }
bar->artifacts[i].lvl = data->player->equipment.artifacts[i].level;
} }
} }

1
src/tooltip.c
View File

@ -16,6 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <string.h>
#include "tooltip.h" #include "tooltip.h"
#include "gui_util.h" #include "gui_util.h"
#include "defines.h" #include "defines.h"