the slot1-10 keys are now working as expected.

src/client/entry.c

@@ -636,34 +636,34 @@ CSQC_ConsoleCommand(string sCMD)
 		pSeat->iShowScores = FALSE;
 		break;
 	case "slot1":
-		localcmd("impulse 1\n");
+		HUD_SlotSelect(0);
 		break;
 	case "slot2":
-		localcmd("impulse 2\n");
+		HUD_SlotSelect(1);
 		break;
 	case "slot3":
-		localcmd("impulse 3\n");
+		HUD_SlotSelect(2);
 		break;
 	case "slot4":
-		localcmd("impulse 4\n");
+		HUD_SlotSelect(3);
 		break;
 	case "slot5":
-		localcmd("impulse 5\n");
+		HUD_SlotSelect(4);
 		break;
 	case "slot6":
-		localcmd("impulse 6\n");
+		HUD_SlotSelect(5);
 		break;
 	case "slot7":
-		localcmd("impulse 7\n");
+		HUD_SlotSelect(6);
 		break;
 	case "slot8":
-		localcmd("impulse 8\n");
+		HUD_SlotSelect(7);
 		break;
 	case "slot9":
-		localcmd("impulse 9\n");
+		HUD_SlotSelect(8);
 		break;
 	case "slot10":
-		localcmd("impulse 10\n");
+		HUD_SlotSelect(9);
 		break;
 	default:
 		return Game_ConsoleCommand();

src/client/gearbox/hud_weaponselect.c

@@ -116,6 +116,43 @@ int HUD_InSlotPos(int slot, int pos)
 	return -1;
 }
 
+int HUD_SlotSelect(int slot)
+{
+	player pl = (player)pSeat->ePlayer;
+	int curslot = g_weapons[pSeat->fHUDWeaponSelected].slot;
+	int i;
+
+	if (pSeat->fHUDWeaponSelectTime < time) {
+		sound(pSeat->ePlayer, CHAN_ITEM, "common/wpn_hudon.wav", 0.5, ATTN_NONE);
+	} else {
+		sound(pSeat->ePlayer, CHAN_ITEM, "common/wpn_moveselect.wav", 0.5, ATTN_NONE);
+	}
+
+	/* weren't in that slot? select the first one then */
+	if (curslot != slot) {
+		for (i = 1; i < g_weapons.length; i++) {
+			if (g_weapons[i].slot == slot) {
+				pSeat->fHUDWeaponSelected = i;
+				pSeat->fHUDWeaponSelectTime = time + 3;
+				break;
+			}
+		}
+	} else {
+		/* increment our current selected weapon by 1 */
+		pSeat->fHUDWeaponSelected++;
+		pSeat->fHUDWeaponSelectTime = time + 3;
+
+		/* reset when out of bounds or outside slot area */
+		if (pSeat->fHUDWeaponSelected >= g_weapons.length) {
+			pSeat->fHUDWeaponSelected = 0;
+			HUD_SlotSelect(slot);
+		} else if (g_weapons[pSeat->fHUDWeaponSelected].slot != slot) {
+			pSeat->fHUDWeaponSelected = 0;
+			HUD_SlotSelect(slot);
+		}
+	}
+}
+
 void HUD_DrawWeaponSelect(void)
 {
 	player pl = (player)pSeat->ePlayer;

src/client/rewolf/hud_weaponselect.c

@@ -118,6 +118,43 @@ int HUD_InSlotPos(int slot, int pos)
 	return -1;
 }
 
