From bbe45269470b788a1403fbc6d4bafd5211e4b476 Mon Sep 17 00:00:00 2001 From: Linus Probert Date: Tue, 22 May 2018 15:48:09 +0200 Subject: [PATCH] Fixes colors to use defines. --- src/actiontext.c | 2 +- src/gui.c | 25 +++++++++---------------- src/main.c | 2 +- src/particle_engine.c | 4 ++-- src/player.c | 2 +- src/roommatrix.c | 15 --------------- src/skillbar.c | 7 ++----- 7 files changed, 16 insertions(+), 41 deletions(-) diff --git a/src/actiontext.c b/src/actiontext.c index 0f8bf3d..d62b96d 100644 --- a/src/actiontext.c +++ b/src/actiontext.c @@ -30,7 +30,7 @@ actiontext_create(Sprite *sprite) t->timer = timer_create(); t->dead = false; t->velocity = (Vector2d) { 0, -100 }; - t->color = (SDL_Color) { 255, 255, 255, 255 }; + t->color = C_WHITE; return t; } diff --git a/src/gui.c b/src/gui.c index abc1027..7aee56f 100644 --- a/src/gui.c +++ b/src/gui.c @@ -340,8 +340,6 @@ gui_update_player_stats(Gui *gui, Player *player, Map *map, SDL_Renderer *render static int current_potion_sips = -1; static int current_dagger_count = -1; - static SDL_Color color = { 255, 255, 255, 255 }; - char buffer[200]; ExperienceData data = player_get_xp_data(player); @@ -361,42 +359,42 @@ gui_update_player_stats(Gui *gui, Player *player, Map *map, SDL_Renderer *render if (dungeon_level != (unsigned int) map->level) { m_sprintf(buffer, 200, "Dungeon level: %d", map->level); - texture_load_from_text(gui->labels[DUNGEON_LEVEL_LABEL]->textures[0], buffer, color, color, renderer); + texture_load_from_text(gui->labels[DUNGEON_LEVEL_LABEL]->textures[0], buffer, C_WHITE, C_BLACK, renderer); gui->labels[DUNGEON_LEVEL_LABEL]->dim = gui->labels[DUNGEON_LEVEL_LABEL]->textures[0]->dim; dungeon_level = (unsigned int) map->level; } if (current_potion_sips != (int) player->potion_sips) { m_sprintf(buffer, 200, "x %u", (unsigned int) player->potion_sips); - texture_load_from_text(gui->labels[HEALTH_POTION_LABEL]->textures[0], buffer, color, color, renderer); + texture_load_from_text(gui->labels[HEALTH_POTION_LABEL]->textures[0], buffer, C_WHITE, C_BLACK, renderer); gui->labels[HEALTH_POTION_LABEL]->dim = gui->labels[HEALTH_POTION_LABEL]->textures[0]->dim; current_potion_sips = player->potion_sips; } if (current_dagger_count != (int) player->daggers) { m_sprintf(buffer, 200, "x %u", (unsigned int) player->daggers); - texture_load_from_text(gui->labels[DAGGER_LABEL]->textures[0], buffer, color, color, renderer); + texture_load_from_text(gui->labels[DAGGER_LABEL]->textures[0], buffer, C_WHITE, C_BLACK, renderer); gui->labels[DAGGER_LABEL]->dim = gui->labels[DAGGER_LABEL]->textures[0]->dim; current_dagger_count = (int) player->daggers; } if (last_gold != player->gold) { m_sprintf(buffer, 200, "x %.2f", player->gold); - texture_load_from_text(gui->labels[GOLD_LABEL]->textures[0], buffer, color, color, renderer); + texture_load_from_text(gui->labels[GOLD_LABEL]->textures[0], buffer, C_WHITE, C_BLACK, renderer); gui->labels[GOLD_LABEL]->dim = gui->labels[GOLD_LABEL]->textures[0]->dim; last_gold = player->gold; } if (last_xp != (int) data.current) { m_sprintf(buffer, 200, "XP: %u / %u", data.current, data.nextLevel); - texture_load_from_text(gui->labels[CURRENT_XP_LABEL]->textures[0], buffer, color, color, renderer); + texture_load_from_text(gui->labels[CURRENT_XP_LABEL]->textures[0], buffer, C_WHITE, C_BLACK, renderer); gui->labels[CURRENT_XP_LABEL]->dim = gui->labels[CURRENT_XP_LABEL]->textures[0]->dim; last_xp = data.current; } if (last_level != data.level) { m_sprintf(buffer, 200, "Level: %u", data.level); - texture_load_from_text(gui->labels[LEVEL_LABEL]->textures[0], buffer, color, color, renderer); + texture_load_from_text(gui->labels[LEVEL_LABEL]->textures[0], buffer, C_WHITE, C_BLACK, renderer); gui->labels[LEVEL_LABEL]->dim = gui->labels[LEVEL_LABEL]->textures[0]->dim; last_level = data.level; } @@ -562,9 +560,6 @@ gui_event_message(const char *fmt, ...) void gui_render_log(Gui *gui, Camera *cam) { - static SDL_Color color = { 255, 255, 255, 255 }; - static SDL_Color ocolor = { 0, 0, 0, 255 }; - unsigned int i; unsigned int render_count; SDL_Rect box = { 16, 0, 16, 16 }; @@ -577,7 +572,7 @@ gui_render_log(Gui *gui, Camera *cam) Texture *t; box.y = 16 + ((LOG_FONT_SIZE+5) * i); t = gui->log_lines[i]; - texture_load_from_text(t, log_data.log[i], color, ocolor, cam->renderer); + texture_load_from_text(t, log_data.log[i], C_WHITE, C_BLACK, cam->renderer); box.w = t->dim.width; box.h = t->dim.height; texture_render(t, &box, cam); @@ -587,8 +582,6 @@ gui_render_log(Gui *gui, Camera *cam) void gui_render_event_message(Gui *gui, Camera *cam) { - static SDL_Color fg_color = { 255, 255, 255, 255 }; - static SDL_Color o_color = { 0, 0, 0, 255 }; static SDL_Rect box = { 0, 0, 150, 50 }; if (timer_started(gui->event_message_timer) @@ -601,8 +594,8 @@ gui_render_event_message(Gui *gui, Camera *cam) if (event_messages.count > 0) { texture_load_from_text(gui->event_message, event_messages.messages[0], - fg_color, - o_color, + C_WHITE, + C_BLACK, cam->renderer); box.x = (GAME_VIEW_WIDTH/2) - (gui->event_message->dim.width/2); diff --git a/src/main.c b/src/main.c index 14406ad..df37918 100644 --- a/src/main.c +++ b/src/main.c @@ -80,7 +80,7 @@ static Turn currentTurn = PLAYER; static Input input; static SDL_Color C_MENU_DEFAULT = { 255, 255, 0, 255 }; -static SDL_Color C_MENU_OUTLINE_DEFAULT = { 0, 0, 0, 255 }; +static SDL_Color C_MENU_OUTLINE_DEFAULT = { 0, 0, 0, 255 }; static SDL_Color C_MENU_HOVER = { 255, 0, 0, 255 }; struct MENU_ITEM { diff --git a/src/particle_engine.c b/src/particle_engine.c index a1f5467..124e106 100644 --- a/src/particle_engine.c +++ b/src/particle_engine.c @@ -54,7 +54,7 @@ create_particle(void) p->lifetime = 100; p->fixed = false; p->blend_mode = SDL_BLENDMODE_MOD; - p->color = (SDL_Color) { 255, 255, 255, 255 }; + p->color = C_WHITE; return p; } @@ -107,7 +107,7 @@ particle_engine_bloodspray(Position pos, Dimension dim, unsigned int count) p->movetime = mt; p->lifetime = lt; p->dim = (Dimension) { w, h }; - p->color = (SDL_Color) { 255, 0, 0, 255 }; + p->color = C_RED; linkedlist_append(&engine->game_particles, p); } } diff --git a/src/player.c b/src/player.c index 361be33..8408fd7 100644 --- a/src/player.c +++ b/src/player.c @@ -201,7 +201,7 @@ player_sip_health(Player *player) --player->potion_sips; ++player->stats.hp; mixer_play_effect(BUBBLE0 + get_random(2)); - gui_log("You take a sip of health potion"); + gui_log("You take a sip from a health potion"); actiontextbuilder_create_text("+1", C_GREEN, &player->sprite->pos); } else { gui_log("You have nothing to sip"); diff --git a/src/roommatrix.c b/src/roommatrix.c index 0e57c8a..464b9dd 100644 --- a/src/roommatrix.c +++ b/src/roommatrix.c @@ -212,21 +212,6 @@ roommatrix_render_mouse_square(RoomMatrix *matrix, Camera *cam) SDL_RenderFillRect(cam->renderer, &box); } -#ifdef LIGHTMAPDEBUG -static Texture * -create_light_texture(int light, Camera *cam) -{ - static SDL_Color color = { 255, 255, 0, 0 }; - - char buffer[4]; - Texture *t = texture_create(); - texture_load_font(t, "GUI/SDS_8x8.ttf", 8); - m_sprintf(buffer, 4, "%d", light); - texture_load_from_text(t, buffer, color, cam->renderer); - return t; -} -#endif // LIGHTMAPDEBUG - void roommatrix_render_lightmap(RoomMatrix *matrix, Camera *cam) { diff --git a/src/skillbar.c b/src/skillbar.c index 86c1d86..7c2fcc6 100644 --- a/src/skillbar.c +++ b/src/skillbar.c @@ -30,8 +30,6 @@ static void load_texture(SkillBar *bar, const char *path, SDL_Renderer *renderer) { - static SDL_Color c_yellow = { 255, 255, 0, 255 }; - Texture *t = texturecache_add(path); t->dim.width = 16; t->dim.height = 16; @@ -44,7 +42,7 @@ load_texture(SkillBar *bar, const char *path, SDL_Renderer *renderer) s->fixed = true; sprite_load_text_texture(s, "GUI/SDS_8x8.ttf", 0, 8, 0); m_sprintf(buffer, 4, "%u", i+1 < 10 ? i+1 : 0); - texture_load_from_text(s->textures[0], buffer, c_yellow, c_yellow, renderer); + texture_load_from_text(s->textures[0], buffer, C_YELLOW, C_BLACK, renderer); linkedlist_append(&bar->sprites, s); } } @@ -147,12 +145,11 @@ render_activation_indicator(SkillBar *bar, Camera *cam) static void render_skill_countdown(SkillBar *bar, int index, unsigned int count, Camera *cam) { - static SDL_Color color = { 255, 255, 255, 255 }; char buffer[5]; Sprite *s = bar->countdowns[index]; m_sprintf(buffer, 5, "%u", count); - texture_load_from_text(s->textures[0], buffer, color, color, cam->renderer); + texture_load_from_text(s->textures[0], buffer, C_WHITE, C_BLACK, cam->renderer); sprite_render(s, cam); }