mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-16 15:29:55 +00:00
Code Issues Releases Wiki Activity

Cell case insensitivity, exterior and interior cells

Browse source
This commit is contained in:
Jason Hooks 2010-10-27 23:22:01 -04:00
parent ffaaad188a
commit 13d8ea09b0
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
components/esm_store/reclists.hpp
View file

@ -9,7 +9,12 @@
#include <assert.h>
#include <stdexcept>
#include <iterator>
#include <boost/algorithm/string.hpp>
using namespace boost::algorithm;
namespace ESMS
{
using namespace ESM;
@ -233,6 +238,15 @@ namespace ESMS
}
};
struct ciLessBoost : std::binary_function<std::string, std::string, bool>
{
bool operator() (const std::string & s1, const std::string & s2) const {
//case insensitive version of is_less
return lexicographical_compare(s1, s2, is_iless());
}
};
// Cells aren't simply indexed by name. Exterior cells are treated
// separately.
// TODO: case handling (cell names are case-insensitive, but they are also showen to the
@ -245,7 +259,7 @@ namespace ESMS
int getSize() { return count; }
// List of interior cells. Indexed by cell name.
typedef std::map<std::string,Cell*> IntCells;
typedef std::map<std::string,Cell*, ciLessBoost> IntCells;
IntCells intCells;
// List of exterior cells. Indexed as extCells[gridX][gridY].
@ -268,6 +282,7 @@ namespace ESMS
}
}
const Cell* findInt(const std::string &id) const
{
IntCells::const_iterator it = intCells.find(id);
@ -300,7 +315,7 @@ namespace ESMS
const ExtCellsCol& column = iter->second;
for (ExtCellsCol::const_iterator iter = column.begin(); iter!=column.end(); ++iter)
{
if (iter->second->name==id)
if ( toLower(iter->second->name) == toLower(id))
return iter->second;
}
}