forked from mirror/openmw-tes3mp
Merged inn athile's work
This commit is contained in:
commit
dc453e1c1d
2 changed files with 2 additions and 3 deletions
|
@ -11,8 +11,8 @@ EventInjector::EventInjector(MyGUI::Gui *g)
|
||||||
: gui(g), mouseX(0), mouseY(0), enabled(true)
|
: gui(g), mouseX(0), mouseY(0), enabled(true)
|
||||||
{
|
{
|
||||||
assert(gui);
|
assert(gui);
|
||||||
maxX = gui->getViewWidth();
|
maxX = gui->getViewSize().width;
|
||||||
maxY = gui->getViewHeight();
|
maxY = gui->getViewSize().height;
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename X>
|
template <typename X>
|
||||||
|
|
|
@ -35,7 +35,6 @@ private:
|
||||||
where we poll to check if a resource is still needed, but where
|
where we poll to check if a resource is still needed, but where
|
||||||
manual references are allowed.
|
manual references are allowed.
|
||||||
*/
|
*/
|
||||||
typedef boost::weak_ptr<Mangle::Sound::Sound> WSoundPtr;
|
|
||||||
WSoundPtr weak;
|
WSoundPtr weak;
|
||||||
SoundPtr self;
|
SoundPtr self;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue