map features + fixes

- add flag to override env_fog distance adjustment for special cases (mystic_radar_v1)
- robogrunt can use rpg/sniper (shockraid_jungle)
- fix crash precaching an empty string
- allow train to move from/to the same path_corner (hl_u12_a5)
- fix warnings
- hwgrunt stuck in a cover/spinup loop (svencontra2)
- fix ambient_generic direction wrong when far from the world origin

dlls/env/CAmbientGeneric.cpp

@@ -162,6 +162,10 @@ void CAmbientGeneric::Spawn(void)
 		m_fLooping = m_forceLoop;
 	}
 
+	// prevent sound direction looping around to the other side of the world due to short coordinates
+	Vector v = pev->origin;
+	UTIL_SetOrigin(pev, Vector(clampf(v.x, -4095, 4095), clampf(v.y, -4095, 4095), clampf(v.z, -4095, 4095)));
+
 	Precache();
 }
 

dlls/env/CEnvWeather.cpp

@@ -58,6 +58,11 @@
 
 #define SF_WEATHER_START_OFF 1
 
+// don't auto adjust fog minimum distance, for when you're sure that there will be no issues
+// with transparent entities in the map (for instance if fog is only active during a cutscene,
+// or if there is no way for a player to move fast from longjumps or falling).
+#define SF_WEATHER_FOG_NO_ADJUST 1024
+
 extern "C" uint32_t g_fog_palette[61][256];
 extern "C" int g_fog_skins;
 
@@ -678,8 +683,15 @@ void CEnvWeather::Spawn(void)
 		int newMax = V_max(newMin + 100, m_fogEndDist); // fog won't look nice if too compacted
 
 		if (newMin > m_fogStartDist || newMax > m_fogEndDist) {
-			ALERT(at_console, "env_weather: fog distance increased to prevent rendering errors. [%d - %d] -> [%d - %d]\n",
-				m_fogStartDist, m_fogEndDist, newMin, newMax);
+			if (pev->spawnflags & SF_WEATHER_FOG_NO_ADJUST) {
+				newMin = m_fogStartDist;
+				newMax = m_fogEndDist;
+				ALERT(at_console, "env_weather: fog distance adjustment disabled via flag. Rendering errors may occur.\n");
+			}
+			else {
+				ALERT(at_console, "env_weather: fog distance increased to prevent rendering errors. [%d - %d] -> [%d - %d]\n",
+					m_fogStartDist, m_fogEndDist, newMin, newMax);
+			}
 		}
 
 		m_fogStartDist = newMin;

dlls/func/CFuncTrain.cpp

@@ -29,6 +29,7 @@ class CFuncTrain : public CBasePlatTrain
 	static	TYPEDESCRIPTION m_SaveData[];
 
 	entvars_t* m_pevCurrentTarget;
+	EHANDLE m_previousTarget;
 	int			m_sounds;
 	int		m_activated; // 0 = never activated, 1 = activated, 2 = toggled off after activate
 };
@@ -161,8 +162,10 @@ void CFuncTrain::Next(void)
 		return;
 	}
 
-	if (m_activated != 2 && ENT(m_pevCurrentTarget) == pTarg->edict()) {
-		return; // prevent infinite recursion
+
+	edict_t* prevTarg = m_previousTarget.GetEdict();
+	if (prevTarg == ENT(m_pevCurrentTarget) && prevTarg == pTarg->edict()) {
+		return; // prevent infinite recursion (path_corner targeting itself with no distance to move)
 	}
 
 	// Save last target in case we need to find it again
@@ -176,6 +179,7 @@ void CFuncTrain::Next(void)
 		pev->speed = m_pevCurrentTarget->speed;
 		ALERT(at_aiconsole, "Train %s speed to %4.2f\n", STRING(pev->targetname), pev->speed);
 	}
+	m_previousTarget = ENT(m_pevCurrentTarget);
 	m_pevCurrentTarget = pTarg->pev;// keep track of this since path corners change our target for us.
 
 	pev->enemy = pTarg->edict();//hack

dlls/monster/CBaseGrunt.cpp

