Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2024-12-22 11:56:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make overrides consistent again.

Browse Source
This commit is contained in:
Relintai 2023-06-04 13:11:04 +02:00
parent 45c0147f66
commit 57153f4a33
3 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/navigation_mesh_generator/editor/navigation_mesh_editor_plugin.h
View File

@ -75,11 +75,11 @@ class NavigationMeshEditorPlugin : public EditorPlugin {
NavigationMeshEditor *navigation_mesh_editor = nullptr; NavigationMeshEditor *navigation_mesh_editor = nullptr;
public: public:
virtual String get_name() const override { return "NavigationMesh"; } virtual String get_name() const { return "NavigationMesh"; }
bool has_main_screen() const override { return false; } bool has_main_screen() const { return false; }
virtual void edit(Object *p_object) override; virtual void edit(Object *p_object);
virtual bool handles(Object *p_object) const override; virtual bool handles(Object *p_object) const;
virtual void make_visible(bool p_visible) override; virtual void make_visible(bool p_visible);
NavigationMeshEditorPlugin(); NavigationMeshEditorPlugin();
~NavigationMeshEditorPlugin(); ~NavigationMeshEditorPlugin();

20
modules/navigation_mesh_generator/editor/navigation_polygon_editor_plugin.h
View File

@ -64,19 +64,19 @@ class NavigationPolygonEditor : public AbstractPolygon2DEditor {
protected: protected:
void _notification(int p_what); void _notification(int p_what);
virtual Node2D *_get_node() const override; virtual Node2D *_get_node() const;
virtual void _set_node(Node *p_polygon) override; virtual void _set_node(Node *p_polygon);
virtual int _get_polygon_count() const override; virtual int _get_polygon_count() const;
virtual Variant _get_polygon(int p_idx) const override; virtual Variant _get_polygon(int p_idx) const;
virtual void _set_polygon(int p_idx, const Variant &p_polygon) const override; virtual void _set_polygon(int p_idx, const Variant &p_polygon) const;
virtual void _action_add_polygon(const Variant &p_polygon) override; virtual void _action_add_polygon(const Variant &p_polygon);
virtual void _action_remove_polygon(int p_idx) override; virtual void _action_remove_polygon(int p_idx);
virtual void _action_set_polygon(int p_idx, const Variant &p_previous, const Variant &p_polygon) override; virtual void _action_set_polygon(int p_idx, const Variant &p_previous, const Variant &p_polygon);
virtual bool _has_resource() const override; virtual bool _has_resource() const;
virtual void _create_resource() override; virtual void _create_resource();
public: public:
NavigationPolygonEditor(); NavigationPolygonEditor();

6
servers/navigation/navigation_mesh_generator.h
View File

@ -31,6 +31,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/ /**************************************************************************/
#include "core/object/object.h"
#include "core/containers/rid.h" #include "core/containers/rid.h"
#include "core/object/class_db.h" #include "core/object/class_db.h"
#include "core/object/func_ref.h" #include "core/object/func_ref.h"
@ -84,7 +86,7 @@ public:
#endif // _3D_DISABLED #endif // _3D_DISABLED
NavigationMeshGenerator(); NavigationMeshGenerator();
~NavigationMeshGenerator() override; ~NavigationMeshGenerator();
}; };
/// NavigationMeshGeneratorManager //////////////////////////////////////////////////// /// NavigationMeshGeneratorManager ////////////////////////////////////////////////////
@ -123,7 +125,7 @@ public:
NavigationMeshGenerator *new_server(const String &p_name) const; NavigationMeshGenerator *new_server(const String &p_name) const;
NavigationMeshGeneratorManager(); NavigationMeshGeneratorManager();
~NavigationMeshGeneratorManager() override; ~NavigationMeshGeneratorManager();
}; };
#endif // NAVIGATION_MESH_GENERATOR_H #endif // NAVIGATION_MESH_GENERATOR_H