6 files changed, 8 insertions, 7 deletions
diff --git a/src/being/actorsprite.cpp b/src/being/actorsprite.cpp
index 6f213903e..4b9a4b61a 100644
--- a/src/being/actorsprite.cpp
+++ b/src/being/actorsprite.cpp
@@ -96,7 +96,8 @@ ActorSprite::~ActorSprite()
 }
 
 void ActorSprite::draw1(Graphics *const graphics,
-                        const int offsetX, const int offsetY) const
+                        const int offsetX,
+                        const int offsetY) const
 {
     FUNC_BLOCK("ActorSprite::draw1", 1)
     if (mUsedTargetCursor)
diff --git a/src/being/actorsprite.h b/src/being/actorsprite.h
index 72ceb2f84..f6119bbef 100644
--- a/src/being/actorsprite.h
+++ b/src/being/actorsprite.h
@@ -70,7 +70,7 @@ class ActorSprite notfinal : public CompoundSprite, public Actor
 
         void draw1(Graphics *const graphics,
                    const int offsetX,
-                   const int offsetY) const;
+                   const int offsetY) const A_NONNULL(2);
 
         virtual void logic();
 
diff --git a/src/gui/widgets/serverslistbox.h b/src/gui/widgets/serverslistbox.h
index e15bebb41..6b03513dd 100644
--- a/src/gui/widgets/serverslistbox.h
+++ b/src/gui/widgets/serverslistbox.h
@@ -140,7 +140,7 @@ class ServersListBox final : public ListBox
             }
         }
 
-        void safeDraw(Graphics *graphics) override final
+        void safeDraw(Graphics *graphics) override final A_NONNULL(2)
         {
             ServersListBox::draw(graphics);
         }
diff --git a/src/gui/widgets/skilllistbox.h b/src/gui/widgets/skilllistbox.h
index a27c57147..b8aa3f3c5 100644
--- a/src/gui/widgets/skilllistbox.h
+++ b/src/gui/widgets/skilllistbox.h
@@ -174,7 +174,7 @@ class SkillListBox final : public ListBox
             }
         }
 
-        void safeDraw(Graphics *graphics) override final
+        void safeDraw(Graphics *graphics) override final A_NONNULL(2)
         {
             SkillListBox::draw(graphics);
         }
diff --git a/src/gui/windowmenu.h b/src/gui/windowmenu.h
index f5f0b1c7d..38ffe2e76 100644
--- a/src/gui/windowmenu.h
+++ b/src/gui/windowmenu.h
@@ -87,9 +87,9 @@ class WindowMenu final : public Container,
 #endif
 
     protected:
-        void drawChildren(Graphics* graphics) override final;
+        void drawChildren(Graphics* graphics) override final A_NONNULL(2);
 
-        void safeDrawChildren(Graphics* graphics) override final;
+        void safeDrawChildren(Graphics* graphics) override final A_NONNULL(2);
 
     private:
         inline void addButton(const char *const text,
diff --git a/src/gui/windows/ministatuswindow.h b/src/gui/windows/ministatuswindow.h
index c1a93d6d9..fa4ca6aec 100644
--- a/src/gui/windows/ministatuswindow.h
+++ b/src/gui/windows/ministatuswindow.h
@@ -63,7 +63,7 @@ class MiniStatusWindow final : public Window,
 
         void eraseIcon(const int index);
 
-        void drawIcons(Graphics *const graphics);
+        void drawIcons(Graphics *const graphics) A_NONNULL(2);
 
         void updateStatus() override final;