Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2024-11-15 04:38:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove extraneous compare function

Browse Source 
std::less<LWOSCENEID> already does this in a map.
This commit is contained in:
David Markowitz 2023-11-21 01:22:54 -08:00
parent d8476b7325
commit f8a01dead3
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dZoneManager/Zone.h
View File

@ -241,15 +241,14 @@ private:
std::string m_ZoneDesc; //Description of the zone by a level designer std::string m_ZoneDesc; //Description of the zone by a level designer
std::string m_ZoneRawPath; //Path to the .raw file of this zone. std::string m_ZoneRawPath; //Path to the .raw file of this zone.
std::map<LWOSCENEID, SceneRef, mapCompareLwoSceneIDs> m_Scenes; std::map<LWOSCENEID, SceneRef> m_Scenes;
std::vector<SceneTransition> m_SceneTransitions; std::vector<SceneTransition> m_SceneTransitions;
uint32_t m_PathDataLength; uint32_t m_PathDataLength;
uint32_t m_PathChunkVersion; uint32_t m_PathChunkVersion;
std::vector<Path> m_Paths; std::vector<Path> m_Paths;
std::map<LWOSCENEID, uint32_t, mapCompareLwoSceneIDs> m_MapRevisions; //rhs is the revision! std::map<LWOSCENEID, uint32_t> m_MapRevisions; //rhs is the revision!
//private ("helper") functions: //private ("helper") functions:
void LoadScene(std::istream& file); void LoadScene(std::istream& file);
void LoadLUTriggers(std::string triggerFile, SceneRef& scene); void LoadLUTriggers(std::string triggerFile, SceneRef& scene);

4
dZoneManager/dZMCommon.h
View File

@ -5,10 +5,6 @@
#include "LDFFormat.h" #include "LDFFormat.h"
#include <vector> #include <vector>
struct mapCompareLwoSceneIDs {
bool operator()(const LWOSCENEID& lhs, const LWOSCENEID& rhs) const { return lhs < rhs; }
};
struct SceneObject { struct SceneObject {
LWOOBJID id; LWOOBJID id;
LOT lot; LOT lot;