video,game: Add and use COLOR_DARK_GREEN

omf2097 · Jun 30, 2024 · 733aae7 · 733aae7
1 parent d8f2076
commit 733aae7
Show file tree

Hide file tree

Showing 23 changed files with 25 additions and 24 deletions.
diff --git a/src/game/gui/dialog.c b/src/game/gui/dialog.c
@@ -12,12 +12,12 @@ void dialog_create(dialog *dlg, dialog_style style, const char *text, int x, int
     text_settings tconf;
     text_defaults(&tconf);
     tconf.font = FONT_BIG;
-    tconf.cforeground = color_create(0, 121, 0, 255);
+    tconf.cforeground = COLOR_DARK_GREEN;
 
     text_settings tconf_desc;
     text_defaults(&tconf_desc);
     tconf_desc.font = FONT_SMALL;
-    tconf_desc.cforeground = color_create(0, 121, 0, 255);
+    tconf_desc.cforeground = COLOR_DARK_GREEN;
 
     dlg->x = x;
     dlg->y = y;

diff --git a/src/game/gui/textbutton.c b/src/game/gui/textbutton.c
@@ -63,7 +63,7 @@ static void textbutton_render(component *c) {
     } else if(component_is_disabled(c)) {
         tb->tconf.cforeground = color_create(121, 121, 121, 255);
     } else {
-        tb->tconf.cforeground = color_create(0, 121, 0, 255);
+        tb->tconf.cforeground = COLOR_DARK_GREEN;
     }
     text_render(&tb->tconf, c->x, c->y, c->w, c->h, tb->text);
 

diff --git a/src/game/gui/textinput.c b/src/game/gui/textinput.c
@@ -47,7 +47,7 @@ static void textinput_render(component *c) {
         }
     } else {
         if(chars > 0) {
-            tb->tconf.cforeground = color_create(0, 121, 0, 255);
+            tb->tconf.cforeground = COLOR_DARK_GREEN;
             text_render(&tb->tconf, c->x, c->y, c->w, c->h, tb->buf);
         }
     }

diff --git a/src/game/gui/textselector.c b/src/game/gui/textselector.c
@@ -69,7 +69,7 @@ static void textselector_render(component *c) {
     } else if(component_is_disabled(c)) {
         tb->tconf.cforeground = color_create(121, 121, 121, 255);
     } else {
-        tb->tconf.cforeground = color_create(0, 121, 0, 255);
+        tb->tconf.cforeground = COLOR_DARK_GREEN;
     }
     text_render(&tb->tconf, c->x, c->y, c->w, c->h, buf);
 }

diff --git a/src/game/gui/textslider.c b/src/game/gui/textslider.c
@@ -43,7 +43,7 @@ static void textslider_render(component *c) {
     } else if(component_is_disabled(c)) {
         tb->tconf.cforeground = color_create(121, 121, 121, 255);
     } else {
-        tb->tconf.cforeground = color_create(0, 121, 0, 255);
+        tb->tconf.cforeground = COLOR_DARK_GREEN;
     }
     text_render(&tb->tconf, c->x, c->y, c->w, c->h, str_c(&txt));
     str_free(&txt);

