diff options
| author | Intel <chemicstry@gmail.com> | 2014-11-05 22:25:57 +0200 |
|---|---|---|
| committer | Intel <chemicstry@gmail.com> | 2014-11-05 22:25:57 +0200 |
| commit | 63a74998380fab29819466b3397591ec444fb498 (patch) | |
| tree | 8163a1d41ee0c33d3ed3716b8ed0fbf2eee3a26f | |
| parent | 3cb4b7359e51aa22b58591ca55112b9b19ca71ef (diff) | |
Core/DataStores: Updated Map.dbc struct
| -rw-r--r-- | src/server/game/DataStores/DBCStructure.h | 38 | ||||
| -rw-r--r-- | src/server/game/DataStores/DBCfmt.h | 4 |
2 files changed, 22 insertions, 20 deletions
diff --git a/src/server/game/DataStores/DBCStructure.h b/src/server/game/DataStores/DBCStructure.h index f13abe888ae..c36ac820ebd 100644 --- a/src/server/game/DataStores/DBCStructure.h +++ b/src/server/game/DataStores/DBCStructure.h @@ -1486,26 +1486,28 @@ struct MailTemplateEntry struct MapEntry { - uint32 MapID; // 0 - //char* internalname; // 1 unused - uint32 map_type; // 2 - uint32 Flags; // 3 - //uint32 unk4; // 4 4.0.1 - //uint32 isPvP; // 5 m_PVP 0 or 1 for battlegrounds (not arenas) - char* name; // 6 m_MapName_lang - uint32 linked_zone; // 7 m_areaTableID + uint32 MapID; // 0 + //char* internalname; // 1 unused + uint32 map_type; // 2 + uint32 Flags; // 3 + //uint32 unk4; // 4 + //uint32 unk5; // 5 + char* name; // 6 m_MapName_lang + uint32 linked_zone; // 7 m_areaTableID //char* hordeIntro; // 8 m_MapDescription0_lang //char* allianceIntro; // 9 m_MapDescription1_lang - uint32 multimap_id; // 10 m_LoadingScreenID (LoadingScreens.dbc) - //float BattlefieldMapIconScale; // 11 m_minimapIconScale - int32 entrance_map; // 12 m_corpseMapID map_id of entrance map in ghost mode (continent always and in most cases = normal entrance) - float entrance_x; // 13 m_corpseX entrance x coordinate in ghost mode (in most cases = normal entrance) - float entrance_y; // 14 m_corpseY entrance y coordinate in ghost mode (in most cases = normal entrance) - //uint32 timeOfDayOverride; // 15 m_timeOfDayOverride - uint32 addon; // 16 m_expansionID - uint32 expireTime; // 17 m_raidOffset - uint32 maxPlayers; // 18 m_maxPlayers - int32 rootPhaseMap; // 19 new 4.0.0, mapid, related to phasing + uint32 multimap_id; // 10 m_LoadingScreenID (LoadingScreens.dbc) + //float BattlefieldMapIconScale; // 11 m_minimapIconScale + int32 entrance_map; // 12 m_corpseMapID map_id of entrance map in ghost mode (continent always and in most cases = normal entrance) + float entrance_x; // 13 m_corpseX entrance x coordinate in ghost mode (in most cases = normal entrance) + float entrance_y; // 14 m_corpseY entrance y coordinate in ghost mode (in most cases = normal entrance) + //uint32 timeOfDayOverride; // 15 m_timeOfDayOverride + uint32 addon; // 16 m_expansionID + uint32 expireTime; // 17 m_raidOffset + uint32 maxPlayers; // 18 m_maxPlayers + int32 rootPhaseMap; // 19 m_parentMapID new 4.0.0, related to phasing + //uint32 cosmeticParentMapID // 20 m_cosmeticParentMapID; + //uint32 timeOffset // 21 m_timeOffset; // Helpers uint32 Expansion() const { return addon; } diff --git a/src/server/game/DataStores/DBCfmt.h b/src/server/game/DataStores/DBCfmt.h index db6fd04d369..3d69165c428 100644 --- a/src/server/game/DataStores/DBCfmt.h +++ b/src/server/game/DataStores/DBCfmt.h @@ -104,7 +104,7 @@ char const LockEntryfmt[] = "niiiiiiiiiiiiiiiiiiiiiiiixxxxxxxx"; char const PhaseEntryfmt[] = "nsi"; char const PhaseGroupfmt[] = "nii"; char const MailTemplateEntryfmt[] = "nxs"; -char const MapEntryfmt[] = "nxiixxsixxixiffxiiii"; +char const MapEntryfmt[] = "nxiixxsixxixiffxiiiixx"; char const MapDifficultyEntryfmt[] = "diisiix"; char const MovieEntryfmt[] = "nxxx"; char const MountCapabilityfmt[] = "niiiiiii"; @@ -178,6 +178,6 @@ char const VehicleSeatEntryfmt[] = "niiffffffffffiiiiiifffffffiiifffiiiiiiiffiii char const WMOAreaTableEntryfmt[] = "niiixxxxxiixxxx"; char const WorldMapAreaEntryfmt[] = "xinxffffixxxxx"; char const WorldMapOverlayEntryfmt[] = "nxiiiixxxxxxxxx"; -char const WorldSafeLocsEntryfmt[] = "niffffx"; +char const WorldSafeLocsEntryfmt[] = "niffff"; #endif |