From: Rudolf Polzer <divVerent@xonotic.org>
Date: Mon, 9 Feb 2015 12:14:41 +0000 (+0100)
Subject: Merge branch 'master' into divVerent/musicvolume
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e3bc409ab004dc509022e03b0a9c4c33556b64e8;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into divVerent/musicvolume

Conflicts:
	qcsrc/client/autocvars.qh
	qcsrc/client/bgmscript.qc
	qcsrc/client/target_music.qc
	qcsrc/common/util-pre.qh
---

e3bc409ab004dc509022e03b0a9c4c33556b64e8
diff --cc qcsrc/client/autocvars.qh
index 0239dddda,e35bf82dd..2f9bcfef6
--- a/qcsrc/client/autocvars.qh
+++ b/qcsrc/client/autocvars.qh
@@@ -3,11 -6,11 +6,11 @@@ bool autocvar__hud_configure
  string autocvar__hud_panelorder;
  float autocvar__menu_alpha;
  string autocvar_accuracy_color_levels;
 -float autocvar_bgmvolume;
 +float autocvar_musicvolume;
- float autocvar_camera_chase_smoothly;
- float autocvar_camera_enable;
- float autocvar_camera_forward_follows;
- float autocvar_camera_free;
+ bool autocvar_camera_chase_smoothly;
+ bool autocvar_camera_enable;
+ bool autocvar_camera_forward_follows;
+ bool autocvar_camera_free;
  float autocvar_camera_look_attenuation;
  float autocvar_camera_look_player;
  float autocvar_camera_mouse_threshold;
