Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

4 files changed, 49 insertions, 4 deletions

diff --git a/README.md b/README.md
index 0bb14f928e1..2feeee58043 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ website at [TrinityCore.org](http://www.trinitycore.org).
 + ACE ≥ 5.8.3 (included for Windows)
 + MySQL ≥ 5.1.0 (included for Windows)
 + CMake ≥ 2.8.0
-+ OpenSSL ≥ 0.9.8o
++ OpenSSL ≥ 1.0.0
 + GCC ≥ 4.3 (Linux only)
 + MS Visual Studio ≥ 9 (2008) (Windows only)
 
diff --git a/sql/updates/world/2013_08_19_00_world_sai.sql b/sql/updates/world/2013_08_19_00_world_sai.sql
new file mode 100644
index 00000000000..b91610d2eab
--- /dev/null
+++ b/sql/updates/world/2013_08_19_00_world_sai.sql
@@ -0,0 +1,44 @@
+-- Rejek: First Blood (12734)
+SET @SPELL        := 52992;
+SET @WASP         := 28086;
+SET @HARDKNUCKLE  := 28096;
+SET @WARRIOR      := 28109;
+SET @ORACLE       := 28110;
+SET @CREDIT1      := 28040;
+SET @CREDIT2      := 36189;
+SET @CREDIT3      := 29043;
+SET @FLIPATTACK   := 50533;
+SET @CHARGE       := 49758;
+SET @STING        := 34392;
+
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@WASP;
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@WASP;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@WASP;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@WASP,0,0,0,2,0,100,0,0,30,7000,9000,11,@STING,1,0,0,0,0,1,0,0,0,0,0,0,0,'Sapphire Hive Wasp - On HP 30% - Cast Stinger Rage'),
+(@WASP,0,1,2,8,0,100,1,@SPELL,0,0,0,33,@CREDIT1,0,0,0,0,0,7,0,0,0,0,0,0,0,'Sapphire Hive Wasp - On Spellhit - Give Quest Credit'),
+(@WASP,0,2,0,61,0,100,0,0,0,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Sapphire Hive Wasp - On Link - Despawn');
+
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@HARDKNUCKLE;
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@HARDKNUCKLE;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@HARDKNUCKLE;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@HARDKNUCKLE,0,0,0,9,0,100,1,10,30,0,0,11,@CHARGE,1,0,0,0,0,2,0,0,0,0,0,0,0,'Hardknuckle Charger - On range - Cast Charge'),
+(@HARDKNUCKLE,0,1,2,8,0,100,1,@SPELL,0,0,0,33,@CREDIT2,0,0,0,0,0,7,0,0,0,0,0,0,0,'Hardknuckle Charger - On Spellhit - Give Quest Credit'),
+(@HARDKNUCKLE,0,2,0,61,0,100,0,0,0,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Hardknuckle Charger - On Link - Despawn');
+
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@WARRIOR;
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@WARRIOR;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@WARRIOR;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@WARRIOR,0,0,0,0,0,100,0,2000,6000,4000,7000,11,@FLIPATTACK,1,0,0,0,0,2,0,0,0,0,0,0,0,'Mistwhisper Warrior - IC - Cast Flip Arrack'),
+(@WARRIOR,0,1,2,8,0,100,1,@SPELL,0,0,0,33,@CREDIT3,0,0,0,0,0,7,0,0,0,0,0,0,0,'Mistwhisper Warrior - On Spellhit - Give Quest Credit'),
+(@WARRIOR,0,2,0,61,0,100,0,0,0,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Mistwhisper Warrior - On Link - Despawn');
+
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ORACLE;
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ORACLE;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ORACLE;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ORACLE,0,0,0,0,0,100,0,4000,7000,11000,19000,11,54921,1,0,0,0,0,1,0,0,0,0,0,0,0,'Mistwhisper Oracle - IC - Cast Lightning Cloud'),
+(@ORACLE,0,1,2,8,0,100,1,@SPELL,0,0,0,33,@CREDIT3,0,0,0,0,0,7,0,0,0,0,0,0,0,'Mistwhisper Oracle - On Spellhit - Give Quest Credit'),
+(@ORACLE,0,2,0,61,0,100,0,0,0,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Mistwhisper Oracle - On Link - Despawn');
diff --git a/src/server/shared/Cryptography/BigNumber.cpp b/src/server/shared/Cryptography/BigNumber.cpp
index 38c274b7555..b2fce985f21 100644
--- a/src/server/shared/Cryptography/BigNumber.cpp
+++ b/src/server/shared/Cryptography/BigNumber.cpp
@@ -186,7 +186,8 @@ ACE_Auto_Array_Ptr<uint8> BigNumber::AsByteArray(int32 minSize, bool littleEndia
     if (littleEndian)
         std::reverse(array, array + length);
 
-    return ACE_Auto_Array_Ptr<uint8>(array);
+    ACE_Auto_Array_Ptr<uint8> ret(array);
+    return ret;
 }
 
 char * BigNumber::AsHexStr() const
diff --git a/src/server/shared/Cryptography/OpenSSLCrypto.cpp b/src/server/shared/Cryptography/OpenSSLCrypto.cpp
index 12169433615..417be813347 100644
--- a/src/server/shared/Cryptography/OpenSSLCrypto.cpp
+++ b/src/server/shared/Cryptography/OpenSSLCrypto.cpp
@@ -23,7 +23,7 @@
 
 std::vector<ACE_Thread_Mutex*> cryptoLocks;
 
-void lockingCallback(int mode, int type, const char *file, int line)
+static void lockingCallback(int mode, int type, const char* /*file*/, int /*line*/)
 {
     if (mode & CRYPTO_LOCK)
         cryptoLocks[type]->acquire();
@@ -31,7 +31,7 @@ void lockingCallback(int mode, int type, const char *file, int line)
         cryptoLocks[type]->release();
 }
 
-void threadIdCallback(CRYPTO_THREADID * id)
+static void threadIdCallback(CRYPTO_THREADID * id)
 {
     CRYPTO_THREADID_set_numeric(id, ACE_Thread::self());
 }