MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update structures 

handle renaming of caste_raw::gender
develop
Ben Lubar 2020-06-29 20:20:37 -05:00
parent a9f219baf9
commit d13e5a3f31
No known key found for this signature in database
GPG Key ID: 92939677AB59EDA4
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/xml

@ -1 +1 @@
Subproject commit 7dfea1f1d4e453b97d5529785701db46360596ce Subproject commit b11433eea0a1117edc2a4a51f7a30b01594cb52b

2
plugins/remotefortressreader/remotefortressreader.cpp
Unescape Escape View File

@ -2685,7 +2685,7 @@ static command_result GetPartialCreatureRaws(color_ostream &stream, const ListRe
send_caste->add_child_name(orig_caste->child_name[0]); send_caste->add_child_name(orig_caste->child_name[0]);
send_caste->add_child_name(orig_caste->child_name[1]); send_caste->add_child_name(orig_caste->child_name[1]);
send_caste->set_gender(orig_caste->gender); send_caste->set_gender(orig_caste->sex);
for (size_t partIndex = 0; partIndex < orig_caste->body_info.body_parts.size(); partIndex++) for (size_t partIndex = 0; partIndex < orig_caste->body_info.body_parts.size(); partIndex++)
{ {

2
plugins/tweak/tweaks/tradereq-pet-gender.h
Unescape Escape View File

@ -20,7 +20,7 @@ struct pet_gender_hook : df::viewscreen_topicmeeting_takerequestsst {
vector<int16_t>& castes = entity->resources.animals.pet_castes; vector<int16_t>& castes = entity->resources.animals.pet_castes;
for (int i = (good_idx / 17) * 17, y = 4; i < (good_idx / 17) * 17 + 17 && size_t(i) < races.size(); i++, y++) { for (int i = (good_idx / 17) * 17, y = 4; i < (good_idx / 17) * 17 + 17 && size_t(i) < races.size(); i++, y++) {
int x = 30 + 1 + world->raws.creatures.all[races[i]]->caste[castes[i]]->caste_name[0].size(); int x = 30 + 1 + world->raws.creatures.all[races[i]]->caste[castes[i]]->caste_name[0].size();
bool male = (bool)world->raws.creatures.all[races[i]]->caste[castes[i]]->gender; bool male = world->raws.creatures.all[races[i]]->caste[castes[i]]->sex == pronoun_type::he;
OutputString((i == good_idx) ? COLOR_WHITE : COLOR_GREY, OutputString((i == good_idx) ? COLOR_WHITE : COLOR_GREY,
x, y, male ? "\013" : "\014"); x, y, male ? "\013" : "\014");
} }

2
scripts

@ -1 +1 @@
Subproject commit 792ae44ab14afd3a2b3e850a6fcb463d714b0a44 Subproject commit 91060d6d2c79196f6b332b9b88492eb0e7ef32da