mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-30 02:15:32 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'ace/include-cleanup'

Browse source
This commit is contained in:
Marc Zinnschlag 2015-02-09 18:03:28 +01:00
commit e9d6e4f6df
39 changed files with 190 additions and 159 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CMakeLists.txt
View file

@ -371,8 +371,6 @@ configure_file(${OpenMW_SOURCE_DIR}/files/opencs/defaultfilters
if (NOT WIN32 AND NOT APPLE)
configure_file(${OpenMW_SOURCE_DIR}/files/openmw.desktop
"${OpenMW_BINARY_DIR}/openmw.desktop")
configure_file(${OpenMW_SOURCE_DIR}/files/openmw-mimeinfo.xml
"${OpenMW_BINARY_DIR}/openmw-mimeinfo.xml")
configure_file(${OpenMW_SOURCE_DIR}/files/openmw-cs.desktop
"${OpenMW_BINARY_DIR}/openmw-cs.desktop")
endif()
@ -441,7 +439,6 @@ IF(NOT WIN32 AND NOT APPLE)
# Install icon and desktop file
INSTALL(FILES "${OpenMW_BINARY_DIR}/openmw.desktop" DESTINATION "${DATAROOTDIR}/applications" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ COMPONENT "openmw")
INSTALL(FILES "${OpenMW_BINARY_DIR}/openmw-mimeinfo.xml" DESTINATION "${DATAROOTDIR}/mime/packages" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ COMPONENT "openmw")
INSTALL(FILES "${OpenMW_SOURCE_DIR}/files/launcher/images/openmw.png" DESTINATION "${ICONDIR}" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ COMPONENT "openmw")
IF(BUILD_OPENCS)
INSTALL(FILES "${OpenMW_BINARY_DIR}/openmw-cs.desktop" DESTINATION "${DATAROOTDIR}/applications" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ COMPONENT "opencs")
@ -761,7 +758,7 @@ if (APPLE)
set(OPENMW_APP "\${CMAKE_INSTALL_PREFIX}/${INSTALL_SUBDIR}/${APP_BUNDLE_NAME}")
set(OPENCS_BUNDLE_NAME "OpenCS.app")
set(OPENCS_BUNDLE_NAME "OpenMW-CS.app")
set(OPENCS_APP "\${CMAKE_INSTALL_PREFIX}/${INSTALL_SUBDIR}/${OPENCS_BUNDLE_NAME}")
set(ABSOLUTE_PLUGINS "")

2
apps/opencs/CMakeLists.txt
View file

@ -211,5 +211,5 @@ target_link_libraries(openmw-cs
)
if(APPLE)
INSTALL(TARGETS openmw-cs BUNDLE DESTINATION OpenMW-CS COMPONENT BUNDLE)
INSTALL(TARGETS openmw-cs BUNDLE DESTINATION OpenMW COMPONENT BUNDLE)
endif()

3
apps/opencs/model/world/pathgrid.cpp
View file

@ -1,4 +1,5 @@
#include "cell.hpp"
#include "idcollection.hpp"
#include "pathgrid.hpp"
#include <sstream>

7
apps/opencs/model/world/pathgrid.hpp
View file

@ -6,11 +6,12 @@
#include <components/esm/loadpgrd.hpp>
#include "idcollection.hpp"
#include "cell.hpp"
namespace CSMWorld
{
struct Cell;
template<typename T, typename AT>
class IdCollection;
/// \brief Wrapper for Pathgrid record
///
/// \attention The mData.mX and mData.mY fields of the ESM::Pathgrid struct are not used.

9
apps/opencs/model/world/subcellcollection.hpp
View file

@ -1,10 +1,17 @@
#ifndef CSM_WOLRD_SUBCOLLECTION_H
#define CSM_WOLRD_SUBCOLLECTION_H
#include "idcollection.hpp"
namespace ESM
{
class ESMReader;
}
namespace CSMWorld
{
struct Cell;
template<typename T, typename AT>
class IdCollection;
/// \brief Single type collection of top level records that are associated with cells
template<typename ESXRecordT, typename IdAccessorT = IdAccessor<ESXRecordT> >
class SubCellCollection : public IdCollection<ESXRecordT, IdAccessorT>

12
apps/openmw/mwbase/windowmanager.hpp
View file

@ -1,11 +1,11 @@
#ifndef GAME_MWBASE_WINDOWMANAGER_H
#define GAME_MWBASE_WINDOWMANAGER_H
#include <stdint.h>
#include <string>
#include <vector>
#include <map>
#include "../mwmechanics/stat.hpp"
#include <set>
#include "../mwgui/mode.hpp"
@ -42,6 +42,14 @@ namespace ESM
struct CellId;
}
namespace MWMechanics
{
class AttributeValue;
template<typename T>
class DynamicStat;
class SkillValue;
}
namespace MWWorld
{
class CellStore;

1
apps/openmw/mwclass/misc.cpp
View file

@ -12,6 +12,7 @@
#include "../mwworld/ptr.hpp"
#include "../mwworld/actiontake.hpp"
#include "../mwworld/cellstore.hpp"
#include "../mwworld/esmstore.hpp"
#include "../mwworld/physicssystem.hpp"
#include "../mwworld/manualref.hpp"
#include "../mwworld/nullaction.hpp"

1
apps/openmw/mwdialogue/scripttest.cpp
View file

@ -3,6 +3,7 @@
#include <iostream>
#include "../mwworld/manualref.hpp"
#include "../mwworld/esmstore.hpp"
#include "../mwworld/class.hpp"
#include "../mwbase/environment.hpp"

1
apps/openmw/mwgui/journalwindow.cpp
View file

@ -11,6 +11,7 @@
#include <boost/bind.hpp>
#include <boost/function.hpp>
#include <components/misc/stringops.hpp>
#include <components/widgets/imagebutton.hpp>
#include <components/widgets/list.hpp>

1
apps/openmw/mwgui/settingswindow.cpp
View file

@ -14,6 +14,7 @@
#include <SDL_video.h>
#include <components/misc/stringops.hpp>
#include <components/widgets/sharedstatebutton.hpp>
#include <components/settings/settings.hpp>

1
apps/openmw/mwgui/tradewindow.cpp
View file

@ -16,6 +16,7 @@
#include "../mwworld/manualref.hpp"
#include "../mwworld/class.hpp"
#include "../mwworld/containerstore.hpp"
#include "../mwworld/esmstore.hpp"
#include "../mwmechanics/creaturestats.hpp"

1
apps/openmw/mwgui/windowmanagerimp.cpp
View file

@ -42,6 +42,7 @@
#include "../mwworld/cellstore.hpp"
#include "../mwworld/esmstore.hpp"
#include "../mwmechanics/stat.hpp"
#include "../mwmechanics/npcstats.hpp"
#include "../mwsound/soundmanagerimp.hpp"

1
apps/openmw/mwgui/windowmanagerimp.hpp
View file

@ -12,6 +12,7 @@
#include "../mwbase/windowmanager.hpp"
#include <components/settings/settings.hpp>
#include <components/to_utf8/to_utf8.hpp>
#include "mapwindow.hpp"

1
apps/openmw/mwmechanics/aiwander.hpp
View file

@ -17,6 +17,7 @@
namespace ESM
{
class Cell;
namespace AiSequence
{
struct AiWander;

1
apps/openmw/mwmechanics/enchanting.cpp
View file

@ -2,6 +2,7 @@
#include "../mwworld/manualref.hpp"
#include "../mwworld/class.hpp"
#include "../mwworld/containerstore.hpp"
#include "../mwworld/esmstore.hpp"
#include "../mwbase/mechanicsmanager.hpp"
#include "creaturestats.hpp"

1
apps/openmw/mwmechanics/levelledlist.hpp
View file

@ -2,6 +2,7 @@
#define OPENMW_MECHANICS_LEVELLEDLIST_H
#include "../mwworld/ptr.hpp"
#include "../mwworld/esmstore.hpp"
#include "../mwworld/manualref.hpp"
#include "../mwworld/class.hpp"
#include "../mwbase/world.hpp"

32
apps/openmw/mwmechanics/npcstats.cpp
View file

@ -125,6 +125,21 @@ bool MWMechanics::NpcStats::isInFaction (const std::string& faction) const
return (mFactionRank.find(Misc::StringUtils::lowerCase(faction)) != mFactionRank.end());
}
int MWMechanics::NpcStats::getFactionReputation (const std::string& faction) const
{
std::map<std::string, int>::const_iterator iter = mFactionReputation.find (Misc::StringUtils::lowerCase(faction));
if (iter==mFactionReputation.end())
return 0;
return iter->second;
}
void MWMechanics::NpcStats::setFactionReputation (const std::string& faction, int value)
{
mFactionReputation[Misc::StringUtils::lowerCase(faction)] = value;
}
float MWMechanics::NpcStats::getSkillProgressRequirement (int skillIndex, const ESM::Class& class_) const
{
float progressRequirement = 1 + getSkill (skillIndex).getBase();
@ -327,21 +342,6 @@ void MWMechanics::NpcStats::setBounty (int bounty)
mBounty = bounty;
}
int MWMechanics::NpcStats::getFactionReputation (const std::string& faction) const
{
std::map<std::string, int>::const_iterator iter = mFactionReputation.find (faction);
if (iter==mFactionReputation.end())
return 0;
return iter->second;
}
void MWMechanics::NpcStats::setFactionReputation (const std::string& faction, int value)
{
mFactionReputation[faction] = value;
}
int MWMechanics::NpcStats::getReputation() const
{
return mReputation;
@ -513,7 +513,7 @@ void MWMechanics::NpcStats::readState (const ESM::NpcStats& state)
mFactionRank[iter->first] = iter->second.mRank;
if (iter->second.mReputation)
mFactionReputation[iter->first] = iter->second.mReputation;
mFactionReputation[Misc::StringUtils::lowerCase(iter->first)] = iter->second.mReputation;
}
mDisposition = state.mDisposition;

2
apps/openmw/mwmechanics/npcstats.hpp
View file

@ -6,8 +6,6 @@
#include <string>
#include <vector>
#include "stat.hpp"
#include "creaturestats.hpp"
namespace ESM

4
apps/openmw/mwmechanics/obstacle.hpp
View file

@ -1,10 +1,6 @@
#ifndef OPENMW_MECHANICS_OBSTACLE_H
#define OPENMW_MECHANICS_OBSTACLE_H
//#include "../mwbase/world.hpp"
//#include "../mwworld/class.hpp"
#include "../mwworld/cellstore.hpp"
namespace MWWorld
{
class Ptr;

2
apps/openmw/mwrender/renderingmanager.cpp
View file

@ -297,6 +297,8 @@ void RenderingManager::rotateObject(const MWWorld::Ptr &ptr)
void
RenderingManager::updateObjectCell(const MWWorld::Ptr &old, const MWWorld::Ptr &cur)
{
if (!old.getRefData().getBaseNode())
return;
Ogre::SceneNode *child =
mRendering.getScene()->getSceneNode(old.getRefData().getHandle());

1
apps/openmw/mwscript/animationextensions.cpp
View file

@ -11,6 +11,7 @@
#include <components/interpreter/runtime.hpp>
#include <components/interpreter/opcodes.hpp>
#include "../mwbase/environment.hpp"
#include "../mwbase/mechanicsmanager.hpp"
#include "interpretercontext.hpp"

3
apps/openmw/mwscript/containerextensions.cpp
View file

@ -14,10 +14,13 @@
#include <components/interpreter/runtime.hpp>
#include <components/interpreter/opcodes.hpp>
#include <components/misc/stringops.hpp>
#include <components/esm/loadskil.hpp>
#include "../mwbase/environment.hpp"
#include "../mwbase/windowmanager.hpp"
#include "../mwbase/world.hpp"
#include "../mwworld/class.hpp"
#include "../mwworld/containerstore.hpp"

1
apps/openmw/mwscript/controlextensions.cpp
View file

@ -10,6 +10,7 @@
#include "../mwbase/environment.hpp"
#include "../mwbase/inputmanager.hpp"
#include "../mwbase/world.hpp"
#include "../mwworld/class.hpp"
#include "../mwworld/ptr.hpp"

1
apps/openmw/mwscript/dialogueextensions.cpp
View file

@ -11,6 +11,7 @@
#include "../mwbase/environment.hpp"
#include "../mwbase/dialoguemanager.hpp"
#include "../mwbase/journal.hpp"
#include "../mwbase/world.hpp"
#include "../mwworld/class.hpp"
#include "../mwmechanics/npcstats.hpp"

2
apps/openmw/mwscript/guiextensions.cpp
View file

@ -12,7 +12,7 @@
#include "../mwbase/environment.hpp"
#include "../mwbase/windowmanager.hpp"
#include "../mwbase/world.hpp"
#include "../mwbase/mechanicsmanager.hpp"
#include "interpretercontext.hpp"

1
apps/openmw/mwscript/miscextensions.cpp
View file

@ -17,6 +17,7 @@
#include "../mwbase/environment.hpp"
#include "../mwbase/windowmanager.hpp"
#include "../mwbase/scriptmanager.hpp"
#include "../mwbase/world.hpp"
#include "../mwworld/class.hpp"
#include "../mwworld/player.hpp"

29
apps/openmw/mwscript/ref.cpp Normal file
View file

@ -0,0 +1,29 @@
#include "ref.hpp"
#include <components/interpreter/runtime.hpp>
#include "../mwbase/environment.hpp"
#include "../mwbase/world.hpp"
#include "interpretercontext.hpp"
MWWorld::Ptr MWScript::ExplicitRef::operator() (Interpreter::Runtime& runtime, bool required,
bool activeOnly) const
{
std::string id = runtime.getStringLiteral(runtime[0].mInteger);
runtime.pop();
if (required)
return MWBase::Environment::get().getWorld()->getPtr(id, activeOnly);
else
return MWBase::Environment::get().getWorld()->searchPtr(id, activeOnly);
}
MWWorld::Ptr MWScript::ImplicitRef::operator() (Interpreter::Runtime& runtime, bool required,
bool activeOnly) const
{
MWScript::InterpreterContext& context
= static_cast<MWScript::InterpreterContext&> (runtime.getContext());
return context.getReference(required);
}

33
apps/openmw/mwscript/ref.hpp
View file

@ -3,14 +3,12 @@
#include <string>
#include <components/interpreter/runtime.hpp>
#include "../mwbase/environment.hpp"
#include "../mwbase/world.hpp"
#include "../mwworld/ptr.hpp"
#include "interpretercontext.hpp"
namespace Interpreter
{
class Runtime;
}
namespace MWScript
{
@ -18,31 +16,16 @@ namespace MWScript
{
static const bool implicit = false;
MWWorld::Ptr operator() (Interpreter::Runtime& runtime, bool required=true,
bool activeOnly = false) const
{
std::string id = runtime.getStringLiteral (runtime[0].mInteger);
runtime.pop();
if (required)
return MWBase::Environment::get().getWorld()->getPtr (id, activeOnly);
else
return MWBase::Environment::get().getWorld()->searchPtr (id, activeOnly);
}
MWWorld::Ptr operator() (Interpreter::Runtime& runtime, bool required = true,
bool activeOnly = false) const;
};
struct ImplicitRef
{
static const bool implicit = true;
MWWorld::Ptr operator() (Interpreter::Runtime& runtime, bool required=true,
bool activeOnly = false) const
{
MWScript::InterpreterContext& context
= static_cast<MWScript::InterpreterContext&> (runtime.getContext());
return context.getReference(required);
}
MWWorld::Ptr operator() (Interpreter::Runtime& runtime, bool required = true,
bool activeOnly = false) const;
};
}

1
apps/openmw/mwscript/statsextensions.cpp
View file

@ -18,6 +18,7 @@
#include "../mwbase/dialoguemanager.hpp"
#include "../mwbase/mechanicsmanager.hpp"
#include "../mwbase/windowmanager.hpp"
#include "../mwbase/world.hpp"
#include "../mwworld/class.hpp"
#include "../mwworld/player.hpp"

2
apps/openmw/mwscript/transformationextensions.cpp
View file

@ -10,7 +10,9 @@
#include <components/interpreter/opcodes.hpp>
#include "../mwbase/environment.hpp"
#include "../mwbase/world.hpp"
#include "../mwworld/cellstore.hpp"
#include "../mwworld/class.hpp"
#include "../mwworld/manualref.hpp"
#include "../mwworld/player.hpp"

4
apps/openmw/mwsound/soundmanagerimp.cpp
View file

@ -723,9 +723,9 @@ namespace MWSound
MWWorld::Ptr player =
MWBase::Environment::get().getWorld()->getPlayerPtr();
const ESM::Cell *cell = player.getCell()->getCell();
const MWWorld::CellStore *cell = player.getCell();
mListenerUnderwater = ((cell->mData.mFlags&cell->HasWater) && mListenerPos.z < cell->mWater);
mListenerUnderwater = ((cell->getCell()->mData.mFlags&ESM::Cell::HasWater) && mListenerPos.z < cell->getWaterLevel());
}
void SoundManager::updatePtr(const MWWorld::Ptr &old, const MWWorld::Ptr &updated)

20
apps/openmw/mwworld/cells.cpp
View file

@ -241,26 +241,30 @@ MWWorld::Ptr MWWorld::Cells::getPtr (const std::string& name)
void MWWorld::Cells::getExteriorPtrs(const std::string &name, std::vector<MWWorld::Ptr> &out)
{
for (std::map<std::pair<int, int>, CellStore>::iterator iter = mExteriors.begin();
iter!=mExteriors.end(); ++iter)
const MWWorld::Store<ESM::Cell> &cells = mStore.get<ESM::Cell>();
for (MWWorld::Store<ESM::Cell>::iterator iter = cells.extBegin(); iter != cells.extEnd(); ++iter)
{
Ptr ptr = getPtrAndCache (name, iter->second);
CellStore *cellStore = getCellStore (&(*iter));
Ptr ptr = getPtrAndCache (name, *cellStore);
if (!ptr.isEmpty())
out.push_back(ptr);
}
}
void MWWorld::Cells::getInteriorPtrs(const std::string &name, std::vector<MWWorld::Ptr> &out)
{
for (std::map<std::string, CellStore>::iterator iter = mInteriors.begin();
iter!=mInteriors.end(); ++iter)
const MWWorld::Store<ESM::Cell> &cells = mStore.get<ESM::Cell>();
for (MWWorld::Store<ESM::Cell>::iterator iter = cells.intBegin(); iter != cells.intEnd(); ++iter)
{
Ptr ptr = getPtrAndCache (name, iter->second);
CellStore *cellStore = getCellStore (&(*iter));
Ptr ptr = getPtrAndCache (name, *cellStore);
if (!ptr.isEmpty())
out.push_back(ptr);
}
}
int MWWorld::Cells::countSavedGameRecords() const

67
apps/openmw/mwworld/manualref.cpp Normal file
View file

@ -0,0 +1,67 @@
#include "manualref.hpp"
#include "esmstore.hpp"
#include "cellstore.hpp"
namespace
{
template<typename T>
void create(const MWWorld::Store<T>& list, const std::string& name, boost::any& refValue, MWWorld::Ptr& ptrValue)
{
const T* base = list.find(name);
ESM::CellRef cellRef;
cellRef.mRefNum.unset();
cellRef.mRefID = name;
cellRef.mScale = 1;
cellRef.mFactionRank = 0;
cellRef.mChargeInt = -1;
cellRef.mGoldValue = 1;
cellRef.mEnchantmentCharge = -1;
cellRef.mTeleport = false;
cellRef.mLockLevel = 0;
cellRef.mReferenceBlocked = 0;
MWWorld::LiveCellRef<T> ref(cellRef, base);
refValue = ref;
ptrValue = MWWorld::Ptr(&boost::any_cast<MWWorld::LiveCellRef<T>&>(refValue), 0);
}
}
MWWorld::ManualRef::ManualRef(const MWWorld::ESMStore& store, const std::string& name, const int count)
{
std::string lowerName = Misc::StringUtils::lowerCase(name);
switch (store.find(lowerName))
{
case ESM::REC_ACTI: create(store.get<ESM::Activator>(), lowerName, mRef, mPtr); break;
case ESM::REC_ALCH: create(store.get<ESM::Potion>(), lowerName, mRef, mPtr); break;
case ESM::REC_APPA: create(store.get<ESM::Apparatus>(), lowerName, mRef, mPtr); break;
case ESM::REC_ARMO: create(store.get<ESM::Armor>(), lowerName, mRef, mPtr); break;
case ESM::REC_BOOK: create(store.get<ESM::Book>(), lowerName, mRef, mPtr); break;
case ESM::REC_CLOT: create(store.get<ESM::Clothing>(), lowerName, mRef, mPtr); break;
case ESM::REC_CONT: create(store.get<ESM::Container>(), lowerName, mRef, mPtr); break;
case ESM::REC_CREA: create(store.get<ESM::Creature>(), lowerName, mRef, mPtr); break;
case ESM::REC_DOOR: create(store.get<ESM::Door>(), lowerName, mRef, mPtr); break;
case ESM::REC_INGR: create(store.get<ESM::Ingredient>(), lowerName, mRef, mPtr); break;
case ESM::REC_LEVC: create(store.get<ESM::CreatureLevList>(), lowerName, mRef, mPtr); break;
case ESM::REC_LEVI: create(store.get<ESM::ItemLevList>(), lowerName, mRef, mPtr); break;
case ESM::REC_LIGH: create(store.get<ESM::Light>(), lowerName, mRef, mPtr); break;
case ESM::REC_LOCK: create(store.get<ESM::Lockpick>(), lowerName, mRef, mPtr); break;
case ESM::REC_MISC: create(store.get<ESM::Miscellaneous>(), lowerName, mRef, mPtr); break;
case ESM::REC_NPC_: create(store.get<ESM::NPC>(), lowerName, mRef, mPtr); break;
case ESM::REC_PROB: create(store.get<ESM::Probe>(), lowerName, mRef, mPtr); break;
case ESM::REC_REPA: create(store.get<ESM::Repair>(), lowerName, mRef, mPtr); break;
case ESM::REC_STAT: create(store.get<ESM::Static>(), lowerName, mRef, mPtr); break;
case ESM::REC_WEAP: create(store.get<ESM::Weapon>(), lowerName, mRef, mPtr); break;
case 0:
throw std::logic_error("failed to create manual cell ref for " + lowerName + " (unknown ID)");
default:
throw std::logic_error("failed to create manual cell ref for " + lowerName + " (unknown type)");
}
mPtr.getRefData().setCount(count);
}

62
apps/openmw/mwworld/manualref.hpp
View file

@ -3,9 +3,7 @@
#include <boost/any.hpp>
#include "esmstore.hpp"
#include "ptr.hpp"
#include "cellstore.hpp"
namespace MWWorld
{
@ -18,66 +16,8 @@ namespace MWWorld
ManualRef (const ManualRef&);
ManualRef& operator= (const ManualRef&);
template<typename T>
void create (const MWWorld::Store<T>& list, const std::string& name)
{
const T* base = list.find(name);
ESM::CellRef cellRef;
cellRef.mRefNum.unset();
cellRef.mRefID = name;
cellRef.mScale = 1;
cellRef.mFactionRank = 0;
cellRef.mChargeInt = -1;
cellRef.mGoldValue = 1;
cellRef.mEnchantmentCharge = -1;
cellRef.mTeleport = false;
cellRef.mLockLevel = 0;
cellRef.mReferenceBlocked = 0;
LiveCellRef<T> ref(cellRef, base);
mRef = ref;
mPtr = Ptr (&boost::any_cast<LiveCellRef<T>&> (mRef), 0);
}
public:
ManualRef (const MWWorld::ESMStore& store, const std::string& name, const int count=1)
{
std::string lowerName = Misc::StringUtils::lowerCase (name);
switch (store.find (lowerName))
{
case ESM::REC_ACTI: create (store.get<ESM::Activator>(), lowerName); break;
case ESM::REC_ALCH: create (store.get<ESM::Potion>(), lowerName); break;
case ESM::REC_APPA: create (store.get<ESM::Apparatus>(), lowerName); break;
case ESM::REC_ARMO: create (store.get<ESM::Armor>(), lowerName); break;
case ESM::REC_BOOK: create (store.get<ESM::Book>(), lowerName); break;
case ESM::REC_CLOT: create (store.get<ESM::Clothing>(), lowerName); break;
case ESM::REC_CONT: create (store.get<ESM::Container>(), lowerName); break;
case ESM::REC_CREA: create (store.get<ESM::Creature>(), lowerName); break;
case ESM::REC_DOOR: create (store.get<ESM::Door>(), lowerName); break;
case ESM::REC_INGR: create (store.get<ESM::Ingredient>(), lowerName); break;
case ESM::REC_LEVC: create (store.get<ESM::CreatureLevList>(), lowerName); break;
case ESM::REC_LEVI: create (store.get<ESM::ItemLevList>(), lowerName); break;
case ESM::REC_LIGH: create (store.get<ESM::Light>(), lowerName); break;
case ESM::REC_LOCK: create (store.get<ESM::Lockpick>(), lowerName); break;
case ESM::REC_MISC: create (store.get<ESM::Miscellaneous>(), lowerName); break;
case ESM::REC_NPC_: create (store.get<ESM::NPC>(), lowerName); break;
case ESM::REC_PROB: create (store.get<ESM::Probe>(), lowerName); break;
case ESM::REC_REPA: create (store.get<ESM::Repair>(), lowerName); break;
case ESM::REC_STAT: create (store.get<ESM::Static>(), lowerName); break;
case ESM::REC_WEAP: create (store.get<ESM::Weapon>(), lowerName); break;
case 0:
throw std::logic_error ("failed to create manual cell ref for " + lowerName + " (unknown ID)");
default:
throw std::logic_error ("failed to create manual cell ref for " + lowerName + " (unknown type)");
}
mPtr.getRefData().setCount(count);
}
ManualRef(const MWWorld::ESMStore& store, const std::string& name, const int count = 1);
const Ptr& getPtr() const
{

8
apps/openmw/mwworld/physicssystem.cpp
View file

@ -862,9 +862,9 @@ namespace MWWorld
for(;iter != mMovementQueue.end();++iter)
{
float waterlevel = -std::numeric_limits<float>::max();
const ESM::Cell *cell = iter->first.getCell()->getCell();
if(cell->hasWater())
waterlevel = cell->mWater;
const MWWorld::CellStore *cell = iter->first.getCell();
if(cell->getCell()->hasWater())
waterlevel = cell->getWaterLevel();
float oldHeight = iter->first.getRefData().getPosition().pos[2];
@ -872,7 +872,7 @@ namespace MWWorld
bool waterCollision = false;
if (effects.get(ESM::MagicEffect::WaterWalking).getMagnitude()
&& cell->hasWater()
&& cell->getCell()->hasWater()
&& !world->isUnderwater(iter->first.getCell(),
Ogre::Vector3(iter->first.getRefData().getPosition().pos)))
waterCollision = true;

1
apps/openmw/mwworld/projectilemanager.cpp
View file

@ -9,6 +9,7 @@
#include "../mwworld/manualref.hpp"
#include "../mwworld/class.hpp"
#include "../mwworld/esmstore.hpp"
#include "../mwworld/inventorystore.hpp"
#include "../mwbase/soundmanager.hpp"

1
apps/openmw/mwworld/worldimp.cpp
View file

@ -44,6 +44,7 @@
#include "player.hpp"
#include "manualref.hpp"
#include "cellstore.hpp"
#include "cellfunctors.hpp"
#include "containerstore.hpp"
#include "inventorystore.hpp"

11
files/openmw-mimeinfo.xml
View file

@ -1,11 +0,0 @@
<?xml version="1.0"?>
<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
<mime-type type="application/x-openmw-savegame">
<icon name="openmw" />
<generic-icon name="applications-games"/>
<comment>OpenMW Savegame</comment>
<glob weight="60" pattern="*.omwsave"/>
</mime-type>
</mime-info>

13
files/openmw.desktop
View file

@ -8,16 +8,3 @@ TryExec=openmw-launcher
Exec=openmw-launcher
Icon=openmw
Categories=Game;RolePlaying;
[Desktop Entry]
Type=Application
Name=OpenMW
GenericName=Role Playing Game
Comment=An engine replacement for The Elder Scrolls III: Morrowind
Keywords=Morrowind;Reimplementation Mods;esm;bsa;
Exec=openmw --load-savegame=%f
Icon=openmw
Categories=Game;RolePlaying;
Terminal=false
NoDisplay=true
MimeType=application/x-openmw-savegame;