From 9dd65dce30b4910b11d1b89f66d2bed10c06d0c3 Mon Sep 17 00:00:00 2001 From: gugus Date: Fri, 11 May 2012 11:52:07 +0200 Subject: [PATCH] Finished merging. --- apps/openmw/mwgui/container.cpp | 10 ++++------ apps/openmw/mwgui/container.hpp | 5 ++--- apps/openmw/mwgui/inventorywindow.cpp | 8 ++++---- apps/openmw/mwgui/inventorywindow.hpp | 2 +- apps/openmw/mwgui/tooltips.cpp | 2 +- apps/openmw/mwgui/window_manager.cpp | 6 +++--- apps/openmw/mwrender/objects.cpp | 4 ++-- apps/openmw/mwworld/actionopen.cpp | 8 ++++---- apps/openmw/mwworld/actionopen.hpp | 2 +- 9 files changed, 22 insertions(+), 25 deletions(-) diff --git a/apps/openmw/mwgui/container.cpp b/apps/openmw/mwgui/container.cpp index 454dd05c3..b4f38b4e1 100644 --- a/apps/openmw/mwgui/container.cpp +++ b/apps/openmw/mwgui/container.cpp @@ -5,7 +5,7 @@ #include "window_manager.hpp" #include "widgets.hpp" -#include "../mwworld/environment.hpp" +#include "../mwbase/environment.hpp" #include "../mwworld/manualref.hpp" #include #include @@ -25,9 +25,8 @@ using namespace MWGui; using namespace Widgets; -ContainerWindow::ContainerWindow(WindowManager& parWindowManager,MWWorld::Environment& environment,DragAndDrop* dragAndDrop) +ContainerWindow::ContainerWindow(WindowManager& parWindowManager,DragAndDrop* dragAndDrop) : WindowBase("openmw_container_window_layout.xml", parWindowManager), - mEnvironment(environment), mDragAndDrop(dragAndDrop), mContainer() { @@ -51,9 +50,8 @@ ContainerWindow::ContainerWindow(WindowManager& parWindowManager,MWWorld::Enviro //mContainerWidget->eventMouseItemActivate += MyGUI::newDelegate(this,&ContainerWindow::onSelectedItem); } -ContainerWindow::ContainerWindow(WindowManager& parWindowManager,MWWorld::Environment& environment,DragAndDrop* dragAndDrop,std::string guiFile) +ContainerWindow::ContainerWindow(WindowManager& parWindowManager,DragAndDrop* dragAndDrop,std::string guiFile) : WindowBase(guiFile, parWindowManager), - mEnvironment(environment), mDragAndDrop(dragAndDrop), mContainer() { @@ -183,7 +181,7 @@ void ContainerWindow::onByeClicked(MyGUI::Widget* _sender) { if(!mDragAndDrop->mIsOnDragAndDrop) { - mEnvironment.mWindowManager->setGuiMode(GM_Game); + MWBase::Environment::get().getWindowManager()->setGuiMode(GM_Game); setVisible(false); } } diff --git a/apps/openmw/mwgui/container.hpp b/apps/openmw/mwgui/container.hpp index b8f76a355..08ac7eba2 100644 --- a/apps/openmw/mwgui/container.hpp +++ b/apps/openmw/mwgui/container.hpp @@ -46,8 +46,8 @@ namespace MWGui class ContainerWindow : public WindowBase { public: - ContainerWindow(WindowManager& parWindowManager,MWWorld::Environment& environment,DragAndDrop* dragAndDrop); - ContainerWindow(WindowManager& parWindowManager,MWWorld::Environment& environment,DragAndDrop* dragAndDrop, + ContainerWindow(WindowManager& parWindowManager,DragAndDrop* dragAndDrop); + ContainerWindow(WindowManager& parWindowManager,DragAndDrop* dragAndDrop, std::string guiFile); @@ -58,7 +58,6 @@ namespace MWGui virtual ~ContainerWindow(); protected: - MWWorld::Environment& mEnvironment; std::vector mContainerWidgets; MyGUI::ItemBoxPtr mContainerWidget; diff --git a/apps/openmw/mwgui/inventorywindow.cpp b/apps/openmw/mwgui/inventorywindow.cpp index cf2cfb537..3ae2ee9eb 100644 --- a/apps/openmw/mwgui/inventorywindow.cpp +++ b/apps/openmw/mwgui/inventorywindow.cpp @@ -4,7 +4,7 @@ #include "window_manager.hpp" #include "widgets.hpp" -#include "../mwworld/environment.hpp" +#include "../mwbase/environment.hpp" #include "../mwworld/manualref.hpp" #include #include @@ -21,14 +21,14 @@ namespace MWGui { - InventoryWindow::InventoryWindow(WindowManager& parWindowManager,MWWorld::Environment& environment,DragAndDrop* dragAndDrop) - :ContainerWindow(parWindowManager,environment,dragAndDrop,"openmw_inventory_window_layout.xml") + InventoryWindow::InventoryWindow(WindowManager& parWindowManager,DragAndDrop* dragAndDrop) + :ContainerWindow(parWindowManager,dragAndDrop,"openmw_inventory_window_layout.xml") { } void InventoryWindow::openInventory() { - open(mEnvironment.mWorld->getPlayer().getPlayer()); + open(MWBase::Environment::get().getWorld()->getPlayer().getPlayer()); } } \ No newline at end of file diff --git a/apps/openmw/mwgui/inventorywindow.hpp b/apps/openmw/mwgui/inventorywindow.hpp index 184cab183..21f27b12f 100644 --- a/apps/openmw/mwgui/inventorywindow.hpp +++ b/apps/openmw/mwgui/inventorywindow.hpp @@ -24,7 +24,7 @@ namespace MWGui class InventoryWindow : public MWGui::ContainerWindow { public: - InventoryWindow(WindowManager& parWindowManager,MWWorld::Environment& environment,DragAndDrop* dragAndDrop); + InventoryWindow(WindowManager& parWindowManager,DragAndDrop* dragAndDrop); void openInventory(); }; diff --git a/apps/openmw/mwgui/tooltips.cpp b/apps/openmw/mwgui/tooltips.cpp index 9d7a7ee87..757563efa 100644 --- a/apps/openmw/mwgui/tooltips.cpp +++ b/apps/openmw/mwgui/tooltips.cpp @@ -165,7 +165,7 @@ void ToolTips::findImageExtension(std::string& image) } } -IntSize ToolTips::createToolTip(const ToolTipInfo& info) +IntSize ToolTips::createToolTip(const MWGui::ToolTipInfo& info) { std::string caption = info.caption; std::string image = info.icon; diff --git a/apps/openmw/mwgui/window_manager.cpp b/apps/openmw/mwgui/window_manager.cpp index ccd51d9db..db5a51f0c 100644 --- a/apps/openmw/mwgui/window_manager.cpp +++ b/apps/openmw/mwgui/window_manager.cpp @@ -95,9 +95,9 @@ WindowManager::WindowManager( console = new Console(w,h, extensions); mJournal = new JournalWindow(*this); mMessageBoxManager = new MessageBoxManager(this); - mDialogueWindow = new DialogueWindow(*this,environment); - mContainerWindow = new ContainerWindow(*this,environment,mDragAndDrop); - mInventoryWindow = new InventoryWindow(*this,environment,mDragAndDrop); + mDialogueWindow = new DialogueWindow(*this); + mContainerWindow = new ContainerWindow(*this,mDragAndDrop); + mInventoryWindow = new InventoryWindow(*this,mDragAndDrop); mToolTips = new ToolTips(this); // The HUD is always on diff --git a/apps/openmw/mwrender/objects.cpp b/apps/openmw/mwrender/objects.cpp index 27c3f818e..b9efcd3f5 100644 --- a/apps/openmw/mwrender/objects.cpp +++ b/apps/openmw/mwrender/objects.cpp @@ -219,7 +219,7 @@ void Objects::insertLight (const MWWorld::Ptr& ptr, float r, float g, float b, f info.type = LT_Normal; // random starting phase for the animation - info.time = Ogre::Math::RangeRandom(0, 2 * M_PI); + info.time = Ogre::Math::RangeRandom(0, 2 * Ogre::Math::PI); // adjust the lights depending if we're in an interior or exterior cell // quadratic means the light intensity falls off quite fast, resulting in a @@ -367,7 +367,7 @@ void Objects::update(const float dt) // Light animation (pulse & flicker) it->time += dt; - const float phase = std::fmod(static_cast (it->time), (32 * 2 * M_PI)) * 20; + const float phase = std::fmod(static_cast (it->time), static_cast(32 * 2 * Ogre::Math::PI)) * 20; float pulseConstant; // These formulas are just guesswork, but they work pretty well diff --git a/apps/openmw/mwworld/actionopen.cpp b/apps/openmw/mwworld/actionopen.cpp index e245989d7..e450585e6 100644 --- a/apps/openmw/mwworld/actionopen.cpp +++ b/apps/openmw/mwworld/actionopen.cpp @@ -1,6 +1,6 @@ #include "actionopen.hpp" -#include "environment.hpp" +#include "../mwbase/environment.hpp" #include "class.hpp" #include "world.hpp" #include "containerstore.hpp" @@ -14,9 +14,9 @@ namespace MWWorld mContainer = container; } - void ActionOpen::execute (Environment& environment) + void ActionOpen::execute () { - environment.mWindowManager->setGuiMode(MWGui::GM_Container); - environment.mWindowManager->getContainerWindow()->open(mContainer); + MWBase::Environment::get().getWindowManager()->setGuiMode(MWGui::GM_Container); + MWBase::Environment::get().getWindowManager()->getContainerWindow()->open(mContainer); } } diff --git a/apps/openmw/mwworld/actionopen.hpp b/apps/openmw/mwworld/actionopen.hpp index 7c660e4c9..eff26c78c 100644 --- a/apps/openmw/mwworld/actionopen.hpp +++ b/apps/openmw/mwworld/actionopen.hpp @@ -15,7 +15,7 @@ namespace MWWorld public: ActionOpen (const Ptr& container); ///< \param The Container the Player has activated. - virtual void execute (Environment& environment); + virtual void execute (); }; }