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

Maint: Less complex main

This commit is contained in:
Linus Probert 2018-09-13 12:49:21 +02:00
parent 983875d064
commit 620a7e3ed5
1 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/main.c
View File

@ -716,26 +716,25 @@ populateUpdateData(UpdateData *data, float deltatime)
data->cam = gCamera; data->cam = gCamera;
} }
static void static bool
run_game_update(void) check_skillbar_activation(void)
{ {
static UpdateData updateData;
static unsigned int playerLevel = 1; static unsigned int playerLevel = 1;
static bool artifactTooltipShown = false;
if (gGameState == IN_GAME_MENU)
menu_update(inGameMenu, &input);
populateUpdateData(&updateData, deltaTime);
bool skillActivated = false;
if (playerLevel != gPlayer->stats.lvl) { if (playerLevel != gPlayer->stats.lvl) {
playerLevel = gPlayer->stats.lvl; playerLevel = gPlayer->stats.lvl;
skillActivated = skillbar_check_skill_activation(gSkillBar, return skillbar_check_skill_activation(gSkillBar, gPlayer);
gPlayer);
} }
return false;
}
static void
check_tooltip_activation(bool skillActivated)
{
static bool artifactTooltipShown = false;
Settings *settings = settings_get(); Settings *settings = settings_get();
if (skillActivated && settings->tooltips_enabled && playerLevel < 5) { if (skillActivated && settings->tooltips_enabled) {
gGui->activeTooltip = new_skill_tooltip; gGui->activeTooltip = new_skill_tooltip;
} }
if (!artifactTooltipShown && gPlayer->equipment.hasArtifacts) { if (!artifactTooltipShown && gPlayer->equipment.hasArtifacts) {
@ -743,6 +742,20 @@ run_game_update(void)
if (settings->tooltips_enabled) if (settings->tooltips_enabled)
gGui->activeTooltip = new_artifact_tooltip; gGui->activeTooltip = new_artifact_tooltip;
} }
}
static void
run_game_update(void)
{
static UpdateData updateData;
if (gGameState == IN_GAME_MENU)
menu_update(inGameMenu, &input);
populateUpdateData(&updateData, deltaTime);
bool skillActivated = check_skillbar_activation();
check_tooltip_activation(skillActivated);
if (gGameState == PLAYING && currentTurn == PLAYER) if (gGameState == PLAYING && currentTurn == PLAYER)
player_update(&updateData); player_update(&updateData);