diff --git a/src/game/World.cpp b/src/game/World.cpp index 953a214f4..22ae03fc9 100644 --- a/src/game/World.cpp +++ b/src/game/World.cpp @@ -857,6 +857,8 @@ void World::LoadConfigSettings(bool reload) m_configs[CONFIG_SAVE_RESPAWN_TIME_IMMEDIATLY] = sConfig.GetBoolDefault("SaveRespawnTimeImmediately",true); m_configs[CONFIG_WEATHER] = sConfig.GetBoolDefault("ActivateWeather",true); + m_configs[CONFIG_DISABLE_BREATHING] = sConfig.GetIntDefault("DisableWaterBreath", SEC_CONSOLE); + m_configs[CONFIG_ALWAYS_MAX_SKILL_FOR_LEVEL] = sConfig.GetBoolDefault("AlwaysMaxSkillForLevel", false); if(reload) diff --git a/src/mangosd/mangosd.conf.dist.in b/src/mangosd/mangosd.conf.dist.in index 8ad5c451a..0534b3391 100644 --- a/src/mangosd/mangosd.conf.dist.in +++ b/src/mangosd/mangosd.conf.dist.in @@ -470,6 +470,10 @@ LogColors = "" # Enable or disable instant logout for security level (0..4) or high (NOT in combat/while dueling/while falling) # Default: 1 (Mods/GMs/Admins) # +# DisableWaterBreath +# Disable/enable waterbreathing for security level (0..4) or high +# Default: 4 (None) +# # AllFlightPaths # Players will start with all flight paths (Note: ALL flight paths, not only player's team) # Default: 0 (true) @@ -590,6 +594,7 @@ StartHonorPoints = 0 MaxArenaPoints = 5000 StartArenaPoints = 0 InstantLogout = 1 +DisableWaterBreath = 4 AllFlightPaths = 0 AlwaysMaxSkillForLevel = 0 ActivateWeather = 1 diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 9885cc80b..3b37940bf 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "7603" + #define REVISION_NR "7604" #endif // __REVISION_NR_H__