mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-15 19:37:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[9398] Some config enmus fixes.

Browse source
This commit is contained in:
VladimirMangos 2010-02-16 16:06:45 +03:00
parent f9db93e78b
commit d20e50a8e5
4 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/game/Player.cpp
View file

@ -4244,7 +4244,7 @@ void Player::ResurrectPlayer(float restore_percent, bool applySickness)
//Characters from level 11-19 will suffer from one minute of sickness
//for each level they are above 10.
//Characters level 20 and up suffer from ten minutes of sickness.
int32 startLevel = sWorld.getConfig(CONFIG_UINT32_DEATH_SICKNESS_LEVEL);
int32 startLevel = sWorld.getConfig(CONFIG_INT32_DEATH_SICKNESS_LEVEL);
if(int32(getLevel()) >= startLevel)
{

2
src/game/World.cpp
View file

@ -950,7 +950,7 @@ void World::LoadConfigSettings(bool reload)
m_configUint32Values[CONFIG_UINT32_CORPSE_DECAY_RAREELITE] = sConfig.GetIntDefault("Corpse.Decay.RAREELITE", 300);
m_configUint32Values[CONFIG_UINT32_CORPSE_DECAY_WORLDBOSS] = sConfig.GetIntDefault("Corpse.Decay.WORLDBOSS", 3600);
m_configUint32Values[CONFIG_UINT32_DEATH_SICKNESS_LEVEL] = sConfig.GetIntDefault ("Death.SicknessLevel", 11);
m_configInt32Values[CONFIG_INT32_DEATH_SICKNESS_LEVEL] = sConfig.GetIntDefault ("Death.SicknessLevel", 11);
m_configBoolValues[CONFIG_BOOL_DEATH_CORPSE_RECLAIM_DELAY_PVP] = sConfig.GetBoolDefault("Death.CorpseReclaimDelay.PvP", true);
m_configBoolValues[CONFIG_BOOL_DEATH_CORPSE_RECLAIM_DELAY_PVE] = sConfig.GetBoolDefault("Death.CorpseReclaimDelay.PvE", true);

5
src/game/World.h
View file

@ -155,7 +155,6 @@ enum eConfigUint32Values
CONFIG_UINT32_CORPSE_DECAY_ELITE,
CONFIG_UINT32_CORPSE_DECAY_RAREELITE,
CONFIG_UINT32_CORPSE_DECAY_WORLDBOSS,
CONFIG_UINT32_DEATH_SICKNESS_LEVEL,
CONFIG_UINT32_THREAT_RADIUS,
CONFIG_UINT32_INSTANT_LOGOUT,
CONFIG_UINT32_BATTLEGROUND_INVITATION_TYPE,
@ -180,7 +179,8 @@ enum eConfigUint32Values
/// Configuration elements
enum eConfigInt32Values
{
CONFIG_INT32_VALUE_COUNT = 1
CONFIG_INT32_DEATH_SICKNESS_LEVEL = 0,
CONFIG_INT32_VALUE_COUNT
};
/// Server config
@ -299,7 +299,6 @@ enum eConfigBoolValues
CONFIG_BOOL_BATTLEGROUND_QUEUE_ANNOUNCER_ENABLE,
CONFIG_BOOL_BATTLEGROUND_QUEUE_ANNOUNCER_PLAYERONLY,
CONFIG_BOOL_ARENA_AUTO_DISTRIBUTE_POINTS,
CONFIG_BOOL_ARENA_AUTO_DISTRIBUTE_INTERVAL_DAYS,
CONFIG_BOOL_ARENA_QUEUE_ANNOUNCER_ENABLE,
CONFIG_BOOL_VALUE_COUNT
};

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
#define REVISION_NR "9397"
#define REVISION_NR "9398"
#endif // __REVISION_NR_H__