Removed inbulk distance, just use send_spawn_distance instead -- also zone in should send a larger radius (not less than 40)

EQ2/source/WorldServer/client.cpp

@@ -8281,7 +8281,7 @@ void Client::SendSpawnChanges(set<Spawn*>& spawns) {
 			vis_size = 0;
 		}*/
 		int16 index = GetPlayer()->GetIndexForSpawn(spawn);
-		if (index == 0 || !GetPlayer()->WasSentSpawn(spawn->GetID()) || GetPlayer()->WasSpawnRemoved(spawn) || GetPlayer()->GetDistance(spawn) >= SEND_SPAWN_INBULK_DISTANCE)
+		if (index == 0 || !GetPlayer()->WasSentSpawn(spawn->GetID()) || GetPlayer()->NeedsSpawnResent(spawn) || GetPlayer()->GetDistance(spawn) >= SEND_SPAWN_DISTANCE)
 			continue;
 		
 		if (spawn->info_changed) {

EQ2/source/WorldServer/zoneserver.cpp

@@ -1073,7 +1073,7 @@ void ZoneServer::CheckSendSpawnToClient(Client* client, bool initial_login) {
 						spawn->RemoveSpawnAccess(client->GetPlayer());
 				}
 				if(spawn && spawn != client->GetPlayer() && client->GetPlayer()->ShouldSendSpawn(spawn)) {
-					if((!initial_login && spawn_iter->second <= SEND_SPAWN_DISTANCE) || (initial_login && (spawn_iter->second <= 40 || spawn->IsWidget()))) {
+					if((!initial_login && spawn_iter->second <= SEND_SPAWN_DISTANCE) || (initial_login && (spawn_iter->second <= (SEND_SPAWN_DISTANCE/2) || spawn->IsWidget()))) {
 						if(closest_spawns.count(spawn_iter->second) == 0)
 							closest_spawns[spawn_iter->second] = new vector<Spawn*>();
 						closest_spawns[spawn_iter->second]->push_back(spawn);

EQ2/source/WorldServer/zoneserver.h

@@ -99,7 +99,6 @@ class Bot;
 #define HEAR_SPAWN_DISTANCE	30		/* max distance a client can be from a spawn to 'hear' it */
 #define MAX_CHASE_DISTANCE 80
 #define REMOVE_SPAWN_DISTANCE 300 // increased distance between send/remove is ideal, this makes sure there is no overlap if a 'fast' client (AKA GM warp speed)
-#define SEND_SPAWN_INBULK_DISTANCE (SEND_SPAWN_DISTANCE+REMOVE_SPAWN_DISTANCE)/2
 
 #define TRACKING_STOP				0
 #define TRACKING_START				1