mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-23 14:39:43 +00:00
Code Issues Releases Wiki Activity

Merged merge request !15

Browse source
This commit is contained in:
Marc Zinnschlag 2018-07-03 08:59:57 +02:00
commit 9a88f9147e
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -81,7 +81,7 @@ namespace MWGui
MyGUI::Widget* getDefaultKeyFocus() override; MyGUI::Widget* getDefaultKeyFocus() override;
virtual bool exit() { return false; } virtual bool exit() override { return false; }
bool mMarkedToDelete; bool mMarkedToDelete;

8
apps/openmw/mwgui/windowbase.hpp
View file

@ -56,15 +56,15 @@ namespace MWGui
/* /*
* "Modal" windows cause the rest of the interface to be unaccessible while they are visible * "Modal" windows cause the rest of the interface to be inaccessible while they are visible
*/ */
class WindowModal : public WindowBase class WindowModal : public WindowBase
{ {
public: public:
WindowModal(const std::string& parLayout); WindowModal(const std::string& parLayout);
virtual void onOpen(); virtual void onOpen() override;
virtual void onClose(); virtual void onClose() override;
virtual bool exit() {return true;} virtual bool exit() override {return true;}
}; };
/// A window that cannot be the target of a drag&drop action. /// A window that cannot be the target of a drag&drop action.

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

@ -608,7 +608,7 @@ namespace MWWorld
void launchProjectile (MWWorld::Ptr actor, MWWorld::ConstPtr projectile, void launchProjectile (MWWorld::Ptr actor, MWWorld::ConstPtr projectile,
const osg::Vec3f& worldPos, const osg::Quat& orient, MWWorld::Ptr bow, float speed, float attackStrength) override; const osg::Vec3f& worldPos, const osg::Quat& orient, MWWorld::Ptr bow, float speed, float attackStrength) override;
void applyLoopingParticles(const MWWorld::Ptr& ptr); void applyLoopingParticles(const MWWorld::Ptr& ptr) override;
const std::vector<std::string>& getContentFiles() const override; const std::vector<std::string>& getContentFiles() const override;
void breakInvisibility (const MWWorld::Ptr& actor) override; void breakInvisibility (const MWWorld::Ptr& actor) override;