Skip to content

Commit 47352d6

Browse files
authored
Merge pull request #5543 from ab9rf/fix-mix-dye-job
fix `Job::getName`
2 parents 24985eb + c2435b0 commit 47352d6

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

docs/changelog.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,19 +57,19 @@ Template for new versions:
5757
## New Features
5858

5959
## Fixes
60+
- job descriptions of mix dye job will display proper dye names
6061

6162
## Misc Improvements
6263

6364
## Documentation
6465

6566
## API
66-
- Added GUI focus strings for new_arena: ``/Loading`` and ``/Mods``
6767

6868
## Lua
6969

7070
## Removed
7171

72-
# 52.03-1
72+
# 52.03-r1
7373

7474
## New Tools
7575

@@ -83,6 +83,7 @@ Template for new versions:
8383
## Documentation
8484

8585
## API
86+
- Added GUI focus strings for new_arena: ``/Loading`` and ``/Mods``
8687

8788
## Lua
8889

library/modules/Job.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -655,6 +655,9 @@ std::string Job::getName(df::job *job)
655655
button->matgloss = job->mat_index;
656656
button->specflag = job->specflag;
657657
button->job_item_flag = job->material_category;
658+
button->specdata = job->specdata;
659+
button->art_specifier_id1 = job->art_spec.id;
660+
button->art_specifier_id2 = job->art_spec.subid;
658661

659662
button->text(&desc);
660663
delete button;

0 commit comments

Comments
 (0)