diff --git a/plugins/catsplosion.cpp b/plugins/catsplosion.cpp index 179aec2fd..c0702df2c 100644 --- a/plugins/catsplosion.cpp +++ b/plugins/catsplosion.cpp @@ -120,14 +120,14 @@ command_result catsplosion (color_ostream &out, std::vector & para female->relations.pregnancy_timer = rand() % 100 + 1; totalchanged++; } - else if(!female->relations.pregnancy_ptr) + else if(!female->relations.pregnancy_genes) { df::unit_genes *preg = new df::unit_genes; preg->appearance = female->appearance.genes.appearance; preg->colors = female->appearance.genes.colors; - female->relations.pregnancy_ptr = preg; + female->relations.pregnancy_genes = preg; female->relations.pregnancy_timer = rand() % 100 + 1; - female->relations.pregnancy_mystery = 1; // WTF is this? + female->relations.pregnancy_caste = 1; totalcreated ++; } } diff --git a/plugins/lua/dfusion/tools.lua b/plugins/lua/dfusion/tools.lua index b066ccfcb..b2cbcf8e2 100644 --- a/plugins/lua/dfusion/tools.lua +++ b/plugins/lua/dfusion/tools.lua @@ -159,22 +159,22 @@ function empregnate(unit) unit.curse.add_tags2.STERILE=false end local genes = unit.appearance.genes - if unit.relations.pregnancy_ptr == nil then + if unit.relations.pregnancy_genes == nil then print("creating preg ptr.") if false then - print(string.format("%x %x",df.sizeof(unit.relations:_field("pregnancy_ptr")))) + print(string.format("%x %x",df.sizeof(unit.relations:_field("pregnancy_genes")))) return end - unit.relations.pregnancy_ptr = { new = true, assign = genes } + unit.relations.pregnancy_genes = { new = true, assign = genes } end - local ngenes = unit.relations.pregnancy_ptr + local ngenes = unit.relations.pregnancy_genes if #ngenes.appearance ~= #genes.appearance or #ngenes.colors ~= #genes.colors then print("Array sizes incorrect, fixing.") ngenes:assign(genes); end print("Setting preg timer.") unit.relations.pregnancy_timer=10 - unit.relations.pregnancy_mystery=1 + unit.relations.pregnancy_caste=1 end menu:add("Empregnate",empregnate) function healunit(unit)