This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/contrib/mmap/src/MapBuilder.cpp b/contrib/mmap/src/MapBuilder.cpp | |
index 28ca4d1..bea47dc 100644 | |
--- a/contrib/mmap/src/MapBuilder.cpp | |
+++ b/contrib/mmap/src/MapBuilder.cpp | |
@@ -209,6 +209,8 @@ namespace MMAP | |
return; | |
} | |
+ return; | |
+ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
namespace RAConsole | |
{ | |
class Program | |
{ | |
static void Main(string[] args) | |
{ | |
TcpClient raClient = new TcpClient(new IPEndPoint(IPAddress.Any, 0)); | |
raClient.Connect(new IPEndPoint(IPAddress.Parse("127.0.0.1"), 3443)); | |
NetworkStream stream = raClient.GetStream(); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/contrib/vmap_extractor_v3/vmapextract/model.cpp b/contrib/vmap_extractor_v3/vmapextract/model.cpp | |
index a2493f7..3710c53 100644 | |
--- a/contrib/vmap_extractor_v3/vmapextract/model.cpp | |
+++ b/contrib/vmap_extractor_v3/vmapextract/model.cpp | |
@@ -160,6 +160,7 @@ ModelInstance::ModelInstance(MPQFile &f,const char* ModelInstName, uint32 mapID, | |
fwrite(&tileX, sizeof(uint32), 1, pDirfile); | |
fwrite(&tileY, sizeof(uint32), 1, pDirfile); | |
fwrite(&flags, sizeof(uint32), 1, pDirfile); | |
+ uint16 mddfFlags = 0; fwrite(&mddfFlags, sizeof(uint16), 1, pDirfile); // should be read as last uint16 from MDDF |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp | |
index 8281729..da7e3e0 100644 | |
--- a/src/game/Spell.cpp | |
+++ b/src/game/Spell.cpp | |
@@ -4230,7 +4230,10 @@ SpellCastResult Spell::CheckCast(bool strict) | |
// check global cooldown | |
if (strict && !m_IsTriggeredSpell && HasGlobalCooldown()) | |
+ { | |
+ sLog.outDebug("GCD prevented cast of %u", m_spellInfo->Id); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/contrib/mmap/src/generator.cpp b/contrib/mmap/src/generator.cpp | |
index 33f2686..4cc5e94 100644 | |
--- a/contrib/mmap/src/generator.cpp | |
+++ b/contrib/mmap/src/generator.cpp | |
@@ -66,6 +66,12 @@ void handleArgs(int argc, char** argv, | |
if(strcmp(argv[i], "--maxAngle") == 0) | |
{ | |
param = argv[++i]; | |
+ if(!param) | |
+ { |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/game/AggressorAI.cpp b/src/game/AggressorAI.cpp | |
index a5fed3e..0579836 100644 | |
--- a/src/game/AggressorAI.cpp | |
+++ b/src/game/AggressorAI.cpp | |
@@ -48,7 +48,7 @@ AggressorAI::MoveInLineOfSight(Unit *u) | |
return; | |
if (m_creature->CanInitiateAttack() && u->isTargetableForAttack() && | |
- m_creature->IsHostileTo(u) && u->isInAccessablePlaceFor(m_creature)) | |
+ m_creature->IsHostileTo(u) && u->isInAccessiblePlaceFor(m_creature)) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
using System; | |
using System.IO; | |
using System.Text; | |
namespace wowtest | |
{ | |
/// <summary> | |
/// Stores the fields of a dbc file's record | |
/// </summary> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
class Record | |
{ | |
public object[] Fields | |
{ | |
get; | |
private set; | |
} | |
public Record(int fieldCount, BinaryReader input) | |
{ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
contrib/mmap/src/generator.cpp | 8 ++++---- | |
1 files changed, 4 insertions(+), 4 deletions(-) | |
diff --git a/contrib/mmap/src/generator.cpp b/contrib/mmap/src/generator.cpp | |
index b02c5fc..8f66db9 100644 | |
--- a/contrib/mmap/src/generator.cpp | |
+++ b/contrib/mmap/src/generator.cpp | |
@@ -14,21 +14,21 @@ bool checkDirectories(bool debugOutput) | |
{ | |
vector<string> dirFiles; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5ad40ed5dc17ab9a7797491bb4c8e7251ccde1a8 | |
src/shared/pathfinding/Recast/Recast.cpp | 3 +- | |
src/shared/pathfinding/Recast/Recast.h | 29 +++++++++-- | |
src/shared/pathfinding/Recast/RecastArea.cpp | 4 +- | |
.../pathfinding/Recast/RecastRasterization.cpp | 53 ++++++++++++++----- | |
src/shared/pathfinding/Recast/RecastRegion.cpp | 2 +- | |
5 files changed, 68 insertions(+), 23 deletions(-) | |
diff --git a/src/shared/pathfinding/Recast/Recast.cpp b/src/shared/pathfinding/Recast/Recast.cpp | |
index 9fed737..d492b3f 100644 |