Console Fixes

game/neo/cfg/autoexec.cfg

@@ -1,7 +1,6 @@
 //////////////////////////////////////
 // Fix potential sounds I/O stutter //
 //                                  //
-cl_forcepreload "0"                 //
 snd_async_fullyasync "1"            //
 //                                  //
 //////////////////////////////////////

game/neo/resource/ui/navprogress.res

@@ -0,0 +1,118 @@
+"Resource/UI/NavProgress.res"
+{
+	"nav_progress"
+	{
+		"ControlName"		"Frame"
+		"fieldName"		"nav_progress"
+		"xpos"		"200"
+		"ypos"		"215"
+		"wide"		"240"
+		"tall"		"40"
+		"autoResize"		"0"
+		"pinCorner"		"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"tabPosition"		"0"
+		"settitlebarvisible"		"0"
+	}
+	"RoundedCornerBackground"
+	{
+		"ControlName"		"Panel"
+		"fieldName"		"RoundedCornerBackground"
+		"xpos"		"0"
+		"ypos"		"0"
+		"wide"		"240"
+		"tall"		"40"
+		"autoResize"		"0"
+		"pinCorner"		"2"
+		"visible"		"1"
+		"enabled"		"1"
+		"tabPosition"		"0"
+		"settitlebarvisible"		"0"
+		"zpos"		"0"
+	}
+	"TitleLabel"
+	{
+		"ControlName"		"Label"
+		"fieldName"		"TitleLabel"
+		"xpos"		"5"
+		"ypos"		"5"
+		"wide"		"80"
+		"tall"		"15"
+		"autoResize"		"0"
+		"pinCorner"		"2"
+		"visible"		"0"
+		"enabled"		"1"
+		"tabPosition"		"0"
+		"labelText"		""
+		"textAlignment"		"north-west"
+		"dulltext"		"0"
+		"brighttext"		"0"
+		"zpos"		"1"
+	}
+	"TextLabel"
+	{
+		"ControlName"		"Label"
+		"fieldName"		"TextLabel"
+		"xpos"		"5"
+		"ypos"		"5"
+		"wide"		"230"
+		"tall"		"15"
+		"autoResize"		"0"
+		"pinCorner"		"2"
+		"visible"		"1"
+		"enabled"		"1"
+		"tabPosition"		"0"
+		"labelText"		""
+		"textAlignment"		"north-west"
+		"dulltext"		"0"
+		"brighttext"		"0"
+		"zpos"		"1"
+	}
+	"ProgressBarSizer"
+	{
+		"ControlName"		"Panel"
+		"fieldName"		"ProgressBarSizer"
+		"xpos"		"9"
+		"ypos"		"24"
+		"wide"		"222"
+		"tall"		"7"
+		"autoResize"		"0"
+		"pinCorner"		"2"
+		"visible"		"1"
+		"enabled"		"1"
+		"tabPosition"		"0"
+		"zpos"		"1"
+	}
+	"ProgressBar"
+	{
+		"ControlName"		"Panel"
+		"fieldName"		"ProgressBar"
+		"xpos"		"9"
+		"ypos"		"24"
+		"wide"		"222"
+		"tall"		"7"
+		"autoResize"		"0"
+		"pinCorner"		"2"
+		"visible"		"1"
+		"enabled"		"1"
+		"tabPosition"		"0"
+		"zpos"		"1"
+	}
+	"ProgressBarBorder"
+	{
+		"ControlName"		"Panel"
+		"fieldName"		"ProgressBarBorder"
+		"xpos"		"7"
+		"ypos"		"22"
+		"wide"		"226"
+		"tall"		"10"
+		"autoResize"		"0"
+		"pinCorner"		"2"
+		"visible"		"1"
+		"enabled"		"1"
+		"tabPosition"		"0"
+		"zpos"		"2"
+	}
+}
+

game/neo/scripts/game_sounds_ui.txt

