From 71b27a82bc0297762d2feff3755c1265cc2f9850 Mon Sep 17 00:00:00 2001
From: hendricks266 <hendricks266@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Mon, 23 Jan 2017 11:20:33 +0000
Subject: [PATCH] weapons.con.sample: Only setvar RETURN -1 for values of
 drawweapon that we actually handle. (Currently all of them, but this is more
 future-proof.)

git-svn-id: https://svn.eduke32.com/eduke32@6032 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/eduke32/package/sdk/samples/weapons.con.sample | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/polymer/eduke32/package/sdk/samples/weapons.con.sample b/polymer/eduke32/package/sdk/samples/weapons.con.sample
index 265ef0722..4038059f2 100644
--- a/polymer/eduke32/package/sdk/samples/weapons.con.sample
+++ b/polymer/eduke32/package/sdk/samples/weapons.con.sample
@@ -1558,8 +1558,6 @@ ends
 
 onevent EVENT_DISPLAYWEAPON // P_DisplayWeapon
 
-    setvar RETURN -1
-
     getplayer[THISACTOR].weapon_pos weapon_pos
     getuserdef[THISACTOR].weaponscale weaponscale
     getplayer[THISACTOR].i playerid
@@ -1621,6 +1619,8 @@ onevent EVENT_DISPLAYWEAPON // P_DisplayWeapon
             divvar hud_scale 100
             rotatesprite hud_x hud_y hud_scale 0 hud_tilenum 0 0 2 windowx1 windowy1 windowx2 windowy2
         }
+
+        setvar RETURN -1
     }
 
     ifvarn hud_temp 1 break // If we are not displaying the actual HUD weapons, stop processing.
@@ -1707,4 +1707,6 @@ onevent EVENT_DISPLAYWEAPON // P_DisplayWeapon
         setvar hud_angle 0
         guniqhudid 0
     }
+
+    setvar RETURN -1
 endevent