diff --cc qcsrc/client/bgmscript.qc
index b71f1aca6,b567190ca..05cc7abab
--- a/qcsrc/client/bgmscript.qc
+++ b/qcsrc/client/bgmscript.qc
@@@ -172,11 -183,11 +183,11 @@@ float BGMScript(entity e
  
  	if(e.bgmscript == "")
  		return 1;
- 	
+ 
 -	if(autocvar_bgmvolume <= 0)
 +	if(autocvar_musicvolume <= 0)
  		return -1;
  
- 	e.just_toggled = FALSE;
+ 	e.just_toggled = false;
  
  	if(bgmtime < 0)
  		return -1;
diff --cc qcsrc/client/main.qc
index 000000000,13f9545fa..27f64113b
mode 000000,100644..100644
--- a/qcsrc/client/main.qc
+++ b/qcsrc/client/main.qc
@@@ -1,0 -1,1319 +1,1321 @@@
+ #include "mapvoting.qh"
+ #include "modeleffects.qh"
+ #include "particles.qh"
+ #include "scoreboard.qh"
+ #include "shownames.qh"
+ #include "target_music.qh"
+ #include "tturrets.qh"
+ #include "tuba.qh"
+ #include "wall.qh"
+ #include "waypointsprites.qh"
+ 
+ #include "vehicles/vehicles.qh"
+ 
+ #include "../server/vehicles/bumblebee.qh"
+ 
+ #include "../common/net_notice.qh"
+ 
+ #include "../common/monsters/monsters.qh"
+ 
+ #include "../warpzonelib/client.qh"
+ 
+ // --------------------------------------------------------------------------
+ // BEGIN REQUIRED CSQC FUNCTIONS
+ //include "main.qh"
+ 
+ entity clearentity_ent;
+ void clearentity(entity e)
+ {
+ 	if (!clearentity_ent)
+ 	{
+ 		clearentity_ent = spawn();
+ 		clearentity_ent.classname = "clearentity";
+ 	}
+ 	int n = e.entnum;
+ 	copyentity(clearentity_ent, e);
+ 	e.entnum = n;
+ }
+ 
+ #define DP_CSQC_ENTITY_REMOVE_IS_B0RKED
+ void menu_show_error()
+ {
+ 	drawstring('0 200 0', _("ERROR - MENU IS VISIBLE BUT NO MENU WAS DEFINED!"), '8 8 0', '1 0 0', 1, 0);
+ }
+ 
+ // CSQC_Init : Called every time the CSQC code is initialized (essentially at map load)
+ // Useful for precaching things
+ 
+ void menu_sub_null()
+ {
+ }
+ 
+ string forcefog;
+ void WaypointSprite_Load();
+ void ConsoleCommand_macro_init();
++void Init_TargetMusic();
+ void CSQC_Init(void)
+ {
+ 	prvm_language = cvar_string("prvm_language");
+ 
+ #ifdef WATERMARK
+ 	dprintf("^4CSQC Build information: ^1%s\n", WATERMARK);
+ #endif
+ 
+ 	int i;
+ 
+ 	binddb = db_create();
+ 	tempdb = db_create();
+ 	ClientProgsDB = db_load("client.db");
+ 	compressShortVector_init();
+ 
+ 	draw_endBoldFont();
+ 	menu_visible = false;
+ 	menu_show = menu_show_error;
+ 	menu_action = func_null;
+ 
+ 	for(i = 0; i < 255; ++i)
+ 		if(getplayerkeyvalue(i, "viewentity") == "")
+ 			break;
+ 	maxclients = i;
+ 
+ 	//registercommand("hud_configure");
+ 	//registercommand("hud_save");
+ 	//registercommand("menu_action");
+ 
+ 	ConsoleCommand_macro_init();
+ 
+ 	registercvar("hud_usecsqc", "1");
+ 	registercvar("scoreboard_columns", "default");
+ 
+ 	registercvar("cl_nade_type", "3");
+ 	registercvar("cl_pokenade_type", "zombie");
+ 
+ 	gametype = 0;
+ 
+ 	// hud_fields uses strunzone on the titles!
+ 	for(i = 0; i < MAX_HUD_FIELDS; ++i)
+ 		hud_title[i] = strzone("(null)");
+ 
+ 	Cmd_HUD_SetFields(0);
+ 
+ 	postinit = false;
+ 
+ 	calledhooks = 0;
+ 
+ 	teams = Sort_Spawn();
+ 	players = Sort_Spawn();
+ 
+ 	GetTeam(NUM_SPECTATOR, true); // add specs first
+ 
+ 	// needs to be done so early because of the constants they create
+ 	CALL_ACCUMULATED_FUNCTION(RegisterWeapons);
+ 	CALL_ACCUMULATED_FUNCTION(RegisterMonsters);
+ 	CALL_ACCUMULATED_FUNCTION(RegisterGametypes);
+ 	CALL_ACCUMULATED_FUNCTION(RegisterNotifications);
+ 	CALL_ACCUMULATED_FUNCTION(RegisterDeathtypes);
+ 	CALL_ACCUMULATED_FUNCTION(RegisterHUD_Panels);
+ 	CALL_ACCUMULATED_FUNCTION(RegisterBuffs);
+ 
+ 	WaypointSprite_Load();
+ 
+ 	// precaches
+ 	precache_model("null");
+ 	precache_sound("misc/hit.wav");
+ 	precache_sound("misc/typehit.wav");
+ 
+ 	Projectile_Precache();
+ 	Hook_Precache();
+ 	GibSplash_Precache();
+ 	Casings_Precache();
+ 	Vehicles_Precache();
+ 	turrets_precache();
+ 	Tuba_Precache();
+ 	CSQCPlayer_Precache();
+ 
+ 	if(autocvar_cl_reticle)
+ 	{
+ 		precache_pic("gfx/reticle_normal");
+ 		// weapon reticles are precached in weapon files
+ 	}
+ 
+ 	get_mi_min_max_texcoords(1); // try the CLEVER way first
+ 	minimapname = strcat("gfx/", mi_shortname, "_radar.tga");
+ 	shortmapname = mi_shortname;
+ 
+ 	if(precache_pic(minimapname) == "")
+ 	{
+ 		// but maybe we have a non-clever minimap
+ 		minimapname = strcat("gfx/", mi_shortname, "_mini.tga");
+ 		if(precache_pic(minimapname) == "")
+ 			minimapname = ""; // FAIL
+ 		else
+ 			get_mi_min_max_texcoords(0); // load new texcoords
+ 	}
+ 
+ 	mi_center = (mi_min + mi_max) * 0.5;
+ 	mi_scale = mi_max - mi_min;
+ 	minimapname = strzone(minimapname);
+ 
+ 	WarpZone_Init();
++	Init_TargetMusic();
+ 
+ 	hud_skin_path = strzone(strcat("gfx/hud/", autocvar_hud_skin));
+ 	hud_configure_prev = -1;
+ 
+ 	draw_currentSkin = strzone(strcat("gfx/menu/", cvar_string("menu_skin")));
+ }
+ 
+ // CSQC_Shutdown : Called every time the CSQC code is shutdown (changing maps, quitting, etc)
+ void Shutdown(void)
+ {
+ 	WarpZone_Shutdown();
+ 
+ 	remove(teams);
+ 	remove(players);
+ 	db_close(binddb);
+ 	db_close(tempdb);
+ 	if(autocvar_cl_db_saveasdump)
+ 		db_dump(ClientProgsDB, "client.db");
+ 	else
+ 		db_save(ClientProgsDB, "client.db");
+ 	db_close(ClientProgsDB);
+ 
+ 	if(camera_active)
+ 		cvar_set("chase_active",ftos(chase_active_backup));
+ 
+ 	// unset the event chasecam's chase_active
+ 	if(autocvar_chase_active < 0)
+ 		cvar_set("chase_active", "0");
+ 
+ 	if (!isdemo())
+ 	{
+ 		if (!(calledhooks & HOOK_START))
+ 			localcmd("\n_cl_hook_gamestart nop\n");
+ 		if (!(calledhooks & HOOK_END))
+ 			localcmd("\ncl_hook_gameend\n");
+ 	}
+ }
+ 
+ .float has_team;
+ float SetTeam(entity o, int Team)
+ {
+ 	entity tm;
+ 	if(teamplay)
+ 	{
+ 		switch(Team)
+ 		{
+ 			case -1:
+ 			case NUM_TEAM_1:
+ 			case NUM_TEAM_2:
+ 			case NUM_TEAM_3:
+ 			case NUM_TEAM_4:
+ 				break;
+ 			default:
+ 				if(GetTeam(Team, false) == world)
+ 				{
+ 					dprintf("trying to switch to unsupported team %d\n", Team);
+ 					Team = NUM_SPECTATOR;
+ 				}
+ 				break;
+ 		}
+ 	}
+ 	else
+ 	{
+ 		switch(Team)
+ 		{
+ 			case -1:
+ 			case 0:
+ 				break;
+ 			default:
+ 				if(GetTeam(Team, false) == world)
+ 				{
+ 					dprintf("trying to switch to unsupported team %d\n", Team);
+ 					Team = NUM_SPECTATOR;
+ 				}
+ 				break;
+ 		}
+ 	}
+ 	if(Team == -1) // leave
+ 	{
+ 		if(o.has_team)
+ 		{
+ 			tm = GetTeam(o.team, false);
+ 			tm.team_size -= 1;
+ 			o.has_team = 0;
+ 			return true;
+ 		}
+ 	}
+ 	else
+ 	{
+ 		if (!o.has_team)
+ 		{
+ 			o.team = Team;
+ 			tm = GetTeam(Team, true);
+ 			tm.team_size += 1;
+ 			o.has_team = 1;
+ 			return true;
+ 		}
+ 		else if(Team != o.team)
+ 		{
+ 			tm = GetTeam(o.team, false);
+ 			tm.team_size -= 1;
+ 			o.team = Team;
+ 			tm = GetTeam(Team, true);
+ 			tm.team_size += 1;
+ 			return true;
+ 		}
+ 	}
+ 	return false;
+ }
+ 
+ void Playerchecker_Think()
+ {
+     int i;
+ 	entity e;
+ 	for(i = 0; i < maxclients; ++i)
+ 	{
+ 		e = playerslots[i];
+ 		if(GetPlayerName(i) == "")
+ 		{
+ 			if(e.sort_prev)
+ 			{
+ 				// player disconnected
+ 				SetTeam(e, -1);
+ 				RemovePlayer(e);
+ 				e.sort_prev = world;
+ 				//e.gotscores = 0;
+ 			}
+ 		}
+ 		else
+ 		{
+ 			if (!e.sort_prev)
+ 			{
+ 				// player connected
+ 				if (!e)
+ 					playerslots[i] = e = spawn();
+ 				e.sv_entnum = i;
+ 				e.ping = 0;
+ 				e.ping_packetloss = 0;
+ 				e.ping_movementloss = 0;
+ 				//e.gotscores = 0; // we might already have the scores...
+ 				SetTeam(e, GetPlayerColor(i)); // will not hurt; later updates come with HUD_UpdatePlayerTeams
+ 				RegisterPlayer(e);
+ 				HUD_UpdatePlayerPos(e);
+ 			}
+ 		}
+ 	}
+ 	self.nextthink = time + 0.2;
+ }
+ 
+ void Porto_Init();
+ void TrueAim_Init();
+ void PostInit(void)
+ {
+ 	entity playerchecker;
+ 	playerchecker = spawn();
+ 	playerchecker.think = Playerchecker_Think;
+ 	playerchecker.nextthink = time + 0.2;
+ 
+ 	Porto_Init();
+ 	TrueAim_Init();
+ 
+ 	postinit = true;
+ }
+ 
+ // CSQC_InputEvent : Used to perform actions based on any key pressed, key released and mouse on the client.
+ // Return value should be 1 if CSQC handled the input, otherwise return 0 to have the input passed to the engine.
+ // All keys are in ascii.
+ // bInputType = 0 is key pressed, 1 is key released, 2 and 3 are mouse input.
+ // In the case of keyboard input, nPrimary is the ascii code, and nSecondary is 0.
+ // In the case of mouse input, nPrimary is xdelta, nSecondary is ydelta.
+ // In the case of mouse input after a setcursormode(1) call, nPrimary is xpos, nSecondary is ypos.
+ float CSQC_InputEvent(float bInputType, float nPrimary, float nSecondary)
+ {
+ 	float bSkipKey;
+ 	bSkipKey = false;
+ 
+ 	if (HUD_Panel_InputEvent(bInputType, nPrimary, nSecondary))
+ 		return true;
+ 
+ 	if (MapVote_InputEvent(bInputType, nPrimary, nSecondary))
+ 		return true;
+ 
+ 	if(menu_visible && menu_action)
+ 		if(menu_action(bInputType, nPrimary, nSecondary))
+ 			return true;
+ 
+ 	return bSkipKey;
+ }
+ 
+ // END REQUIRED CSQC FUNCTIONS
+ // --------------------------------------------------------------------------
+ 
+ // --------------------------------------------------------------------------
+ // BEGIN OPTIONAL CSQC FUNCTIONS
+ void Ent_RemoveEntCS()
+ {
+ 	entcs_receiver[self.sv_entnum] = world;
+ }
+ void Ent_ReadEntCS()
+ {
+     int sf;
+ 	InterpolateOrigin_Undo();
+ 
+ 	self.classname = "entcs_receiver";
+ 	sf = ReadByte();
+ 
+ 	if(sf & 1)
+ 		self.sv_entnum = ReadByte();
+ 	if(sf & 2)
+ 	{
+ 		self.origin_x = ReadShort();
+ 		self.origin_y = ReadShort();
+ 		self.origin_z = ReadShort();
+ 		setorigin(self, self.origin);
+ 	}
+ 	if(sf & 4)
+ 	{
+ 		self.angles_y = ReadByte() * 360.0 / 256;
+ 		self.angles_x = self.angles_z = 0;
+ 	}
+ 	if(sf & 8)
+ 		self.healthvalue = ReadByte() * 10;
+ 	if(sf & 16)
+ 		self.armorvalue = ReadByte() * 10;
+ 
+ 	entcs_receiver[self.sv_entnum] = self;
+ 	self.entremove = Ent_RemoveEntCS;
+ 	self.iflags |= IFLAG_ORIGIN;
+ 
+ 	InterpolateOrigin_Note();
+ }
+ 
+ void Ent_Remove();
+ 
+ void Ent_RemovePlayerScore()
+ {
+ 	if(self.owner) {
+ 		SetTeam(self.owner, -1);
+ 		self.owner.gotscores = 0;
+ 		for(int i = 0; i < MAX_SCORE; ++i) {
+ 			self.owner.(scores[i]) = 0; // clear all scores
+ 		}
+ 	}
+ }
+ 
+ void Ent_ReadPlayerScore()
+ {
+ 	int i, n;
+ 	bool isNew;
+ 	entity o;
+ 
+ 	// damnit -.- don't want to go change every single .sv_entnum in hud.qc AGAIN
+ 	// (no I've never heard of M-x replace-string, sed, or anything like that)
+ 	isNew = !self.owner; // workaround for DP bug
+ 	n = ReadByte()-1;
+ 
+ #ifdef DP_CSQC_ENTITY_REMOVE_IS_B0RKED
+ 	if(!isNew && n != self.sv_entnum)
+ 	{
+ 		//print("A CSQC entity changed its owner!\n");
+ 		printf("A CSQC entity changed its owner! (edict: %d, classname: %s)\n", num_for_edict(self), self.classname);
+ 		isNew = true;
+ 		Ent_Remove();
+ 		self.enttype = ENT_CLIENT_SCORES;
+ 	}
+ #endif
+ 
+ 	self.sv_entnum = n;
+ 
+ 	if (!(playerslots[self.sv_entnum]))
+ 		playerslots[self.sv_entnum] = spawn();
+ 	o = self.owner = playerslots[self.sv_entnum];
+ 	o.sv_entnum = self.sv_entnum;
+ 	o.gotscores = 1;
+ 
+ 	//if (!o.sort_prev)
+ 	//	RegisterPlayer(o);
+ 	//playerchecker will do this for us later, if it has not already done so
+ 
+     int sf, lf;
+ #if MAX_SCORE <= 8
+ 	sf = ReadByte();
+ 	lf = ReadByte();
+ #else
+ 	sf = ReadShort();
+ 	lf = ReadShort();
+ #endif
+     int p;
+ 	for(i = 0, p = 1; i < MAX_SCORE; ++i, p *= 2)
+ 		if(sf & p)
+ 		{
+ 			if(lf & p)
+ 				o.(scores[i]) = ReadInt24_t();
+ 			else
+ 				o.(scores[i]) = ReadChar();
+ 		}
+ 
+ 	if(o.sort_prev)
+ 		HUD_UpdatePlayerPos(o); // if not registered, we cannot do this yet!
+ 
+ 	self.entremove = Ent_RemovePlayerScore;
+ }
+ 
+ void Ent_ReadTeamScore()
+ {
+ 	int i;
+ 	entity o;
+ 
+ 	self.team = ReadByte();
+ 	o = self.owner = GetTeam(self.team, true); // these team numbers can always be trusted
+ 
+     int sf, lf;
+ #if MAX_TEAMSCORE <= 8
+ 	sf = ReadByte();
+ 	lf = ReadByte();
+ #else
+ 	sf = ReadShort();
+ 	lf = ReadShort();
+ #endif
+ 	int p;
+ 	for(i = 0, p = 1; i < MAX_TEAMSCORE; ++i, p *= 2)
+ 		if(sf & p)
+ 		{
+ 			if(lf & p)
+ 				o.(teamscores[i]) = ReadInt24_t();
+ 			else
+ 				o.(teamscores[i]) = ReadChar();
+ 		}
+ 
+ 	HUD_UpdateTeamPos(o);
+ }
+ 
+ void Ent_ClientData()
+ {
+ 	float newspectatee_status;
+ 
+     int f = ReadByte();
+ 
+ 	scoreboard_showscores_force = (f & 1);
+ 
+ 	if(f & 2)
+ 	{
+ 		newspectatee_status = ReadByte();
+ 		if(newspectatee_status == player_localnum + 1)
+ 			newspectatee_status = -1; // observing
+ 	}
+ 	else
+ 		newspectatee_status = 0;
+ 
+ 	spectatorbutton_zoom = (f & 4);
+ 
+ 	if(f & 8)
+ 	{
+ 		angles_held_status = 1;
+ 		angles_held.x = ReadAngle();
+ 		angles_held.y = ReadAngle();
+ 		angles_held.z = 0;
+ 	}
+ 	else
+ 		angles_held_status = 0;
+ 
+ 	if(newspectatee_status != spectatee_status)
+ 	{
+ 		// clear race stuff
+ 		race_laptime = 0;
+ 		race_checkpointtime = 0;
+ 	}
+ 	if (autocvar_hud_panel_healtharmor_progressbar_gfx)
+ 	{
+ 		if ( (spectatee_status == -1 && newspectatee_status > 0) //before observing, now spectating
+ 		  || (spectatee_status > 0 && newspectatee_status > 0 && spectatee_status != newspectatee_status) //changed spectated player
+ 		)
+ 			prev_p_health = -1;
+ 		else if(spectatee_status && !newspectatee_status) //before observing/spectating, now playing
+ 			prev_health = -1;
+ 	}
+ 	spectatee_status = newspectatee_status;
+ 
+ 	// we could get rid of spectatee_status, and derive it from player_localentnum and player_localnum
+ }
+ 
+ void Ent_Nagger()
+ {
+     int i, j, b, f;
+ 
+     int nags = ReadByte(); // NAGS NAGS NAGS NAGS NAGS NAGS NADZ NAGS NAGS NAGS
+ 
+ 	if(!(nags & 4))
+ 	{
+ 		if(vote_called_vote)
+ 			strunzone(vote_called_vote);
+ 		vote_called_vote = string_null;
+ 		vote_active = 0;
+ 	}
+ 	else
+ 	{
+ 		vote_active = 1;
+ 	}
+ 
+ 	if(nags & 64)
+ 	{
+ 		vote_yescount = ReadByte();
+ 		vote_nocount = ReadByte();
+ 		vote_needed = ReadByte();
+ 		vote_highlighted = ReadChar();
+ 	}
+ 
+ 	if(nags & 128)
+ 	{
+ 		if(vote_called_vote)
+ 			strunzone(vote_called_vote);
+ 		vote_called_vote = strzone(ColorTranslateRGB(ReadString()));
+ 	}
+ 
+ 	if(nags & 1)
+ 	{
+ 		for(j = 0; j < maxclients; ++j)
+ 			if(playerslots[j])
+ 				playerslots[j].ready = 1;
+ 		for(i = 1; i <= maxclients; i += 8)
+ 		{
+ 			f = ReadByte();
+ 			for(j = i-1, b = 1; b < 256; b *= 2, ++j)
+ 				if (!(f & b))
+ 					if(playerslots[j])
+ 						playerslots[j].ready = 0;
+ 		}
+ 	}
+ 
+ 	ready_waiting = (nags & 1);
+ 	ready_waiting_for_me = (nags & 2);
+ 	vote_waiting = (nags & 4);
+ 	vote_waiting_for_me = (nags & 8);
+ 	warmup_stage = (nags & 16);
+ }
+ 
+ void Ent_EliminatedPlayers()
+ {
+     int i, j, b, f;
+ 
+     int sf = ReadByte();
+ 	if(sf & 1)
+ 	{
+ 		for(j = 0; j < maxclients; ++j)
+ 			if(playerslots[j])
+ 				playerslots[j].eliminated = 1;
+ 		for(i = 1; i <= maxclients; i += 8)
+ 		{
+ 			f = ReadByte();
+ 			for(j = i-1, b = 1; b < 256; b *= 2, ++j)
+ 				if (!(f & b))
+ 					if(playerslots[j])
+ 						playerslots[j].eliminated = 0;
+ 		}
+ 	}
+ }
+ 
+ void Ent_RandomSeed()
+ {
+ 	float s;
+ 	prandom_debug();
+ 	s = ReadShort();
+ 	psrandom(s);
+ }
+ 
+ void Ent_ReadAccuracy(void)
+ {
+     int f, w;
+     int sf = ReadInt24_t();
+ 	if(sf == 0)
+ 	{
+ 		for(w = 0; w <= WEP_LAST - WEP_FIRST; ++w)
+ 			weapon_accuracy[w] = -1;
+ 		return;
+ 	}
+ 
+ 	for(w = 0, f = 1; w <= WEP_LAST - WEP_FIRST; ++w)
+ 	{
+ 		if(sf & f)
+ 		{
+             int b = ReadByte();
+ 			if(b == 0)
+ 				weapon_accuracy[w] = -1;
+ 			else if(b == 255)
+ 				weapon_accuracy[w] = 1.0; // no better error handling yet, sorry
+ 			else
+ 				weapon_accuracy[w] = (b - 1.0) / 100.0;
+ 		}
+ 		if(f == 0x800000)
+ 			f = 1;
+ 		else
+ 			f *= 2;
+ 	}
+ }
+ 
+ void Spawn_Draw(void)
+ {
+ 	pointparticles(self.cnt, self.origin + '0 0 28', '0 0 2', bound(0, frametime, 0.1));
+ }
+ 
+ void Ent_ReadSpawnPoint(float is_new) // entity for spawnpoint
+ {
+ 	float teamnum = (ReadByte() - 1);
+ 	vector spn_origin;
+ 	spn_origin.x = ReadShort();
+ 	spn_origin.y = ReadShort();
+ 	spn_origin.z = ReadShort();
+ 
+ 	if(is_new)
+ 	{
+ 		self.origin = spn_origin;
+ 		setsize(self, PL_MIN, PL_MAX);
+ 		droptofloor();
+ 
+ 		/*if(autocvar_cl_spawn_point_model) // needs a model first
+ 		{
+ 			self.mdl = "models/spawnpoint.md3";
+ 			self.colormod = Team_ColorRGB(teamnum);
+ 			precache_model(self.mdl);
+ 			setmodel(self, self.mdl);
+ 			self.drawmask = MASK_NORMAL;
+ 			//self.movetype = MOVETYPE_NOCLIP;
+ 			//self.draw = Spawn_Draw;
+ 		}*/
+ 		if(autocvar_cl_spawn_point_particles)
+ 		{
+ 			if((serverflags & SERVERFLAG_TEAMPLAY))
+ 			{
+ 				switch(teamnum)
+ 				{
+ 					case NUM_TEAM_1: self.cnt = particleeffectnum("spawn_point_red"); break;
+ 					case NUM_TEAM_2: self.cnt = particleeffectnum("spawn_point_blue"); break;
+ 					case NUM_TEAM_3: self.cnt = particleeffectnum("spawn_point_yellow"); break;
+ 					case NUM_TEAM_4: self.cnt = particleeffectnum("spawn_point_pink"); break;
+ 					default: self.cnt = particleeffectnum("spawn_point_neutral"); break;
+ 				}
+ 			}
+ 			else { self.cnt = particleeffectnum("spawn_point_neutral"); }
+ 
+ 			self.draw = Spawn_Draw;
+ 		}
+ 	}
+ 
+ 	//printf("Ent_ReadSpawnPoint(is_new = %d); origin = %s, team = %d, effect = %d\n", is_new, vtos(self.origin), teamnum, self.cnt);
+ }
+ 
+ void Ent_ReadSpawnEvent(float is_new)
+ {
+ 	// If entnum is 0, ONLY do the local spawn actions
+ 	// this way the server can disable the sending of
+ 	// spawn origin or such to clients if wanted.
+ 	float entnum = ReadByte();
+ 
+ 	if(entnum)
+ 	{
+ 		self.origin_x = ReadShort();
+ 		self.origin_y = ReadShort();
+ 		self.origin_z = ReadShort();
+ 
+ 		if(is_new)
+ 		{
+ 			float teamnum = GetPlayerColor(entnum - 1);
+ 
+ 			if(autocvar_cl_spawn_event_particles)
+ 			{
+ 				switch(teamnum)
+ 				{
+ 					case NUM_TEAM_1: pointparticles(particleeffectnum("spawn_event_red"), self.origin, '0 0 0', 1); break;
+ 					case NUM_TEAM_2: pointparticles(particleeffectnum("spawn_event_blue"), self.origin, '0 0 0', 1); break;
+ 					case NUM_TEAM_3: pointparticles(particleeffectnum("spawn_event_yellow"), self.origin, '0 0 0', 1); break;
+ 					case NUM_TEAM_4: pointparticles(particleeffectnum("spawn_event_pink"), self.origin, '0 0 0', 1); break;
+ 					default: pointparticles(particleeffectnum("spawn_event_neutral"), self.origin, '0 0 0', 1); break;
+ 				}
+ 			}
+ 			if(autocvar_cl_spawn_event_sound)
+ 			{
+ 				sound(self, CH_TRIGGER, "misc/spawn.wav", VOL_BASE, ATTEN_NORM);
+ 			}
+ 		}
+ 	}
+ 
+ 	// local spawn actions
+ 	if(is_new && (!entnum || (entnum == player_localentnum)))
+ 	{
+ 		zoomin_effect = 1;
+ 		current_viewzoom = (1 / bound(1, autocvar_cl_spawnzoom_factor, 16));
+ 
+ 		if(autocvar_cl_unpress_zoom_on_spawn)
+ 		{
+ 			localcmd("-zoom\n");
+ 			button_zoom = false;
+ 		}
+ 	}
+ 
+ 	//printf("Ent_ReadSpawnEvent(is_new = %d); origin = %s, entnum = %d, localentnum = %d\n", is_new, vtos(self.origin), entnum, player_localentnum);
+ }
+ 
+ // CSQC_Ent_Update : Called every frame that the server has indicated an update to the SSQC / CSQC entity has occured.
+ // The only parameter reflects if the entity is "new" to the client, meaning it just came into the client's PVS.
+ void Ent_RadarLink();
+ void Ent_Init();
+ void Ent_ScoresInfo();
+ void CSQC_Ent_Update(float bIsNewEntity)
+ {
+ 	float t;
+ 	float savetime;
+ 	t = ReadByte();
+ 
+ 	if(autocvar_developer_csqcentities)
+ 		printf("CSQC_Ent_Update(%d) with self=%i self.entnum=%d self.enttype=%d t=%d\n", bIsNewEntity, self, self.entnum, self.enttype, t);
+ 
+ 	// set up the "time" global for received entities to be correct for interpolation purposes
+ 	savetime = time;
+ 	if(servertime)
+ 	{
+ 		time = servertime;
+ 	}
+ 	else
+ 	{
+ 		serverprevtime = time;
+ 		serverdeltatime = getstatf(STAT_MOVEVARS_TICRATE) * getstatf(STAT_MOVEVARS_TIMESCALE);
+ 		time = serverprevtime + serverdeltatime;
+ 	}
+ 
+ #ifdef DP_CSQC_ENTITY_REMOVE_IS_B0RKED
+ 	if(self.enttype)
+ 	{
+ 		if(t != self.enttype || bIsNewEntity)
+ 		{
+ 			//print("A CSQC entity changed its type!\n");
+ 			printf("A CSQC entity changed its type! (edict: %d, server: %d, type: %d -> %d)\n", num_for_edict(self), self.entnum, self.enttype, t);
+ 			Ent_Remove();
+ 			clearentity(self);
+ 			bIsNewEntity = 1;
+ 		}
+ 	}
+ 	else
+ 	{
+ 		if(!bIsNewEntity)
+ 		{
+ 			printf("A CSQC entity appeared out of nowhere! (edict: %d, server: %d, type: %d)\n", num_for_edict(self), self.entnum, t);
+ 			bIsNewEntity = 1;
+ 		}
+ 	}
+ #endif
+ 	self.enttype = t;
+ 	switch(t)
+ 	{
+ 		case ENT_CLIENT_ENTCS: Ent_ReadEntCS(); break;
+ 		case ENT_CLIENT_SCORES: Ent_ReadPlayerScore(); break;
+ 		case ENT_CLIENT_TEAMSCORES: Ent_ReadTeamScore(); break;
+ 		case ENT_CLIENT_POINTPARTICLES: Ent_PointParticles(); break;
+ 		case ENT_CLIENT_RAINSNOW: Ent_RainOrSnow(); break;
+ 		case ENT_CLIENT_LASER: Ent_Laser(); break;
+ 		case ENT_CLIENT_NAGGER: Ent_Nagger(); break;
+ 		case ENT_CLIENT_ELIMINATEDPLAYERS: Ent_EliminatedPlayers(); break;
+ 		case ENT_CLIENT_WAYPOINT: Ent_WaypointSprite(); break;
+ 		case ENT_CLIENT_RADARLINK: Ent_RadarLink(); break;
+ 		case ENT_CLIENT_PROJECTILE: Ent_Projectile(); break;
+ 		case ENT_CLIENT_GIBSPLASH: Ent_GibSplash(bIsNewEntity); break;
+ 		case ENT_CLIENT_DAMAGEINFO: Ent_DamageInfo(bIsNewEntity); break;
+ 		case ENT_CLIENT_CASING: Ent_Casing(bIsNewEntity); break;
+ 		case ENT_CLIENT_INIT: Ent_Init(); break;
+ 		case ENT_CLIENT_SCORES_INFO: Ent_ScoresInfo(); break;
+ 		case ENT_CLIENT_MAPVOTE: Ent_MapVote(); break;
+ 		case ENT_CLIENT_CLIENTDATA: Ent_ClientData(); break;
+ 		case ENT_CLIENT_RANDOMSEED: Ent_RandomSeed(); break;
+ 		case ENT_CLIENT_WALL: Ent_Wall(); break;
+ 		case ENT_CLIENT_MODELEFFECT: Ent_ModelEffect(bIsNewEntity); break;
+ 		case ENT_CLIENT_TUBANOTE: Ent_TubaNote(bIsNewEntity); break;
+ 		case ENT_CLIENT_WARPZONE: WarpZone_Read(bIsNewEntity); break;
+ 		case ENT_CLIENT_WARPZONE_CAMERA: WarpZone_Camera_Read(bIsNewEntity); break;
+ 		case ENT_CLIENT_WARPZONE_TELEPORTED: WarpZone_Teleported_Read(bIsNewEntity); break;
+ 		case ENT_CLIENT_TRIGGER_MUSIC: Ent_ReadTriggerMusic(); break;
+ 		case ENT_CLIENT_HOOK: Ent_ReadHook(bIsNewEntity, ENT_CLIENT_HOOK); break;
+ 		case ENT_CLIENT_ARC_BEAM: Ent_ReadArcBeam(bIsNewEntity); break;
+ 		case ENT_CLIENT_ACCURACY: Ent_ReadAccuracy(); break;
+ 		case ENT_CLIENT_AUXILIARYXHAIR: Net_AuXair2(bIsNewEntity); break;
+ 		case ENT_CLIENT_TURRET: ent_turret(); break;
+ 		case ENT_CLIENT_MODEL: CSQCModel_Read(bIsNewEntity); break;
+ 		case ENT_CLIENT_ITEM: ItemRead(bIsNewEntity); break;
+ 		case ENT_CLIENT_BUMBLE_RAYGUN: bumble_raygun_read(bIsNewEntity); break;
+ 		case ENT_CLIENT_SPAWNPOINT: Ent_ReadSpawnPoint(bIsNewEntity); break;
+ 		case ENT_CLIENT_SPAWNEVENT: Ent_ReadSpawnEvent(bIsNewEntity); break;
+ 		case ENT_CLIENT_NOTIFICATION: Read_Notification(bIsNewEntity); break;
+ 		case ENT_CLIENT_HEALING_ORB: ent_healer(); break;
+ 
+ 		default:
+ 			//error(strcat(_("unknown entity type in CSQC_Ent_Update: %d\n"), self.enttype));
+ 			error(sprintf("Unknown entity type in CSQC_Ent_Update (enttype: %d, edict: %d, classname: %s)\n", self.enttype, num_for_edict(self), self.classname));
+ 			break;
+ 	}
+ 
+ 	time = savetime;
+ }
+ // Destructor, but does NOT deallocate the entity by calling remove(). Also
+ // used when an entity changes its type. For an entity that someone interacts
+ // with others, make sure it can no longer do so.
+ void Ent_Remove()
+ {
+ 	if(self.entremove)
+ 		self.entremove();
+ 
+ 	if(self.skeletonindex)
+ 	{
+ 		skel_delete(self.skeletonindex);
+ 		self.skeletonindex = 0;
+ 	}
+ 
+ 	if(self.snd_looping > 0)
+ 	{
+ 		sound(self, self.snd_looping, "misc/null.wav", VOL_BASE, autocvar_g_jetpack_attenuation);
+ 		self.snd_looping = 0;
+ 	}
+ 
+ 	self.enttype = 0;
+ 	self.classname = "";
+ 	self.draw = menu_sub_null;
+ 	self.entremove = menu_sub_null;
+ 	// TODO possibly set more stuff to defaults
+ }
+ // CSQC_Ent_Remove : Called when the server requests a SSQC / CSQC entity to be removed.  Essentially call remove(self) as well.
+ void CSQC_Ent_Remove()
+ {
+ 	if(autocvar_developer_csqcentities)
+ 		printf("CSQC_Ent_Remove() with self=%i self.entnum=%d self.enttype=%d\n", self, self.entnum, self.enttype);
+ 
+ 	if(wasfreed(self))
+ 	{
+ 		print("WARNING: CSQC_Ent_Remove called for already removed entity. Packet loss?\n");
+ 		return;
+ 	}
+ 	if(self.enttype)
+ 		Ent_Remove();
+ 	remove(self);
+ }
+ 
+ void Gamemode_Init()
+ {
+ 	if (!isdemo())
+ 	{
+ 		if(!(calledhooks & HOOK_START))
+ 			localcmd("\n_cl_hook_gamestart ", MapInfo_Type_ToString(gametype), "\n");
+ 		calledhooks |= HOOK_START;
+ 	}
+ }
+ // CSQC_Parse_StuffCmd : Provides the stuffcmd string in the first parameter that the server provided.  To execute standard behavior, simply execute localcmd with the string.
+ void CSQC_Parse_StuffCmd(string strMessage)
+ {
+ 	if(autocvar_developer_csqcentities)
+ 		printf("CSQC_Parse_StuffCmd(\"%s\")\n", strMessage);
+ 
+ 	localcmd(strMessage);
+ }
+ // CSQC_Parse_Print : Provides the print string in the first parameter that the server provided.  To execute standard behavior, simply execute print with the string.
+ void CSQC_Parse_Print(string strMessage)
+ {
+ 	if(autocvar_developer_csqcentities)
+ 		printf("CSQC_Parse_Print(\"%s\")\n", strMessage);
+ 
+ 	print(ColorTranslateRGB(strMessage));
+ }
+ 
+ // CSQC_Parse_CenterPrint : Provides the centerprint_hud string in the first parameter that the server provided.
+ void CSQC_Parse_CenterPrint(string strMessage)
+ {
+ 	if(autocvar_developer_csqcentities)
+ 		printf("CSQC_Parse_CenterPrint(\"%s\")\n", strMessage);
+ 
+ 	centerprint_hud(strMessage);
+ }
+ 
+ string notranslate_fogcmd1 = "\nfog ";
+ string notranslate_fogcmd2 = "\nr_fog_exp2 0\nr_drawfog 1\n";
+ void Fog_Force()
+ {
+ 	// TODO somehow thwart prvm_globalset client ...
+ 
+ 	if(autocvar_cl_orthoview && autocvar_cl_orthoview_nofog)
+ 		{ localcmd("\nr_drawfog 0\n"); }
+ 	else if(forcefog != "")
+ 		{ localcmd(strcat(notranslate_fogcmd1, forcefog, notranslate_fogcmd2)); }
+ }
+ 
+ void Gamemode_Init();
+ void Ent_ScoresInfo()
+ {
+     int i;
+ 	self.classname = "ent_client_scores_info";
+ 	gametype = ReadInt24_t();
+ 	HUD_ModIcons_SetFunc();
+ 	for(i = 0; i < MAX_SCORE; ++i)
+ 	{
+ 		if(scores_label[i])
+ 			strunzone(scores_label[i]);
+ 		scores_label[i] = strzone(ReadString());
+ 		scores_flags[i] = ReadByte();
+ 	}
+ 	for(i = 0; i < MAX_TEAMSCORE; ++i)
+ 	{
+ 		if(teamscores_label[i])
+ 			strunzone(teamscores_label[i]);
+ 		teamscores_label[i] = strzone(ReadString());
+ 		teamscores_flags[i] = ReadByte();
+ 	}
+ 	HUD_InitScores();
+ 	Gamemode_Init();
+ }
+ 
+ void Ent_Init()
+ {
+ 	self.classname = "ent_client_init";
+ 
+ 	nb_pb_period = ReadByte() / 32; //Accuracy of 1/32th
+ 
+ 	hook_shotorigin[0] = decompressShotOrigin(ReadInt24_t());
+ 	hook_shotorigin[1] = decompressShotOrigin(ReadInt24_t());
+ 	hook_shotorigin[2] = decompressShotOrigin(ReadInt24_t());
+ 	hook_shotorigin[3] = decompressShotOrigin(ReadInt24_t());
+ 	arc_shotorigin[0] = decompressShotOrigin(ReadInt24_t());
+ 	arc_shotorigin[1] = decompressShotOrigin(ReadInt24_t());
+ 	arc_shotorigin[2] = decompressShotOrigin(ReadInt24_t());
+ 	arc_shotorigin[3] = decompressShotOrigin(ReadInt24_t());
+ 
+ 	if(forcefog)
+ 		strunzone(forcefog);
+ 	forcefog = strzone(ReadString());
+ 
+ 	armorblockpercent = ReadByte() / 255.0;
+ 
+ 	g_balance_mortar_bouncefactor = ReadCoord();
+ 	g_balance_mortar_bouncestop = ReadCoord();
+ 	g_balance_electro_secondary_bouncefactor = ReadCoord();
+ 	g_balance_electro_secondary_bouncestop = ReadCoord();
+ 
+ 	vortex_scope = !ReadByte();
+ 	rifle_scope = !ReadByte();
+ 
+ 	serverflags = ReadByte();
+ 
+ 	minelayer_maxmines = ReadByte();
+ 
+ 	hagar_maxrockets = ReadByte();
+ 
+ 	g_trueaim_minrange = ReadCoord();
+ 	g_balance_porto_secondary = ReadByte();
+ 
+ 	if(!postinit)
+ 		PostInit();
+ }
+ 
+ void Net_ReadRace()
+ {
+ 	float b;
+ 
+ 	b = ReadByte();
+ 
+ 	switch(b)
+ 	{
+ 		case RACE_NET_CHECKPOINT_HIT_QUALIFYING:
+ 			race_checkpoint = ReadByte();
+ 			race_time = ReadInt24_t();
+ 			race_previousbesttime = ReadInt24_t();
+ 			if(race_previousbestname)
+ 				strunzone(race_previousbestname);
+ 			race_previousbestname = strzone(ColorTranslateRGB(ReadString()));
+ 
+ 			race_checkpointtime = time;
+ 
+ 			if(race_checkpoint == 0 || race_checkpoint == 254)
+ 			{
+ 				race_penaltyaccumulator = 0;
+ 				race_laptime = time; // valid
+ 			}
+ 
+ 			break;
+ 
+ 		case RACE_NET_CHECKPOINT_CLEAR:
+ 			race_laptime = 0;
+ 			race_checkpointtime = 0;
+ 			break;
+ 
+ 		case RACE_NET_CHECKPOINT_NEXT_SPEC_QUALIFYING:
+ 			race_laptime = ReadCoord();
+ 			race_checkpointtime = -99999;
+ 			// fall through
+ 		case RACE_NET_CHECKPOINT_NEXT_QUALIFYING:
+ 			race_nextcheckpoint = ReadByte();
+ 
+ 			race_nextbesttime = ReadInt24_t();
+ 			if(race_nextbestname)
+ 				strunzone(race_nextbestname);
+ 			race_nextbestname = strzone(ColorTranslateRGB(ReadString()));
+ 			break;
+ 
+ 		case RACE_NET_CHECKPOINT_HIT_RACE:
+ 			race_mycheckpoint = ReadByte();
+ 			race_mycheckpointtime = time;
+ 			race_mycheckpointdelta = ReadInt24_t();
+ 			race_mycheckpointlapsdelta = ReadByte();
+ 			if(race_mycheckpointlapsdelta >= 128)
+ 				race_mycheckpointlapsdelta -= 256;
+ 			if(race_mycheckpointenemy)
+ 				strunzone(race_mycheckpointenemy);
+ 			race_mycheckpointenemy = strzone(ColorTranslateRGB(ReadString()));
+ 			break;
+ 
+ 		case RACE_NET_CHECKPOINT_HIT_RACE_BY_OPPONENT:
+ 			race_othercheckpoint = ReadByte();
+ 			race_othercheckpointtime = time;
+ 			race_othercheckpointdelta = ReadInt24_t();
+ 			race_othercheckpointlapsdelta = ReadByte();
+ 			if(race_othercheckpointlapsdelta >= 128)
+ 				race_othercheckpointlapsdelta -= 256;
+ 			if(race_othercheckpointenemy)
+ 				strunzone(race_othercheckpointenemy);
+ 			race_othercheckpointenemy = strzone(ColorTranslateRGB(ReadString()));
+ 			break;
+ 
+ 		case RACE_NET_PENALTY_RACE:
+ 			race_penaltyeventtime = time;
+ 			race_penaltytime = ReadShort();
+ 			//race_penaltyaccumulator += race_penaltytime;
+ 			if(race_penaltyreason)
+ 				strunzone(race_penaltyreason);
+ 			race_penaltyreason = strzone(ReadString());
+ 			break;
+ 
+ 		case RACE_NET_PENALTY_QUALIFYING:
+ 			race_penaltyeventtime = time;
+ 			race_penaltytime = ReadShort();
+ 			race_penaltyaccumulator += race_penaltytime;
+ 			if(race_penaltyreason)
+ 				strunzone(race_penaltyreason);
+ 			race_penaltyreason = strzone(ReadString());
+ 			break;
+ 
+ 		case RACE_NET_SERVER_RECORD:
+ 			race_server_record = ReadInt24_t();
+ 			break;
+ 		case RACE_NET_SPEED_AWARD:
+ 			race_speedaward = ReadInt24_t();
+ 			if(race_speedaward_holder)
+ 				strunzone(race_speedaward_holder);
+ 			race_speedaward_holder = strzone(ReadString());
+ 			break;
+ 		case RACE_NET_SPEED_AWARD_BEST:
+ 			race_speedaward_alltimebest = ReadInt24_t();
+ 			if(race_speedaward_alltimebest_holder)
+ 				strunzone(race_speedaward_alltimebest_holder);
+ 			race_speedaward_alltimebest_holder = strzone(ReadString());
+ 			break;
+ 		case RACE_NET_SERVER_RANKINGS:
+ 			float prevpos, del;
+             int pos = ReadShort();
+ 			prevpos = ReadShort();
+ 			del = ReadShort();
+ 
+ 			// move other rankings out of the way
+             int i;
+ 			if (prevpos) {
+ 				for (i=prevpos-1;i>pos-1;--i) {
+ 					grecordtime[i] = grecordtime[i-1];
+ 					if(grecordholder[i])
+ 						strunzone(grecordholder[i]);
+ 					grecordholder[i] = strzone(grecordholder[i-1]);
+ 				}
+ 			} else if (del) { // a record has been deleted by the admin
+ 				for (i=pos-1; i<= RANKINGS_CNT-1; ++i) {
+ 					if (i == RANKINGS_CNT-1) { // clear out last record
+ 						grecordtime[i] = 0;
+ 						if (grecordholder[i])
+ 							strunzone(grecordholder[i]);
+ 						grecordholder[i] = string_null;
+ 					}
+ 					else {
+ 						grecordtime[i] = grecordtime[i+1];
+ 						if (grecordholder[i])
+ 							strunzone(grecordholder[i]);
+ 						grecordholder[i] = strzone(grecordholder[i+1]);
+ 					}
+ 				}
+ 			} else { // player has no ranked record yet
+ 				for (i=RANKINGS_CNT-1;i>pos-1;--i) {
+ 					grecordtime[i] = grecordtime[i-1];
+ 					if(grecordholder[i])
+ 						strunzone(grecordholder[i]);
+ 					grecordholder[i] = strzone(grecordholder[i-1]);
+ 				}
+ 			}
+ 
+ 			// store new ranking
+ 			if(grecordholder[pos-1] != "")
+ 				strunzone(grecordholder[pos-1]);
+ 			grecordholder[pos-1] = strzone(ReadString());
+ 			grecordtime[pos-1] = ReadInt24_t();
+ 			if(grecordholder[pos-1] == GetPlayerName(player_localnum))
+ 				race_myrank = pos;
+ 			break;
+ 		case RACE_NET_SERVER_STATUS:
+ 			race_status = ReadShort();
+ 			if(race_status_name)
+ 				strunzone(race_status_name);
+ 			race_status_name = strzone(ReadString());
+ 	}
+ }
+ 
+ void Net_TeamNagger()
+ {
+ 	teamnagger = 1;
+ }
+ 
+ void Net_ReadPingPLReport()
+ {
+ 	int e, pi, pl, ml;
+ 	e = ReadByte();
+ 	pi = ReadShort();
+ 	pl = ReadByte();
+ 	ml = ReadByte();
+ 	if (!(playerslots[e]))
+ 		return;
+ 	playerslots[e].ping = pi;
+ 	playerslots[e].ping_packetloss = pl / 255.0;
+ 	playerslots[e].ping_movementloss = ml / 255.0;
+ }
+ 
+ void Net_WeaponComplain()
+ {
+ 	complain_weapon = ReadByte();
+ 
+ 	if(complain_weapon_name)
+ 		strunzone(complain_weapon_name);
+ 	complain_weapon_name = strzone(WEP_NAME(complain_weapon));
+ 
+ 	complain_weapon_type = ReadByte();
+ 
+ 	complain_weapon_time = time;
+ 	weapontime = time; // ping the weapon panel
+ 
+ 	switch(complain_weapon_type)
+ 	{
+ 		case 0: Local_Notification(MSG_MULTI, ITEM_WEAPON_NOAMMO, complain_weapon); break;
+ 		case 1: Local_Notification(MSG_MULTI, ITEM_WEAPON_DONTHAVE, complain_weapon); break;
+ 		default: Local_Notification(MSG_MULTI, ITEM_WEAPON_UNAVAILABLE, complain_weapon); break;
+ 	}
+ }
+ 
+ // CSQC_Parse_TempEntity : Handles all temporary entity network data in the CSQC layer.
+ // You must ALWAYS first acquire the temporary ID, which is sent as a byte.
+ // Return value should be 1 if CSQC handled the temporary entity, otherwise return 0 to have the engine process the event.
+ float CSQC_Parse_TempEntity()
+ {
+ 	float bHandled;
+ 		bHandled  = true;
+ 	// Acquire TE ID
+ 	float nTEID;
+ 		nTEID = ReadByte();
+ 
+ 	if(autocvar_developer_csqcentities)
+ 		printf("CSQC_Parse_TempEntity() with nTEID=%d\n", nTEID);
+ 
+ 		// NOTE: Could just do return instead of break...
+ 	switch(nTEID)
+ 	{
+ 		case TE_CSQC_TARGET_MUSIC:
+ 			Net_TargetMusic();
+ 			bHandled = true;
+ 			break;
+ 		case TE_CSQC_PICTURE:
+ 			Net_MapVote_Picture();
+ 			bHandled = true;
+ 			break;
+ 		case TE_CSQC_RACE:
+ 			Net_ReadRace();
+ 			bHandled = true;
+ 			break;
+ 		case TE_CSQC_VORTEXBEAMPARTICLE:
+ 			Net_ReadVortexBeamParticle();
+ 			bHandled = true;
+ 			break;
+ 		case TE_CSQC_TEAMNAGGER:
+ 			Net_TeamNagger();
+ 			bHandled = true;
+ 			break;
+ 		case TE_CSQC_ARC:
+ 			Net_ReadArc();
+ 			bHandled = true;
+ 			break;
+ 		case TE_CSQC_PINGPLREPORT:
+ 			Net_ReadPingPLReport();
+ 			bHandled = true;
+ 			break;
+ 		case TE_CSQC_WEAPONCOMPLAIN:
+ 			Net_WeaponComplain();
+ 			bHandled = true;
+ 			break;
+ 		case TE_CSQC_VEHICLESETUP:
+ 			Net_VehicleSetup();
+ 			bHandled = true;
+ 			break;
+ 		case TE_CSQC_SVNOTICE:
+ 			cl_notice_read();
+ 			bHandled = true;
+ 			break;
+ 		case TE_CSQC_SHOCKWAVEPARTICLE:
+ 			Net_ReadShockwaveParticle();
+ 			bHandled = true;
+ 			break;
+ 		default:
+ 			// No special logic for this temporary entity; return 0 so the engine can handle it
+ 			bHandled = false;
+ 			break;
+ 	}
+ 
+ 	return bHandled;
+ }
+ 
+ string getcommandkey(string text, string command)
+ {
+ 	string keys;
+ 	float n, j, k, l = 0;
+ 
+ 	if (!autocvar_hud_showbinds)
+ 		return text;
+ 
+ 	keys = db_get(binddb, command);
+ 	if (keys == "")
+ 	{
+ 		n = tokenize(findkeysforcommand(command, 0)); // uses '...' strings
+ 		for(j = 0; j < n; ++j)
+ 		{
+ 			k = stof(argv(j));
+ 			if(k != -1)
+ 			{
+ 				if ("" == keys)
+ 					keys = keynumtostring(k);
+ 				else
+ 					keys = strcat(keys, ", ", keynumtostring(k));
+ 
+ 				++l;
+ 				if (autocvar_hud_showbinds_limit > 0 && autocvar_hud_showbinds_limit <= l)
+ 					break;
+ 			}
+ 
+ 		}
+ 		if (keys == "")
+ 			keys = "NO_KEY";
+ 		db_put(binddb, command, keys);
+ 	}
+ 
+ 	if (keys == "NO_KEY") {
+ 		if (autocvar_hud_showbinds > 1)
+ 			return sprintf(_("%s (not bound)"), text);
+ 		else
+ 			return text;
+ 	}
+ 	else if (autocvar_hud_showbinds > 1)
+ 		return sprintf("%s (%s)", text, keys);
+ 	else
+ 		return keys;
+ }
diff --cc qcsrc/client/target_music.qc
index 25cbcb3d1,662a673d7..988c2cb46
--- a/qcsrc/client/target_music.qc
+++ b/qcsrc/client/target_music.qc
@@@ -38,19 -33,13 +33,19 @@@ void TargetMusic_Advance(
  			else
  				e.state = 0;
  		}
 -		vol = e.state * e.volume * autocvar_bgmvolume;
 +		vol = e.state * e.volume * autocvar_musicvolume;
  		if(vol != vol0)
  		{
 -			if(vol0 < 0)
 +			if(e.noise == "")
 +#ifdef COMPAT_XON070_BGMVOLUME
 +				cvar_settemp("bgmvolume", ftos(vol));
 +#else
 +				cvar_set("bgmvolume", ftos(vol));
 +#endif
 +			else if(vol0 < 0)
- 				sound(e, CH_BGM_SINGLE, e.noise, vol, ATTN_NONE); // restart
+ 				sound(e, CH_BGM_SINGLE, e.noise, vol, ATTEN_NONE); // restart
  			else
- 				sound(e, CH_BGM_SINGLE, "", vol, ATTN_NONE);
+ 				sound(e, CH_BGM_SINGLE, "", vol, ATTEN_NONE);
  			e.lastvol = vol;
  		}
  	}
