From 1a0eb73ea0e72db9de13418c40b6804f1210c4c7 Mon Sep 17 00:00:00 2001 From: Saveliy Skresanov Date: Thu, 4 Apr 2024 22:20:14 +0700 Subject: [PATCH] Use create_part in resist reactions, and set CarriesCtypeIn for RSSS. --- src/simulation/elements/PTNM.cpp | 2 +- src/simulation/elements/RSSS.cpp | 1 + src/simulation/elements/RSST.cpp | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/simulation/elements/PTNM.cpp b/src/simulation/elements/PTNM.cpp index cd7c7cab9..55b22365c 100644 --- a/src/simulation/elements/PTNM.cpp +++ b/src/simulation/elements/PTNM.cpp @@ -238,7 +238,7 @@ static int update(UPDATE_FUNC_ARGS) break; case PT_RSST: // RSST -> BIZR - sim->part_change_type(ID(r), x + rx, y + ry, PT_BIZR); + sim->create_part(ID(r), x + rx, y + ry, PT_BIZR); break; } } diff --git a/src/simulation/elements/RSSS.cpp b/src/simulation/elements/RSSS.cpp index 7ca3fd424..1a11942fb 100644 --- a/src/simulation/elements/RSSS.cpp +++ b/src/simulation/elements/RSSS.cpp @@ -33,6 +33,7 @@ void Element::Element_RSSS() Description = "Solidified resist. Blocks pressure and insulates electricity. Liquefies on contact with neutrons."; Properties = TYPE_SOLID|PROP_NEUTPASS; + CarriesTypeIn = (1U << FIELD_CTYPE) | (1U << FIELD_TMP); LowPressure = IPL; LowPressureTransition = NT; diff --git a/src/simulation/elements/RSST.cpp b/src/simulation/elements/RSST.cpp index 747b52ced..d12f294f8 100644 --- a/src/simulation/elements/RSST.cpp +++ b/src/simulation/elements/RSST.cpp @@ -61,7 +61,7 @@ int update(UPDATE_FUNC_ARGS) // RSST + GUNP = FIRW if(TYP(r) == PT_GUNP) { - sim->part_change_type(i, x, y, PT_FIRW); + sim->create_part(i, x, y, PT_FIRW); sim->kill_part(ID(r)); return 1; } @@ -69,7 +69,7 @@ int update(UPDATE_FUNC_ARGS) // RSST + BCOL = FSEP if(TYP(r) == PT_BCOL) { - sim->part_change_type(i, x, y, PT_FSEP); + sim->create_part(i, x, y, PT_FSEP); parts[i].life = 50; sim->kill_part(ID(r)); return 1;