aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README.md1
-rw-r--r--sql/updates/world/2014_10_12_03_world.sql2
-rw-r--r--sql/updates/world/2014_10_12_04_world.sql3
-rw-r--r--sql/updates/world/2014_10_12_05_world.sql2
-rw-r--r--sql/updates/world/2014_10_12_06_world.sql8
-rw-r--r--sql/updates/world/2014_10_12_07_world.sql2
-rw-r--r--src/server/game/Maps/Map.cpp2
-rw-r--r--src/server/game/Maps/Map.h2
8 files changed, 20 insertions, 2 deletions
diff --git a/README.md b/README.md
index 33fea30e36e..8f5219f52dd 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,7 @@
[![Coverity Scan Build Status](https://scan.coverity.com/projects/435/badge.svg)](https://scan.coverity.com/projects/435)
`3.3.5`: [![3.3.5 Build Status](https://travis-ci.org/TrinityCore/TrinityCore.svg?branch=master)](https://travis-ci.org/TrinityCore/TrinityCore)
`4.3.4`: [![4.3.4 Build Status](https://travis-ci.org/TrinityCore/TrinityCore.svg?branch=4.3.4)](https://travis-ci.org/TrinityCore/TrinityCore)
+[![Bountysource](https://www.bountysource.com/badge/tracker?tracker_id=1310)](https://www.bountysource.com/trackers/1310-trinity-core?utm_source=1310&utm_medium=shield&utm_campaign=TRACKER_BADGE)
## Introduction
diff --git a/sql/updates/world/2014_10_12_03_world.sql b/sql/updates/world/2014_10_12_03_world.sql
new file mode 100644
index 00000000000..7f6649cd271
--- /dev/null
+++ b/sql/updates/world/2014_10_12_03_world.sql
@@ -0,0 +1,2 @@
+--
+UPDATE `spell_dbc` SET `AttributesEx3` = 0 WHERE `Id` = 65142;
diff --git a/sql/updates/world/2014_10_12_04_world.sql b/sql/updates/world/2014_10_12_04_world.sql
new file mode 100644
index 00000000000..b522b5fc927
--- /dev/null
+++ b/sql/updates/world/2014_10_12_04_world.sql
@@ -0,0 +1,3 @@
+UPDATE `smart_scripts` SET `link`=12 WHERE `entryorguid`=11680 AND `source_type`=0 AND `id`=11;
+UPDATE `smart_scripts` SET `link`=2 WHERE `entryorguid`=18855 AND `source_type`=0 AND `id`=1;
+UPDATE `smart_scripts` SET `link`=18 WHERE `entryorguid`=26670 AND `source_type`=0 AND `id`=18;
diff --git a/sql/updates/world/2014_10_12_05_world.sql b/sql/updates/world/2014_10_12_05_world.sql
new file mode 100644
index 00000000000..8ea7ba0aea1
--- /dev/null
+++ b/sql/updates/world/2014_10_12_05_world.sql
@@ -0,0 +1,2 @@
+--
+UPDATE `spell_dbc` SET `AttributesEx3` = 128 WHERE `Id` = 65142;
diff --git a/sql/updates/world/2014_10_12_06_world.sql b/sql/updates/world/2014_10_12_06_world.sql
new file mode 100644
index 00000000000..c448e6cbd98
--- /dev/null
+++ b/sql/updates/world/2014_10_12_06_world.sql
@@ -0,0 +1,8 @@
+DELETE FROM `creature_loot_template` WHERE `Entry`=15623;
+INSERT INTO `creature_loot_template`(`Entry`,`Item`,`Chance`,`MinCount`,`MaxCount`) VALUES
+(15623,14047,19,1,4),
+(15623,14256,3,1,1),
+(15623,8952,2,1,1),
+(15623,13446,1.3,1,1),
+(15623,13443,0.3,1,1),
+(15623,14283,0.11,1,1);
diff --git a/sql/updates/world/2014_10_12_07_world.sql b/sql/updates/world/2014_10_12_07_world.sql
new file mode 100644
index 00000000000..1bd0e4d9352
--- /dev/null
+++ b/sql/updates/world/2014_10_12_07_world.sql
@@ -0,0 +1,2 @@
+DELETE FROM `creature_loot_template` WHERE `Entry`=15623 AND `Item`=12002;
+INSERT INTO `creature_loot_template`(`Entry`,`Item`,`Chance`,`MinCount`,`MaxCount`) VALUE (15623,12002,0.13,1,1);
diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp
index 37563acd74a..7f350df2280 100644
--- a/src/server/game/Maps/Map.cpp
+++ b/src/server/game/Maps/Map.cpp
@@ -1586,7 +1586,7 @@ GridMap::~GridMap()
unloadData();
}
-bool GridMap::loadData(char* filename)
+bool GridMap::loadData(const char* filename)
{
// Unload old data if exist
unloadData();
diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h
index 87434d555aa..e2e9fa1f706 100644
--- a/src/server/game/Maps/Map.h
+++ b/src/server/game/Maps/Map.h
@@ -200,7 +200,7 @@ class GridMap
public:
GridMap();
~GridMap();
- bool loadData(char* filaname);
+ bool loadData(const char* filename);
void unloadData();
uint16 getArea(float x, float y) const;