AnarchistGamers/TES3MP
1
0
Fork 0
mirror of https://github.com/TES3MP/TES3MP.git synced 2025-09-30 08:35:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add updated pathgrid marker nif file and fix merge issues.

Browse Source
This commit is contained in:
cc9cii 2015-04-18 16:14:25 +10:00
parent 03578129c7
commit 68dbf929a2
3 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/opencs/view/render/cell.cpp
View File

@ -93,7 +93,7 @@ bool CSVRender::Cell::addObjects (int start, int end)
bool modified = false; bool modified = false;
const CSMWorld::RefCollection& collection = mData.getReferences(); const CSMWorld::RefCollection& collection = mData.getReferences();
for (int i=start; i<=end; ++i) for (int i=start; i<=end; ++i)
{ {
std::string cell = Misc::StringUtils::lowerCase (collection.getRecord (i).get().mCell); std::string cell = Misc::StringUtils::lowerCase (collection.getRecord (i).get().mCell);
@ -177,7 +177,6 @@ CSVRender::Cell::~Cell()
if (mTerrain.get()) if (mTerrain.get())
mPhysics->removeHeightField(mSceneMgr, mX, mY); mPhysics->removeHeightField(mSceneMgr, mX, mY);
for (std::map<std::string, Object *>::iterator iter (mObjects.begin()); for (std::map<std::string, Object *>::iterator iter (mObjects.begin());
iter!=mObjects.end(); ++iter) iter!=mObjects.end(); ++iter)
delete iter->second; delete iter->second;

3
apps/opencs/view/render/cell.hpp
View File

@ -11,11 +11,8 @@
#ifndef Q_MOC_RUN #ifndef Q_MOC_RUN
#include <components/terrain/terraingrid.hpp> #include <components/terrain/terraingrid.hpp>
<<<<<<< .mine
#include <components/esm/loadpgrd.hpp> // FIXME: temporaty storage until saving to document #include <components/esm/loadpgrd.hpp> // FIXME: temporaty storage until saving to document
=======
#endif #endif
>>>>>>> .theirs
#include "object.hpp" #include "object.hpp"

BIN
files/materials/pathgrid_pt.nif
View File

Binary file not shown.