aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sql/updates/world/2014_07_20_02_world_misc.sql18
-rw-r--r--src/server/game/Entities/GameObject/GameObject.cpp2
-rw-r--r--src/server/game/Entities/Object/Object.cpp2
-rw-r--r--src/server/game/Maps/MapUpdater.cpp7
-rw-r--r--src/server/game/Maps/MapUpdater.h4
-rw-r--r--src/server/game/Miscellaneous/SharedDefines.h2
-rw-r--r--src/server/game/Server/WorldSocket.cpp14
-rw-r--r--src/server/shared/Debugging/Errors.cpp1
-rw-r--r--src/server/shared/Define.h11
-rw-r--r--src/server/shared/Utilities/Util.h12
10 files changed, 35 insertions, 38 deletions
diff --git a/sql/updates/world/2014_07_20_02_world_misc.sql b/sql/updates/world/2014_07_20_02_world_misc.sql
new file mode 100644
index 00000000000..6c201a3ad03
--- /dev/null
+++ b/sql/updates/world/2014_07_20_02_world_misc.sql
@@ -0,0 +1,18 @@
+--
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=26048;
+DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid`=2604800;
+
+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
+(26048, 0, 0, 1, 64, 0, 100, 0, 0, 0, 0, 0, 12, 26045, 2, 300000, 0, 0, 0, 8, 0, 0, 0, 3403.83, 4133.07, 18.1375, 5.75959, 'Storm Totem - On Gossip Hello - Spawn Storm Tempest'),
+(26048, 0, 1, 2, 61, 0, 100, 0, 0, 0, 0, 0, 81, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Storm Totem - Linked with Previous Event - Set NPC Flags'),
+(26048, 0, 2, 3, 61, 0, 100, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Storm Totem - Linked with Previous Event - Close Gossip'),
+(26048, 0, 3, 0, 61, 0, 100, 0, 0, 0, 0, 0, 80, 2604800, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Storm Totem - Linked with Previous Event - Run Script'),
+(26048, 0, 4, 0, 11, 0, 100, 0, 0, 0, 0, 0, 81, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Storm Totem - On Spawn - Set NPC Flags'),
+(26048, 0, 6, 0, 64, 0, 100, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Storm Totem - On Gossip Hello - Close Gossip'),
+(2604800, 9, 0, 0, 0, 0, 100, 0, 300000, 300000, 0, 0, 81, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Storm Totem - Script - Set NPC Flags');
+
+UPDATE `smart_scripts` SET `action_param1`=1 WHERE `entryorguid`=26045 AND `source_type`=0 AND `id`=8 AND `link`=9;
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=22 AND `SourceEntry` =26048;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(22,1,26048,0,0,9,0,11895,0,0,0,0,'','Storm Totem - Only Summon Storm Tempest if player is on Master the Storms');
diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp
index f44d1a39f79..90f46c4ad86 100644
--- a/src/server/game/Entities/GameObject/GameObject.cpp
+++ b/src/server/game/Entities/GameObject/GameObject.cpp
@@ -16,7 +16,6 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <G3D/Quat.h>
#include "GameObjectAI.h"
#include "Battleground.h"
#include "CellImpl.h"
@@ -34,6 +33,7 @@
#include "UpdateFieldFlags.h"
#include "World.h"
#include "Transport.h"
+#include <G3D/Quat.h>
GameObject::GameObject() : WorldObject(false), MapObject(),
m_model(NULL), m_goValue(), m_AI(NULL)
diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp
index 4be90d7e082..13d725dbbe2 100644
--- a/src/server/game/Entities/Object/Object.cpp
+++ b/src/server/game/Entities/Object/Object.cpp
@@ -2801,7 +2801,6 @@ void WorldObject::MovePositionToFirstCollision(Position &pos, float dist, float
float destx, desty, destz;
destx = pos.m_positionX + dist * std::cos(angle);
desty = pos.m_positionY + dist * std::sin(angle);
- destz = NormalizeZforCollision(this, destx, desty, pos.GetPositionZ());
// Prevent invalid coordinates here, position is unchanged
if (!Trinity::IsValidMapCoord(destx, desty))
@@ -2810,6 +2809,7 @@ void WorldObject::MovePositionToFirstCollision(Position &pos, float dist, float
return;
}
+ destz = NormalizeZforCollision(this, destx, desty, pos.GetPositionZ());
bool col = VMAP::VMapFactory::createOrGetVMapManager()->getObjectHitPos(GetMapId(), pos.m_positionX, pos.m_positionY, pos.m_positionZ + 0.5f, destx, desty, destz + 0.5f, destx, desty, destz, -0.5f);
// collision occured
diff --git a/src/server/game/Maps/MapUpdater.cpp b/src/server/game/Maps/MapUpdater.cpp
index c456f57bd20..69f0bdff885 100644
--- a/src/server/game/Maps/MapUpdater.cpp
+++ b/src/server/game/Maps/MapUpdater.cpp
@@ -45,13 +45,6 @@ class MapUpdateRequest
}
};
-MapUpdater::MapUpdater() : _cancelationToken(false), pending_requests(0) {}
-
-MapUpdater::~MapUpdater()
-{
- deactivate();
-}
-
void MapUpdater::activate(size_t num_threads)
{
for (size_t i = 0; i < num_threads; ++i)
diff --git a/src/server/game/Maps/MapUpdater.h b/src/server/game/Maps/MapUpdater.h
index c499110173e..0d4058a38a3 100644
--- a/src/server/game/Maps/MapUpdater.h
+++ b/src/server/game/Maps/MapUpdater.h
@@ -32,8 +32,8 @@ class MapUpdater
{
public:
- MapUpdater();
- virtual ~MapUpdater();
+ MapUpdater() : _cancelationToken(false), pending_requests(0) {}
+ ~MapUpdater() { };
friend class MapUpdateRequest;
diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h
index 7e4bc05ee6e..833e4f7c7bc 100644
--- a/src/server/game/Miscellaneous/SharedDefines.h
+++ b/src/server/game/Miscellaneous/SharedDefines.h
@@ -19,8 +19,8 @@
#ifndef TRINITY_SHAREDDEFINES_H
#define TRINITY_SHAREDDEFINES_H
-#include "DetourNavMesh.h"
#include "Define.h"
+#include "DetourNavMesh.h"
#include <cassert>
enum SpellEffIndex
diff --git a/src/server/game/Server/WorldSocket.cpp b/src/server/game/Server/WorldSocket.cpp
index 2680df3ac3a..f6ddad5aed9 100644
--- a/src/server/game/Server/WorldSocket.cpp
+++ b/src/server/game/Server/WorldSocket.cpp
@@ -83,11 +83,8 @@ void WorldSocket::AsyncReadHeader()
else
{
// _socket.is_open() till returns true even after calling close()
- try
- {
- _socket.close();
- }
- catch (std::exception const& /*ex*/) { }
+ boost::system::error_code socketError;
+ _socket.close(socketError);
}
});
}
@@ -193,11 +190,8 @@ void WorldSocket::AsyncReadData(size_t dataSize)
else
{
// _socket.is_open() till returns true even after calling close()
- try
- {
- _socket.close();
- }
- catch (std::exception const& /*ex*/) {}
+ boost::system::error_code socketError;
+ _socket.close(socketError);
}
});
}
diff --git a/src/server/shared/Debugging/Errors.cpp b/src/server/shared/Debugging/Errors.cpp
index 62e97d56d42..0621cfa5b6d 100644
--- a/src/server/shared/Debugging/Errors.cpp
+++ b/src/server/shared/Debugging/Errors.cpp
@@ -18,6 +18,7 @@
#include "Errors.h"
+#include <cstdio>
#include <cstdlib>
#include <thread>
diff --git a/src/server/shared/Define.h b/src/server/shared/Define.h
index 8865c70fdf8..2a04b8cdfad 100644
--- a/src/server/shared/Define.h
+++ b/src/server/shared/Define.h
@@ -21,16 +21,19 @@
#include "CompilerDefs.h"
-#include <cstddef>
-#include <cinttypes>
-#include <climits>
-
#if COMPILER == COMPILER_GNU
# if !defined(__STDC_FORMAT_MACROS)
# define __STDC_FORMAT_MACROS
# endif
+# if !defined(__STDC_CONSTANT_MACROS)
+# define __STDC_CONSTANT_MACROS
+# endif
#endif
+#include <cstddef>
+#include <cinttypes>
+#include <climits>
+
#define TRINITY_LITTLEENDIAN 0
#define TRINITY_BIGENDIAN 1
diff --git a/src/server/shared/Utilities/Util.h b/src/server/shared/Utilities/Util.h
index 6fc5dcfdc2b..2a776715521 100644
--- a/src/server/shared/Utilities/Util.h
+++ b/src/server/shared/Utilities/Util.h
@@ -353,11 +353,6 @@ uint32 CreatePIDFile(const std::string& filename);
std::string ByteArrayToHexStr(uint8 const* bytes, uint32 length, bool reverse = false);
void HexStrToByteArray(std::string const& str, uint8* out, bool reverse = false);
-#endif
-
-//handler for operations on large flags
-#ifndef _FLAG96
-#define _FLAG96
// simple class for not-modifyable list
template <typename T>
@@ -404,13 +399,6 @@ public:
part[2] = p3;
}
- flag96(uint64 p1, uint32 p2)
- {
- part[0] = (uint32)(p1 & UI64LIT(0x00000000FFFFFFFF));
- part[1] = (uint32)((p1 >> 32) & UI64LIT(0x00000000FFFFFFFF));
- part[2] = p2;
- }
-
inline bool IsEqual(uint32 p1 = 0, uint32 p2 = 0, uint32 p3 = 0) const
{
return (part[0] == p1 && part[1] == p2 && part[2] == p3);