Merge branch 'b-2.5'

Author: rtxa

valve/addons/amxmodx/data/lang/agmodxctf.txt renamed to valve/addons/amxmodx/data/lang/agmodx_ctf.txt

@@ -1183,9 +1183,23 @@ public FwVoiceSetClientListening(receiver, sender, bool:listen) {
 	if (receiver == sender)
 		return FMRES_IGNORED;
 
-	if (gVersusStarted && !get_pcvar_num(gCvarSpecTalk) && hl_get_user_spectator(sender) && !hl_get_user_spectator(receiver)) {
-		engfunc(EngFunc_SetClientListening, receiver, sender, false);
-		return FMRES_SUPERCEDE;
+	if (!is_user_connected(receiver) || !is_user_connected(sender))
+		return FMRES_IGNORED;
+
+	if (gVersusStarted) {
+		// Don't allow players who are not in the match to hear players in a match even if ag_spectalk is enabled
+		if (RestoreScore_FindPlayer(sender) && !RestoreScore_FindPlayer(receiver)) {
+			engfunc(EngFunc_SetClientListening, receiver, sender, false);
+			return FMRES_SUPERCEDE;
+		}
+
+		if (!get_pcvar_num(gCvarSpecTalk)) {
+			// Don't allow players who are not in the match to speak to players in a match
+			if (!RestoreScore_FindPlayer(sender) && RestoreScore_FindPlayer(receiver)) {
+				engfunc(EngFunc_SetClientListening, receiver, sender, false);
+				return FMRES_SUPERCEDE;
+			}
+		}
 	}
 
 	return FMRES_IGNORED;
@@ -1195,10 +1209,26 @@ public FwVoiceSetClientListening(receiver, sender, bool:listen) {
 * Location System
 */
 public LoadLocations() {
-	new map[32];
-	get_mapname(map, charsmax(map));
+	new mapFile[64];
 
-	new handle = fopen(fmt("locs/%s.loc", map), "r");
+	// because fopen is case sensitive, we need to find the .loc file and use his exact name
+	// otherwise, files like HAVOC.LOC or HaVoC.LoC will not be read
+	{
+		new mapName[32];
+		get_mapname(mapName, charsmax(mapName));
+
+		new file[64];
+		new handleDir = open_dir("locs", file, charsmax(file));
+		do {
+			if (equali(file, fmt("%s.loc", mapName))) {
+				formatex(mapFile, charsmax(mapFile), "locs/%s", file);
+				break;
+			}
+		} while (next_file(handleDir, file, charsmax(file)));
+		close_dir(handleDir);
+	}
+
+	new handle = fopen(mapFile, "r");
 
 	if (!handle)
 		return false;
@@ -1238,6 +1268,8 @@ public LoadLocations() {
 		}
 	}
 
+	fclose(handle);
+
 	return true;
 }
 
@@ -2793,7 +2825,7 @@ SetPlayerEquipment(id) {
 	}
 
 	if (get_pcvar_bool(gCvarStartLongJump)) {
-			give_item(id, "item_longjump");
+		hl_set_user_longjump(id, true);
 	}
 
 	ResetBpAmmo(id);

valve/addons/amxmodx/scripting/agmodx.sma

@@ -51,10 +51,32 @@ public CmdDrop() {
 
 public OnPlayerKilled_Pre(victim, attacker) {
 	if (is_user_alive(attacker)) {
-		set_user_health(attacker, get_pcvar_num(gCvarStartHealth));
-		set_user_armor(attacker, get_pcvar_num(gCvarStartArmor));
-		ResetBpAmmo(attacker);
-		ResetWeaponClip(attacker);
+		RestorePlayer(attacker); // restore attacker HP/AP and weapons after frag
+	}
+}
+
+RestorePlayer(id) {
+	set_user_health(id, get_pcvar_num(gCvarStartHealth));
+	set_user_armor(id, get_pcvar_num(gCvarStartArmor));
+
+	RestoreWeapons(id);
+	ResetBpAmmo(id);
+	ResetWeaponClip(id);
+}
+
+RestoreWeapons(id) {
+	// these weapons need to be restored in case they have gone from player's inventory 
+	if (!hl_user_has_weapon(id, HLW_SATCHEL) && get_pcvar_num(gCvarStartWeapons[START_SATCHEL])) {
+		give_item(id, "weapon_satchel");
+	}
+	if (!hl_user_has_weapon(id, HLW_HANDGRENADE) && get_pcvar_num(gCvarStartWeapons[START_HGRENADE])) {
+		give_item(id, "weapon_handgrenade");
+	}
+	if (!hl_user_has_weapon(id, HLW_SNARK) && get_pcvar_num(gCvarStartWeapons[START_SNARK])) {
+		give_item(id, "weapon_snark");
+	}
+	if (!hl_user_has_weapon(id, HLW_TRIPMINE) && get_pcvar_num(gCvarStartWeapons[START_TRIPMINE])) {
+		give_item(id, "weapon_tripmine");
 	}
 }
 

valve/addons/amxmodx/scripting/agmodx_arcade.sma

@@ -214,7 +214,7 @@ ParseEntFromFile(const input[], ent_name[], len, Float:ent_origin[3], Float:ent_
 }
 
 public plugin_init() {
-	register_dictionary("agmodxctf.txt");
+	register_dictionary("agmodx_ctf.txt");
 
 	// load always ctf map config file
 	new bool:result = LoadCtfMapFile();

valve/addons/amxmodx/scripting/agmodx_ctf.sma

@@ -74,7 +74,7 @@ stock ResetChargers() {
 			} else if (equal(classname, "func_healthcharger")) {
 				set_pev(i, pev_frame, 0);
 				set_pev(i, pev_nextthink, 0);
-				set_ent_data(i, "CWallHealth", "m_iJuice", 75);
+				set_ent_data(i, "CWallHealth", "m_iJuice", get_skill_cvar_num("sk_healthcharger"));
 			}
 		}
 	}
@@ -278,3 +278,15 @@ stock CountSpecs() {
 	}
 	return numSpecs;
 }
+
+stock get_skill_cvar_string(const name[], output[], len) {
+	new skill = clamp(get_cvar_num("skill"), 1, 3);
+	get_cvar_string(fmt("%s%d", name, skill), output, len);
+}
+
+
+stock get_skill_cvar_num(const name[]) {
+	new value[32];
+	get_skill_cvar_string(name, value, charsmax(value));
+	return str_to_num(value);
+}