Guest User

Untitled

a guest
Jun 19th, 2018
85
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 3.91 KB | None | 0 0
  1. diff --git a/src/game/ObjectGuid.cpp b/src/game/ObjectGuid.cpp
  2. index eefc901..c297263 100644
  3. --- a/src/game/ObjectGuid.cpp
  4. +++ b/src/game/ObjectGuid.cpp
  5. @@ -37,6 +37,7 @@ char const* ObjectGuid::GetTypeName(HighGuid high)
  6. case HIGHGUID_DYNAMICOBJECT:return "DynObject";
  7. case HIGHGUID_CORPSE: return "Corpse";
  8. case HIGHGUID_MO_TRANSPORT: return "MoTransport";
  9. + case HIGHGUID_INSTANCE: return "InstanceID";
  10. default:
  11. return "<unknown>";
  12. }
  13. @@ -105,3 +106,4 @@ template uint32 ObjectGuidGenerator<HIGHGUID_PET>::Generate();
  14. template uint32 ObjectGuidGenerator<HIGHGUID_VEHICLE>::Generate();
  15. template uint32 ObjectGuidGenerator<HIGHGUID_DYNAMICOBJECT>::Generate();
  16. template uint32 ObjectGuidGenerator<HIGHGUID_CORPSE>::Generate();
  17. +//template uint32 ObjectGuidGenerator<HIGHGUID_INSTANCE>::Generate(); Currently not used
  18. diff --git a/src/game/ObjectGuid.h b/src/game/ObjectGuid.h
  19. index 4fc9bb0..b86483c 100644
  20. --- a/src/game/ObjectGuid.h
  21. +++ b/src/game/ObjectGuid.h
  22. @@ -72,6 +72,7 @@ enum HighGuid
  23. HIGHGUID_DYNAMICOBJECT = 0xF100, // blizz F100/F500
  24. HIGHGUID_CORPSE = 0xF500, // blizz F100/F500 used second variant to resolve conflict with HIGHGUID_DYNAMICOBJECT
  25. HIGHGUID_MO_TRANSPORT = 0x1FC0, // blizz 1FC0 (for GAMEOBJECT_TYPE_MO_TRANSPORT)
  26. + HIGHGUID_INSTANCE = 0x1F42, // blizz 1F42
  27. };
  28.  
  29. //*** Must be replaced by ObjectGuid use ***
  30. @@ -92,6 +93,7 @@ inline bool IsGuidHaveEnPart(uint64 const& guid)
  31. case HIGHGUID_DYNAMICOBJECT:
  32. case HIGHGUID_CORPSE:
  33. case HIGHGUID_MO_TRANSPORT:
  34. + case HIGHGUID_INSTANCE:
  35. return false;
  36. case HIGHGUID_GAMEOBJECT:
  37. case HIGHGUID_TRANSPORT:
  38. @@ -170,6 +172,7 @@ class MANGOS_DLL_SPEC ObjectGuid
  39. bool IsCorpse() const { return GetHigh() == HIGHGUID_CORPSE; }
  40. bool IsTransport() const { return GetHigh() == HIGHGUID_TRANSPORT; }
  41. bool IsMOTransport() const { return GetHigh() == HIGHGUID_MO_TRANSPORT; }
  42. + bool IsInstance() const { return GetHigh() == HIGHGUID_INSTANCE; }
  43.  
  44. static TypeID GetTypeId(HighGuid high)
  45. {
  46. @@ -186,6 +189,7 @@ class MANGOS_DLL_SPEC ObjectGuid
  47. case HIGHGUID_MO_TRANSPORT: return TYPEID_GAMEOBJECT;
  48. case HIGHGUID_VEHICLE: return TYPEID_UNIT;
  49. // unknown
  50. + case HIGHGUID_INSTANCE:
  51. default: return TYPEID_OBJECT;
  52. }
  53. }
  54. @@ -211,6 +215,7 @@ class MANGOS_DLL_SPEC ObjectGuid
  55. case HIGHGUID_DYNAMICOBJECT:
  56. case HIGHGUID_CORPSE:
  57. case HIGHGUID_MO_TRANSPORT:
  58. + case HIGHGUID_INSTANCE:
  59. return false;
  60. case HIGHGUID_GAMEOBJECT:
  61. case HIGHGUID_TRANSPORT:
  62. diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp
  63. index ccd8382..2dc5efe 100644
  64. --- a/src/game/ObjectMgr.cpp
  65. +++ b/src/game/ObjectMgr.cpp
  66. @@ -6265,6 +6265,8 @@ uint32 ObjectMgr::GenerateLowGuid(HighGuid guidhigh)
  67. return m_GameobjectGuids.Generate();
  68. case HIGHGUID_CORPSE:
  69. return m_CorpseGuids.Generate();
  70. + //case HIGHGUID_INSTANCE: Currently not used
  71. + // return m_InstanceGuids.Generate();
  72. default:
  73. MANGOS_ASSERT(0);
  74. }
  75. diff --git a/src/game/ObjectMgr.h b/src/game/ObjectMgr.h
  76. index 19285d9..a52c688 100644
  77. --- a/src/game/ObjectMgr.h
  78. +++ b/src/game/ObjectMgr.h
  79. @@ -1299,6 +1299,7 @@ class ObjectMgr
  80. ObjectGuidGenerator<HIGHGUID_ITEM> m_ItemGuids;
  81. ObjectGuidGenerator<HIGHGUID_GAMEOBJECT> m_GameobjectGuids;
  82. ObjectGuidGenerator<HIGHGUID_CORPSE> m_CorpseGuids;
  83. + //ObjectGuidGenerator<HIGHGUID_INSTANCE> m_InstanceGuids; Currently not used
  84.  
  85. QuestMap mQuestTemplates;
Add Comment
Please, Sign In to add comment