mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-26 09:35:28 +00:00
Code Issues Projects Releases Wiki Activity

conflict resolution

Browse Source
This commit is contained in:
eduard 2012-12-30 13:46:07 +01:00
parent fb25f407fb
commit 98103e15eb
2 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
apps/openmw/mwworld/worldimp.cpp
View File

@ -235,20 +235,11 @@ namespace MWWorld
} }
// didn't work -> now check for regions // didn't work -> now check for regions
<<<<<<< HEAD
std::string cellName2 = Misc::toLower (cellName);
for (ESMS::RecListT<ESM::Region>::MapType::const_iterator iter (mStore.regions.list.begin());
iter!=mStore.regions.list.end(); ++iter)
{
if (Misc::toLower (iter->second.mName)==cellName2)
=======
const MWWorld::Store<ESM::Region> &regions = mStore.get<ESM::Region>(); const MWWorld::Store<ESM::Region> &regions = mStore.get<ESM::Region>();
MWWorld::Store<ESM::Region>::iterator it = regions.begin(); MWWorld::Store<ESM::Region>::iterator it = regions.begin();
for (; it != regions.end(); ++it) for (; it != regions.end(); ++it)
{ {
if (Misc::StringUtils::ciEqual(cellName, it->mName)) if (Misc::StringUtils::ciEqual(cellName, it->mName))
>>>>>>> 92623921add0d6e16a34973dcf6f2ee1f52dbbe7
{ {
return mStore.get<ESM::Cell>().searchExtByRegion(it->mId); return mStore.get<ESM::Cell>().searchExtByRegion(it->mId);
} }
@ -625,26 +616,16 @@ namespace MWWorld
CellStore *currCell = ptr.getCell(); CellStore *currCell = ptr.getCell();
bool isPlayer = ptr == mPlayer->getPlayer(); bool isPlayer = ptr == mPlayer->getPlayer();
bool haveToMove = mWorldScene->isCellActive(*currCell) || isPlayer; bool haveToMove = mWorldScene->isCellActive(*currCell) || isPlayer;
<<<<<<< HEAD
if (*currCell != newCell) {
if (isPlayer) {
if (!newCell.isExterior()) {
changeToInteriorCell(Misc::toLower(newCell.cell->mName), pos);
} else {
int cellX = newCell.cell->mData.mX;
int cellY = newCell.cell->mData.mY;
=======
if (*currCell != newCell) if (*currCell != newCell)
{ {
if (isPlayer) if (isPlayer)
if (!newCell.isExterior()) if (!newCell.isExterior())
changeToInteriorCell(toLower(newCell.mCell->mName), pos); changeToInteriorCell(Misc::toLower(newCell.mCell->mName), pos);
else else
{ {
int cellX = newCell.mCell->getGridX(); int cellX = newCell.mCell->getGridX();
int cellY = newCell.mCell->getGridY(); int cellY = newCell.mCell->getGridY();
>>>>>>> 92623921add0d6e16a34973dcf6f2ee1f52dbbe7
mWorldScene->changeCell(cellX, cellY, pos, false); mWorldScene->changeCell(cellX, cellY, pos, false);
} }
else { else {

3
components/misc/stringops.hpp
View File

@ -2,10 +2,7 @@
#define MISC_STRINGOPS_H #define MISC_STRINGOPS_H
#include <string> #include <string>
<<<<<<< HEAD
=======
#include <algorithm> #include <algorithm>
>>>>>>> 92623921add0d6e16a34973dcf6f2ee1f52dbbe7
namespace Misc namespace Misc
{ {