@@ -2281,8 +2281,8 @@ Schedule_t* CBaseGrunt::GetShootSchedule(void) {
 	else
 	{
 
-		if (HasMemory(bits_MEMORY_MOVE_FAILED)) {
-			// tried and failed to take cover, just shoot
+		if (HasMemory(bits_MEMORY_MOVE_FAILED) || HasEquipment(MEQUIP_MINIGUN)) {
+			// tried and failed to take cover, or too slow to take cover, so just shoot
 			return GetScheduleOfType(SCHED_RANGE_ATTACK1);
 		}
 		else {

dlls/monster/CBaseMonster.cpp

@@ -3032,10 +3032,10 @@ void CBaseMonster::HandleAnimEvent(MonsterEvent_t* pEvent)
 		if (flash.sprite) {
 			Vector origin, angles;
 
-			if (flash.attachment != -1) {
+			if (flash.attachment != (uint8_t)-1) {
 				GetAttachment(flash.attachment, origin, angles);
 			}
-			else if (flash.bone != -1) {
+			else if (flash.bone != (uint8_t)-1) {
 				GetBonePosition(flash.bone, origin, angles);
 				origin = origin + flash.offset;
 			}

dlls/monster/CRoboGrunt.cpp

@@ -18,6 +18,8 @@
 #define GUN_MP5						0
 #define GUN_SHOTGUN					1
 #define GUN_NONE					2
+#define GUN_ROCKETLAUNCHER			3
+#define GUN_SNIPERRIFLE				4
 
 #define HGRUNT_9MMAR				( 1 << 0)
 #define HGRUNT_HANDGRENADE			( 1 << 1)
@@ -164,6 +166,22 @@ void CRoboGrunt::Spawn() {
 		SetBodygroup(GUN_GROUP, GUN_SHOTGUN);
 		m_cClipSize = 8;
 	}
+	else if (FBitSet(pev->weapons, HGRUNT_ROCKETLAUNCHER))
+	{
+		SetBodygroup(GUN_GROUP, GUN_ROCKETLAUNCHER);
+		m_cClipSize = 1;
+		m_flDistTooFar = 4096.0;
+		m_flDistLook = 4096.0;
+		maxShootDist = 4096;
+	}
+	else if (m_iEquipment & MEQUIP_SNIPER)
+	{
+		SetBodygroup(GUN_GROUP, GUN_SNIPERRIFLE);
+		m_cClipSize = 1;
+		m_flDistTooFar = 4096.0;
+		m_flDistLook = 4096.0;
+		maxShootDist = 4096;
+	}
 	else
 	{
 		m_cClipSize = GRUNT_CLIP_SIZE;
@@ -200,6 +218,12 @@ void CRoboGrunt::Precache()
 	if (FBitSet(pev->weapons, HGRUNT_GRENADELAUNCHER)) {
 		m_iEquipment |= MEQUIP_GRENADE_LAUNCHER;
 	}
+	if (FBitSet(pev->weapons, HGRUNT_ROCKETLAUNCHER)) {
+		m_iEquipment |= MEQUIP_RPG;
+	}
+	if (FBitSet(pev->weapons, HGRUNT_SNIPERRIFLE)) {
+		m_iEquipment |= MEQUIP_SNIPER;
+	}
 
 	BasePrecache();
 

dlls/player/CBasePlayer.cpp

@@ -4679,12 +4679,6 @@ void CBasePlayer :: UpdateClientData( void )
 			if ( !II->iId )
 				continue;
 
-			const char *pszName;
-			if (!II->pszName)
-				pszName = "Empty";
-			else
-				pszName = II->pszName;
-
 			MESSAGE_BEGIN(MSG_ONE, gmsgWeaponList, NULL, pev);
 			WRITE_STRING(II->pszName);			// string	weapon name
 			WRITE_BYTE(GetAmmoIndex(II->pszAmmo1));	// byte		Ammo Type
@@ -6427,8 +6421,6 @@ void CBasePlayer::ResolveWeaponSlotConflict(int wepId) {
 int CBasePlayer::GetCurrentIdForConflictedSlot(int wepId) {
 	int mask = g_weaponSlotMasks[wepId];
 
-	ItemInfo& II = CBasePlayerItem::ItemInfoArray[wepId];
-
 	if (count_bits_set(mask) <= 1) {
 		return wepId; // impossible for there to be a conflict
 	}

dlls/triggers/CBaseTrigger.cpp

@@ -103,7 +103,6 @@ void CBaseTrigger::ActivateMultiTrigger(CBaseEntity* pActivator, bool isUntouch)
 	else if (pev->spawnflags & (SF_TRIGGER_FIRE_ON_ENTER | SF_TRIGGER_FIRE_ON_EXIT)) {
 		int emptySlot = -1;
 
-		bool alreadyTouching = false;
 		for (int i = 0; i < MAX_TOUCHERS; i++) {
 			if (m_touchers[i].GetEntity() == pActivator) {
 				return;

dlls/util/eng_wrappers.cpp

@@ -189,6 +189,10 @@ int PRECACHE_GENERIC(const char* path) {
 		return -1;
 	}
 
+	if (!path || !path[0]) {
+		return -1;
+	}
+
 	g_tryPrecacheGeneric.insert(path);
 
 	if (g_tryPrecacheGeneric.size() < MAX_PRECACHE) {
@@ -234,6 +238,10 @@ int PRECACHE_SOUND_ENT(CBaseEntity* ent, const char* path) {
 		}
 	}
 
+	if (!path || !path[0]) {
+		return g_engfuncs.pfnPrecacheSound(NOT_PRECACHED_SOUND);
+	}
+
 	g_tryPrecacheSounds.insert(path);
 
 	if (g_tryPrecacheSounds.size() <= MAX_PRECACHE_SOUND) {
@@ -435,6 +443,10 @@ int PRECACHE_MODEL_ENT(CBaseEntity* ent, const char* path) {
 		}
 	}
 
+	if (!path || !path[0]) {
+		return g_engfuncs.pfnPrecacheModel(NOT_PRECACHED_MODEL);
+	}
+
 	g_tryPrecacheModels.insert(path);
 
 	// Tested with sc_darknebula.