From ebd9786268e9c3dc77957eee193924bafa8b0df5 Mon Sep 17 00:00:00 2001 From: Stan Date: Thu, 28 May 2020 18:18:00 +0000 Subject: [PATCH] Add missing cpp files in last commit refs D2503 This was SVN commit r23704. --- source/ps/TemplateLoader.cpp | 8 ++++---- source/simulation2/tests/test_CmpTemplateManager.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/source/ps/TemplateLoader.cpp b/source/ps/TemplateLoader.cpp index 8a3e2fd485..2d37a9f016 100644 --- a/source/ps/TemplateLoader.cpp +++ b/source/ps/TemplateLoader.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2017 Wildfire Games. +/* Copyright (C) 2020 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -193,16 +193,16 @@ void CTemplateLoader::ConstructTemplateActor(const std::string& actorName, CPara // Copy the actor template out = GetTemplateFileData("special/actor"); - // Initialise the actor's name and make it an Atlas selectable entity. + // Initialize the actor's name and make it an Atlas selectable entity. std::wstring actorNameW = wstring_from_utf8(actorName); std::string name = utf8_from_wstring(CParamNode::EscapeXMLString(actorNameW)); std::string xml = "" "" + name + "" - // arbitrary-sized Footprint definition to make actors' selection outlines show up in Atlas + // Arbitrary-sized Footprint definition to make actors' selection outlines show up in Atlas. "1.0" "" "" - "actor.pngactor_mask.png" + "128x128/ellipse.png128x128/ellipse_mask.png" "" ""; diff --git a/source/simulation2/tests/test_CmpTemplateManager.h b/source/simulation2/tests/test_CmpTemplateManager.h index a155a3d1f6..4c7cbe7a87 100644 --- a/source/simulation2/tests/test_CmpTemplateManager.h +++ b/source/simulation2/tests/test_CmpTemplateManager.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2017 Wildfire Games. +/* Copyright (C) 2020 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -79,7 +79,7 @@ public: const CParamNode* actor = tempMan->LoadTemplate(ent2, "actor|example1"); TS_ASSERT(actor != NULL); TS_ASSERT_WSTR_EQUALS(actor->ToXML(), - L"1.0actor.pngactor_mask.png" + L"1.0128x128/ellipse.png128x128/ellipse_mask.png" L"example1falsefalsefalse"); }