Merged inn athile's work

This commit is contained in:
Nicolay Korslund 2010-09-02 12:49:54 +02:00
commit dc453e1c1d
2 changed files with 2 additions and 3 deletions

View file

@ -11,8 +11,8 @@ EventInjector::EventInjector(MyGUI::Gui *g)
: gui(g), mouseX(0), mouseY(0), enabled(true)
{
assert(gui);
maxX = gui->getViewWidth();
maxY = gui->getViewHeight();
maxX = gui->getViewSize().width;
maxY = gui->getViewSize().height;
}
template <typename X>

View file

@ -35,7 +35,6 @@ private:
where we poll to check if a resource is still needed, but where
manual references are allowed.
*/
typedef boost::weak_ptr<Mangle::Sound::Sound> WSoundPtr;
WSoundPtr weak;
SoundPtr self;