Rename a bunch of old names.

src/client/defs.h

@@ -23,8 +23,8 @@
 #include "fade.h"
 #include "cmd.h"
 #include "util.h"
-#include "NSView.h"
-#include "NSRadar.h"
+#include "View.h"
+#include "Radar.h"
 #include "crosshair.h"
 #include "hud.h"
 

src/client/include.src

@@ -1,7 +1,7 @@
 #includelist
-NSInteractiveSurface.qc
-NSView.qc
-NSRadar.qc
+InteractiveSurface.qc
+View.qc
+Radar.qc
 hud.qc
 fog.qc
 font.qc
@@ -15,7 +15,7 @@ text.qc
 predict.qc
 entities.qc
 modelevent.qc
-view.qc
+viewmodel.qc
 damage.qc
 chat.qc
 textmenu.qc

src/server/defs.h

@@ -17,8 +17,8 @@
 #include "api_func.h"
 #include "../shared/api.h"
 #include "../shared/entityDef.h"
-#include "NSOutput.h"
-#include "NSGameRules.h"
+#include "Output.h"
+#include "GameRules.h"
 #include "skill.h"
 #include "logging.h"
 #include "../nav/defs.h"
@@ -29,7 +29,7 @@
 #include "mapcycle.h"
 #include "maptweaks.h"
 #include "scripts.h"
-#include "ai_schedule.h"
+#include "Schedule.h"
 
 /* helper macros */
 #define EVALUATE_FIELD(fieldname, changedflag) {\

src/server/include.src

@@ -1,10 +1,10 @@
 #includelist
-NSOutput.qc
+Output.qc
 plugins.qc
 logging.qc
 skill.qc
 spawn.qc
-NSGameRules.qc
+GameRules.qc
 vote.qc
 lament.qc
 mapcycle.qc
@@ -13,7 +13,7 @@ scripts.qc
 cmd_cl.qc
 cmd_sv.qc
 entry.qc
-ai_schedule.qc
+Schedule.qc
 ../nav/includes.src
 api.qc
 #endlist

src/shared/Monster.qc

@@ -565,19 +565,22 @@ ncMonster::AlertNoise(void)
 		return;
 	}
 
-	StartSoundDef(m_sndSight, CHAN_VOICE, true);
+	MessageSchedule("AlertSound");
 }
 
 bool
 ncMonster::IsFriend(int al)
 {
 	/* neutrals are always friendly */
-	if (m_iAlliance == MAL_NEUTRAL)
+	if (m_iAlliance == MAL_NEUTRAL) {
 		return (true);
-	if (m_iAlliance == MAL_ROGUE)
+	}
+
+	if (m_iAlliance == MAL_ROGUE) {
 		return (false);
-	else if (al == m_iAlliance)
+	} else if (al == m_iAlliance) {
 		return (true);
+	}
 
 	return (false);
 }
@@ -2806,7 +2809,7 @@ ncMonster_AlertEnemyAlliance(vector pos, float radius, int alliance)
 		return;
 	}
 
-#if 0
+#if 1
 	if (autocvar_ai_debugAlerts)
 		NSLog("AI alert from %v with radius %f and alliance %i", pos, radius, alliance);
 
@@ -2849,9 +2852,6 @@ ncMonster_AlertEnemyAlliance(vector pos, float radius, int alliance)
 		}
 
 		/* we've heard a noise. investigate the location */
-		f.RouteClear();
-		f.RouteToPosition(pos);
-		f.m_flSequenceSpeed = f.GetWalkSpeed();
 		f.AlertNoise();
 	}
 #endif

src/shared/defs.h

@@ -91,47 +91,47 @@ string __fullspawndata;
 #include "../gs-entbase/server/defs.h"
 #endif
 
-#include "NSDecal.h"
+#include "Decal.h"
 
 #include "../botlib/botinfo.h"
 #include "sentences.h"
 
