From 519fb9482aa36e9e07d544f16325aa9fee14dd01 Mon Sep 17 00:00:00 2001 From: scrawl Date: Thu, 2 Jul 2015 18:11:24 +0200 Subject: [PATCH] Minor cleanup --- apps/openmw/mwworld/player.cpp | 2 +- apps/openmw/mwworld/player.hpp | 8 +------- apps/openmw/mwworld/worldimp.cpp | 2 +- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/apps/openmw/mwworld/player.cpp b/apps/openmw/mwworld/player.cpp index 0b00f211e..48d69e4de 100644 --- a/apps/openmw/mwworld/player.cpp +++ b/apps/openmw/mwworld/player.cpp @@ -28,7 +28,7 @@ namespace MWWorld { - Player::Player (const ESM::NPC *player, const MWBase::World& world) + Player::Player (const ESM::NPC *player) : mCellStore(0), mLastKnownExteriorPosition(0,0,0), mMarkedCell(NULL), diff --git a/apps/openmw/mwworld/player.hpp b/apps/openmw/mwworld/player.hpp index d5376c40d..bd5a74187 100644 --- a/apps/openmw/mwworld/player.hpp +++ b/apps/openmw/mwworld/player.hpp @@ -17,12 +17,6 @@ namespace ESM class ESMReader; } -namespace MWBase -{ - class World; - class Ptr; -} - namespace Loading { class Listener; @@ -58,7 +52,7 @@ namespace MWWorld public: - Player(const ESM::NPC *player, const MWBase::World& world); + Player(const ESM::NPC *player); void saveSkillsAttributes(); void restoreSkillsAttributes(); diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp index d8f331c62..4b14ea602 100644 --- a/apps/openmw/mwworld/worldimp.cpp +++ b/apps/openmw/mwworld/worldimp.cpp @@ -2045,7 +2045,7 @@ namespace MWWorld { const ESM::NPC *player = mStore.get().find("player"); if (!mPlayer) - mPlayer = new MWWorld::Player(player, *this); + mPlayer = new MWWorld::Player(player); else { // Remove the old CharacterController