marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Materials: Fix misspelling of "Incendiary" (#1680) 

The wrong spelling will still be accepted as a material value, as long
as no value with the correct spelling exists.
liquid_container
Nicolas Hake 2016-02-09 23:45:02 +01:00
parent 6f669e7b49
commit 5f895c14fc
9 changed files with 46 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
docs/sdk/material/ocm.xml
View File

@ -106,9 +106,12 @@
<col>Inflammability.</col>
</row>
<row>
<col>Incindiary</col>
<col>Incendiary</col>
<col>Integer</col>
<col>This material incinerates objects.</col>
<col>
This material incinerates objects.
<em>Note: For compatibility reasons, the misspelling &quot;Incindiary&quot; is also accepted if (and only if) no value with the correct spelling is set.</em>
</col>
</row>
<row>
<col>Corrode</col>
@ -372,8 +375,11 @@
<col>The background material.</col>
</row>
<row>
<col>Incindiary</col>
<col>All materials to be incinerated.</col>
<col>Incendiary</col>
<col>
All materials that can incinerate objects.
<em>Note: For compatibility reasons, the misspelling &quot;Incindiary&quot; is also accepted.</em>
</col>
</row>
<row>
<col>Extinguisher</col>

2
planet/Arena.ocf/FrozenFortress.ocs/Material.ocg/Snow.ocm
View File

@ -25,5 +25,5 @@ InMatConvertDepth=1
[Reaction]
Type=Convert
TargetSpec=Incindiary
TargetSpec=Incendiary
ConvertMat=Water

2
planet/Material.ocg/DuroLava.ocm
View File

@ -5,7 +5,7 @@ Instable=1
MaxAirSpeed=50
MaxSlide=10000
WindDrift=40
Incindiary=1
Incendiary=1
Placement=10
Light=1
TextureOverlay=lava_red

2
planet/Material.ocg/Lava.ocm
View File

@ -5,7 +5,7 @@ Instable=1
MaxAirSpeed=50
MaxSlide=10000
WindDrift=40
Incindiary=1
Incendiary=1
TempConvStrength=12
BelowTempConvert=100
BelowTempConvertTo=Rock

2
planet/Material.ocg/Snow.ocm
View File

@ -27,5 +27,5 @@ Dig2ObjectRatio=400
[Reaction]
Type=Poof
TargetSpec=Incindiary
TargetSpec=Incendiary

2
planet/Parkour.ocf/VolcanoEscapeEx.ocs/Material.ocg/StableLava.ocm
View File

@ -5,7 +5,7 @@ Instable=0
MaxAirSpeed=50
MaxSlide=10000
WindDrift=40
Incindiary=1
Incendiary=1
Placement=10
TextureOverlay=lava_red
PXSGfxSize=6

37
src/landscape/C4Material.cpp
View File

@ -123,7 +123,7 @@ void C4MaterialCore::Clear()
MaxSlide = 0;
WindDrift = 0;
Inflammable = 0;
Incindiary = 0;
Incendiary = 0;
Extinguisher = 0;
Corrosive = 0;
Corrode = 0;
@ -183,6 +183,7 @@ bool C4MaterialCore::Load(C4Group &hGroup,
void C4MaterialCore::CompileFunc(StdCompiler *pComp)
{
assert(pComp->hasNaming());
if (pComp->isCompiler()) Clear();
pComp->Name("Material");
pComp->Value(mkNamingAdapt(toC4CStr(Name), "Name", ""));
@ -214,7 +215,27 @@ void C4MaterialCore::CompileFunc(StdCompiler *pComp)
pComp->Value(mkNamingAdapt(MaxSlide, "MaxSlide", 0));
pComp->Value(mkNamingAdapt(WindDrift, "WindDrift", 0));
pComp->Value(mkNamingAdapt(Inflammable, "Inflammable", 0));
pComp->Value(mkNamingAdapt(Incindiary, "Incindiary", 0));
if (pComp->isCompiler())
{
// The value used to have a wrong spelling ("Incindiary"). If there's
// no "Incendiary" value, use the wrong spelling instead
try
{
pComp->Value(mkNamingAdapt(Incendiary, "Incendiary"));
}
catch (StdCompiler::NotFoundException *ex)
{
delete ex;
pComp->Value(mkNamingAdapt(Incendiary, "Incindiary", 0));
}
}
else
{
// When serializing, write both spellings because some script might be
// calling GetMaterialVal with the wrong one
pComp->Value(mkNamingAdapt(Incendiary, "Incendiary"));
pComp->Value(mkNamingAdapt(Incendiary, "Incindiary"));
}
pComp->Value(mkNamingAdapt(Corrode, "Corrode", 0));
pComp->Value(mkNamingAdapt(Corrosive, "Corrosive", 0));
pComp->Value(mkNamingAdapt(Extinguisher, "Extinguisher", 0));
@ -371,10 +392,10 @@ bool C4MaterialMap::CrossMapMaterials(const char* szEarthMaterial) // Called aft
else if (pMatPXS && pMatLS)
{
// incindiary vs extinguisher
if ((pMatPXS->Incindiary && pMatLS->Extinguisher) || (pMatPXS->Extinguisher && pMatLS->Incindiary))
if ((pMatPXS->Incendiary && pMatLS->Extinguisher) || (pMatPXS->Extinguisher && pMatLS->Incendiary))
pReaction = &DefReactPoof;
// incindiary vs inflammable
else if ((pMatPXS->Incindiary && pMatLS->Inflammable) || (pMatPXS->Inflammable && pMatLS->Incindiary))
else if ((pMatPXS->Incendiary && pMatLS->Inflammable) || (pMatPXS->Inflammable && pMatLS->Incendiary))
pReaction = &DefReactIncinerate;
// corrosive vs corrode
else if (pMatPXS->Corrosive && pMatLS->Corrode)
@ -476,11 +497,11 @@ bool C4MaterialMap::CrossMapMaterials(const char* szEarthMaterial) // Called aft
else
for (int32_t cnt2=0; cnt2<Num; cnt2++) SetMatReaction(cnt, cnt2, pReact);
}
else if (SEqualNoCase(pReact->TargetSpec.getData(), "Incindiary"))
else if (SEqualNoCase(pReact->TargetSpec.getData(), "Incendiary") || SEqualNoCase(pReact->TargetSpec.getData(), "Incindiary"))
{
// add to all incendiary materials
if (pReact->fInverseSpec) SetMatReaction(cnt, -1, pReact);
for (int32_t cnt2=0; cnt2<Num; cnt2++) if (!Map[cnt2].Incindiary == pReact->fInverseSpec) SetMatReaction(cnt, cnt2, pReact);
for (int32_t cnt2=0; cnt2<Num; cnt2++) if (!Map[cnt2].Incendiary == pReact->fInverseSpec) SetMatReaction(cnt, cnt2, pReact);
}
else if (SEqualNoCase(pReact->TargetSpec.getData(), "Extinguisher"))
{
@ -667,8 +688,8 @@ bool mrfInsertCheck(int32_t &iX, int32_t &iY, C4Real &fXDir, C4Real &fYDir, int3
// Contact: Stop
fYDir = -GravAccel;
// Incindiary mats smoke on contact even before doing their slide
if (::MaterialMap.Map[iPxsMat].Incindiary)
// Incendiary mats smoke on contact even before doing their slide
if (::MaterialMap.Map[iPxsMat].Incendiary)
if (!Random(25))
{
Smoke(iX, iY, 4 + Random(3));

2
src/landscape/C4Material.h
View File

@ -106,7 +106,7 @@ public:
int32_t MaxSlide;
int32_t WindDrift;
int32_t Inflammable;
int32_t Incindiary;
int32_t Incendiary;
int32_t Extinguisher;
int32_t Corrosive;
int32_t Corrode;

2
src/object/C4Object.cpp
View File

@ -995,7 +995,7 @@ bool C4Object::ExecLife()
// InMat incineration
if (!::Game.iTick10)
if (InMat!=MNone)
if (::MaterialMap.Map[InMat].Incindiary)
if (::MaterialMap.Map[InMat].Incendiary)
if (GetPropertyInt(P_ContactIncinerate) > 0)
{
Call(PSF_OnInIncendiaryMaterial, &C4AulParSet());