@@ -0,0 +1,214 @@
+//
+//
+// NOTE:  AUTOMATICALLY GENERATED FILE, ANY HAND EDITED COMMENTS WILL BE LOST!!!
+// NOTE:  AUTOMATICALLY GENERATED FILE, ANY HAND EDITED COMMENTS WILL BE LOST!!!
+// NOTE:  AUTOMATICALLY GENERATED FILE, ANY HAND EDITED COMMENTS WILL BE LOST!!!
+//
+// VOL_NORM		1.0f
+//
+//-----------------------------------------------------------------------------
+// common attenuation values
+//-----------------------------------------------------------------------------
+//
+// DON'T USE THESE - USE SNDLVL_ INSTEAD!!!
+//	ATTN_NONE		0.0f	
+//	ATTN_NORM		0.8f
+//	ATTN_IDLE		2.0f
+//	ATTN_STATIC		1.25f 
+//	ATTN_RICOCHET	1.5f
+//	ATTN_GUNFIRE	0.27f
+//
+//	SNDLVL_NONE		= 0,
+//	SNDLVL_25dB		= 25,
+//	SNDLVL_30dB		= 30,
+//	SNDLVL_35dB		= 35,
+//	SNDLVL_40dB		= 40,
+//	SNDLVL_45dB		= 45,
+//	SNDLVL_50dB		= 50,	// 3.9
+//	SNDLVL_55dB		= 55,	// 3.0
+//	SNDLVL_IDLE		= 60,	// 2.0
+//	SNDLVL_TALKING	= 60,	// 2.0
+//	SNDLVL_60dB		= 60,	// 2.0
+//	SNDLVL_65dB		= 65,	// 1.5
+//	SNDLVL_STATIC	= 66,	// 1.25
+//	SNDLVL_70dB		= 70,	// 1.0
+//	SNDLVL_NORM		= 75,
+//	SNDLVL_75dB		= 75,	// 0.8
+//	SNDLVL_80dB		= 80,	// 0.7
+//	SNDLVL_85dB		= 85,	// 0.6
+//	SNDLVL_90dB		= 90,	// 0.5
+//	SNDLVL_95dB		= 95,
+//	SNDLVL_100dB	= 100,	// 0.4
+//	SNDLVL_105dB	= 105,
+//	SNDLVL_120dB	= 120,
+//	SNDLVL_130dB	= 130,
+//	SNDLVL_GUNFIRE	= 140,	// 0.27
+//	SNDLVL_140dB	= 140,	// 0.2
+//	SNDLVL_150dB	= 150,	// 0.2
+
+"HUD.CountdownBeep"
+{
+	"channel"		"CHAN_VOICE"
+	"volume"		"0.33"
+	"pitch"			"PITCH_NORM"
+
+	"soundlevel"	"SNDLVL_NONE"
+
+	"wave"			"tutorial/hitsound.wav"			
+}
+
+"HUD.JinraiWin"
+{
+	"channel"		"CHAN_VOICE"
+	"volume"		"0.9"
+	"pitch"			"PITCH_NORM"
+
+	"soundlevel"		"SNDLVL_NONE"
+
+	"wave"			"gameplay/jinrai.mp3"
+}
+
+"HUD.NSFWin"
+{
+	"channel"		"CHAN_VOICE"
+	"volume"		"0.9"
+	"pitch"			"PITCH_NORM"
+
+	"soundlevel"		"SNDLVL_NONE"
+
+	"wave"			"gameplay/nsf.mp3"
+}
+
+"HUD.Draw"
+{
+	"channel"		"CHAN_VOICE"
+	"volume"		"0.9"
+	"pitch"			"PITCH_NORM"
+
+	"soundlevel"		"SNDLVL_NONE"
+
+	"wave"			"gameplay/draw.mp3"
+}
+
+"HUD.GhostPickUp"
+{
+	"channel"		"CHAN_ITEM"
+	"volume"		"0.9"
+	"pitch"			"PITCH_NORM"
+
+	"soundlevel"		"SNDLVL_NONE"
+
+	"wave"			"gameplay/ghost_pickup.wav"
+}
+
+"HUD.GhostEquip"
+{
+	"channel"		"CHAN_ITEM"
+	"volume"		"0.9"
+	"pitch"			"PITCH_NORM"
+
+	"soundlevel"		"SNDLVL_NONE"
+
+	"rndwave"	
+	{	
+		"wave"	"gameplay/ghost_equip.wav"
+		"wave"	"gameplay/ghost_equip2.wav"
+		"wave"	"gameplay/ghost_equip3.wav"
+		"wave"	"gameplay/ghost_equip4.wav"
+		"wave"	"gameplay/ghost_equip5.wav"
+	}
+}
+
+"HUDQuickInfo.LowHealth"
+{
+	"channel"		"CHAN_ITEM"
+	"volume"		"0.8"
+	"pitch"			"PITCH_NORM"
+
+	"soundlevel"	"SNDLVL_NONE"
+
+	"wave"			"common/warning.wav"
+}
+
+"HUDQuickInfo.LowAmmo"
+{
+	"channel"		"CHAN_ITEM"
+	"volume"		"0.8"
+	"pitch"			"PITCH_NORM"
+
+	"soundlevel"	"SNDLVL_NONE"
+
+	"wave"			"common/warning.wav"
+}
+
+"HudChat.Message"
+{
+	"channel"	"CHAN_ITEM"
+	"volume"	"0.8"
+	"soundlevel"  "SNDLVL_NONE"
+	"pitch"	"PITCH_NORM"
+
+	"wave"	"common/talk.wav"
+}
+
+// Client .dll sounds
+
+"Player.DenyWeaponSelection"
+{
+	"channel"	"CHAN_ITEM"
+	"volume"	"0.32"
+	"soundlevel"  "SNDLVL_NONE"
+	"pitch"	"PITCH_NORM"
+
+	"wave"	"common/wpn_denyselect.wav"
+}
+
+"Player.WeaponSelected"
+{
+	"channel"	"CHAN_ITEM"
+	"volume"	"0.32"
+	"soundlevel"  "SNDLVL_NONE"
+	"pitch"	"PITCH_NORM"
+
+	"wave"	"common/wpn_select.wav"
+}
+
+"Player.WeaponSelectionMoveSlot"
+{
+	"channel"	"CHAN_ITEM"
+	"volume"	"0.32"
+	"soundlevel"  "SNDLVL_NONE"
+	"pitch"	"PITCH_NORM"
+
+	"wave"	"common/wpn_moveselect.wav"
+}
+
+"Player.WeaponSelectionOpen"
+{
+	"channel"	"CHAN_ITEM"
+	"volume"	"0.32"
+	"soundlevel"  "SNDLVL_NONE"
+	"pitch"	"PITCH_NORM"
+
+	"wave"	"common/wpn_hudon.wav"
+}
+
+"Player.WeaponSelectionClose"
+{
+	"channel"	"CHAN_ITEM"
+	"volume"	"0.55"
+	"soundlevel"  "SNDLVL_NONE"
+	"pitch"	"PITCH_NORM"
+
+	"wave"	"common/wpn_hudoff.wav"
+}
+
+"MenuMusic.Intro"
+{
+	"channel"	"CHAN_ITEM"
+	"volume"	"0.4"
+	"soundlevel"  "SNDLVL_NONE"
+	"pitch"	"PITCH_NORM"
+
+	"wave"	"#music\HL2_song7.mp3"
+}