+int HUD_SlotSelect(int slot)
+{
+	player pl = (player)pSeat->ePlayer;
+	int curslot = g_weapons[pSeat->fHUDWeaponSelected].slot;
+	int i;
+
+	if (pSeat->fHUDWeaponSelectTime < time) {
+		sound(pSeat->ePlayer, CHAN_ITEM, "common/wpn_hudon.wav", 0.5, ATTN_NONE);
+	} else {
+		sound(pSeat->ePlayer, CHAN_ITEM, "common/wpn_moveselect.wav", 0.5, ATTN_NONE);
+	}
+
+	/* weren't in that slot? select the first one then */
+	if (curslot != slot) {
+		for (i = 1; i < g_weapons.length; i++) {
+			if (g_weapons[i].slot == slot) {
+				pSeat->fHUDWeaponSelected = i;
+				pSeat->fHUDWeaponSelectTime = time + 3;
+				break;
+			}
+		}
+	} else {
+		/* increment our current selected weapon by 1 */
+		pSeat->fHUDWeaponSelected++;
+		pSeat->fHUDWeaponSelectTime = time + 3;
+
+		/* reset when out of bounds or outside slot area */
+		if (pSeat->fHUDWeaponSelected >= g_weapons.length) {
+			pSeat->fHUDWeaponSelected = 0;
+			HUD_SlotSelect(slot);
+		} else if (g_weapons[pSeat->fHUDWeaponSelected].slot != slot) {
+			pSeat->fHUDWeaponSelected = 0;
+			HUD_SlotSelect(slot);
+		}
+	}
+}
+
 void HUD_DrawWeaponSelect(void)
 {
 	player pl = (player)pSeat->ePlayer;

src/client/valve/hud_weaponselect.c

@@ -110,6 +110,43 @@ int HUD_InSlotPos(int slot, int pos)
 	return -1;
 }
 
