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

[10575] Fix world states related to arena season.

Browse source 
Replace the "in progress" option in config (as no such thing exist) with the expected "previous arena season id".

Signed-off-by: NoFantasy <nofantasy@nf.no>
This commit is contained in:
NoFantasy 2010-10-02 11:28:20 +02:00
parent fa8f9ad522
commit bc2f2916e9
5 changed files with 11 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/game/Player.cpp
View file

@ -8409,12 +8409,10 @@ void Player::SendInitWorldStates(uint32 zoneid, uint32 areaid)
FillInitialWorldState(data, count, 0x8d5, 0x0); // 2261 4 FillInitialWorldState(data, count, 0x8d5, 0x0); // 2261 4
FillInitialWorldState(data, count, 0x8d4, 0x0); // 2260 5 FillInitialWorldState(data, count, 0x8d4, 0x0); // 2260 5
FillInitialWorldState(data, count, 0x8d3, 0x0); // 2259 6 FillInitialWorldState(data, count, 0x8d3, 0x0); // 2259 6
// 3191 7 1 - Arena season in progress, 0 - end of season // 3191 7 Current arena season
// Expected value=8 for this state, not bool 0/1 (as of sept 2010) FillInitialWorldState(data, count, 0xC77, sWorld.getConfig(CONFIG_UINT32_ARENA_SEASON_ID));
FillInitialWorldState(data, count, 0xC77, sWorld.getConfig(CONFIG_BOOL_ARENA_SEASON_IN_PROGRESS)); // 3901 8 Previous arena season
// 3901 8 Arena season id FillInitialWorldState(data, count, 0xF3D, sWorld.getConfig(CONFIG_UINT32_ARENA_SEASON_PREVIOUS_ID));
// Expected value=7 for this state (as of sept 2010)
FillInitialWorldState(data, count, 0xF3D, sWorld.getConfig(CONFIG_UINT32_ARENA_SEASON_ID));
if(mapid == 530) // Outland if(mapid == 530) // Outland
{ {

2
src/game/World.cpp
View file

@ -729,7 +729,7 @@ void World::LoadConfigSettings(bool reload)
setConfig(CONFIG_BOOL_ARENA_QUEUE_ANNOUNCER_JOIN, "Arena.QueueAnnouncer.Join", false); setConfig(CONFIG_BOOL_ARENA_QUEUE_ANNOUNCER_JOIN, "Arena.QueueAnnouncer.Join", false);
setConfig(CONFIG_BOOL_ARENA_QUEUE_ANNOUNCER_EXIT, "Arena.QueueAnnouncer.Exit", false); setConfig(CONFIG_BOOL_ARENA_QUEUE_ANNOUNCER_EXIT, "Arena.QueueAnnouncer.Exit", false);
setConfig(CONFIG_UINT32_ARENA_SEASON_ID, "Arena.ArenaSeason.ID", 1); setConfig(CONFIG_UINT32_ARENA_SEASON_ID, "Arena.ArenaSeason.ID", 1);
setConfig(CONFIG_BOOL_ARENA_SEASON_IN_PROGRESS, "Arena.ArenaSeason.InProgress", true); setConfig(CONFIG_UINT32_ARENA_SEASON_PREVIOUS_ID, "Arena.ArenaSeasonPrevious.ID", 0);
setConfigMin(CONFIG_INT32_ARENA_STARTRATING, "Arena.StartRating", -1, -1); setConfigMin(CONFIG_INT32_ARENA_STARTRATING, "Arena.StartRating", -1, -1);
setConfigMin(CONFIG_INT32_ARENA_STARTPERSONALRATING, "Arena.StartPersonalRating", -1, -1); setConfigMin(CONFIG_INT32_ARENA_STARTPERSONALRATING, "Arena.StartPersonalRating", -1, -1);

2
src/game/World.h
View file

@ -169,6 +169,7 @@ enum eConfigUInt32Values
CONFIG_UINT32_ARENA_RATING_DISCARD_TIMER, CONFIG_UINT32_ARENA_RATING_DISCARD_TIMER,
CONFIG_UINT32_ARENA_AUTO_DISTRIBUTE_INTERVAL_DAYS, CONFIG_UINT32_ARENA_AUTO_DISTRIBUTE_INTERVAL_DAYS,
CONFIG_UINT32_ARENA_SEASON_ID, CONFIG_UINT32_ARENA_SEASON_ID,
CONFIG_UINT32_ARENA_SEASON_PREVIOUS_ID,
CONFIG_UINT32_CLIENTCACHE_VERSION, CONFIG_UINT32_CLIENTCACHE_VERSION,
CONFIG_UINT32_GUILD_EVENT_LOG_COUNT, CONFIG_UINT32_GUILD_EVENT_LOG_COUNT,
CONFIG_UINT32_GUILD_BANK_EVENT_LOG_COUNT, CONFIG_UINT32_GUILD_BANK_EVENT_LOG_COUNT,
@ -273,7 +274,6 @@ enum eConfigBoolValues
CONFIG_BOOL_GRID_UNLOAD = 0, CONFIG_BOOL_GRID_UNLOAD = 0,
CONFIG_BOOL_SAVE_RESPAWN_TIME_IMMEDIATLY, CONFIG_BOOL_SAVE_RESPAWN_TIME_IMMEDIATLY,
CONFIG_BOOL_OFFHAND_CHECK_AT_TALENTS_RESET, CONFIG_BOOL_OFFHAND_CHECK_AT_TALENTS_RESET,
CONFIG_BOOL_ARENA_SEASON_IN_PROGRESS,
CONFIG_BOOL_ALLOW_TWO_SIDE_ACCOUNTS, CONFIG_BOOL_ALLOW_TWO_SIDE_ACCOUNTS,
CONFIG_BOOL_ALLOW_TWO_SIDE_INTERACTION_CHAT, CONFIG_BOOL_ALLOW_TWO_SIDE_INTERACTION_CHAT,
CONFIG_BOOL_ALLOW_TWO_SIDE_INTERACTION_CHANNEL, CONFIG_BOOL_ALLOW_TWO_SIDE_INTERACTION_CHANNEL,

9
src/mangosd/mangosd.conf.dist.in
View file

@ -1414,10 +1414,9 @@ BattleGround.PremadeGroupWaitForMatch = 1800000
# Current area season id show in client # Current area season id show in client
# Default: 1 # Default: 1
# #
# Arena.ArenaSeason.InProgress # Arena.ArenaSeasonPrevious.ID
# Current area season state # Previous area season id show in client
# Default: 1 (active) # Default: 0
# 0 (finished)
# #
# Arena.StartRating # Arena.StartRating
# Default Rating at team creation # Default Rating at team creation
@ -1436,7 +1435,7 @@ Arena.AutoDistributeInterval = 7
Arena.QueueAnnouncer.Join = 0 Arena.QueueAnnouncer.Join = 0
Arena.QueueAnnouncer.Exit = 0 Arena.QueueAnnouncer.Exit = 0
Arena.ArenaSeason.ID = 1 Arena.ArenaSeason.ID = 1
Arena.ArenaSeason.InProgress = 1 Arena.ArenaSeasonPrevious.ID = 0
Arena.StartRating = -1 Arena.StartRating = -1
Arena.StartPersonalRating = -1 Arena.StartPersonalRating = -1

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "10574" #define REVISION_NR "10575"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__