Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix some font colors in mechlab/VS/newsroom #654

Merged
merged 3 commits into from
Oct 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/game/gui/menu_background.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@

#define COLOR_MENU_LINE 252
#define COLOR_MENU_BORDER 251
#define COLOR_MENU_LINE2 250
#define COLOR_MENU_BORDER1 253
#define COLOR_MENU_BORDER2 254
#define COLOR_MENU_LINE2 172
#define COLOR_MENU_BORDER1 164
#define COLOR_MENU_BORDER2 162
#define COLOR_MENU_BG 0

void menu_background_create(surface *s, int w, int h) {
Expand All @@ -23,7 +23,7 @@ void menu_background_create(surface *s, int w, int h) {
image_free(&img);
}

// the *other* style menu background
// the *other* style menu background, used on VS and MELEE
void menu_background2_create(surface *s, int w, int h) {
image img;
image_create(&img, w, h);
Expand Down
2 changes: 1 addition & 1 deletion src/game/scenes/mechlab.c
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,7 @@ int mechlab_create(scene *scene) {
tconf.font = FONT_SMALL;
tconf.halign = TEXT_CENTER;
tconf.valign = TEXT_MIDDLE;
tconf.cforeground = TEXT_DARK_GREEN;
tconf.cforeground = MECHLAB_YELLOW;

local->hint = label_create(&tconf, "HINTY");
component_set_pos_hints(local->hint, 32, 131);
Expand Down
4 changes: 4 additions & 0 deletions src/game/scenes/mechlab.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@
#include "game/gui/component.h"
#include "game/protos/scene.h"

#define MECHLAB_DARK_GREEN 165
#define MECHLAB_BRIGHT_GREEN 167
#define MECHLAB_YELLOW 207

typedef enum
{
DASHBOARD_NONE,
Expand Down
8 changes: 4 additions & 4 deletions src/game/scenes/mechlab/lab_dash_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -205,18 +205,18 @@ component *lab_dash_main_create(scene *s, dashboard_widgets *dw) {
text_settings tconf_dark;
text_defaults(&tconf_dark);
tconf_dark.font = FONT_SMALL;
tconf_dark.cforeground = TEXT_DARK_GREEN;
tconf_dark.cforeground = MECHLAB_DARK_GREEN;

text_settings tconf_light;
text_defaults(&tconf_light);
tconf_light.font = FONT_SMALL;
tconf_light.cforeground = TEXT_BLINKY_GREEN;
tconf_light.cforeground = MECHLAB_BRIGHT_GREEN;

text_settings tconf_light_centered;
text_defaults(&tconf_light_centered);
tconf_light_centered.font = FONT_SMALL;
tconf_light_centered.halign = TEXT_CENTER;
tconf_light_centered.cforeground = TEXT_BLINKY_GREEN;
tconf_light_centered.cforeground = MECHLAB_BRIGHT_GREEN;

// Pilot image
dw->photo = pilotpic_create(PIC_PLAYERS, 0);
Expand Down Expand Up @@ -315,7 +315,7 @@ component *lab_dash_main_create_gauges(component *xy, dashboard_widgets *dw, sd_
text_settings tconf_dark;
text_defaults(&tconf_dark);
tconf_dark.font = FONT_SMALL;
tconf_dark.cforeground = TEXT_MEDIUM_GREEN;
tconf_dark.cforeground = MECHLAB_DARK_GREEN;

// Bars and texts (bottom left side)
xysizer_attach(xy, label_create(&tconf_dark, "POWER"), 12, 95, -1, -1);
Expand Down
4 changes: 2 additions & 2 deletions src/game/scenes/vs.c
Original file line number Diff line number Diff line change
Expand Up @@ -240,10 +240,10 @@ void vs_render(scene *scene) {
video_draw(&local->arena_select_bg, 55, 150);

// arena name
font_render_wrapped(&font_small, lang_get(56 + local->arena), 56 + 72, 153, (211 - 72) - 4, TEXT_MEDIUM_GREEN);
font_render_wrapped(&font_small, lang_get(56 + local->arena), 56 + 72, 153, (211 - 72) - 4, TEXT_BRIGHT_GREEN);

// arena description
font_render_wrapped(&font_small, lang_get(66 + local->arena), 56 + 72, 160, (211 - 72) - 4, TEXT_MEDIUM_GREEN);
font_render_wrapped(&font_small, lang_get(66 + local->arena), 56 + 72, 160, (211 - 72) - 4, TEXT_BRIGHT_GREEN);
} else if(player2->pilot && player2->pilot->pilot_id == PILOT_KREISSACK &&
settings_get()->gameplay.difficulty < 2) {
// kreissack, but not on Veteran or higher
Expand Down
2 changes: 1 addition & 1 deletion src/video/color.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
// These are okay
#define COLOR_GREEN 0xA7
#define COLOR_DARK_GREEN 0xA0
#define COLOR_YELLOW 0xFF
#define COLOR_YELLOW 0xCF

typedef struct color {
unsigned char r;
Expand Down
Loading