mirror of
https://github.com/EQEmu/Server.git
synced 2026-05-17 03:08:26 +00:00
Merge branch 'master' into feature/global-base-scaling
This commit is contained in:
+10
-1
@@ -263,6 +263,16 @@ Client::Client(EQStreamInterface* ieqs)
|
||||
PendingSacrifice = false;
|
||||
controlling_boat_id = 0;
|
||||
|
||||
if (!RuleB(Character, PerCharacterQglobalMaxLevel) && !RuleB(Character, PerCharacterBucketMaxLevel)) {
|
||||
SetClientMaxLevel(0);
|
||||
} else if (RuleB(Character, PerCharacterQglobalMaxLevel)) {
|
||||
int client_max_level = GetCharMaxLevelFromQGlobal();
|
||||
SetClientMaxLevel(client_max_level);
|
||||
} else if (RuleB(Character, PerCharacterBucketMaxLevel)) {
|
||||
int client_max_level = GetCharMaxLevelFromBucket();
|
||||
SetClientMaxLevel(client_max_level);
|
||||
}
|
||||
|
||||
KarmaUpdateTimer = new Timer(RuleI(Chat, KarmaUpdateIntervalMS));
|
||||
GlobalChatLimiterTimer = new Timer(RuleI(Chat, IntervalDurationMS));
|
||||
AttemptedMessages = 0;
|
||||
@@ -1971,7 +1981,6 @@ void Client::FillSpawnStruct(NewSpawn_Struct* ns, Mob* ForWho)
|
||||
// ns->spawn.pvp = GetPVP(false) ? 1 : 0;
|
||||
ns->spawn.show_name = true;
|
||||
|
||||
|
||||
strcpy(ns->spawn.title, m_pp.title);
|
||||
strcpy(ns->spawn.suffix, m_pp.suffix);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user