Просмотр исходного кода

Renamed NoMineEffect mapflag to ForceMinEffect to clarify it's behavior (#6940)

Daegaladh 3 лет назад
Родитель
Сommit
2bb740115e
5 измененных файлов с 8 добавлено и 8 удалено
  1. 2 3
      doc/mapflags.txt
  2. 2 2
      src/map/atcommand.cpp
  3. 1 1
      src/map/clif.cpp
  4. 1 1
      src/map/map.hpp
  5. 2 1
      src/map/script_constants.hpp

+ 2 - 3
doc/mapflags.txt

@@ -226,10 +226,9 @@ Disables Star Gladiator's "Solar, Lunar, and Stellar Miracle" from occurring on
 
 ---------------------------------------
 
-*nomineeffect
+*forcemineffect
 
-Disables mine effects on a map.
-[More information needed.]
+Forces simpler skill effects, just like the command /mineffect.
 
 ---------------------------------------
 

+ 2 - 2
src/map/atcommand.cpp

@@ -4515,8 +4515,8 @@ ACMD_FUNC(mapinfo) {
 		strcat(atcmd_output, " NoItemConsumption |");
 	if (map_getmapflag(m_id, MF_NOSUNMOONSTARMIRACLE))
 		strcat(atcmd_output, " NoSunMoonStarMiracle |");
-	if (map_getmapflag(m_id, MF_NOMINEEFFECT))
-		strcat(atcmd_output, " NoMineEffect |");
+	if (map_getmapflag(m_id, MF_FORCEMINEFFECT))
+		strcat(atcmd_output, " ForceMinEffect |");
 	if (map_getmapflag(m_id, MF_NOLOCKON))
 		strcat(atcmd_output, " NoLockOn |");
 	if (map_getmapflag(m_id, MF_NOTOMB))

+ 1 - 1
src/map/clif.cpp

@@ -6810,7 +6810,7 @@ void clif_map_property(struct block_list *bl, enum map_property property, enum s
 	WBUFL(buf,4) = ((mapdata->flag[MF_PVP] || (sd && sd->duel_group > 0))<<0)| // PARTY - Show attack cursor on non-party members (PvP)
 		((mapdata->flag[MF_BATTLEGROUND] || mapdata_flag_gvg2(mapdata))<<1)|// GUILD - Show attack cursor on non-guild members (GvG)
 		((mapdata->flag[MF_BATTLEGROUND] || mapdata_flag_gvg2(mapdata))<<2)|// SIEGE - Show emblem over characters heads when in GvG (WoE castle)
-		((mapdata->flag[MF_NOMINEEFFECT] || mapdata_flag_gvg2(mapdata))<<3)| // USE_SIMPLE_EFFECT - Automatically enable /mineffect
+		((mapdata->flag[MF_FORCEMINEFFECT] || mapdata_flag_gvg2(mapdata))<<3)| // USE_SIMPLE_EFFECT - Forces simpler skill effects, like /mineffect command
 		((mapdata->flag[MF_NOLOCKON] || mapdata_flag_vs(mapdata) || (sd && sd->duel_group > 0))<<4)| // DISABLE_LOCKON - Only allow attacks on other players with shift key or /ns active
 		((mapdata->flag[MF_PVP])<<5)| // COUNT_PK - Show the PvP counter
 		((mapdata->flag[MF_PARTYLOCK])<<6)| // NO_PARTY_FORMATION - Prevents party creation/modification (Might be used for instance dungeons)

+ 1 - 1
src/map/map.hpp

@@ -631,7 +631,7 @@ enum e_mapflag : int16 {
 	MF_NOUSECART,
 	MF_NOITEMCONSUMPTION,
 	MF_NOSUNMOONSTARMIRACLE,
-	MF_NOMINEEFFECT,
+	MF_FORCEMINEFFECT,
 	MF_NOLOCKON,
 	MF_NOTOMB,
 	MF_SKILL_DAMAGE,	//60

+ 2 - 1
src/map/script_constants.hpp

@@ -516,7 +516,8 @@
 	export_constant(MF_NOITEMCONSUMPTION);
 	export_constant(MF_NOSUNMOONSTARMIRACLE);
 	export_deprecated_constant3("mf_sumstarmiracle", MF_NOSUNMOONSTARMIRACLE, "MF_NOSUNMOONSTARMIRACLE");
-	export_constant(MF_NOMINEEFFECT);
+	export_constant(MF_FORCEMINEFFECT);
+	export_deprecated_constant3("mf_nomineeffect", MF_FORCEMINEFFECT, "MF_FORCEMINEFFECT");
 	export_constant(MF_NOLOCKON);
 	export_constant(MF_NOTOMB);
 	export_constant(MF_SKILL_DAMAGE);