Fix some issues with aux infantry

Ouaz · Jan 31, 2024 · 6dfee44 · 6dfee44
1 parent 5e864ed
commit 6dfee44
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/src/translation/english.c b/src/translation/english.c
@@ -1357,6 +1357,7 @@ static translation_string all_strings[] = {
     {TR_REPLAY_MAP_NOT_FOUND_TITLE, "Unable to replay map"},
     {TR_REPLAY_MAP_NOT_FOUND_MESSAGE, "The original map file for this saved game was not found.\nYou need the following file with either a .map or .mapx extension:"},
     {TR_BUILDING_FORT_AUXILIA_INFANTRY, "Auxiliaries - Infantry"},
+    {TR_WINDOW_ADVISOR_MILITARY_INFANTRY, "Infantrymen"}
 };
 
 void translation_english(const translation_string **strings, int *num_strings)

diff --git a/src/translation/translation.h b/src/translation/translation.h
@@ -1351,6 +1351,7 @@ typedef enum {
     TR_REPLAY_MAP_NOT_FOUND_TITLE,
     TR_REPLAY_MAP_NOT_FOUND_MESSAGE,
     TR_BUILDING_FORT_AUXILIA_INFANTRY,
+    TR_WINDOW_ADVISOR_MILITARY_INFANTRY,
     TRANSLATION_MAX_KEY
 } translation_key;
 

diff --git a/src/window/advisor/military.c b/src/window/advisor/military.c
@@ -164,6 +164,9 @@ static int draw_background(void)
             case FIGURE_FORT_JAVELIN:
                 lang_text_draw(138, 35, 84 + width, 100 + 44 * i, FONT_NORMAL_GREEN);
                 break;
+            case FIGURE_FORT_INFANTRY:
+                text_draw(translation_for(TR_WINDOW_ADVISOR_MILITARY_INFANTRY), 84 + width, 100 + 44 * i, FONT_NORMAL_GREEN, 0);
+                break;
         }
         int morale_offset = m->morale / 5;
         if (morale_offset > 20) {

diff --git a/src/window/building/military.c b/src/window/building/military.c
@@ -256,12 +256,18 @@ void window_building_draw_legion_info(building_info_context *c)
         flag_image_id += 9;
     } else if (m->figure_type == FIGURE_FORT_MOUNTED) {
         flag_image_id += 18;
-    } else if (m->figure_type == FIGURE_FORT_INFANTRY) {
-        flag_image_id = assets_get_image_id("Military", "auxinf_banner_0");
     }
     if (m->is_halted) {
         flag_image_id += 8;
     }
+    if (m->figure_type == FIGURE_FORT_INFANTRY) {
+        if (m->is_halted) {
+            flag_image_id = assets_get_image_id("Military", "auxinf_banner_0");
+        } else {
+            flag_image_id = assets_get_image_id("Military", "auxinf_banner_01");
+        }
+    }
+
     const image *flag_image = image_get(flag_image_id);
     int flag_height = flag_image->height;
     image_draw(flag_image_id, c->x_offset + 16 + (40 - flag_image->width - flag_image->x_offset) / 2,