-#include "NSIO.h"
-#include "NSDict.h"
-#include "NSTrigger.h"
-#include "NSEntity.h"
-#include "NSTimer.h"
-#include "NSRenderableEntity.h"
-#include "NSSurfacePropEntity.h"
-#include "NSRagdoll.h"
-#include "NSMoverEntity.h"
-#include "NSPhysicsConstraint.h"
-#include "NSPhysicsEntity.h"
-#include "NSBrushTrigger.h"
-#include "NSPointTrigger.h"
-#include "NSItem.h"
-#include "NSWeapon.h"
-#include "NSNavAI.h"
-#include "NSMonster.h"
-#include "NSSquadMonster.h"
-#include "NSTalkMonster.h"
-#include "NSSpawnPoint.h"
-#include "NSSoundScape.h"
-#include "NSAttack.h"
-#include "NSProjectile.h"
-#include "NSSpraylogo.h"
-#include "NSPortal.h"
-#include "NSSound.h"
-#include "NSDebris.h"
+#include "IO.h"
+#include "Dict.h"
+#include "Trigger.h"
+#include "Entity.h"
+#include "Timer.h"
+#include "RenderableEntity.h"
+#include "SurfacePropEntity.h"
+#include "Ragdoll.h"
+#include "Mover.h"
+#include "PhysicsConstraint.h"
+#include "PhysicsEntity.h"
+#include "BrushTrigger.h"
+#include "PointTrigger.h"
+#include "Item.h"
+#include "Weapon.h"
+#include "Actor.h"
+#include "Monster.h"
+#include "SquadMonster.h"
+#include "TalkMonster.h"
+#include "SpawnPoint.h"
+#include "SoundScape.h"
+#include "Attack.h"
+#include "Projectile.h"
+#include "Spraylogo.h"
+#include "Portal.h"
+#include "Sound.h"
+#include "Debris.h"
 
 #include "../xr/defs.h"
-#include "../botlib/NSBot.h"
-#include "NSClient.h"
-#include "NSClientSpectator.h"
+#include "../botlib/Bot.h"
+#include "Client.h"
+#include "Spectator.h"
 #include "pmove.h"
-#include "NSClientPlayer.h"
+#include "Player.h"
 
-#include "NSVehicle.h"
+#include "Vehicle.h"
 
 #include "materials.h"
 #include "damage.h"

src/shared/include.src

@@ -1,47 +1,47 @@
 #includelist
-NSIO.qc
-NSDict.qc
-NSTrigger.qc
-NSEntity.qc
-NSTimer.qc
-NSDecal.qc
-NSRenderableEntity.qc
-NSSurfacePropEntity.qc
-NSMoverEntity.qc
-NSPhysicsConstraint.qc
-NSPhysicsEntity.qc
-NSBrushTrigger.qc
-NSPointTrigger.qc
+IO.qc
+Dict.qc
+Trigger.qc
+Entity.qc
+Timer.qc
+Decal.qc
+RenderableEntity.qc
+SurfacePropEntity.qc
+Mover.qc
+PhysicsConstraint.qc
+PhysicsEntity.qc
+BrushTrigger.qc
+PointTrigger.qc
 pmove.qc
-NSVehicle.qc
-NSAttack.qc
-NSNavAI.qc
-NSMonster.qc
-NSSquadMonster.qc
-NSTalkMonster.qc
-NSProjectile.qc
-NSSpawnPoint.qc
-NSSoundScape.qc
-NSItem.qc
-NSWeapon.qc
-NSPortal.qc
-NSDebris.qc
-NSSound.qc
-NSClient.qc
-NSClientSpectator.qc
+Vehicle.qc
+Attack.qc
+Actor.qc
+Monster.qc
+SquadMonster.qc
+TalkMonster.qc
+Projectile.qc
+SpawnPoint.qc
+SoundScape.qc
+Item.qc
+Weapon.qc
+Portal.qc
+Debris.qc
+Sound.qc
+Client.qc
+Spectator.qc
 pmove_custom.qc
 cloader.qc
 sound.qc
-NSRagdoll.qc
-NSClientPlayer.qc
+Ragdoll.qc
+Player.qc
 player_pmove.qc
 propdata.qc
 surfaceproperties.qc
 decalgroups.qc
 materials.qc
 sentences.qc
-NSCharger.qc
-NSSpraylogo.qc
+Charger.qc
+Spraylogo.qc
 util.qc
 motd.qc
 bodyque.qc
@@ -50,5 +50,5 @@ ammo.qc
 activities.qc
 api.qc
 ../xr/include.src
-../botlib/NSBot.qc
+../botlib/Bot.qc
 #endlist