From 536bee14d096a4de8a973e8d75d43b95b94368fb Mon Sep 17 00:00:00 2001
From: puzl <puzl@67975925-1194-0748-b3d5-c16f83f1a3a1>
Date: Sat, 19 Nov 2005 01:25:38 +0000
Subject: [PATCH] o kHiveSightRange 1500 -> 3000 o Maximum of 20 friendly blips
 and 25 enemy blips o HG do NS_DMG_BLAST

git-svn-id: https://unknownworlds.svn.cloudforge.com/ns1@355 67975925-1194-0748-b3d5-c16f83f1a3a1
---
 releases/3.1.1/Balance.txt                       | 4 ++--
 releases/3.1.1/source/mod/AvHNetworkMessages.cpp | 7 +++++--
 releases/3.1.1/source/mod/AvHServerUtil.cpp      | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/releases/3.1.1/Balance.txt b/releases/3.1.1/Balance.txt
index 1cb556e..5acd08c 100644
--- a/releases/3.1.1/Balance.txt
+++ b/releases/3.1.1/Balance.txt
@@ -135,7 +135,7 @@
 #define kGrenadeLauncherCost 15
 #define kGrenadeRadius 350
 #define kGrenadesResearchCost 10
-#define kGrenadesResearchTime 90
+#define kGrenadesResearchTime 45
 #define kHandGrenDetonateTime 0.75
 #define kHGDamage 20
 #define kHGMaxAmmo 30
@@ -161,7 +161,7 @@
 #define kHiveHealRadius 500
 #define kHiveHealth 7000
 #define kHiveRegenerationAmount 2
-#define kHiveSightRange 1500
+#define kHiveSightRange 3000
 #define kInfantryPortalBuildTime 10
 #define kInfantryPortalCost 20
 #define kInfantryPortalHealth 2500
diff --git a/releases/3.1.1/source/mod/AvHNetworkMessages.cpp b/releases/3.1.1/source/mod/AvHNetworkMessages.cpp
index 9ea9890..d15f213 100644
--- a/releases/3.1.1/source/mod/AvHNetworkMessages.cpp
+++ b/releases/3.1.1/source/mod/AvHNetworkMessages.cpp
@@ -1162,9 +1162,12 @@ union float_converter
 #else
 	void NetMsg_BlipList( entvars_t* const pev, const bool friendly_blips, const AvHVisibleBlipList& list )
 	{
+		int maxBlips = friendly_blips ? 20 : 25;
+		maxBlips =  min ( list.mNumBlips, maxBlips );
+
 		MESSAGE_BEGIN( MSG_ONE_UNRELIABLE, g_msgBlipList, NULL, pev );
 			//pack header - 7 bits for blip count (doesn't go over 40 in practice), 1 bit for Friend or Foe
-			unsigned char list_info = list.mNumBlips | (friendly_blips ? 0x80 : 0);
+			unsigned char list_info = maxBlips | (friendly_blips ? 0x80 : 0);
 			WRITE_BYTE( list_info );
 			//pack each blip - this could be optimized as follows once bit packer is implemented:
 			// convert X, Y to integer values ranging from 0 to 2047 (11 bits each) based on map extents
@@ -1176,7 +1179,7 @@ union float_converter
 			// blip precision would be equal to double large minimap precision, with worst case of 4 unit X,Y separation for MT.
 			// because maps are much smaller vertically than horizontally as a rule, the worst case of 16 unit Z separation
 			// will very rarely occur.
-			for( int counter = 0; counter < list.mNumBlips; counter++ )
+			for( int counter = 0; counter < maxBlips; counter++ )
 			{
 				WRITE_COORD( list.mBlipPositions[counter][0] );
 				WRITE_COORD( list.mBlipPositions[counter][1] );
diff --git a/releases/3.1.1/source/mod/AvHServerUtil.cpp b/releases/3.1.1/source/mod/AvHServerUtil.cpp
index 0dcf241..0ccd1f1 100644
--- a/releases/3.1.1/source/mod/AvHServerUtil.cpp
+++ b/releases/3.1.1/source/mod/AvHServerUtil.cpp
@@ -1076,7 +1076,7 @@ CBaseEntity* AvHSUGetEntityFromIndex(int inEntityIndex)
 
 CGrenade* AvHSUShootServerGrenade(entvars_t* inOwner, Vector inOrigin, Vector inVelocity, float inTime, bool inHandGrenade)
 {
-	CGrenade* theGrenade = CGrenade::ShootExplosiveTimed(inOwner, inOrigin, inVelocity, inTime, inHandGrenade ? NS_DMG_NORMAL : NS_DMG_BLAST );
+	CGrenade* theGrenade = CGrenade::ShootExplosiveTimed(inOwner, inOrigin, inVelocity, inTime, NS_DMG_BLAST); // inHandGrenade ? NS_DMG_NORMAL : NS_DMG_BLAST );
     ASSERT(theGrenade);
     
 	theGrenade->pev->team = inOwner->team;