diff --cc qcsrc/client/target_music.qh
index 000000000,c685214be..ec052e853
mode 000000,100644..100644
--- a/qcsrc/client/target_music.qh
+++ b/qcsrc/client/target_music.qh
@@@ -1,0 -1,22 +1,20 @@@
+ #ifndef TARGET_MUSIC_H
+ #define TARGET_MUSIC_H
+ 
 -float music_disabled;
+ entity music_default;
+ entity music_target;
+ entity music_trigger;
 -// FIXME also control bgmvolume here, to not require a target_music for the default track.
+ 
+ .int state;
+ .float lastvol;
+ 
+ void TargetMusic_Advance();
+ 
+ void Net_TargetMusic();
+ 
+ void Ent_TriggerMusic_Think();
+ 
+ void Ent_TriggerMusic_Remove();
+ 
+ void Ent_ReadTriggerMusic();
+ #endif
diff --cc qcsrc/common/util-pre.qh
index 0a740b168,ed4ebcf06..111e13b77
--- a/qcsrc/common/util-pre.qh
+++ b/qcsrc/common/util-pre.qh
@@@ -1,24 -1,39 +1,40 @@@
- #ifdef FTEQCC
- #pragma flag enable subscope
- #pragma flag enable lo
+ #ifndef UTIL_PRE_H
+ #define UTIL_PRE_H
+ 
+ #ifndef NOCOMPAT
+     #define COMPAT_NO_MOD_IS_XONOTIC
++    #define COMPAT_XON070_BGMVOLUME
  #endif
  
