diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-07-25 18:42:53 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-07-25 18:42:53 (GMT) |
| commit | a033fe7e496cfb5c6f4ec78e607408418858e765 (patch) | |
| tree | a94e07b4cad1b0e81809682c5b48eee88c075e7e /src/simulation/elements/CONV.cpp | |
| parent | a5d6c56f8cb5eab1d0c9823142c61de97230ee94 (diff) | |
| download | powder-a033fe7e496cfb5c6f4ec78e607408418858e765.zip powder-a033fe7e496cfb5c6f4ec78e607408418858e765.tar.gz | |
TPT: Add ptypes.enabled checks to a few more places 61f39f5464
Diffstat (limited to 'src/simulation/elements/CONV.cpp')
| -rw-r--r-- | src/simulation/elements/CONV.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/simulation/elements/CONV.cpp b/src/simulation/elements/CONV.cpp index 4ee4682..de31d73 100644 --- a/src/simulation/elements/CONV.cpp +++ b/src/simulation/elements/CONV.cpp @@ -50,7 +50,7 @@ Element_CONV::Element_CONV() int Element_CONV::update(UPDATE_FUNC_ARGS) { int r, rx, ry; - if (parts[i].ctype<=0 || parts[i].ctype>=PT_NUM || (parts[i].ctype==PT_LIFE && (parts[i].tmp<0 || parts[i].tmp>=NGOLALT))) + if (parts[i].ctype<=0 || parts[i].ctype>=PT_NUM || !sim->elements[parts[i].ctype].Enabled || (parts[i].ctype==PT_LIFE && (parts[i].tmp<0 || parts[i].tmp>=NGOLALT))) { for (rx=-1; rx<2; rx++) for (ry=-1; ry<2; ry++) @@ -72,7 +72,7 @@ int Element_CONV::update(UPDATE_FUNC_ARGS) } } } - else if(parts[i].ctype>0 && parts[i].ctype<PT_NUM && parts[i].ctype!=PT_CONV) { + else if(parts[i].ctype>0 && parts[i].ctype<PT_NUM && sim->elements[parts[i].ctype]->Enabled && parts[i].ctype!=PT_CONV) { for (rx=-1; rx<2; rx++) for (ry=-1; ry<2; ry++) if (x+rx>=0 && y+ry>=0 && x+rx<XRES && y+ry<YRES) |