diff --git a/src/game/scenes/arena.c b/src/game/scenes/arena.c
@@ -1336,7 +1336,7 @@ int arena_create(scene *scene) {
     text_settings tconf;
     text_defaults(&tconf);
     tconf.font = FONT_BIG;
-    tconf.cforeground = color_create(0, 121, 0, 255);
+    tconf.cforeground = COLOR_DARK_GREEN;
     tconf.halign = TEXT_CENTER;
 
     // Arena menu

diff --git a/src/game/scenes/mainmenu/menu_audio.c b/src/game/scenes/mainmenu/menu_audio.c
@@ -94,7 +94,7 @@ component *menu_audio_create(scene *s) {
     text_defaults(&tconf);
     tconf.font = FONT_BIG;
     tconf.halign = TEXT_CENTER;
-    tconf.cforeground = color_create(0, 121, 0, 255);
+    tconf.cforeground = COLOR_DARK_GREEN;
 
     // Create menu and its header
     component *menu = menu_create(11);

diff --git a/src/game/scenes/mainmenu/menu_configuration.c b/src/game/scenes/mainmenu/menu_configuration.c
@@ -36,7 +36,7 @@ component *menu_configuration_create(scene *s) {
     text_defaults(&tconf);
     tconf.font = FONT_BIG;
     tconf.halign = TEXT_CENTER;
-    tconf.cforeground = color_create(0, 121, 0, 255);
+    tconf.cforeground = COLOR_DARK_GREEN;
 
     component *menu = menu_create(11);
     menu_attach(menu, label_create(&tconf, "CONFIGURATION"));

diff --git a/src/game/scenes/mainmenu/menu_connect.c b/src/game/scenes/mainmenu/menu_connect.c
@@ -180,7 +180,7 @@ component *menu_connect_create(scene *s) {
     text_defaults(&tconf);
     tconf.font = FONT_BIG;
     tconf.halign = TEXT_CENTER;
-    tconf.cforeground = color_create(0, 121, 0, 255);
+    tconf.cforeground = COLOR_DARK_GREEN;
 
     component *menu = menu_create(11);
     menu_attach(menu, label_create(&tconf, "CONNECT TO SERVER"));

diff --git a/src/game/scenes/mainmenu/menu_gameplay.c b/src/game/scenes/mainmenu/menu_gameplay.c
@@ -23,7 +23,7 @@ component *menu_gameplay_create(scene *s) {
     text_defaults(&tconf);
     tconf.font = FONT_BIG;
     tconf.halign = TEXT_CENTER;
-    tconf.cforeground = color_create(0, 121, 0, 255);
+    tconf.cforeground = COLOR_DARK_GREEN;
 
     component *menu = menu_create(11);
     menu_attach(menu, label_create(&tconf, "GAMEPLAY"));

diff --git a/src/game/scenes/mainmenu/menu_input.c b/src/game/scenes/mainmenu/menu_input.c
@@ -184,7 +184,7 @@ component *menu_input_create(scene *s, int player_id) {
     text_defaults(&tconf);
     tconf.font = FONT_BIG;
     tconf.halign = TEXT_CENTER;
-    tconf.cforeground = color_create(0, 121, 0, 255);
+    tconf.cforeground = COLOR_DARK_GREEN;
 
     component *menu = menu_create(11);
     menu_attach(menu, label_create(&tconf, "CHOOSE INPUT"));

diff --git a/src/game/scenes/mainmenu/menu_keyboard.c b/src/game/scenes/mainmenu/menu_keyboard.c
@@ -131,7 +131,7 @@ guiframe *menu_keyboard_create(scene *s, int selected_player) {
     text_defaults(&tconf);
     tconf.font = FONT_BIG;
     tconf.halign = TEXT_CENTER;
-    tconf.cforeground = color_create(0, 121, 0, 255);
+    tconf.cforeground = COLOR_DARK_GREEN;
 
     local->frame = guiframe_create(25, 5, 270, 140);
     component *menu = menu_create(11);

diff --git a/src/game/scenes/mainmenu/menu_listen.c b/src/game/scenes/mainmenu/menu_listen.c
@@ -140,7 +140,7 @@ component *menu_listen_create(scene *s) {
     text_defaults(&tconf);
     tconf.font = FONT_BIG;
     tconf.halign = TEXT_CENTER;
-    tconf.cforeground = color_create(0, 121, 0, 255);
+    tconf.cforeground = COLOR_DARK_GREEN;
 
     // Create the menu
     component *menu = menu_create(11);

diff --git a/src/game/scenes/mainmenu/menu_main.c b/src/game/scenes/mainmenu/menu_main.c
@@ -95,7 +95,7 @@ component *menu_main_create(scene *s) {
     text_defaults(&tconf);
     tconf.font = FONT_BIG;
     tconf.halign = TEXT_CENTER;
-    tconf.cforeground = color_create(0, 121, 0, 255);
+    tconf.cforeground = COLOR_DARK_GREEN;
 
     component *menu = menu_create(11);
     menu_attach(menu, textbutton_create(&tconf, "ONE PLAYER GAME", COM_ENABLED, mainmenu_1v1, s));

diff --git a/src/game/scenes/mainmenu/menu_net.c b/src/game/scenes/mainmenu/menu_net.c
@@ -28,7 +28,7 @@ component *menu_net_create(scene *s) {
     text_defaults(&tconf);
     tconf.font = FONT_BIG;
     tconf.halign = TEXT_CENTER;
-    tconf.cforeground = color_create(0, 121, 0, 255);
+    tconf.cforeground = COLOR_DARK_GREEN;
 
     component *menu = menu_create(11);
     menu_attach(menu, label_create(&tconf, "NETWORK PLAY"));

diff --git a/src/game/scenes/mainmenu/menu_presskey.c b/src/game/scenes/mainmenu/menu_presskey.c
@@ -65,7 +65,7 @@ void menu_presskey_tick(component *c) {
         if(local->warn_timeout == 0) {
             for(int i = 0; i < 2; i++) {
                 text_settings *tconf = label_get_text_settings(local->text[i]);
-                tconf->cforeground = color_create(0, 121, 0, 255);
+                tconf->cforeground = COLOR_DARK_GREEN;
             }
         }
     }
@@ -114,7 +114,7 @@ component *menu_presskey_create(char **key) {
     text_defaults(&tconf);
     tconf.font = FONT_BIG;
     tconf.halign = TEXT_CENTER;
-    tconf.cforeground = color_create(0, 121, 0, 255);
+    tconf.cforeground = COLOR_DARK_GREEN;
 
     component *menu = menu_create(11);
     local->text[0] = label_create(&tconf, "PRESS A KEY FOR");

diff --git a/src/game/scenes/mainmenu/menu_video.c b/src/game/scenes/mainmenu/menu_video.c
@@ -182,7 +182,7 @@ component *menu_video_create(scene *s) {
     text_defaults(&tconf);
     tconf.font = FONT_BIG;
     tconf.halign = TEXT_CENTER;
-    tconf.cforeground = color_create(0, 121, 0, 255);
+    tconf.cforeground = COLOR_DARK_GREEN;
 
     // Create menu and its header
     component *menu = menu_create(11);

diff --git a/src/game/scenes/mainmenu/menu_video_confirm.c b/src/game/scenes/mainmenu/menu_video_confirm.c
@@ -70,7 +70,7 @@ component *menu_video_confirm_create(scene *s, settings_video *old_settings) {
     text_defaults(&tconf);
     tconf.font = FONT_BIG;
     tconf.halign = TEXT_CENTER;
-    tconf.cforeground = color_create(0, 121, 0, 255);
+    tconf.cforeground = COLOR_DARK_GREEN;
 
     component *menu = menu_create(11);
     menu_attach(menu, label_create(&tconf, "ACCEPT RESOLUTION?"));

diff --git a/src/game/scenes/mechlab/lab_dash_newplayer.c b/src/game/scenes/mechlab/lab_dash_newplayer.c
@@ -25,7 +25,7 @@ component *lab_dash_newplayer_create(scene *s, newplayer_widgets *nw) {
     xysizer_attach(xy, label_create(&tconf, lang_get(192)), 110, 43, 100, 50);
 
     // Input field
-    tconf.cforeground = color_create(0, 121, 0, 255);
+    tconf.cforeground = COLOR_DARK_GREEN;
     nw->input = textinput_create(&tconf, "Name", "");
     component_select(nw->input, 1);
     textinput_enable_background(nw->input, 0);

diff --git a/src/game/scenes/mechlab/lab_menu_confirm.c b/src/game/scenes/mechlab/lab_menu_confirm.c
@@ -73,7 +73,7 @@ component *lab_menu_confirm_create(scene *s, lab_menu_select_cb yes, void *yesda
     trnmenu_attach(menu, button);
 
     // Add text label
-    tconf.cforeground = color_create(0, 121, 0, 255);
+    tconf.cforeground = COLOR_DARK_GREEN;
     component *label = label_create(&tconf, title);
     component_set_pos_hints(label, 10, 155);
     component_set_size_hints(label, 300, 10);

diff --git a/src/game/scenes/mechlab/lab_menu_difficultyselect.c b/src/game/scenes/mechlab/lab_menu_difficultyselect.c
@@ -85,7 +85,7 @@ component *lab_menu_difficultyselect_create(scene *s) {
     }
 
     // Add text label
-    tconf.cforeground = color_create(0, 121, 0, 255);
+    tconf.cforeground = COLOR_DARK_GREEN;
     component *label = label_create(&tconf, "SELECT A DIFFICULTY LEVEL");
     component_set_pos_hints(label, 87, 155);
     component_set_size_hints(label, 150, 10);

diff --git a/src/game/scenes/mechlab/lab_menu_select.c b/src/game/scenes/mechlab/lab_menu_select.c
@@ -88,7 +88,7 @@ component *lab_menu_select_create(scene *s, lab_menu_select_cb select, void *sel
     // TODO the left-right buttons apply on focus, not select
 
     // Add text label
-    tconf.cforeground = color_create(0, 121, 0, 255);
+    tconf.cforeground = COLOR_DARK_GREEN;
     // TODO interpolate %s in the string here with blank
     component *label = label_create(&tconf, lang_get(title));
     component_set_pos_hints(label, 87, 155);

diff --git a/src/video/color.h b/src/video/color.h
@@ -3,6 +3,7 @@
 
 #define COLOR_RED color_create(255, 0, 0, 255)
 #define COLOR_GREEN color_create(0, 255, 0, 255)
+#define COLOR_DARK_GREEN color_create(0, 121, 0, 255)
 #define COLOR_BLUE color_create(0, 0, 255, 255)
 #define COLOR_YELLOW color_create(255, 255, 0, 255)
 #define COLOR_WHITE color_create(255, 255, 255, 255)