From 9f910ff10cf0a868cc5fcd3f35c8b8c40d0b6478 Mon Sep 17 00:00:00 2001
From: hendricks266 <hendricks266@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Sun, 25 Jan 2015 12:27:52 +0000
Subject: [PATCH] Fix next/previous weapon when the pipebomb detonator is
 active.

git-svn-id: https://svn.eduke32.com/eduke32@4950 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/eduke32/source/sector.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/polymer/eduke32/source/sector.c b/polymer/eduke32/source/sector.c
index ed6148646..f5d628bbd 100644
--- a/polymer/eduke32/source/sector.c
+++ b/polymer/eduke32/source/sector.c
@@ -2656,7 +2656,7 @@ CHECKINV1:
                     j = (j == 10 ? -1 : 1);     // JBF: prev (-1) or next (1) weapon choice
                     i = k;
 
-                    while ((k >= 0 && k < 10) || (PLUTOPAK && k == GROW_WEAPON))
+                    while ((k >= 0 && k < 11) || (PLUTOPAK && k == GROW_WEAPON))
                     {
                         // this accounts for the expander when handling next/previous
 
@@ -2693,6 +2693,8 @@ CHECKINV1:
                                     k--;
                                 break;
 
+                            case HANDREMOTE_WEAPON:
+                                i = k = HANDBOMB_WEAPON;
                             default:
                                 k += j;
                                 break;