+int HUD_SlotSelect(int slot)
+{
+	player pl = (player)pSeat->ePlayer;
+	int curslot = g_weapons[pSeat->fHUDWeaponSelected].slot;
+	int i;
+
+	if (pSeat->fHUDWeaponSelectTime < time) {
+		sound(pSeat->ePlayer, CHAN_ITEM, "common/wpn_hudon.wav", 0.5, ATTN_NONE);
+	} else {
+		sound(pSeat->ePlayer, CHAN_ITEM, "common/wpn_moveselect.wav", 0.5, ATTN_NONE);
+	}
+
+	/* weren't in that slot? select the first one then */
+	if (curslot != slot) {
+		for (i = 1; i < g_weapons.length; i++) {
+			if (g_weapons[i].slot == slot) {
+				pSeat->fHUDWeaponSelected = i;
+				pSeat->fHUDWeaponSelectTime = time + 3;
+				break;
+			}
+		}
+	} else {
+		/* increment our current selected weapon by 1 */
+		pSeat->fHUDWeaponSelected++;
+		pSeat->fHUDWeaponSelectTime = time + 3;
+
+		/* reset when out of bounds or outside slot area */
+		if (pSeat->fHUDWeaponSelected >= g_weapons.length) {
+			pSeat->fHUDWeaponSelected = 0;
+			HUD_SlotSelect(slot);
+		} else if (g_weapons[pSeat->fHUDWeaponSelected].slot != slot) {
+			pSeat->fHUDWeaponSelected = 0;
+			HUD_SlotSelect(slot);
+		}
+	}
+}
+
 void HUD_DrawWeaponSelect(void)
 {
 	player pl = (player)pSeat->ePlayer;

src/server/scihunt/monster_scientist.cpp

@@ -617,24 +617,22 @@ void monster_scientist::Respawn(void)
 	v_angle[2] = Math_FixDelta(m_oldAngle[2]);
 
 	flags |= FL_MONSTER;
-	setorigin(this, m_oldOrigin);
 	angles = v_angle;
 	solid = SOLID_SLIDEBOX;
 	movetype = MOVETYPE_WALK;
 	setmodel(this, m_oldModel);
 	setsize(this, VEC_HULL_MIN + [0,0,36], VEC_HULL_MAX + [0,0,36]);
-	m_eUser = world;
+	setorigin(this, m_oldOrigin);
 	takedamage = DAMAGE_YES;
 	iBleeds = TRUE;
 	style = SCI_IDLE;
-	customphysics = Physics;
 	frame = SCIA_IDLE1;
-	SendFlags |= NPC_FRAME | NPC_BODY;
 	health = 50;
 	velocity = [0,0,0];
 	m_iFlags = 0x0;
-	SendFlags = 0xff;
-	
+	m_eUser = world;
+	customphysics = Physics;
+
 	if (autocvar_sh_scialert) {
 		m_iFlags |= SCIF_FEAR;
 	}
@@ -678,7 +676,6 @@ void monster_scientist::monster_scientist(void)
 	model = "models/scientist.mdl";
 	CBaseEntity::CBaseEntity();
 	precache_model(m_oldModel);
-	Respawn();
 
 	if (body == -1) {
 		/* This stuff needs to be persistent because we can't guarantee that
@@ -704,5 +701,4 @@ void monster_scientist::monster_scientist(void)
 			m_flPitch = 100;
 			netname = "Slick";
 	}
-	SendFlags |= NPC_FRAME | NPC_BODY;
 }

src/server/valve/monster_alien_controller.cpp

@@ -16,7 +16,8 @@
 
 /*QUAKED monster_alien_controller (0 0.8 0.8) (-16 -16 0) (16 16 72)
 
-Monster.
+Alien Controller
+
 */
 
 class monster_alien_controller:CBaseMonster

src/server/valve/monster_alien_grunt.cpp

@@ -16,7 +16,8 @@
 
 /*QUAKED monster_alien_grunt (0 0.8 0.8) (-32 -32 0) (32 32 64)
 
-Monster.
+Alien Grunt
+
 */
 
 class monster_alien_grunt:CBaseMonster

src/server/valve/monster_alien_slave.cpp

@@ -16,7 +16,8 @@
 
 /*QUAKED monster_alien_slave (0 0.8 0.8) (-16 -16 0) (16 16 72)
 
-Monster.
+Alien Slave
+
 */
 
 class monster_alien_slave:CBaseMonster

src/server/valve/monster_apache.cpp

@@ -16,7 +16,8 @@
 
 /*QUAKED monster_apache (0 0.8 0.8) (-300 -300 -172) (300 300 8)
 
-Monster.
+Boeing AH-64 Apache
+
 */
 
 class monster_apache:CBaseMonster

src/server/valve/monster_babycrab.cpp

@@ -16,7 +16,8 @@
 
 /*QUAKED monster_babycrab (0 0.8 0.8) (-16 -16 0) (16 16 36)
 
-Monster.
+Baby Headcrab
+
 */
 
 class monster_babycrab:CBaseMonster

src/server/valve/monster_barnacle.cpp

@@ -16,7 +16,8 @@
 
 /*QUAKED monster_barnacle (0 0.8 0.8) (-16 -16 -36) (16 16 0)
 
-Monster.
+Barnacle
+
 */
 
 class monster_barnacle:CBaseMonster

src/server/valve/monster_barney.cpp

@@ -16,7 +16,8 @@
 
 /*QUAKED monster_barney (0 0.8 0.8) (-16 -16 0) (16 16 72)
 
-Monster.
+Barney Calhoun
+
 */
 
 enum {

src/server/valve/monster_barney_dead.cpp

@@ -16,7 +16,8 @@
 
 /*QUAKED monster_barney_dead (0 0.8 0.8) (-16 -16 0) (16 16 72)
 
-Monster.
+Barney's corpse
+
 */
 
 class monster_barney_dead:CBaseEntity

src/server/valve/monster_bigmomma.cpp

@@ -16,7 +16,8 @@
 
 /*QUAKED monster_bigmomma (0 0.8 0.8) (-95 -95 0) (95 95 190)
 
-Monster.
+Gonarch
+
 */
 
 class monster_bigmomma:CBaseMonster
@@ -33,7 +34,7 @@ void monster_bigmomma::Respawn(void)
 
 void monster_bigmomma::monster_bigmomma(void)
 {
-	netname = "Big Momma";
+	netname = "Gonarch";
 	model = "models/big_mom.mdl";
 	CBaseMonster::CBaseMonster();
 }

src/server/valve/monster_bloater.cpp

@@ -16,7 +16,8 @@
 
 /*QUAKED monster_bloater (0 0.8 0.8) (-16 -16 0) (16 16 72)
 
-Monster.
+Flocking Floater
+
 */
 
 class monster_bloater:CBaseMonster

src/server/valve/monster_bullchicken.cpp

@@ -16,7 +16,8 @@
 
 /*QUAKED monster_bullchicken (0 0.8 0.8) (-32 -32 0) (32 32 64)
 
-Monster.
+Bullsquid
+
 */
 
 class monster_bullchicken:CBaseMonster

src/server/valve/monster_cockroach.cpp

@@ -16,7 +16,8 @@
 
 /*QUAKED monster_cockroach (0 0.8 0.8) (-4 -4 0) (4 4 4)
 
-Monster.
+Cockroach
+
 */
 
 class monster_cockroach:CBaseMonster

src/server/valve/monster_flyer_flock.cpp

@@ -16,7 +16,8 @@
 
 /*QUAKED monster_flyer_flock (0 0.8 0.8) (-16 -16 0) (16 16 16)
 
-Monster.
+Boid
+
 */
 
 class monster_flyer_flock:CBaseMonster
@@ -33,7 +34,7 @@ void monster_flyer_flock::Respawn(void)
 
 void monster_flyer_flock::monster_flyer_flock(void)
 {
-	netname = "Flyer";
+	netname = "Boid";
 	model = "models/aflock.mdl";
 	CBaseMonster::CBaseMonster();
 }

src/server/valve/monster_gargantua.cpp

@@ -16,7 +16,8 @@
 
 /*QUAKED monster_gargantua (0 0.8 0.8) (-32 -32 0) (32 32 128)
 
-Monster.
+Gargantua
+
 */
 
 class monster_gargantua:CBaseMonster

src/server/valve/monster_gman.cpp

@@ -16,7 +16,8 @@
 
 /*QUAKED monster_gman (0 0.8 0.8) (-16 -16 0) (16 16 72)
 
-Monster.
+G-Man
+
 */
 
 class monster_gman:CBaseMonster

src/server/valve/monster_headcrab.cpp

@@ -16,7 +16,8 @@
 
 /*QUAKED monster_headcrab (0 0.8 0.8) (-16 -16 0) (16 16 36)
 
-Monster.
+Headcrab
+
 */
 
 class monster_headcrab:CBaseMonster

src/server/valve/monster_hevsuit_dead.cpp

@@ -16,7 +16,8 @@
 
 /*QUAKED monster_hevsuit_dead (0 0.8 0.8) (-16 -16 0) (16 16 72)
 
-Monster.
+HEV-Suit/Player's corpse
+
 */
 
 class monster_hevsuit_dead:CBaseMonster

src/server/valve/monster_hgrunt_dead.cpp

@@ -16,7 +16,8 @@
 
 /*QUAKED monster_hgrunt_dead (0 0.8 0.8) (-16 -16 0) (16 16 72)
 
-Monster.
+Human Grunt's corpse
+
 */
 
 class monster_hgrunt_dead:CBaseMonster

src/server/valve/monster_houndeye.cpp

@@ -16,7 +16,8 @@
 
 /*QUAKED monster_houndeye (0 0.8 0.8) (-16 -16 0) (16 16 36)
 
-Monster.
+Houndeye
+
 */
 
 class monster_houndeye:CBaseMonster

src/server/valve/monster_human_assassin.cpp

@@ -16,7 +16,8 @@
 
 /*QUAKED monster_human_assassin (0 0.8 0.8) (-16 -16 0) (16 16 72)
 
-Monster.
+Black Ops - Assassin
+
 */
 
 class monster_human_assassin:CBaseMonster

src/server/valve/monster_human_grunt.cpp

@@ -16,7 +16,8 @@
 
 /*QUAKED monster_human_grunt (0 0.8 0.8) (-16 -16 0) (16 16 72)
 
-Monster.
+HECU - Human Grunt
+
 */
 
 class monster_human_grunt:CBaseMonster

src/server/valve/monster_ichthyosaur.cpp

@@ -16,7 +16,8 @@
 
 /*QUAKED monster_ichthyosaur (0 0.8 0.8) (-32 -32 0) (32 32 64)
 
-Monster.
+Ichthyosaur
+
 */
 
 class monster_ichthyosaur:CBaseMonster

src/server/valve/monster_leech.cpp

@@ -16,7 +16,8 @@
 
 /*QUAKED monster_leech (0 0.8 0.8) (-6 -6 0) (6 6 6)
 
-Monster.
+Leech
+
 */
 
 class monster_leech:CBaseMonster

src/server/valve/monster_miniturret.cpp

@@ -16,7 +16,8 @@
 
 /*QUAKED monster_miniturret (0 0.8 0.8) (-16 -16 -32) (16 16 32)
 
-Monster.
+Automatic Turret (small)
+
 */
 
 class monster_miniturret:CBaseMonster

src/server/valve/monster_nihilanth.cpp

@@ -16,7 +16,8 @@
 
 /*QUAKED monster_nihilanth (0 0.8 0.8) (-192 -192 0) (192 192 384)
 
-Monster.
+Nihilanth
+
 */
 
 class monster_nihilanth:CBaseMonster

src/server/valve/monster_osprey.cpp

@@ -16,7 +16,8 @@
 
 /*QUAKED monster_osprey (0 0.8 0.8) (-480 -480 -112) (480 480 24)
 
-Monster.
+Bell Boeing VV-22 Osprey
+
 */
 
 class monster_osprey:CBaseMonster

src/server/valve/monster_rat.cpp

@@ -16,7 +16,8 @@
 
 /*QUAKED monster_rat (0 0.8 0.8) (-6 -6 0) (6 6 6)
 
-Monster.
+Rat
+
 */
 
 class monster_rat:CBaseEntity

src/server/valve/monster_scientist.cpp

@@ -16,7 +16,8 @@
 
 /*QUAKED monster_scientist (0 0.8 0.8) (-16 -16 0) (16 16 72)
 
-Monster.
+Scientist
+
 */
 
 enum {

src/server/valve/monster_scientist_dead.cpp

@@ -16,7 +16,8 @@
 
 /*QUAKED monster_scientist_dead (0 0.8 0.8) (-16 -16 0) (16 16 72)
 
-Monster.
+Scientists' corpse
+
 */
 
 enum {

src/server/valve/monster_sentry.cpp

@@ -16,7 +16,8 @@
 
 /*QUAKED monster_sentry (0 0.8 0.8) (-16 -16 0) (16 16 72)
 
-Monster.
+Sentry Gun
+
 */
 
 class monster_sentry:CBaseMonster

src/server/valve/monster_sitting_scientist.cpp

@@ -16,7 +16,8 @@
 
 /*QUAKED monster_sitting_scientist (0 0.8 0.8) (-14 -14 0) (14 14 36)
 
-Monster.
+Sitting scientists
+
 */
 
 enum {

src/server/valve/monster_tentacle.cpp

@@ -16,7 +16,8 @@
 
 /*QUAKED monster_tentacle (0 0.8 0.8) (-32 -32 0) (32 32 64)
 
-Monster.
+Tentacle
+
 */
 
 class monster_tentacle:CBaseMonster

src/server/valve/monster_turret.cpp

@@ -16,7 +16,8 @@
 
 /*QUAKED monster_turret (0 0.8 0.8) (-16 -16 0) (16 16 72)
 
-Monster.
+Automatic Turret (large)
+
 */
 
 class monster_turret:CBaseMonster

src/server/valve/monster_zombie.cpp

@@ -16,7 +16,8 @@
 
 /*QUAKED monster_zombie (0 0.8 0.8) (-16 -16 0) (16 16 72)
 
-Monster.
+Zombie
+
 */
 
 enum {