game/neo/scripts/soundscapes_manifest.txt

@@ -1,4 +1,4 @@
-soundscaples_manifest
+soundscapes_manifest
 {
 	"file"		"scripts/soundscapes.txt"
 

src/game/client/clientmode_shared.cpp

@@ -1420,11 +1420,13 @@ void ClientModeShared::FireGameEvent( IGameEvent *event )
 				{
 					pPlayer->SetNextAchievementAnnounceTime( gpGlobals->curtime + ACHIEVEMENT_ANNOUNCEMENT_MIN_TIME );
 
+#ifndef NEO
 					// no particle effect if the local player is the one with the achievement or the player is dead
 					if ( !pPlayer->IsLocalPlayer() && pPlayer->IsAlive() ) 
 					{
 						pPlayer->ParticleProp()->Create( "achieved", PATTACH_POINT_FOLLOW, "head" );
 					}
+#endif // NEO
 
 					pPlayer->OnAchievementAchieved( iAchievement );
 				}

src/game/client/game_controls/NavProgress.cpp

@@ -54,6 +54,13 @@ CNavProgress::CNavProgress( IViewPort *pViewPort ) : Frame( NULL, PANEL_NAV_PROG
 //--------------------------------------------------------------------------------------------------------------
 CNavProgress::~CNavProgress()
 {
+#ifdef NEO
+	delete m_pTitle;
+	delete m_pText;
+	delete m_pProgressBarBorder;
+	delete m_pProgressBar;
+	delete m_pProgressBarSizer;
+#endif // NEO
 }
 
 //--------------------------------------------------------------------------------------------------------------

src/game/client/neo/ui/neo_root_settings.cpp

@@ -259,7 +259,7 @@ void NeoSettingsRestore(NeoSettings *ns, const NeoSettings::Keys::Flags flagsKey
 		pGeneral->bLeanViewmodelOnly = cvr->cl_neo_lean_viewmodel_only.GetBool();
 		pGeneral->iLeanAutomatic = cvr->cl_neo_lean_automatic.GetInt();
 		pGeneral->bShowSquadList = cvr->cl_neo_squad_hud_original.GetBool();
-		pGeneral->bShowPlayerSprays = !(cvr->cl_playerspraydisable.GetBool()); // Inverse
+		pGeneral->bShowPlayerSprays = !(cvr->cl_spraydisable.GetBool()); // Inverse
 		pGeneral->bShowPos = cvr->cl_showpos.GetBool();
 		pGeneral->iShowFps = cvr->cl_showfps.GetInt();
 		{
@@ -485,7 +485,7 @@ void NeoSettingsSave(const NeoSettings *ns)
 		cvr->cl_neo_lean_viewmodel_only.SetValue(pGeneral->bLeanViewmodelOnly);
 		cvr->cl_neo_lean_automatic.SetValue(pGeneral->iLeanAutomatic);
 		cvr->cl_neo_squad_hud_original.SetValue(pGeneral->bShowSquadList);
-		cvr->cl_playerspraydisable.SetValue(!pGeneral->bShowPlayerSprays); // Inverse
+		cvr->cl_spraydisable.SetValue(!pGeneral->bShowPlayerSprays); // Inverse
 		cvr->cl_showpos.SetValue(pGeneral->bShowPos);
 		cvr->cl_showfps.SetValue(pGeneral->iShowFps);
 		cvr->cl_downloadfilter.SetValue(DLFILTER_STRMAP[pGeneral->iDlFilter]);