diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-06-28 23:06:02 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-06-28 23:06:10 +0200 |
| commit | a3e34f562141e272fd64b44272fa58ea729bcffa (patch) | |
| tree | 3e4efd21cdc6398369b1b46e8db5c00b038fc8e2 | |
| parent | d15db5f7ea4ad3f03bc1a6ac867037e33815c2fa (diff) | |
| parent | a36925937a9edee0afc3afd49440cae4ae9a73d1 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
| -rw-r--r-- | sql/updates/world/2014_06_28_04_world_misc.sql | 8 | ||||
| -rw-r--r-- | src/server/game/Battlegrounds/BattlegroundScore.h | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/sql/updates/world/2014_06_28_04_world_misc.sql b/sql/updates/world/2014_06_28_04_world_misc.sql new file mode 100644 index 00000000000..4c5c25e7dfe --- /dev/null +++ b/sql/updates/world/2014_06_28_04_world_misc.sql @@ -0,0 +1,8 @@ +-- +DELETE FROM `gossip_menu_option` WHERE `menu_id`=4824; +INSERT INTO `gossip_menu_option` (`menu_id`, `id`, `option_icon`, `option_text`, `OptionBroadcastTextID`, `option_id`, `npc_option_npcflag`, `action_menu_id`, `action_poi_id`, `box_coded`, `box_money`, `box_text`, `BoxBroadcastTextID`) VALUES +(4824, 0, 3, 'Please teach me.', 8442, 5, 16, 0, 0, 0, 0, '', 0); + +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=4824; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(15, 4824, 0, 0, 0, 15, 0, 128, 0, 0, 0, 0, 0, '', 'Show gossip option if player is a mage'); diff --git a/src/server/game/Battlegrounds/BattlegroundScore.h b/src/server/game/Battlegrounds/BattlegroundScore.h index 498999cfed7..ab4bd4ab529 100644 --- a/src/server/game/Battlegrounds/BattlegroundScore.h +++ b/src/server/game/Battlegrounds/BattlegroundScore.h @@ -56,7 +56,7 @@ struct BattlegroundScore friend class Battleground; protected: - BattlegroundScore(uint64 playerGuid, uint8 team) : PlayerGuid(playerGuid), TeamId(team == ALLIANCE ? 1 : 0), + BattlegroundScore(uint64 playerGuid, uint32 team) : PlayerGuid(playerGuid), TeamId(team == ALLIANCE ? 1 : 0), KillingBlows(0), Deaths(0), HonorableKills(0), BonusHonor(0), DamageDone(0), HealingDone(0) { } virtual ~BattlegroundScore() { } |