real_tabasco_sauce/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Actions Activity

Remove redundant path name argument from the CinemaManager AddPath function.

Browse Source 
Differential Revision: https://code.wildfiregames.com/D310
Patch By: Vladislav
This was SVN commit r19406.
This commit is contained in:
elexis 2017-04-11 01:37:00 +00:00
parent 65cbf12b7e
commit 2e37e6a8d9
5 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/graphics/CinemaPath.cpp
View File

@ -109,7 +109,7 @@ float CCinemaPath::GetElapsedTime() const
return m_TimeElapsed;
}
CStrW CCinemaPath::GetName() const
const CStrW& CCinemaPath::GetName() const
{
return m_Name;
}

2
source/graphics/CinemaPath.h
View File

@ -90,7 +90,7 @@ public:
float GetNodeFraction() const;
float GetElapsedTime() const;
CStrW GetName() const;
const CStrW& GetName() const;
void SetTimescale(fixed scale);

2
source/graphics/MapReader.cpp
View File

@ -927,7 +927,7 @@ void CXMLReader::ReadPaths(XMBElement parent)
if (!cmpCinemaManager)
continue;
if (!cmpCinemaManager->HasPath(pathName))
cmpCinemaManager->AddPath(pathName, path);
cmpCinemaManager->AddPath(path);
else
LOGWARNING("Path with name '%s' already exists", pathName.ToUTF8());
}

8
source/simulation2/components/CCmpCinemaManager.cpp
View File

@ -153,14 +153,14 @@ public:
}
}
virtual void AddPath(const CStrW& name, const CCinemaPath& path)
virtual void AddPath(const CCinemaPath& path)
{
if (m_Paths.find(name) != m_Paths.end())
if (m_Paths.find(path.GetName()) != m_Paths.end())
{
LOGWARNING("Path with name '%s' already exists", name.ToUTF8());
LOGWARNING("Path with name '%s' already exists", path.GetName().ToUTF8());
return;
}
m_Paths[name] = path;
m_Paths[path.GetName()] = path;
}
virtual void AddCinemaPathToQueue(const CStrW& name)

3
source/simulation2/components/ICmpCinemaManager.h
View File

@ -33,10 +33,9 @@ class ICmpCinemaManager : public IComponent
public:
/**
* Adds the path to the path list
* @param name path name
* @param CCinemaPath path data
*/
virtual void AddPath(const CStrW& name, const CCinemaPath& path) = 0;
virtual void AddPath(const CCinemaPath& path) = 0;
/**
* Adds the path to the playlist