From 604ec667f320e4288a2a2cfe7fc0d5a0f6285508 Mon Sep 17 00:00:00 2001
From: vladislavbelov <vladislavbelov@wildfiregames.com>
Date: Fri, 10 Jan 2020 22:36:22 +0000
Subject: [PATCH] Removes possible copying of CStr in CTerrainTextureEntry and
 adds const where possible.

The copy returning was introduced in 7577d224a6.

This was SVN commit r23363.
---
 source/graphics/TerrainTextureEntry.cpp |  4 ++--
 source/graphics/TerrainTextureEntry.h   | 21 ++++++++-------------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/source/graphics/TerrainTextureEntry.cpp b/source/graphics/TerrainTextureEntry.cpp
index 3f4617ff42..ac2e707737 100644
--- a/source/graphics/TerrainTextureEntry.cpp
+++ b/source/graphics/TerrainTextureEntry.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 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
@@ -194,7 +194,7 @@ void CTerrainTextureEntry::BuildBaseColor()
 	}
 }
 
-const float* CTerrainTextureEntry::GetTextureMatrix()
+const float* CTerrainTextureEntry::GetTextureMatrix() const
 {
 	return &m_TextureMatrix._11;
 }
diff --git a/source/graphics/TerrainTextureEntry.h b/source/graphics/TerrainTextureEntry.h
index 2251d2dd19..dfe90e479d 100644
--- a/source/graphics/TerrainTextureEntry.h
+++ b/source/graphics/TerrainTextureEntry.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2012 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
@@ -71,27 +71,22 @@ public:
 	CTerrainTextureEntry(CTerrainPropertiesPtr props, const VfsPath& path);
 	~CTerrainTextureEntry();
 
-	CStr GetTag() const
-	{ return m_Tag; }
+	const CStr& GetTag() const { return m_Tag; }
 
-	const CTerrainProperties& GetProperties() const
-	{ return *m_pProperties; }
+	const CTerrainProperties& GetProperties() const { return *m_pProperties; }
 
 	// Get texture handle, load texture if not loaded.
-	const CTexturePtr& GetTexture() {
-		return m_Material.GetDiffuseTexture();
-	}
+	const CTexturePtr& GetTexture() const { return m_Material.GetDiffuseTexture(); }
 
-	const CMaterial& GetMaterial() {
-		return m_Material;
-	}
+	const CMaterial& GetMaterial() const { return m_Material; }
 
 	// Returns a matrix of the form [c 0 -s 0; -s 0 -c 0; 0 0 0 0; 0 0 0 1]
 	// mapping world-space (x,y,z,1) coordinates onto (u,v,0,1) texcoords
-	const float* GetTextureMatrix();
+	const float* GetTextureMatrix() const;
 
 	// Get mipmap color in BGRA format
-	u32 GetBaseColor() {
+	u32 GetBaseColor()
+	{
 		if (!m_BaseColorValid) BuildBaseColor();
 		return m_BaseColor;
 	}