- // FTEQCC can do this
- #define HAVE_YO_DAWG_CPP
+ #ifndef QCC_SUPPORT_ACCUMULATE
+     #ifdef GMQCC
+         #define QCC_SUPPORT_ACCUMULATE
+     #endif
+ #endif
  
- #ifndef NOCOMPAT
- //# define WORKAROUND_XON010
- //# define COMPAT_XON010_CHANNELS
- //# define COMPAT_XON050_ENGINE
- # define COMPAT_NO_MOD_IS_XONOTIC
- # define COMPAT_XON060_DONTCRASH_CHECKPVS
- # define COMPAT_XON070_BGMVOLUME
+ #ifndef QCC_SUPPORT_NIL
+     #ifdef GMQCC
+         #define QCC_SUPPORT_NIL
+     #endif
+ #endif
+ 
+ #ifndef QCC_SUPPORT_INT
+     #define int float
+ 
+     #define stoi(s) stof(s)
+     #define itos(s) ftos(s)
  #endif
  
- #ifdef FTEQCC
- #ifdef WATERMARK
- string FTEQCC_SUCKS_WATERMARKS_THROUGH_C60_FULLERENES = WATERMARK();
- #undef WATERMARK
- #define WATERMARK FTEQCC_SUCKS_WATERMARKS_THROUGH_C60_FULLERENES
+ #ifndef QCC_SUPPORT_BOOL
+     #define bool float
+ 
+     // Boolean Constants
+     const int true 	= 1;
+     const int false = 0;
  #endif
