sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore(Core/Shared): restyle shared lib with astyle (#3462)

Browse Source
This commit is contained in:
Kargatum
2020-09-11 11:50:48 +07:00
committed by GitHub
parent d47d6d34f3
commit 8b3621779e
10 changed files with 184 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/shared/DataStores/DBCDatabaseLoader.cpp
+28 -28
View File
@@ -14,10 +14,10 @@
DBCDatabaseLoader::DBCDatabaseLoader(char const* tableName, char const* dbcFormatString, std::vector<char*>& stringPool) DBCDatabaseLoader::DBCDatabaseLoader(char const* tableName, char const* dbcFormatString, std::vector<char*>& stringPool)
: _sqlTableName(tableName), : _sqlTableName(tableName),
_dbcFormat(dbcFormatString), _dbcFormat(dbcFormatString),
_sqlIndexPos(0), _sqlIndexPos(0),
_recordSize(0), _recordSize(0),
_stringPool(stringPool) _stringPool(stringPool)
{ {
// Get sql index position // Get sql index position
int32 indexPos = -1; int32 indexPos = -1;
@@ -47,7 +47,7 @@ char* DBCDatabaseLoader::Load(uint32& records, char**& indexTable)
uint32 indexTableSize = std::max(records, (*result)[_sqlIndexPos].GetUInt32() + 1); uint32 indexTableSize = std::max(records, (*result)[_sqlIndexPos].GetUInt32() + 1);
if (indexTableSize > records) if (indexTableSize > records)
{ {
char** tmpIdxTable = new char*[indexTableSize]; char** tmpIdxTable = new char* [indexTableSize];
memset(tmpIdxTable, 0, indexTableSize * sizeof(char*)); memset(tmpIdxTable, 0, indexTableSize * sizeof(char*));
memcpy(tmpIdxTable, indexTable, records * sizeof(char*)); memcpy(tmpIdxTable, indexTable, records * sizeof(char*));
delete[] indexTable; delete[] indexTable;
@@ -77,29 +77,29 @@ char* DBCDatabaseLoader::Load(uint32& records, char**& indexTable)
{ {
switch (*dbcFormat) switch (*dbcFormat)
{ {
case FT_FLOAT: case FT_FLOAT:
*reinterpret_cast<float*>(&dataValue[dataOffset]) = fields[sqlColumnNumber].GetFloat(); *reinterpret_cast<float*>(&dataValue[dataOffset]) = fields[sqlColumnNumber].GetFloat();
dataOffset += sizeof(float); dataOffset += sizeof(float);
break; break;
case FT_IND: case FT_IND:
case FT_INT: case FT_INT:
*reinterpret_cast<uint32*>(&dataValue[dataOffset]) = fields[sqlColumnNumber].GetUInt32(); *reinterpret_cast<uint32*>(&dataValue[dataOffset]) = fields[sqlColumnNumber].GetUInt32();
dataOffset += sizeof(uint32); dataOffset += sizeof(uint32);
break; break;
case FT_BYTE: case FT_BYTE:
*reinterpret_cast<uint8*>(&dataValue[dataOffset]) = fields[sqlColumnNumber].GetUInt8(); *reinterpret_cast<uint8*>(&dataValue[dataOffset]) = fields[sqlColumnNumber].GetUInt8();
dataOffset += sizeof(uint8); dataOffset += sizeof(uint8);
break; break;
case FT_STRING: case FT_STRING:
*reinterpret_cast<char**>(&dataValue[dataOffset]) = CloneStringToPool(fields[sqlColumnNumber].GetString()); *reinterpret_cast<char**>(&dataValue[dataOffset]) = CloneStringToPool(fields[sqlColumnNumber].GetString());
dataOffset += sizeof(char*); dataOffset += sizeof(char*);
break; break;
case FT_SORT: case FT_SORT:
case FT_NA: case FT_NA:
break; break;
default: default:
ASSERT(false, "Unsupported data type '%c' in table '%s'", *dbcFormat, _sqlTableName); ASSERT(false, "Unsupported data type '%c' in table '%s'", *dbcFormat, _sqlTableName);
return nullptr; return nullptr;
} }
++sqlColumnNumber; ++sqlColumnNumber;
src/server/shared/DataStores/DBCEnums.h
+2 -2
View File
@@ -282,7 +282,7 @@ enum FactionTemplateFlags
{ {
FACTION_TEMPLATE_FLAG_PVP = 0x00000800, // flagged for PvP FACTION_TEMPLATE_FLAG_PVP = 0x00000800, // flagged for PvP
FACTION_TEMPLATE_FLAG_CONTESTED_GUARD = 0x00001000, // faction will attack players that were involved in PvP combats FACTION_TEMPLATE_FLAG_CONTESTED_GUARD = 0x00001000, // faction will attack players that were involved in PvP combats
FACTION_TEMPLATE_FLAG_HOSTILE_BY_DEFAULT= 0x00002000, FACTION_TEMPLATE_FLAG_HOSTILE_BY_DEFAULT = 0x00002000,
}; };
enum FactionMasks enum FactionMasks
@@ -291,7 +291,7 @@ enum FactionMasks
FACTION_MASK_ALLIANCE = 2, // player or creature from alliance team FACTION_MASK_ALLIANCE = 2, // player or creature from alliance team
FACTION_MASK_HORDE = 4, // player or creature from horde team FACTION_MASK_HORDE = 4, // player or creature from horde team
FACTION_MASK_MONSTER = 8 // aggressive creature from monster team FACTION_MASK_MONSTER = 8 // aggressive creature from monster team
// if none flags set then non-aggressive creature // if none flags set then non-aggressive creature
}; };
enum MapTypes // Lua_IsInInstance enum MapTypes // Lua_IsInInstance
src/server/shared/DataStores/DBCStorageIterator.h
+35 -35
View File
@@ -13,46 +13,46 @@
template <class T> template <class T>
class DBCStorageIterator : public std::iterator<std::forward_iterator_tag, T> class DBCStorageIterator : public std::iterator<std::forward_iterator_tag, T>
{ {
public: public:
DBCStorageIterator() : _index(nullptr), _pos(0), _end(0) { } DBCStorageIterator() : _index(nullptr), _pos(0), _end(0) { }
DBCStorageIterator(T** index, uint32 size, uint32 pos = 0) : _index(index), _pos(pos), _end(size) DBCStorageIterator(T** index, uint32 size, uint32 pos = 0) : _index(index), _pos(pos), _end(size)
{
if (_pos < _end)
{ {
if (_pos < _end) while (_pos < _end && !_index[_pos])
{ ++_pos;
while (_pos < _end && !_index[_pos]) }
++_pos; }
}
T const* operator->() { return _index[_pos]; }
T const* operator*() { return _index[_pos]; }
bool operator==(DBCStorageIterator const& right) const { /*ASSERT(_index == right._index, "Iterator belongs to a different container")*/ return _pos == right._pos; }
bool operator!=(DBCStorageIterator const& right) const { return !(*this == right); }
DBCStorageIterator& operator++()
{
if (_pos < _end)
{
do
++_pos;
while (_pos < _end && !_index[_pos]);
} }
T const* operator->() { return _index[_pos]; } return *this;
T const* operator*() { return _index[_pos]; } }
bool operator==(DBCStorageIterator const& right) const { /*ASSERT(_index == right._index, "Iterator belongs to a different container")*/ return _pos == right._pos; } DBCStorageIterator operator++(int)
bool operator!=(DBCStorageIterator const& right) const { return !(*this == right); } {
DBCStorageIterator tmp = *this;
++*this;
return tmp;
}
DBCStorageIterator& operator++() private:
{ T** _index;
if (_pos < _end) uint32 _pos;
{ uint32 _end;
do
++_pos;
while (_pos < _end && !_index[_pos]);
}
return *this;
}
DBCStorageIterator operator++(int)
{
DBCStorageIterator tmp = *this;
++*this;
return tmp;
}
private:
T** _index;
uint32 _pos;
uint32 _end;
}; };
#endif // DBCStorageIterator_h__ #endif // DBCStorageIterator_h__
src/server/shared/DataStores/DBCStore.h
+1 -1
View File
@@ -12,7 +12,7 @@
#include "Errors.h" #include "Errors.h"
#include <vector> #include <vector>
/// Interface class for common access /// Interface class for common access
class DBCStorageBase class DBCStorageBase
{ {
public: public:
src/server/shared/DataStores/DBCStructure.h
+101 -98
View File
@@ -28,7 +28,7 @@ struct AchievementEntry
int32 requiredFaction; // 1 -1=all, 0=horde, 1=alliance int32 requiredFaction; // 1 -1=all, 0=horde, 1=alliance
int32 mapID; // 2 -1=none int32 mapID; // 2 -1=none
//uint32 parentAchievement; // 3 its Achievement parent (can`t start while parent uncomplete, use its Criteria if don`t have own, use its progress on begin) //uint32 parentAchievement; // 3 its Achievement parent (can`t start while parent uncomplete, use its Criteria if don`t have own, use its progress on begin)
char *name[16]; // 4-19 char* name[16]; // 4-19
//uint32 name_flags; // 20 //uint32 name_flags; // 20
//char *description[16]; // 21-36 //char *description[16]; // 21-36
//uint32 desc_flags; // 37 //uint32 desc_flags; // 37
@@ -325,7 +325,7 @@ struct AchievementCriteriaEntry
uint32 rollValue; // 3 uint32 rollValue; // 3
uint32 count; // 4 uint32 count; // 4
} roll_need_on_loot; } roll_need_on_loot;
// ACHIEVEMENT_CRITERIA_TYPE_ROLL_GREED_ON_LOOT = 51 // ACHIEVEMENT_CRITERIA_TYPE_ROLL_GREED_ON_LOOT = 51
struct struct
{ {
uint32 rollValue; // 3 uint32 rollValue; // 3
@@ -495,8 +495,8 @@ struct AchievementCriteriaEntry
uint32 flags; // 26 uint32 flags; // 26
uint32 timedType; // 27 uint32 timedType; // 27
uint32 timerStartEvent; // 28 Alway appears with timed events uint32 timerStartEvent; // 28 Alway appears with timed events
// for timed spells it is spell id for // for timed spells it is spell id for
// timed kills it is creature id // timed kills it is creature id
uint32 timeLimit; // 29 time limit in seconds uint32 timeLimit; // 29 time limit in seconds
//uint32 showOrder; // 30 show order //uint32 showOrder; // 30 show order
}; };
@@ -508,10 +508,10 @@ struct AreaTableEntry
uint32 zone; // 2 if 0 then it's zone, else it's zone id of this area uint32 zone; // 2 if 0 then it's zone, else it's zone id of this area
uint32 exploreFlag; // 3, main index uint32 exploreFlag; // 3, main index
uint32 flags; // 4, unknown value but 312 for all cities uint32 flags; // 4, unknown value but 312 for all cities
// 5-9 unused // 5-9 unused
int32 area_level; // 10 int32 area_level; // 10
char* area_name[16]; // 11-26 char* area_name[16]; // 11-26
// 27, string flags, unused // 27, string flags, unused
uint32 team; // 28 uint32 team; // 28
uint32 LiquidTypeOverride[4]; // 29-32 liquid override by type uint32 LiquidTypeOverride[4]; // 29-32 liquid override by type
@@ -568,7 +568,7 @@ struct AuctionHouseEntry
uint32 depositPercent; // 2 1/3 from real uint32 depositPercent; // 2 1/3 from real
uint32 cutPercent; // 3 uint32 cutPercent; // 3
//char* name[16]; // 4-19 //char* name[16]; // 4-19
// 20 string flag, unused // 20 string flag, unused
}; };
struct BankBagSlotPricesEntry struct BankBagSlotPricesEntry
@@ -624,9 +624,9 @@ struct CharTitlesEntry
uint32 ID; // 0, title ids, for example in Quest::GetCharTitleId() uint32 ID; // 0, title ids, for example in Quest::GetCharTitleId()
//uint32 unk1; // 1 flags? //uint32 unk1; // 1 flags?
char* nameMale[16]; // 2-17 char* nameMale[16]; // 2-17
// 18 string flag, unused // 18 string flag, unused
char* nameFemale[16]; // 19-34 char* nameFemale[16]; // 19-34
// 35 string flag, unused // 35 string flag, unused
uint32 bit_index; // 36 used in PLAYER_CHOSEN_TITLE and 1<<index in PLAYER__FIELD_KNOWN_TITLES uint32 bit_index; // 36 used in PLAYER_CHOSEN_TITLE and 1<<index in PLAYER__FIELD_KNOWN_TITLES
}; };
@@ -635,26 +635,26 @@ struct ChatChannelsEntry
uint32 ChannelID; // 0 uint32 ChannelID; // 0
uint32 flags; // 1 uint32 flags; // 1
char* pattern[16]; // 3-18 char* pattern[16]; // 3-18
// 19 string flags, unused // 19 string flags, unused
//char* name[16]; // 20-35 unused //char* name[16]; // 20-35 unused
// 36 string flag, unused // 36 string flag, unused
}; };
struct ChrClassesEntry struct ChrClassesEntry
{ {
uint32 ClassID; // 0 uint32 ClassID; // 0
// 1, unused // 1, unused
uint32 powerType; // 2 uint32 powerType; // 2
// 3-4, unused // 3-4, unused
char* name[16]; // 5-20 unused char* name[16]; // 5-20 unused
// 21 string flag, unused // 21 string flag, unused
//char* nameFemale[16]; // 21-36 unused, if different from base (male) case //char* nameFemale[16]; // 21-36 unused, if different from base (male) case
// 37 string flag, unused // 37 string flag, unused
//char* nameNeutralGender[16]; // 38-53 unused, if different from base (male) case //char* nameNeutralGender[16]; // 38-53 unused, if different from base (male) case
// 54 string flag, unused // 54 string flag, unused
// 55, unused // 55, unused
uint32 spellfamily; // 56 uint32 spellfamily; // 56
// 57, unused // 57, unused
uint32 CinematicSequence; // 58 id from CinematicSequences.dbc uint32 CinematicSequence; // 58 id from CinematicSequences.dbc
uint32 expansion; // 59 (0 - original race, 1 - tbc addon, ...) uint32 expansion; // 59 (0 - original race, 1 - tbc addon, ...)
}; };
@@ -662,23 +662,23 @@ struct ChrClassesEntry
struct ChrRacesEntry struct ChrRacesEntry
{ {
uint32 RaceID; // 0 uint32 RaceID; // 0
// 1 unused // 1 unused
uint32 FactionID; // 2 facton template id uint32 FactionID; // 2 facton template id
// 3 unused // 3 unused
uint32 model_m; // 4 uint32 model_m; // 4
uint32 model_f; // 5 uint32 model_f; // 5
// 6 unused // 6 unused
uint32 TeamID; // 7 (7-Alliance 1-Horde) uint32 TeamID; // 7 (7-Alliance 1-Horde)
// 8-11 unused // 8-11 unused
uint32 CinematicSequence; // 12 id from CinematicSequences.dbc uint32 CinematicSequence; // 12 id from CinematicSequences.dbc
//uint32 unk_322; // 13 faction (0 alliance, 1 horde, 2 not available?) //uint32 unk_322; // 13 faction (0 alliance, 1 horde, 2 not available?)
char* name[16]; // 14-29 used for DBC language detection/selection char* name[16]; // 14-29 used for DBC language detection/selection
// 30 string flags, unused // 30 string flags, unused
//char* nameFemale[16]; // 31-46, if different from base (male) case //char* nameFemale[16]; // 31-46, if different from base (male) case
// 47 string flags, unused // 47 string flags, unused
//char* nameNeutralGender[16]; // 48-63, if different from base (male) case //char* nameNeutralGender[16]; // 48-63, if different from base (male) case
// 64 string flags, unused // 64 string flags, unused
// 65-67 unused // 65-67 unused
uint32 expansion; // 68 (0 - original race, 1 - tbc addon, ...) uint32 expansion; // 68 (0 - original race, 1 - tbc addon, ...)
}; };
@@ -700,25 +700,25 @@ struct CinematicSequencesEntry
uint32 Id; // 0 index uint32 Id; // 0 index
//uint32 unk1; // 1 always 0 //uint32 unk1; // 1 always 0
//uint32 cinematicCamera; // 2 id in CinematicCamera.dbc //uint32 cinematicCamera; // 2 id in CinematicCamera.dbc
// 3-9 always 0 // 3-9 always 0
}; };
struct CreatureDisplayInfoEntry struct CreatureDisplayInfoEntry
{ {
uint32 Displayid; // 0 m_ID uint32 Displayid; // 0 m_ID
uint32 ModelId; // 1 m_modelID uint32 ModelId; // 1 m_modelID
// 2 m_soundID // 2 m_soundID
// 3 m_extendedDisplayInfoID // 3 m_extendedDisplayInfoID
float scale; // 4 m_creatureModelScale float scale; // 4 m_creatureModelScale
// 5 m_creatureModelAlpha // 5 m_creatureModelAlpha
// 6-8 m_textureVariation[3] // 6-8 m_textureVariation[3]
// 9 m_portraitTextureName // 9 m_portraitTextureName
// 10 m_sizeClass // 10 m_sizeClass
// 11 m_bloodID // 11 m_bloodID
// 12 m_NPCSoundID // 12 m_NPCSoundID
// 13 m_particleColorID // 13 m_particleColorID
// 14 m_creatureGeosetData // 14 m_creatureGeosetData
// 15 m_objectEffectPackageID // 15 m_objectEffectPackageID
}; };
struct CreatureFamilyEntry struct CreatureFamilyEntry
@@ -731,10 +731,10 @@ struct CreatureFamilyEntry
uint32 skillLine[2]; // 5-6 m_skillLine uint32 skillLine[2]; // 5-6 m_skillLine
uint32 petFoodMask; // 7 m_petFoodMask uint32 petFoodMask; // 7 m_petFoodMask
int32 petTalentType; // 8 m_petTalentType int32 petTalentType; // 8 m_petTalentType
// 9 m_categoryEnumID // 9 m_categoryEnumID
char* Name[16]; // 10-25 m_name_lang char* Name[16]; // 10-25 m_name_lang
// 26 string flags // 26 string flags
// 27 m_iconFile // 27 m_iconFile
}; };
struct CreatureModelDataEntry struct CreatureModelDataEntry
@@ -772,7 +772,7 @@ struct CreatureTypeEntry
{ {
uint32 ID; // 0 m_ID uint32 ID; // 0 m_ID
//char* Name[16]; // 1-16 name //char* Name[16]; // 1-16 name
// 17 string flags // 17 string flags
//uint32 no_expirience; // 18 no exp? critters, non-combat pets, gas cloud. //uint32 no_expirience; // 18 no exp? critters, non-combat pets, gas cloud.
}; };
@@ -872,9 +872,9 @@ struct FactionEntry
uint32 spilloverMaxRankIn; // 21 The highest rank the faction will profit from incoming spillover uint32 spilloverMaxRankIn; // 21 The highest rank the faction will profit from incoming spillover
//uint32 spilloverRank_unk; // 22 It does not seem to be the max standing at which a faction outputs spillover ...so no idea //uint32 spilloverRank_unk; // 22 It does not seem to be the max standing at which a faction outputs spillover ...so no idea
char* name[16]; // 23-38 m_name_lang char* name[16]; // 23-38 m_name_lang
// 39 string flags // 39 string flags
//char* description[16]; // 40-55 m_description_lang //char* description[16]; // 40-55 m_description_lang
// 56 string flags // 56 string flags
// helpers // helpers
bool CanHaveReputation() const bool CanHaveReputation() const
@@ -928,7 +928,7 @@ struct FactionTemplateEntry
} }
return (hostileMask & entry.ourMask) != 0; return (hostileMask & entry.ourMask) != 0;
} }
bool IsHostileToPlayers() const { return (hostileMask & FACTION_MASK_PLAYER) !=0; } bool IsHostileToPlayers() const { return (hostileMask & FACTION_MASK_PLAYER) != 0; }
bool IsNeutralToAll() const bool IsNeutralToAll() const
{ {
for (uint8 i = 0; i < MAX_FACTION_RELATIONS; ++i) for (uint8 i = 0; i < MAX_FACTION_RELATIONS; ++i)
@@ -1089,17 +1089,17 @@ struct ItemBagFamilyEntry
struct ItemDisplayInfoEntry struct ItemDisplayInfoEntry
{ {
uint32 ID; // 0 m_ID uint32 ID; // 0 m_ID
// 1 m_modelName[2] // 1 m_modelName[2]
// 2 m_modelTexture[2] // 2 m_modelTexture[2]
char* inventoryIcon; // 3 m_inventoryIcon char* inventoryIcon; // 3 m_inventoryIcon
// 4 m_geosetGroup[3] // 4 m_geosetGroup[3]
// 5 m_flags // 5 m_flags
// 6 m_spellVisualID // 6 m_spellVisualID
// 7 m_groupSoundIndex // 7 m_groupSoundIndex
// 8 m_helmetGeosetVis[2] // 8 m_helmetGeosetVis[2]
// 9 m_texture[2] // 9 m_texture[2]
// 10 m_itemVisual[8] // 10 m_itemVisual[8]
// 11 m_particleColorID // 11 m_particleColorID
}; };
//struct ItemCondExtCostsEntry //struct ItemCondExtCostsEntry
@@ -1127,7 +1127,7 @@ struct ItemLimitCategoryEntry
{ {
uint32 ID; // 0 Id uint32 ID; // 0 Id
//char* name[16] // 1-16 m_name_lang //char* name[16] // 1-16 m_name_lang
// 17 name flags // 17 name flags
uint32 maxCount; // 18, max allowed equipped as item or in gem slot uint32 maxCount; // 18, max allowed equipped as item or in gem slot
uint32 mode; // 19, 0 = have, 1 = equip (enum ItemLimitCategoryMode) uint32 mode; // 19, 0 = have, 1 = equip (enum ItemLimitCategoryMode)
}; };
@@ -1140,15 +1140,15 @@ struct ItemRandomPropertiesEntry
//char* internalName // 1 m_Name //char* internalName // 1 m_Name
uint32 enchant_id[MAX_ITEM_ENCHANTMENT_EFFECTS]; // 2-6 m_Enchantment uint32 enchant_id[MAX_ITEM_ENCHANTMENT_EFFECTS]; // 2-6 m_Enchantment
char* nameSuffix[16]; // 7-22 m_name_lang char* nameSuffix[16]; // 7-22 m_name_lang
// 23 name flags // 23 name flags
}; };
struct ItemRandomSuffixEntry struct ItemRandomSuffixEntry
{ {
uint32 ID; // 0 m_ID uint32 ID; // 0 m_ID
char* nameSuffix[16]; // 1-16 m_name_lang char* nameSuffix[16]; // 1-16 m_name_lang
// 17, name flags // 17, name flags
// 18 m_internalName // 18 m_internalName
uint32 enchant_id[MAX_ITEM_ENCHANTMENT_EFFECTS]; // 19-23 m_enchantment uint32 enchant_id[MAX_ITEM_ENCHANTMENT_EFFECTS]; // 19-23 m_enchantment
uint32 prefix[MAX_ITEM_ENCHANTMENT_EFFECTS]; // 24-28 m_allocationPct uint32 prefix[MAX_ITEM_ENCHANTMENT_EFFECTS]; // 24-28 m_allocationPct
}; };
@@ -1160,7 +1160,7 @@ struct ItemSetEntry
{ {
//uint32 id // 0 m_ID //uint32 id // 0 m_ID
char* name[16]; // 1-16 m_name_lang char* name[16]; // 1-16 m_name_lang
// 17 string flags, unused // 17 string flags, unused
uint32 itemId[MAX_ITEM_SET_ITEMS]; // 18-27 m_itemID uint32 itemId[MAX_ITEM_SET_ITEMS]; // 18-27 m_itemID
//uint32 unknown[7]; // 28-34 unk, all 0 //uint32 unknown[7]; // 28-34 unk, all 0
uint32 spells[MAX_ITEM_SET_SPELLS]; // 35-42 m_setSpellID uint32 spells[MAX_ITEM_SET_SPELLS]; // 35-42 m_setSpellID
@@ -1249,7 +1249,7 @@ struct MailTemplateEntry
{ {
uint32 ID; // 0 uint32 ID; // 0
//char* subject[16]; // 1-16 //char* subject[16]; // 1-16
// 17 name flags, unused // 17 name flags, unused
char* content[16]; // 18-33 char* content[16]; // 18-33
}; };
@@ -1259,14 +1259,14 @@ struct MapEntry
//char* internalname; // 1 unused //char* internalname; // 1 unused
uint32 map_type; // 2 uint32 map_type; // 2
uint32 Flags; // 3 uint32 Flags; // 3
// 4 0 or 1 for battlegrounds (not arenas) // 4 0 or 1 for battlegrounds (not arenas)
char* name[16]; // 5-20 char* name[16]; // 5-20
// 21 name flags, unused // 21 name flags, unused
uint32 linked_zone; // 22 common zone for instance and continent map uint32 linked_zone; // 22 common zone for instance and continent map
//char* hordeIntro[16]; // 23-38 text for PvP Zones //char* hordeIntro[16]; // 23-38 text for PvP Zones
// 39 intro text flags // 39 intro text flags
//char* allianceIntro[16]; // 40-55 text for PvP Zones //char* allianceIntro[16]; // 40-55 text for PvP Zones
// 56 intro text flags // 56 intro text flags
uint32 multimap_id; // 57 uint32 multimap_id; // 57
//float BattlefieldMapIconScale; // 58 //float BattlefieldMapIconScale; // 58
int32 entrance_map; // 59 map_id of entrance map int32 entrance_map; // 59 map_id of entrance map
@@ -1289,7 +1289,7 @@ struct MapEntry
bool IsBattlegroundOrArena() const { return map_type == MAP_BATTLEGROUND || map_type == MAP_ARENA; } bool IsBattlegroundOrArena() const { return map_type == MAP_BATTLEGROUND || map_type == MAP_ARENA; }
bool IsWorldMap() const { return map_type == MAP_COMMON; } bool IsWorldMap() const { return map_type == MAP_COMMON; }
bool GetEntrancePos(int32 &mapid, float &x, float &y) const bool GetEntrancePos(int32& mapid, float& x, float& y) const
{ {
if (entrance_map < 0) if (entrance_map < 0)
return false; return false;
@@ -1363,19 +1363,19 @@ struct QuestSortEntry
{ {
uint32 id; // 0 m_ID uint32 id; // 0 m_ID
//char* name[16]; // 1-16 m_SortName_lang //char* name[16]; // 1-16 m_SortName_lang
// 17 name flags // 17 name flags
}; };
struct QuestXPEntry struct QuestXPEntry
{ {
uint32 id; uint32 id;
uint32 Exp[10]; uint32 Exp[10];
}; };
struct QuestFactionRewEntry struct QuestFactionRewEntry
{ {
uint32 id; uint32 id;
int32 QuestRewFactionValue[10]; int32 QuestRewFactionValue[10];
}; };
struct RandomPropertiesPointsEntry struct RandomPropertiesPointsEntry
@@ -1496,12 +1496,12 @@ struct SkillLineEntry
int32 categoryId; // 1 m_categoryID int32 categoryId; // 1 m_categoryID
//uint32 skillCostID; // 2 m_skillCostsID //uint32 skillCostID; // 2 m_skillCostsID
char* name[16]; // 3-18 m_displayName_lang char* name[16]; // 3-18 m_displayName_lang
// 19 string flags // 19 string flags
//char* description[16]; // 20-35 m_description_lang //char* description[16]; // 20-35 m_description_lang
// 36 string flags // 36 string flags
uint32 spellIcon; // 37 m_spellIconID uint32 spellIcon; // 37 m_spellIconID
//char* alternateVerb[16]; // 38-53 m_alternateVerb_lang //char* alternateVerb[16]; // 38-53 m_alternateVerb_lang
// 54 string flags // 54 string flags
uint32 canLink; // 55 m_canLink (prof. with recipes uint32 canLink; // 55 m_canLink (prof. with recipes
}; };
@@ -1530,12 +1530,12 @@ struct SoundEntriesEntry
//char* FileName[10]; // 3-12 m_File[10] //char* FileName[10]; // 3-12 m_File[10]
//uint32 Unk13[10]; // 13-22 m_Freq[10] //uint32 Unk13[10]; // 13-22 m_Freq[10]
//char* Path; // 23 m_DirectoryBase //char* Path; // 23 m_DirectoryBase
// 24 m_volumeFloat // 24 m_volumeFloat
// 25 m_flags // 25 m_flags
// 26 m_minDistance // 26 m_minDistance
// 27 m_distanceCutoff // 27 m_distanceCutoff
// 28 m_EAXDef // 28 m_EAXDef
// 29 new in 3.1 // 29 new in 3.1
}; };
#define MAX_SPELL_EFFECTS 3 #define MAX_SPELL_EFFECTS 3
@@ -1684,7 +1684,7 @@ struct SpellFocusObjectEntry
{ {
uint32 ID; // 0 uint32 ID; // 0
//char* Name[16]; // 1-15 unused //char* Name[16]; // 1-15 unused
// 16 string flags, unused // 16 string flags, unused
}; };
struct SpellRadiusEntry struct SpellRadiusEntry
@@ -1704,9 +1704,9 @@ struct SpellRangeEntry
float maxRangeFriend; float maxRangeFriend;
uint32 type; uint32 type;
//char* Name[16]; // 7-23 unused //char* Name[16]; // 7-23 unused
// 24 string flags, unused // 24 string flags, unused
//char* Name2[16]; // 25-40 unused //char* Name2[16]; // 25-40 unused
// 41 string flags, unused // 41 string flags, unused
}; };
struct SpellRuneCostEntry struct SpellRuneCostEntry
@@ -1803,11 +1803,11 @@ struct TalentEntry
uint32 Row; // 2 uint32 Row; // 2
uint32 Col; // 3 uint32 Col; // 3
uint32 RankID[MAX_TALENT_RANK]; // 4-8 uint32 RankID[MAX_TALENT_RANK]; // 4-8
// 9-12 not used, always 0, maybe not used high ranks // 9-12 not used, always 0, maybe not used high ranks
uint32 DependsOn; // 13 index in Talent.dbc (TalentEntry) uint32 DependsOn; // 13 index in Talent.dbc (TalentEntry)
// 14-15 not used // 14-15 not used
uint32 DependsOnRank; // 16 uint32 DependsOnRank; // 16
// 17-18 not used // 17-18 not used
uint32 addToSpellBook; // 19 also need disable higest ranks on reset talent tree uint32 addToSpellBook; // 19 also need disable higest ranks on reset talent tree
//uint32 unk2; // 20, all 0 //uint32 unk2; // 20, all 0
//uint64 allowForPet; // 21-22 its a 64 bit mask for pet 1<<m_categoryEnumID in CreatureFamily.dbc //uint64 allowForPet; // 21-22 its a 64 bit mask for pet 1<<m_categoryEnumID in CreatureFamily.dbc
@@ -1819,7 +1819,7 @@ struct TalentTabEntry
//char* name[16]; // 1-16, unused //char* name[16]; // 1-16, unused
//uint32 nameFlags; // 17, unused //uint32 nameFlags; // 17, unused
//unit32 spellicon; // 18 //unit32 spellicon; // 18
// 19 not used // 19 not used
uint32 ClassMask; // 20 uint32 ClassMask; // 20
uint32 petTalentMask; // 21 uint32 petTalentMask; // 21
uint32 tabpage; // 22 uint32 tabpage; // 22
@@ -1834,7 +1834,7 @@ struct TaxiNodesEntry
float y; // 3 m_y float y; // 3 m_y
float z; // 4 m_z float z; // 4 m_z
char* name[16]; // 5-21 m_Name_lang char* name[16]; // 5-21 m_Name_lang
// 22 string flags // 22 string flags
uint32 MountCreatureID[2]; // 23-24 m_MountCreatureID[2] uint32 MountCreatureID[2]; // 23-24 m_MountCreatureID[2]
}; };
@@ -1848,7 +1848,7 @@ struct TaxiPathEntry
struct TaxiPathNodeEntry struct TaxiPathNodeEntry
{ {
// 0 m_ID // 0 m_ID
uint32 path; // 1 m_PathID uint32 path; // 1 m_PathID
uint32 index; // 2 m_NodeIndex uint32 index; // 2 m_NodeIndex
uint32 mapid; // 3 m_ContinentID uint32 mapid; // 3 m_ContinentID
@@ -1871,7 +1871,7 @@ struct TotemCategoryEntry
{ {
uint32 ID; // 0 uint32 ID; // 0
//char* name[16]; // 1-16 //char* name[16]; // 1-16
// 17 string flags, unused // 17 string flags, unused
uint32 categoryType; // 18 (one for specialization) uint32 categoryType; // 18 (one for specialization)
uint32 categoryMask; // 19 (compatibility mask for same type: different for totems, compatible from high to low for rods) uint32 categoryMask; // 19 (compatibility mask for same type: different for totems, compatible from high to low for rods)
}; };
@@ -1933,8 +1933,8 @@ struct VehicleEntry
float m_msslTrgtImpactTexRadius; // 35 float m_msslTrgtImpactTexRadius; // 35
uint32 m_uiSeatIndicatorType; // 36 uint32 m_uiSeatIndicatorType; // 36
uint32 m_powerDisplayId; // 37, new in 3.1 uint32 m_powerDisplayId; // 37, new in 3.1
// 38, new in 3.1 // 38, new in 3.1
// 39, new in 3.1 // 39, new in 3.1
}; };
struct VehicleSeatEntry struct VehicleSeatEntry
@@ -1985,7 +1985,7 @@ struct VehicleSeatEntry
uint32 m_exitUISoundID; // 43 uint32 m_exitUISoundID; // 43
int32 m_uiSkin; // 44 int32 m_uiSkin; // 44
uint32 m_flagsB; // 45 uint32 m_flagsB; // 45
// 46-57 added in 3.1, floats mostly // 46-57 added in 3.1, floats mostly
bool CanEnterOrExit() const bool CanEnterOrExit() const
{ {
@@ -1994,9 +1994,12 @@ struct VehicleSeatEntry
(m_flags & (VEHICLE_SEAT_FLAG_HAS_LOWER_ANIM_FOR_ENTER | VEHICLE_SEAT_FLAG_HAS_LOWER_ANIM_FOR_RIDE)) != 0); (m_flags & (VEHICLE_SEAT_FLAG_HAS_LOWER_ANIM_FOR_ENTER | VEHICLE_SEAT_FLAG_HAS_LOWER_ANIM_FOR_RIDE)) != 0);
} }
bool CanSwitchFromSeat() const { return m_flags & VEHICLE_SEAT_FLAG_CAN_SWITCH; } bool CanSwitchFromSeat() const { return m_flags & VEHICLE_SEAT_FLAG_CAN_SWITCH; }
bool IsUsableByOverride() const { return (m_flags & (VEHICLE_SEAT_FLAG_UNCONTROLLED | VEHICLE_SEAT_FLAG_UNK18) bool IsUsableByOverride() const
|| (m_flagsB & (VEHICLE_SEAT_FLAG_B_USABLE_FORCED | VEHICLE_SEAT_FLAG_B_USABLE_FORCED_2 | {
VEHICLE_SEAT_FLAG_B_USABLE_FORCED_3 | VEHICLE_SEAT_FLAG_B_USABLE_FORCED_4))); } return (m_flags & (VEHICLE_SEAT_FLAG_UNCONTROLLED | VEHICLE_SEAT_FLAG_UNK18)
|| (m_flagsB & (VEHICLE_SEAT_FLAG_B_USABLE_FORCED | VEHICLE_SEAT_FLAG_B_USABLE_FORCED_2 |
VEHICLE_SEAT_FLAG_B_USABLE_FORCED_3 | VEHICLE_SEAT_FLAG_B_USABLE_FORCED_4)));
}
bool IsEjectable() const { return m_flagsB & VEHICLE_SEAT_FLAG_B_EJECTABLE; } bool IsEjectable() const { return m_flagsB & VEHICLE_SEAT_FLAG_B_EJECTABLE; }
}; };
@@ -2039,9 +2042,9 @@ struct WorldMapOverlayEntry
uint32 ID; // 0 uint32 ID; // 0
//uint32 worldMapAreaId; // 1 idx in WorldMapArea.dbc //uint32 worldMapAreaId; // 1 idx in WorldMapArea.dbc
uint32 areatableID[MAX_WORLD_MAP_OVERLAY_AREA_IDX]; // 2-5 uint32 areatableID[MAX_WORLD_MAP_OVERLAY_AREA_IDX]; // 2-5
// 6-7 always 0, possible part of areatableID[] // 6-7 always 0, possible part of areatableID[]
//char* internal_name // 8 //char* internal_name // 8
// 9-16 some ints // 9-16 some ints
}; };
/* /*
src/server/shared/Network/RealmSocket.cpp
+8 -8
View File
@@ -38,7 +38,7 @@ RealmSocket::~RealmSocket(void)
peer().close(); peer().close();
} }
int RealmSocket::open(void * arg) int RealmSocket::open(void* arg)
{ {
ACE_INET_Addr addr; ACE_INET_Addr addr;
@@ -90,7 +90,7 @@ size_t RealmSocket::recv_len(void) const
return input_buffer_.length(); return input_buffer_.length();
} }
bool RealmSocket::recv_soft(char *buf, size_t len) bool RealmSocket::recv_soft(char* buf, size_t len)
{ {
if (input_buffer_.length() < len) if (input_buffer_.length() < len)
return false; return false;
@@ -100,7 +100,7 @@ bool RealmSocket::recv_soft(char *buf, size_t len)
return true; return true;
} }
bool RealmSocket::recv(char *buf, size_t len) bool RealmSocket::recv(char* buf, size_t len)
{ {
bool ret = recv_soft(buf, len); bool ret = recv_soft(buf, len);
@@ -115,7 +115,7 @@ void RealmSocket::recv_skip(size_t len)
input_buffer_.rd_ptr(len); input_buffer_.rd_ptr(len);
} }
ssize_t RealmSocket::noblk_send(ACE_Message_Block &message_block) ssize_t RealmSocket::noblk_send(ACE_Message_Block& message_block)
{ {
const size_t len = message_block.length(); const size_t len = message_block.length();
@@ -146,7 +146,7 @@ ssize_t RealmSocket::noblk_send(ACE_Message_Block &message_block)
return n; return n;
} }
bool RealmSocket::send(const char *buf, size_t len) bool RealmSocket::send(const char* buf, size_t len)
{ {
if (buf == NULL || len == 0) if (buf == NULL || len == 0)
return true; return true;
@@ -174,7 +174,7 @@ bool RealmSocket::send(const char *buf, size_t len)
ACE_Message_Block* mb = message_block.clone(); ACE_Message_Block* mb = message_block.clone();
if (msg_queue()->enqueue_tail(mb, (ACE_Time_Value *)(&ACE_Time_Value::zero)) == -1) if (msg_queue()->enqueue_tail(mb, (ACE_Time_Value*)(&ACE_Time_Value::zero)) == -1)
{ {
mb->release(); mb->release();
return false; return false;
@@ -199,7 +199,7 @@ int RealmSocket::handle_output(ACE_HANDLE)
return 0; return 0;
} }
if (msg_queue()->dequeue_head(mb, (ACE_Time_Value *)(&ACE_Time_Value::zero)) == -1) if (msg_queue()->dequeue_head(mb, (ACE_Time_Value*)(&ACE_Time_Value::zero)) == -1)
return -1; return -1;
ssize_t n = noblk_send(*mb); ssize_t n = noblk_send(*mb);
@@ -218,7 +218,7 @@ int RealmSocket::handle_output(ACE_HANDLE)
{ {
mb->rd_ptr(n); mb->rd_ptr(n);
if (msg_queue()->enqueue_head(mb, (ACE_Time_Value *) &ACE_Time_Value::zero) == -1) if (msg_queue()->enqueue_head(mb, (ACE_Time_Value*) &ACE_Time_Value::zero) == -1)
{ {
mb->release(); mb->release();
return -1; return -1;
src/server/shared/Network/RealmSocket.h
+5 -5
View File
@@ -35,17 +35,17 @@ public:
virtual ~RealmSocket(void); virtual ~RealmSocket(void);
size_t recv_len(void) const; size_t recv_len(void) const;
bool recv_soft(char *buf, size_t len); bool recv_soft(char* buf, size_t len);
bool recv(char *buf, size_t len); bool recv(char* buf, size_t len);
void recv_skip(size_t len); void recv_skip(size_t len);
bool send(const char *buf, size_t len); bool send(const char* buf, size_t len);
const std::string& getRemoteAddress(void) const; const std::string& getRemoteAddress(void) const;
uint16 getRemotePort(void) const; uint16 getRemotePort(void) const;
virtual int open(void *); virtual int open(void*);
virtual int close(u_long); virtual int close(u_long);
@@ -57,7 +57,7 @@ public:
void set_session(Session* session); void set_session(Session* session);
private: private:
ssize_t noblk_send(ACE_Message_Block &message_block); ssize_t noblk_send(ACE_Message_Block& message_block);
ACE_Message_Block input_buffer_; ACE_Message_Block input_buffer_;
Session* session_; Session* session_;
src/server/shared/Realms/RealmList.cpp
+1 -2
View File
@@ -94,7 +94,6 @@ void RealmList::UpdateRealms(bool init)
if (init) if (init)
sLog->outString("Added realm \"%s\" at %s:%u.", name.c_str(), m_realms[name].ExternalAddress.get_host_addr(), port); sLog->outString("Added realm \"%s\" at %s:%u.", name.c_str(), m_realms[name].ExternalAddress.get_host_addr(), port);
} } while (result->NextRow());
while (result->NextRow());
} }
} }
src/server/shared/Realms/RealmList.h
+1 -1
View File
@@ -59,7 +59,7 @@ public:
uint32 size() const { return m_realms.size(); } uint32 size() const { return m_realms.size(); }
private: private:
void UpdateRealms(bool init=false); void UpdateRealms(bool init = false);
void UpdateRealm(uint32 id, const std::string& name, ACE_INET_Addr const& address, ACE_INET_Addr const& localAddr, ACE_INET_Addr const& localSubmask, uint8 icon, RealmFlags flag, uint8 timezone, AccountTypes allowedSecurityLevel, float popu, uint32 build); void UpdateRealm(uint32 id, const std::string& name, ACE_INET_Addr const& address, ACE_INET_Addr const& localAddr, ACE_INET_Addr const& localSubmask, uint8 icon, RealmFlags flag, uint8 timezone, AccountTypes allowedSecurityLevel, float popu, uint32 build);
RealmMap m_realms; RealmMap m_realms;