update structures

handle renaming of caste_raw::gender
Hiranus · Jun 30, 2020 · d13e5a3 · d13e5a3
1 parent a9f219b
commit d13e5a3
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/library/xml b/library/xml
diff --git a/plugins/remotefortressreader/remotefortressreader.cpp b/plugins/remotefortressreader/remotefortressreader.cpp
@@ -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[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++)
             {

diff --git a/plugins/tweak/tweaks/tradereq-pet-gender.h b/plugins/tweak/tweaks/tradereq-pet-gender.h
@@ -20,7 +20,7 @@ struct pet_gender_hook : df::viewscreen_topicmeeting_takerequestsst {
             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++) {
                 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,
                     x, y, male ? "\013" : "\014");
             }

diff --git a/scripts b/scripts
+3 −0		changelog.txt
+1 −1		df.creature-raws.xml
+1 −1		df.history.xml
+2 −2		df.items.xml
+10 −2		df.units.xml