Project Cleanup pt3

disturbedalive2011 · Jan 10, 2020 · 3669c63 · 3669c63
1 parent 0417581
commit 3669c63
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 70 deletions.
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
diff --git a/src/game/OutdoorPvP/OutdoorPvP.h b/src/game/OutdoorPvP/OutdoorPvP.h
@@ -30,6 +30,7 @@
 #include "SharedDefines.h"
 #include "OutdoorPvPMgr.h"
 
+// forward declaration
 class WorldPacket;
 class WorldObject;
 class Player;

diff --git a/src/game/OutdoorPvP/OutdoorPvPMgr.h b/src/game/OutdoorPvP/OutdoorPvPMgr.h
@@ -74,6 +74,7 @@ struct CapturePointSlider
     bool IsLocked;
 };
 
+// forward declaration
 class Player;
 class GameObject;
 class Creature;

diff --git a/src/game/Server/DBCStores.cpp b/src/game/Server/DBCStores.cpp
@@ -676,27 +676,9 @@ ChatChannelsEntry const* GetChannelEntryFor(const std::string& name)
     return NULL;
 }
 
-/*[-ZERO]
-bool IsTotemCategoryCompatiableWith(uint32 itemTotemCategoryId, uint32 requiredTotemCategoryId)
-{
-    if(requiredTotemCategoryId==0)
-        return true;
-    if(itemTotemCategoryId==0)
-        return false;
-
-    TotemCategoryEntry const* itemEntry = sTotemCategoryStore.LookupEntry(itemTotemCategoryId);
-    if(!itemEntry)
-        return false;
-    TotemCategoryEntry const* reqEntry = sTotemCategoryStore.LookupEntry(requiredTotemCategoryId);
-    if(!reqEntry)
-        return false;
-
-    if(itemEntry->categoryType!=reqEntry->categoryType)
-        return false;
-
-    return (itemEntry->categoryMask & reqEntry->categoryMask)==reqEntry->categoryMask;
-}
-*/
+
+
+
 bool Zone2MapCoordinates(float& x, float& y, uint32 zone)
 {
     WorldMapAreaEntry const* maEntry = sWorldMapAreaStore.LookupEntry(zone);

diff --git a/src/game/Server/DBCStores.h b/src/game/Server/DBCStores.h
@@ -47,8 +47,8 @@ uint32 GetAreaFlagByMapId(uint32 mapid);
 
 WMOAreaTableEntry const* GetWMOAreaTableEntryByTripple(int32 rootid, int32 adtid, int32 groupid);
 
- AreaTableEntry const* GetAreaEntryByAreaID(uint32 area_id);
- AreaTableEntry const* GetAreaEntryByAreaFlagAndMap(uint32 area_flag, uint32 map_id);
+AreaTableEntry const* GetAreaEntryByAreaID(uint32 area_id);
+AreaTableEntry const* GetAreaEntryByAreaFlagAndMap(uint32 area_flag, uint32 map_id);
 
 uint32 GetVirtualMapForMapAndZone(uint32 mapid, uint32 zoneId);
 

diff --git a/src/game/Server/SharedDefines.h b/src/game/Server/SharedDefines.h
@@ -491,7 +491,6 @@ enum CharacterSlot
     SLOT_EMPTY                         = 19
 };
 
-// from Languages.dbc (checked for 1.12.1)
 enum Language
 {
     LANG_UNIVERSAL      = 0,
@@ -2034,30 +2033,6 @@ enum SkillCategory
     SKILL_CATEGORY_PROFESSION    = 11,                      // primary professions
     SKILL_CATEGORY_GENERIC       = 12
 };
-/*[-ZERO]
-enum TotemCategory
-{
-    TC_SKINNING_SKIFE              = 1,
-    TC_EARTH_TOTEM                 = 2,
-    TC_AIR_TOTEM                   = 3,
-    TC_FIRE_TOTEM                  = 4,
-    TC_WATER_TOTEM                 = 5,
-    TC_COPPER_ROD                  = 6,
-    TC_SILVER_ROD                  = 7,
-    TC_GOLDEN_ROD                  = 8,
-    TC_TRUESILVER_ROD              = 9,
-    TC_ARCANITE_ROD                = 10,
-    TC_MINING_PICK                 = 11,
-    TC_PHILOSOPHERS_STONE          = 12,
-    TC_BLACKSMITH_HAMMER           = 13,
-    TC_ARCLIGHT_SPANNER            = 14,
-    TC_GYROMATIC_MA                = 15,
-    TC_MASTER_TOTEM                = 21,
-    TC_FEL_IRON_ROD                = 41,
-    TC_ADAMANTITE_ROD              = 62,
-    TC_ETERNIUM_ROD                = 63
-};
-*/
 
 enum UnitDynFlags
 {

diff --git a/src/game/Server/WorldSession.cpp b/src/game/Server/WorldSession.cpp
@@ -701,7 +701,6 @@ void WorldSession::SendAuthWaitQue(uint32 position)
         WorldPacket packet(SMSG_AUTH_RESPONSE, 1 + 4);
         packet << uint8(AUTH_WAIT_QUEUE);
         packet << uint32(position);
-        //packet << uint8(0);                                 // [-ZERO] unk
         SendPacket(&packet);
     }
 }

diff --git a/src/game/Server/WorldSession.h b/src/game/Server/WorldSession.h
@@ -733,6 +733,7 @@ class WorldSession
         // for Warden
         uint16 GetClientBuild() const { return _build; }
 
+
     private:
         // private trade methods
         void moveItems(Item* myItems[], Item* hisItems[]);

diff --git a/src/game/WorldHandlers/Channel.cpp b/src/game/WorldHandlers/Channel.cpp
@@ -572,13 +572,11 @@ void Channel::Say(Player* player, const char* text, uint32 lang)
             speakInWorldDef = true;
         }
 
+        // Only Applicable for Vanilla
         HonorRankInfo honorInfo = plr->GetHonorRankInfo();
         //We can speak in local defense if we're above this rank (see .h file)
         if (honorInfo.rank >= SPEAK_IN_LOCALDEFENSE_RANK)
             speakInLocalDef = true;
-        // Are we not allowed to speak in WorldDefense at all?
-        // if (honorInfo.rank >= SPEAK_IN_WORLDDEFENSE_RANK)
-        //     speakInWorldDef = true;
     }
 
     if (!IsOn(guid))
@@ -588,7 +586,6 @@ void Channel::Say(Player* player, const char* text, uint32 lang)
         SendToOne(&data, guid);
         return;
     }
-
     else if (m_players[guid].IsMuted() ||
              (GetChannelId() == CHANNEL_ID_LOCAL_DEFENSE && !speakInLocalDef) ||
              (GetChannelId() == CHANNEL_ID_WORLD_DEFENSE && !speakInWorldDef))
@@ -761,8 +758,6 @@ void Channel::MakeYouJoined(WorldPacket* data)
 void Channel::MakeYouLeft(WorldPacket* data)
 {
     MakeNotifyPacket(data, CHAT_YOU_LEFT_NOTICE);
-    //*data << uint32(GetChannelId());                        //[-ZERO]
-    //*data << uint8(0);                                      //[-ZERO] can be 0x00 and 0x01 (bool)
 }
 
 void Channel::MakeWrongPassword(WorldPacket* data)