From 1b1fd9e0eb97bd8b78b0452340b04baa5e3f15ad Mon Sep 17 00:00:00 2001 From: hendricks266 Date: Sat, 15 Jul 2017 21:56:12 +0000 Subject: [PATCH] CON: ifspawnedby and ifwasweapon are really the same command. Merge the code to execute them. git-svn-id: https://svn.eduke32.com/eduke32@6360 1a8010ca-5511-0410-912e-c29ae57300e0 --- source/duke3d/src/gameexec.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/source/duke3d/src/gameexec.cpp b/source/duke3d/src/gameexec.cpp index 60d2971b4..175ddfda3 100644 --- a/source/duke3d/src/gameexec.cpp +++ b/source/duke3d/src/gameexec.cpp @@ -3437,6 +3437,7 @@ nullquote: continue; case CON_IFWASWEAPON: + case CON_IFSPAWNEDBY: insptr++; VM_CONDITIONAL(vm.pActor->picnum == *insptr); continue; @@ -3644,11 +3645,6 @@ nullquote: insptr += 3; continue; - case CON_IFSPAWNEDBY: - insptr++; - VM_CONDITIONAL(vm.pActor->picnum == *insptr); - continue; - case CON_WACKPLAYER: insptr++; P_ForceAngle(pPlayer);