From bd280414ea192b82b2ca8f9dfd9330f6e92eba61 Mon Sep 17 00:00:00 2001
From: Clownacy <Clownacy@users.noreply.github.com>
Date: Sat, 4 Apr 2020 00:43:06 +0100
Subject: [PATCH] Cleanup

---
 src/BossAlmo1.cpp  | 2 ++
 src/BossAlmo2.cpp  | 2 ++
 src/BossBallos.cpp | 2 ++
 src/BossOhm.cpp    | 4 ++--
 src/BossX.cpp      | 4 +++-
 5 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/BossAlmo1.cpp b/src/BossAlmo1.cpp
index 06f5a407..0204779a 100644
--- a/src/BossAlmo1.cpp
+++ b/src/BossAlmo1.cpp
@@ -1,5 +1,7 @@
 #include "BossAlmo1.h"
 
+#include <stddef.h>
+
 #include "WindowsWrapper.h"
 
 #include "Boss.h"
diff --git a/src/BossAlmo2.cpp b/src/BossAlmo2.cpp
index 8fcf6b36..3d8b2591 100644
--- a/src/BossAlmo2.cpp
+++ b/src/BossAlmo2.cpp
@@ -1,5 +1,7 @@
 #include "BossAlmo2.h"
 
+#include <stddef.h>
+
 #include "WindowsWrapper.h"
 
 #include "Boss.h"
diff --git a/src/BossBallos.cpp b/src/BossBallos.cpp
index fd2c5a03..21d9cd44 100644
--- a/src/BossBallos.cpp
+++ b/src/BossBallos.cpp
@@ -1,5 +1,7 @@
 #include "BossBallos.h"
 
+#include <stddef.h>
+
 #include "WindowsWrapper.h"
 
 #include "Boss.h"
diff --git a/src/BossOhm.cpp b/src/BossOhm.cpp
index 5ebd7bf1..7530f841 100644
--- a/src/BossOhm.cpp
+++ b/src/BossOhm.cpp
@@ -1,6 +1,6 @@
 #include "BossOhm.h"
 
-#include <string.h>
+#include <stddef.h>
 
 #include "WindowsWrapper.h"
 
@@ -381,7 +381,7 @@ void ActBossChar_Omega(void)
 				gBoss[0].count1 = 0;
 			}
 
-			if (gBoss[0].act_wait < 30 && !(gBoss[0].act_wait % 5))
+			if (gBoss[0].act_wait < 30 && gBoss[0].act_wait % 5 == 0)
 			{
 				SetNpChar(48, gBoss[0].x, gBoss[0].y - (16 * 0x200), Random(-341, 341), -0x333, 0, NULL, 0x100);
 				PlaySoundObject(39, 1);
diff --git a/src/BossX.cpp b/src/BossX.cpp
index b17128b3..e4829cb7 100644
--- a/src/BossX.cpp
+++ b/src/BossX.cpp
@@ -1,5 +1,7 @@
 #include "BossX.h"
 
+#include <stddef.h>
+
 #include "WindowsWrapper.h"
 
 #include "Boss.h"
@@ -259,7 +261,7 @@ static void ActBossChar03_02(NPCHAR *npc)
 					break;
 			}
 
-			SetNpChar(158, npc->x + x, npc->y + y, 0, 0, direct, 0, 0x100);
+			SetNpChar(158, npc->x + x, npc->y + y, 0, 0, direct, NULL, 0x100);
 			PlaySoundObject(39, 1);
 			npc->act_wait = 120;