From b5b9c0f2ae6ea26ea8cef47e4b3abfa1206f5436 Mon Sep 17 00:00:00 2001 From: Itms Date: Wed, 21 Jan 2015 21:45:05 +0000 Subject: [PATCH] Improve template code style for the Decay component. This was SVN commit r16171. --- .../campaigns/army_mace_hero_alexander.xml | 1 - .../campaigns/army_mace_standard.xml | 1 - .../campaigns/army_spart_hero_leonidas.xml | 1 - .../templates/other/hellenic_epic_temple.xml | 1 - .../simulation/templates/other/plane.xml | 3 +-- .../simulation/templates/template_rubble.xml | 2 ++ .../templates/template_structure.xml | 3 ++- .../simulation/templates/template_unit.xml | 3 ++- .../templates/template_unit_mechanical.xml | 1 - .../template_unit_mechanical_ship.xml | 3 +-- source/ps/TemplateLoader.cpp | 4 ++-- source/simulation2/components/CCmpDecay.cpp | 24 ++++++++----------- 12 files changed, 20 insertions(+), 27 deletions(-) diff --git a/binaries/data/mods/public/simulation/templates/campaigns/army_mace_hero_alexander.xml b/binaries/data/mods/public/simulation/templates/campaigns/army_mace_hero_alexander.xml index 09cfc010b9..91decb46ca 100644 --- a/binaries/data/mods/public/simulation/templates/campaigns/army_mace_hero_alexander.xml +++ b/binaries/data/mods/public/simulation/templates/campaigns/army_mace_hero_alexander.xml @@ -14,7 +14,6 @@ - 0.0 3.0 9.8 diff --git a/binaries/data/mods/public/simulation/templates/campaigns/army_mace_standard.xml b/binaries/data/mods/public/simulation/templates/campaigns/army_mace_standard.xml index e61b52ccf0..5abf8be879 100644 --- a/binaries/data/mods/public/simulation/templates/campaigns/army_mace_standard.xml +++ b/binaries/data/mods/public/simulation/templates/campaigns/army_mace_standard.xml @@ -6,7 +6,6 @@ - 0.0 3.0 9.8 diff --git a/binaries/data/mods/public/simulation/templates/campaigns/army_spart_hero_leonidas.xml b/binaries/data/mods/public/simulation/templates/campaigns/army_spart_hero_leonidas.xml index c60c8d5387..4ae7f7e146 100644 --- a/binaries/data/mods/public/simulation/templates/campaigns/army_spart_hero_leonidas.xml +++ b/binaries/data/mods/public/simulation/templates/campaigns/army_spart_hero_leonidas.xml @@ -14,7 +14,6 @@ - 0.0 3.0 9.8 diff --git a/binaries/data/mods/public/simulation/templates/other/hellenic_epic_temple.xml b/binaries/data/mods/public/simulation/templates/other/hellenic_epic_temple.xml index d7ec2379b2..66324243a5 100644 --- a/binaries/data/mods/public/simulation/templates/other/hellenic_epic_temple.xml +++ b/binaries/data/mods/public/simulation/templates/other/hellenic_epic_temple.xml @@ -10,7 +10,6 @@ - 0.0 2.0 9.0 diff --git a/binaries/data/mods/public/simulation/templates/other/plane.xml b/binaries/data/mods/public/simulation/templates/other/plane.xml index 62d3624550..a639e25b70 100644 --- a/binaries/data/mods/public/simulation/templates/other/plane.xml +++ b/binaries/data/mods/public/simulation/templates/other/plane.xml @@ -27,8 +27,7 @@ - - + true 0.0 3.0 7.0 diff --git a/binaries/data/mods/public/simulation/templates/template_rubble.xml b/binaries/data/mods/public/simulation/templates/template_rubble.xml index 7d3ca0cd32..7dbcc1c6b6 100644 --- a/binaries/data/mods/public/simulation/templates/template_rubble.xml +++ b/binaries/data/mods/public/simulation/templates/template_rubble.xml @@ -1,6 +1,8 @@ + true + false 15.0 0.2 0 diff --git a/binaries/data/mods/public/simulation/templates/template_structure.xml b/binaries/data/mods/public/simulation/templates/template_structure.xml index 3a9e0dbc2f..3cbcd922da 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure.xml @@ -32,7 +32,8 @@ - + false + false 0.0 3.0 9.8 diff --git a/binaries/data/mods/public/simulation/templates/template_unit.xml b/binaries/data/mods/public/simulation/templates/template_unit.xml index eb35cf0564..9e86cdf9f8 100644 --- a/binaries/data/mods/public/simulation/templates/template_unit.xml +++ b/binaries/data/mods/public/simulation/templates/template_unit.xml @@ -17,7 +17,8 @@ - + false + false 80.0 0.01 0.0 diff --git a/binaries/data/mods/public/simulation/templates/template_unit_mechanical.xml b/binaries/data/mods/public/simulation/templates/template_unit_mechanical.xml index adbd7d369d..1b9d7423ea 100644 --- a/binaries/data/mods/public/simulation/templates/template_unit_mechanical.xml +++ b/binaries/data/mods/public/simulation/templates/template_unit_mechanical.xml @@ -1,7 +1,6 @@ - 0.0 0.0 2.0 diff --git a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship.xml b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship.xml index fe5f46a78c..91d8e345aa 100644 --- a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship.xml +++ b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship.xml @@ -16,8 +16,7 @@ - - + true 0.0 0.5 7.0 diff --git a/source/ps/TemplateLoader.cpp b/source/ps/TemplateLoader.cpp index d2e8345849..30f34ceac8 100644 --- a/source/ps/TemplateLoader.cpp +++ b/source/ps/TemplateLoader.cpp @@ -393,9 +393,9 @@ void CTemplateLoader::CopyPreviewSubset(CParamNode& out, const CParamNode& in, b if (corpse) { - // Corpses should include decay components and un-inactivate them + // Corpses should include decay components and activate them if (out.GetChild("Entity").GetChild("Decay").IsOk()) - CParamNode::LoadXMLString(out, ""); + CParamNode::LoadXMLString(out, "true"); // Corpses shouldn't display silhouettes (especially since they're often half underground) if (out.GetChild("Entity").GetChild("VisualActor").IsOk()) diff --git a/source/simulation2/components/CCmpDecay.cpp b/source/simulation2/components/CCmpDecay.cpp index cc33837649..a39f91877c 100644 --- a/source/simulation2/components/CCmpDecay.cpp +++ b/source/simulation2/components/CCmpDecay.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2012 Wildfire Games. +/* Copyright (C) 2015 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -70,6 +70,12 @@ public: static std::string GetSchema() { return + "" + "" + "" + "" + "" + "" "" "" "" @@ -78,23 +84,13 @@ public: "" "" "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - ""; + ""; } virtual void Init(const CParamNode& paramNode) { - m_Active = !paramNode.GetChild("Inactive").IsOk(); - m_ShipSink = paramNode.GetChild("SinkingAnim").IsOk(); + m_Active = paramNode.GetChild("Active").ToBool(); + m_ShipSink = paramNode.GetChild("SinkingAnim").ToBool(); m_DelayTime = paramNode.GetChild("DelayTime").ToFixed().ToFloat(); m_SinkRate = paramNode.GetChild("SinkRate").ToFixed().ToFloat(); m_SinkAccel = paramNode.GetChild("SinkAccel").ToFixed().ToFloat();