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

Finished merging.

Browse source
This commit is contained in:
gugus 2012-05-11 11:52:07 +02:00
parent 8e8f80807e
commit 9dd65dce30
9 changed files with 22 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/openmw/mwgui/container.cpp
View file

@ -5,7 +5,7 @@
#include "window_manager.hpp"
#include "widgets.hpp"
#include "../mwworld/environment.hpp"
#include "../mwbase/environment.hpp"
#include "../mwworld/manualref.hpp"
#include <cmath>
#include <algorithm>
@ -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);
}
}

5
apps/openmw/mwgui/container.hpp
View file

@ -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<MyGUI::WidgetPtr> mContainerWidgets;
MyGUI::ItemBoxPtr mContainerWidget;

8
apps/openmw/mwgui/inventorywindow.cpp
View file

@ -4,7 +4,7 @@
#include "window_manager.hpp"
#include "widgets.hpp"
#include "../mwworld/environment.hpp"
#include "../mwbase/environment.hpp"
#include "../mwworld/manualref.hpp"
#include <cmath>
#include <algorithm>
@ -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());
}
}

2
apps/openmw/mwgui/inventorywindow.hpp
View file

@ -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();
};

2
apps/openmw/mwgui/tooltips.cpp
View file

@ -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;

6
apps/openmw/mwgui/window_manager.cpp
View file

@ -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

4
apps/openmw/mwrender/objects.cpp
View file

@ -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<double> (it->time), (32 * 2 * M_PI)) * 20;
const float phase = std::fmod(static_cast<double> (it->time), static_cast<double>(32 * 2 * Ogre::Math::PI)) * 20;
float pulseConstant;
// These formulas are just guesswork, but they work pretty well

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

@ -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);
}
}

2
apps/openmw/mwworld/actionopen.hpp
View file

@ -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 ();
};
}