+ 
+ // Transitional aliases
+ [[deprecated("use true")]] [[alias("true")]] const bool TRUE;
+ [[deprecated("use false")]] [[alias("false")]] const bool FALSE;
+ 
  #endif
diff --cc qcsrc/menu/xonotic/dialog_settings_audio.qc
index 000000000,cccaa2652..e71bbd736
mode 000000,100644..100644
--- a/qcsrc/menu/xonotic/dialog_settings_audio.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_audio.qc
@@@ -1,0 -1,170 +1,172 @@@
+ #ifdef INTERFACE
+ CLASS(XonoticAudioSettingsTab) EXTENDS(XonoticTab)
+ 	METHOD(XonoticAudioSettingsTab, fill, void(entity))
+ 	ATTRIB(XonoticAudioSettingsTab, title, string, _("Audio"))
+ 	ATTRIB(XonoticAudioSettingsTab, intendedWidth, float, 0.9)
+ 	ATTRIB(XonoticAudioSettingsTab, rows, float, 15.5)
+ 	ATTRIB(XonoticAudioSettingsTab, columns, float, 6.2) // added extra .2 for center space
+ 	ATTRIB(XonoticAudioSettingsTab, hiddenMenuSoundsSlider, entity, NULL)
+ ENDCLASS(XonoticAudioSettingsTab)
+ entity makeXonoticAudioSettingsTab();
+ #endif
+ 
+ #ifdef IMPLEMENTATION
+ entity makeXonoticAudioSettingsTab()
+ {
+ 	entity me;
+ 	me = spawnXonoticAudioSettingsTab();
+ 	me.configureDialog(me);
+ 	return me;
+ }
+ 
+ void XonoticAudioSettingsTab_fill(entity me)
+ {
+ 	entity e, s;
+ 
+ 	me.TR(me);
+ 		s = makeXonoticDecibelsSlider(-40, 0, 0.4, "mastervolume");
+ 		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Master:")));
+ 		me.TD(me, 1, 2, s);
+ 	me.TR(me);
+ 		me.TDempty(me, 0.2);
 -		s = makeXonoticDecibelsSlider(-40, 0, 0.4, "bgmvolume");
 -		makeMulti(s, "snd_channel8volume");
++		s = makeXonoticDecibelsSlider(-40, 0, 0.4, "musicvolume");
++#ifdef COMPAT_XON070_BGMVOLUME
++		makeMulti(s, "bgmvolume");
++#endif
+ 		me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Music:")));
+ 		me.TD(me, 1, 2, s);
+ 		setDependentStringNotEqual(e, "mastervolume", "0");
+ 		setDependentStringNotEqual(s, "mastervolume", "0");
+ 	me.TR(me);
+ 		me.TDempty(me, 0.2);
+ 		s = makeXonoticDecibelsSlider(-40, 0, 0.4, "snd_staticvolume");
+ 		makeMulti(s, "snd_channel9volume");
+ 		me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, ZCTX(_("VOL^Ambient:"))));
+ 		me.TD(me, 1, 2, s);
+ 		setDependentStringNotEqual(e, "mastervolume", "0");
+ 		setDependentStringNotEqual(s, "mastervolume", "0");
+ 	me.TR(me);
+ 		me.TDempty(me, 0.2);
+ 		s = makeXonoticDecibelsSlider(-40, 0, 0.4, "snd_channel0volume");
+ 		me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Info:")));
+ 		me.TD(me, 1, 2, s);
+ 		setDependentStringNotEqual(e, "mastervolume", "0");
+ 		setDependentStringNotEqual(s, "mastervolume", "0");
+ 	me.TR(me);
+ 		me.TDempty(me, 0.2);
+ 		s = makeXonoticDecibelsSlider(-40, 0, 0.4, "snd_channel3volume");
+ 		me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Items:")));
+ 		me.TD(me, 1, 2, s);
+ 		setDependentStringNotEqual(e, "mastervolume", "0");
+ 		setDependentStringNotEqual(s, "mastervolume", "0");
+ 	me.TR(me);
+ 		me.TDempty(me, 0.2);
+ 		s = makeXonoticDecibelsSlider(-40, 0, 0.4, "snd_channel6volume");
+ 		me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Pain:")));
+ 		me.TD(me, 1, 2, s);
+ 		setDependentStringNotEqual(e, "mastervolume", "0");
+ 		setDependentStringNotEqual(s, "mastervolume", "0");
+ 	me.TR(me);
+ 		me.TDempty(me, 0.2);
+ 		s = makeXonoticDecibelsSlider(-40, 0, 0.4, "snd_channel7volume");
+ 		me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Player:")));
+ 		me.TD(me, 1, 2, s);
+ 		setDependentStringNotEqual(e, "mastervolume", "0");
+ 		setDependentStringNotEqual(s, "mastervolume", "0");
+ 	me.TR(me);
+ 		me.TDempty(me, 0.2);
+ 		s = makeXonoticDecibelsSlider(-40, 0, 0.4, "snd_channel4volume");
+ 		me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Shots:")));
+ 		me.TD(me, 1, 2, s);
+ 		setDependentStringNotEqual(e, "mastervolume", "0");
+ 		setDependentStringNotEqual(s, "mastervolume", "0");
+ 	me.TR(me);
+ 		me.TDempty(me, 0.2);
+ 		s = makeXonoticDecibelsSlider(-40, 0, 0.4, "snd_channel2volume");
+ 		me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Voice:")));
+ 		me.TD(me, 1, 2, s);
+ 		setDependentStringNotEqual(e, "mastervolume", "0");
+ 		setDependentStringNotEqual(s, "mastervolume", "0");
+ 	me.TR(me);
+ 		me.TDempty(me, 0.2);
+ 		s = makeXonoticDecibelsSlider(-40, 0, 0.4, "snd_channel1volume");
+ 		makeMulti(s, "snd_channel5volume"); // @!#%'n Tuba
+ 		me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Weapons:")));
+ 		me.TD(me, 1, 2, s);
+ 		setDependentStringNotEqual(e, "mastervolume", "0");
+ 		setDependentStringNotEqual(s, "mastervolume", "0");
+ 	me.TR(me);
+ 	me.TR(me);
+ 		me.TD(me, 1, 3, makeXonoticCheckBox(0, "menu_snd_attenuation_method", _("New style sound attenuation")));
+ 	me.TR(me);
+ 		me.TD(me, 1, 3, makeXonoticCheckBox(0, "snd_mutewhenidle", _("Mute sounds when not active")));
+ 
+ 	me.gotoRC(me, 0, 3.2); me.setFirstColumn(me, me.currentColumn);
+ 		me.TD(me, 1, 1, makeXonoticTextLabel(0, _("Frequency:")));
+ 		me.TD(me, 1, 2, e = makeXonoticTextSlider("snd_speed"));
+ 			e.addValue(e, _("8 kHz"), "8000");
+ 			e.addValue(e, _("11.025 kHz"), "11025");
+ 			e.addValue(e, _("16 kHz"), "16000");
+ 			e.addValue(e, _("22.05 kHz"), "22050");
+ 			e.addValue(e, _("24 kHz"), "24000");
+ 			e.addValue(e, _("32 kHz"), "32000");
+ 			e.addValue(e, _("44.1 kHz"), "44100");
+ 			e.addValue(e, _("48 kHz"), "48000");
+ 			e.configureXonoticTextSliderValues(e);
+ 	me.TR(me);
+ 		me.TD(me, 1, 1, makeXonoticTextLabel(0, _("Channels:")));
+ 		me.TD(me, 1, 2, e = makeXonoticTextSlider("snd_channels"));
+ 			e.addValue(e, _("Mono"), "1");
+ 			e.addValue(e, _("Stereo"), "2");
+ 			e.addValue(e, _("2.1"), "3");
+ 			e.addValue(e, _("4"), "4");
+ 			e.addValue(e, _("5"), "5");
+ 			e.addValue(e, _("5.1"), "6");
+ 			e.addValue(e, _("6.1"), "7");
+ 			e.addValue(e, _("7.1"), "8");
+ 			e.configureXonoticTextSliderValues(e);
+ 	me.TR(me);
+ 	me.TR(me);
+ 		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "snd_swapstereo", _("Swap stereo output channels")));
+ 		setDependent(e, "snd_channels", 1.5, 0.5);
+ 	me.TR(me);
+ 		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "snd_spatialization_control", _("Headphone friendly mode")));
+ 		setDependent(e, "snd_channels", 1.5, 0.5);
+ 	me.TR(me);
+ 	me.TR(me);
+ 		me.TD(me, 1, 3, makeXonoticCheckBox(0, "cl_hitsound", _("Hit indication sound")));
+ 		e.sendCvars = true;
+ 	me.TR(me);
+ 		me.TD(me, 1, 3, makeXonoticCheckBox(0, "con_chatsound", _("Chat message sound")));
+ 	me.TR(me);
+ 		me.hiddenMenuSoundsSlider = makeXonoticSlider(1, 1, 1, "menu_sounds");
+ 		me.TD(me, 1, 1.2, makeXonoticSliderCheckBox(0, 1, me.hiddenMenuSoundsSlider, _("Menu sounds")));
+ 		me.TD(me, 1, 1.8, e = makeXonoticSliderCheckBox(2, 0, me.hiddenMenuSoundsSlider, _("Focus sounds")));
+ 		setDependent(e, "menu_sounds", 1, 2);
+ 	me.TR(me);
+ 	me.TR(me);
+ 		me.TD(me, 1, 1, makeXonoticTextLabel(0, _("Time announcer:")));
+ 		me.TD(me, 1, 2, e = makeXonoticTextSlider("cl_announcer_maptime"));
+ 			e.addValue(e, ZCTX(_("WRN^Disabled")), "0");
+ 			e.addValue(e, _("1 minute"), "1");
+ 			e.addValue(e, _("5 minutes"), "2");
+ 			e.addValue(e, ZCTX(_("WRN^Both")), "3");
+ 			e.configureXonoticTextSliderValues(e);
+ 	me.TR(me);
+ 		me.TD(me, 1, 1, makeXonoticTextLabel(0, _("Automatic taunts:")));
+ 		me.TD(me, 1, 2, e = makeXonoticTextSlider("cl_autotaunt"));
+ 			e.addValue(e, _("Never"), "0");
+ 			e.addValue(e, _("Sometimes"), "0.35");
+ 			e.addValue(e, _("Often"), "0.65");
+ 			e.addValue(e, _("Always"), "1");
+ 			e.configureXonoticTextSliderValues(e);
+ 			e.sendCvars = true;
+ 	me.TR(me);
+ 	me.TR(me);
+ 		if(cvar("developer"))
+ 			me.TD(me, 1, 3, makeXonoticCheckBox(0, "showsound", _("Debug info about sounds")));
+ 
+ 	me.gotoRC(me, me.rows - 1, 0);
+ 		me.TD(me, 1, me.columns, makeXonoticCommandButton(_("Apply immediately"), '0 0 0', "snd_restart; snd_attenuation_method_${menu_snd_attenuation_method}", COMMANDBUTTON_APPLY));
+ }
+ #endif