From b59246f413abbe88818eb86e153d83c74fea6787 Mon Sep 17 00:00:00 2001
From: ZTsukei <ztsukei@gmail.com>
Date: Mon, 4 Sep 2017 22:32:01 -0400
Subject: [PATCH] Added Donut Plains Bushes

---
 src/doomdef.h | 10 +++---
 src/info.c    | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++
 src/info.h    |  8 ++++-
 3 files changed, 97 insertions(+), 6 deletions(-)

diff --git a/src/doomdef.h b/src/doomdef.h
index 31adf2cc..5343745b 100644
--- a/src/doomdef.h
+++ b/src/doomdef.h
@@ -143,16 +143,16 @@ extern FILE *logstream;
 #define DEVELOP // Disable this for release builds to remove excessive cheat commands and enable MD5 checking and stuff, all in one go. :3
 #ifdef DEVELOP
 #define VERSION    104 // Game version
-#define SUBVERSION 1 // more precise version number
+#define SUBVERSION 2 // more precise version number
 #define VERSIONSTRING "Development EXE"
-#define VERSIONSTRINGW "v1.4.1"
+#define VERSIONSTRINGW "v1.4.2"
 // most interface strings are ignored in development mode.
 // we use comprevision and compbranch instead.
 #else
 #define VERSION    104 // Game version
-#define SUBVERSION 1 // more precise version number
-#define VERSIONSTRING "DevEXE v1.4.1"
-#define VERSIONSTRINGW L"v1.4.1"
+#define SUBVERSION 2 // more precise version number
+#define VERSIONSTRING "DevEXE v1.4.2"
+#define VERSIONSTRINGW L"v1.4.2"
 // Hey! If you change this, add 1 to the MODVERSION below!
 // Otherwise we can't force updates!
 #endif
diff --git a/src/info.c b/src/info.c
index 01772262..acaf5d3c 100644
--- a/src/info.c
+++ b/src/info.c
@@ -2804,6 +2804,10 @@ state_t states[NUMSTATES] =
 	{SPR_DOOD, 15, 4, {NULL}, 0, 0, S_DOOD_RING5}, // S_DOOD_RING4
 	{SPR_DOOD, 16, 4, {NULL}, 0, 0, S_DOOD_RING1}, // S_DOOD_RING5
 
+	{SPR_SNES, 0, -1, {NULL}, 0, 0, S_NULL}, // S_SNES_DONUTBUSH1
+	{SPR_SNES, 1, -1, {NULL}, 0, 0, S_NULL}, // S_SNES_DONUTBUSH2
+	{SPR_SNES, 2, -1, {NULL}, 0, 0, S_NULL}, // S_SNES_DONUTBUSH3
+
 	{SPR_GBAS, 131072, 12, {NULL}, 0, 0, S_GBA_BOO2}, // S_GBA_BOO1
 	{SPR_GBAS, 196609, 12, {NULL}, 0, 0, S_GBA_BOO3}, // S_GBA_BOO2
 	{SPR_GBAS, 262146, 12, {NULL}, 0, 0, S_GBA_BOO4}, // S_GBA_BOO3
@@ -15962,6 +15966,87 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
 		S_NULL          // raisestate
 	},
 
+	{           // MT_SNES_DONUTBUSH1
+		2301,           // doomednum
+		S_SNES_DONUTBUSH1, // spawnstate
+		1000,           // spawnhealth
+		S_NULL,         // seestate
+		sfx_None,       // seesound
+		8,              // reactiontime
+		sfx_None,       // attacksound
+		S_NULL,         // painstate
+		0,              // painchance
+		sfx_None,       // painsound
+		S_NULL,         // meleestate
+		S_NULL,         // missilestate
+		S_NULL,         // deathstate
+		S_NULL,         // xdeathstate
+		sfx_None,       // deathsound
+		0,              // speed
+		14*FRACUNIT,    // radius
+		15*FRACUNIT,    // height
+		0,              // display offset
+		100,            // mass
+		0,              // damage
+		sfx_None,       // activesound
+		MF_NOGRAVITY|MF_SCENERY, // flags
+		S_NULL          // raisestate
+	},
+
+	{           // MT_SNES_DONUTBUSH2
+		2302,           // doomednum
+		S_SNES_DONUTBUSH2, // spawnstate
+		1000,           // spawnhealth
+		S_NULL,         // seestate
+		sfx_None,       // seesound
+		8,              // reactiontime
+		sfx_None,       // attacksound
+		S_NULL,         // painstate
+		0,              // painchance
+		sfx_None,       // painsound
+		S_NULL,         // meleestate
+		S_NULL,         // missilestate
+		S_NULL,         // deathstate
+		S_NULL,         // xdeathstate
+		sfx_None,       // deathsound
+		0,              // speed
+		13*FRACUNIT,    // radius
+		13*FRACUNIT,    // height
+		0,              // display offset
+		100,            // mass
+		0,              // damage
+		sfx_None,       // activesound
+		MF_NOGRAVITY|MF_SCENERY, // flags
+		S_NULL          // raisestate
+	},
+
+	{           // MT_SNES_DONUTBUSH3
+		2303,           // doomednum
+		S_SNES_DONUTBUSH3, // spawnstate
+		1000,           // spawnhealth
+		S_NULL,         // seestate
+		sfx_None,       // seesound
+		8,              // reactiontime
+		sfx_None,       // attacksound
+		S_NULL,         // painstate
+		0,              // painchance
+		sfx_None,       // painsound
+		S_NULL,         // meleestate
+		S_NULL,         // missilestate
+		S_NULL,         // deathstate
+		S_NULL,         // xdeathstate
+		sfx_None,       // deathsound
+		0,              // speed
+		7*FRACUNIT,     // radius
+		7*FRACUNIT,     // height
+		0,              // display offset
+		100,            // mass
+		0,              // damage
+		sfx_None,       // activesound
+		MF_NOGRAVITY|MF_SCENERY, // flags
+		S_NULL          // raisestate
+	},
+
 	{           // MT_GBA_BOO
 		379,            // doomednum
 		S_GBA_BOO1,     // spawnstate
diff --git a/src/info.h b/src/info.h
index ab4d6fbd..8378a16a 100644
--- a/src/info.h
+++ b/src/info.h
@@ -3315,7 +3315,9 @@ typedef enum state
 	S_DOOD_RING5,
 
 	// SNES Objects
-	
+	S_SNES_DONUTBUSH1,
+	S_SNES_DONUTBUSH2,
+	S_SNES_DONUTBUSH3,
 
 	// GBA Objects
 	S_GBA_BOO1,
@@ -3972,6 +3974,10 @@ typedef enum mobj_type
 	MT_DOOD_BALLOON,
 	MT_DOOD_RING,
 
+	MT_SNES_DONUTBUSH1,
+	MT_SNES_DONUTBUSH2,
+	MT_SNES_DONUTBUSH3,
+
 	MT_GBA_BOO,
 
 	MT_BUZZBOMBER,