From 6f76b2b827709f4013f714634445e7b595b9f935 Mon Sep 17 00:00:00 2001
From: TehRealSalt <tehrealsalt@gmail.com>
Date: Wed, 24 Oct 2018 21:51:43 -0400
Subject: [PATCH] Fix merges

(Don't bother me hastily to merge something in again, please)
---
 src/info.c    | 4 ++++
 src/p_enemy.c | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/info.c b/src/info.c
index 3366e5df0..4cf3d8454 100644
--- a/src/info.c
+++ b/src/info.c
@@ -17648,6 +17648,10 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
 		16<<FRACBITS,   // speed
 		20<<FRACBITS,   // radius
 		20<<FRACBITS,  // height
+		0,              // display offset
+		0,              // mass
+		0,              // damage
+		sfx_None,       // activesound
 		MF_SCENERY|MF_NOCLIP|MF_NOGRAVITY, 	// flags
 		S_NULL          // raisestate
 	},
diff --git a/src/p_enemy.c b/src/p_enemy.c
index 0e8066bee..f06718390 100644
--- a/src/p_enemy.c
+++ b/src/p_enemy.c
@@ -8830,9 +8830,9 @@ void A_ReaperThinker(mobj_t *actor)
 	thinker_t *th;
 
 	//Player targetting stuff:
-	INT32 maxscore = 0;	// we target the player with the highest score so yeah there you go.
+	UINT32 maxscore = 0;	// we target the player with the highest score so yeah there you go.
 	player_t *player;	// used as a shortcut in a loop.
-	mobj_t *targetplayermo;	// the player mo we can eventually target, or whatever.
+	mobj_t *targetplayermo = NULL;	// the player mo we can eventually target, or whatever.
 
 
 #ifdef HAVE_BLUA