From 611344ed05300fdfe87054928ca1b2e48090375a Mon Sep 17 00:00:00 2001
From: s1lentq <s1lentsk@yandex.ru>
Date: Wed, 3 Aug 2016 14:35:36 +0700
Subject: [PATCH] Fix touched armoury_entity

---
 regamedll/dlls/cbase.cpp   | 7 ++-----
 regamedll/dlls/weapons.cpp | 4 ++--
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/regamedll/dlls/cbase.cpp b/regamedll/dlls/cbase.cpp
index 327537af..fa316f44 100644
--- a/regamedll/dlls/cbase.cpp
+++ b/regamedll/dlls/cbase.cpp
@@ -1053,17 +1053,14 @@ int CBaseEntity::__MAKE_VHOOK(DamageDecal)(int bitsDamageType)
 // will keep a pointer to it after this call.
 CBaseEntity *CBaseEntity::Create(char *szName, const Vector &vecOrigin, const Vector &vecAngles, edict_t *pentOwner)
 {
-	edict_t	*pent;
-	CBaseEntity *pEntity;
-
-	pent = CREATE_NAMED_ENTITY(MAKE_STRING(szName));
+	edict_t	*pent = CREATE_NAMED_ENTITY(MAKE_STRING(szName));
 	if (FNullEnt(pent))
 	{
 		ALERT(at_console, "NULL Ent in Create!\n");
 		return NULL;
 	}
 
-	pEntity = Instance(pent);
+	CBaseEntity *pEntity = Instance(pent);
 
 	pEntity->pev->owner = pentOwner;
 	pEntity->pev->origin = vecOrigin;
diff --git a/regamedll/dlls/weapons.cpp b/regamedll/dlls/weapons.cpp
index a8b6423b..ff0f31f1 100644
--- a/regamedll/dlls/weapons.cpp
+++ b/regamedll/dlls/weapons.cpp
@@ -2201,6 +2201,8 @@ void CArmoury::__MAKE_VHOOK(Restart)()
 	if (m_iCount < 1)
 		m_iCount = 1;
 
+	Draw();
+
 #ifdef REGAMEDLL_ADD
 	// Restored origin from the cache
 	UTIL_SetSize(pev, Vector(-16, -16, 0), Vector(16, 16, 16));
@@ -2208,8 +2210,6 @@ void CArmoury::__MAKE_VHOOK(Restart)()
 
 	DROP_TO_FLOOR(edict());
 #endif
-
-	Draw();
 }
 
 void CArmoury::__MAKE_VHOOK(Precache)()