From 459ad87d3c0771b71d3cda8048a22e5344fc7152 Mon Sep 17 00:00:00 2001
From: "Aaron B. Gallagher" <aaron.b.gallagher@gmail.com>
Date: Mon, 24 Jul 2017 03:41:04 -0700
Subject: [PATCH] Bugfix: map pops up whenever cyling to the chainsaw

---
 src/i_video.c | 54 ---------------------------------------------------
 1 file changed, 54 deletions(-)

diff --git a/src/i_video.c b/src/i_video.c
index a66be80..78abc8d 100644
--- a/src/i_video.c
+++ b/src/i_video.c
@@ -434,8 +434,6 @@ void I_GetEvent()
 
 	if (gamestate == GS_LEVEL)
 	{
-        boolean looped = false;
-
 		plyrweap = &players[consoleplayer];
 
 		num = plyrweap->readyweapon;
@@ -445,21 +443,12 @@ void I_GetEvent()
 		
 		if (key & SCE_CTRL_UP)
 		{
-            looped = false;
-
 			while (1)
             {
 				++num;
                 if (num > wp_supershotgun)
                 {
-                    if (looped)
-                    {
-                        num = plyrweap->readyweapon;
-                        break;
-                    }
-
                     num = wp_fist;
-                    looped = true;
                 }
 
 				if (plyrweap->weaponowned[num])
@@ -470,10 +459,6 @@ void I_GetEvent()
 
 				
 			}
-
-		kbevent.type = ev_keydown;
-		kbevent.data1 = KEY_1 + num;
-		D_PostEvent(&kbevent);
 		}
 		else  
 		{
@@ -485,21 +470,12 @@ void I_GetEvent()
 		
 		if (key & SCE_CTRL_DOWN)
         {
-            looped = false;
-
 			while (1)
             {
 				--num;
                 if (num == -1)
                 {
-                    if (looped)
-                    {
-                        num = plyrweap->readyweapon;
-                        break;
-                    }
-
                     num = wp_supershotgun;
-                    looped = true;
                 }
 				if (plyrweap->weaponowned[num])
 				{
@@ -507,31 +483,18 @@ void I_GetEvent()
 					break;
 				}
 			}
-
-			kbevent.type = ev_keydown;
-			kbevent.data1 = KEY_1 + num;
-			D_PostEvent(&kbevent);
 		}
 		}
 
 		if (!analog) {
 		if (ctl.ry <= 0x10)
 		{
-            looped = false;
-
 			while (1)
             {
 				++num;
 				if (num > wp_supershotgun)
                 {
-                    if (looped)
-                    {
-                        num = plyrweap->readyweapon;
-                        break;
-                    }
-
                     num = wp_fist;
-                    looped = true;
                 }
 
 				if (plyrweap->weaponowned[num])
@@ -540,10 +503,6 @@ void I_GetEvent()
 					break;
 				}
 			}
-
-			kbevent.type = ev_keydown;
-			kbevent.data1 = KEY_1 + num;
-			D_PostEvent(&kbevent);
 		}
 		else  
         {
@@ -553,21 +512,12 @@ void I_GetEvent()
 		}
 		if (ctl.ry >= 0xD0)
 		{
-            looped = false;
-
 			while (1)
             {
                 --num;
                 if (num == -1)
                 {
-                    if (looped)
-                    {
-                        num = plyrweap->readyweapon;
-                        break;
-                    }
-
                     num = wp_supershotgun;
-                    looped = true;
                 }
 
 				if (plyrweap->weaponowned[num])
@@ -576,10 +526,6 @@ void I_GetEvent()
 					break;
 				}
 			}
-
-			kbevent.type = ev_keydown;
-			kbevent.data1 = KEY_1 + num;
-			D_PostEvent(&kbevent);
 		}
         }
     }