From f250249f9ed4d941eabb6d0dbbec0c08e1258e78 Mon Sep 17 00:00:00 2001
From: Night Owl <sepulkarium45@yahoo.com>
Date: Mon, 25 Dec 2017 02:33:23 +0500
Subject: [PATCH] Fix some warnings.

---
 dlls/eftd/hassault.cpp |  4 ++--
 dlls/hgrunt.cpp        | 13 +++++--------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/dlls/eftd/hassault.cpp b/dlls/eftd/hassault.cpp
index b8091e4a..9376a4a9 100644
--- a/dlls/eftd/hassault.cpp
+++ b/dlls/eftd/hassault.cpp
@@ -219,7 +219,7 @@ int CHassault::Classify(void)
 //=========================================================
 void CHassault::Shoot(void)
 {
-	if (m_hEnemy == NULL)
+	if( m_hEnemy == 0 )
 	{
 		return;
 	}
@@ -248,4 +248,4 @@ void CHassault::Shoot(void)
 void CHassault::DeathSound(void)
 {
 	EMIT_SOUND(ENT(pev), CHAN_VOICE, RANDOM_SOUND_ARRAY(pDeathSounds), 1, ATTN_IDLE);
-}
\ No newline at end of file
+}
diff --git a/dlls/hgrunt.cpp b/dlls/hgrunt.cpp
index c880cda6..6728af7e 100644
--- a/dlls/hgrunt.cpp
+++ b/dlls/hgrunt.cpp
@@ -1103,19 +1103,16 @@ void CHGrunt::Spawn()
 {
 	Precache();
 
-	char* szModel = (char*)STRING( pev->model );
-	if( !szModel || !*szModel )
+	if( !pev->model )
 	{
-		szModel = "models/hgrunt.mdl";
-		pev->model = ALLOC_STRING( szModel );
+		pev->model = MAKE_STRING( "models/hgrunt.mdl" );
 	}
-	else if( !FStrEq( szModel, "models/hgrunt.mdl" ) )
+	else if( !FStrEq( STRING( pev->model ), "models/hgrunt.mdl" ) )
 	{
-		szModel = "models/hgruntsnow.mdl";
-		pev->model = ALLOC_STRING( szModel );
+		pev->model = MAKE_STRING( "models/hgruntsnow.mdl" );
 	}
 
-	SET_MODEL( ENT( pev ), szModel );
+	SET_MODEL( ENT( pev ), STRING( pev->model ) );
 	UTIL_SetSize( pev, VEC_HUMAN_HULL_MIN, VEC_HUMAN_HULL_MAX );
 
 	pev->solid		= SOLID_SLIDEBOX;