Merge pull request #4061 from Venugh/4.x

Fix some whitespaces in Datastore
This commit is contained in:
Kaelima
2011-11-25 01:22:25 -08:00
2 changed files with 74 additions and 76 deletions
+21 -23
View File
@@ -880,7 +880,7 @@ struct DungeonEncounterEntry
uint32 difficulty; // 2 instance mode uint32 difficulty; // 2 instance mode
//uint32 unk0; // 3 //uint32 unk0; // 3
uint32 encounterIndex; // 4 encounter index for creating completed mask uint32 encounterIndex; // 4 encounter index for creating completed mask
char* encounterName; // 5-20 encounter name char* encounterName; // 5 encounter name
//uint32 nameFlags; // 21 //uint32 nameFlags; // 21
//uint32 unk1; // 22 //uint32 unk1; // 22
}; };
@@ -1107,8 +1107,7 @@ struct GtRegenMPPerSptEntry
struct HolidayDescriptionsEntry struct HolidayDescriptionsEntry
{ {
uint32 ID; // 0, this is NOT holiday id uint32 ID; // 0, this is NOT holiday id
//char* name[16] // 1-16 m_name_lang //char* name // 1 m_name_lang
// 17 name flags
}; };
*/ */
@@ -1116,8 +1115,7 @@ struct HolidayDescriptionsEntry
struct HolidayNamesEntry struct HolidayNamesEntry
{ {
uint32 ID; // 0, this is NOT holiday id uint32 ID; // 0, this is NOT holiday id
//char* name[16] // 1-16 m_name_lang //char* name // 1 m_name_lang
// 17 name flags
}; };
*/ */
@@ -1299,7 +1297,7 @@ struct LFGDungeonEntry
uint32 expansion; // 29 uint32 expansion; // 29
//uint32 unk4; // 30 //uint32 unk4; // 30
uint32 grouptype; // 31 uint32 grouptype; // 31
//char* desc; // 32-47 Description //char* desc; // 32 Description
// Helpers // Helpers
uint32 Entry() const { return ID + (type << 24); } uint32 Entry() const { return ID + (type << 24); }
}; };
@@ -1804,31 +1802,31 @@ struct SpellClassOptionsEntry
struct SpellInterruptsEntry struct SpellInterruptsEntry
{ {
//uint32 Id; // 0 m_ID //uint32 Id; // 0 m_ID
uint32 AuraInterruptFlags; // 33 m_auraInterruptFlags uint32 AuraInterruptFlags; // 1 m_auraInterruptFlags
//uint32 // 34 4.0.0 //uint32 // 2 4.0.0
uint32 ChannelInterruptFlags; // 35 m_channelInterruptFlags uint32 ChannelInterruptFlags; // 3 m_channelInterruptFlags
//uint32 // 36 4.0.0 //uint32 // 4 4.0.0
uint32 InterruptFlags; // 32 m_interruptFlags uint32 InterruptFlags; // 5 m_interruptFlags
}; };
// SpellLevels.dbc // SpellLevels.dbc
struct SpellLevelsEntry struct SpellLevelsEntry
{ {
//uint32 Id; // 0 m_ID //uint32 Id; // 0 m_ID
uint32 baseLevel; // 41 m_baseLevel uint32 baseLevel; // 1 m_baseLevel
uint32 maxLevel; // 40 m_maxLevel uint32 maxLevel; // 2 m_maxLevel
uint32 spellLevel; // 42 m_spellLevel uint32 spellLevel; // 3 m_spellLevel
}; };
// SpellPower.dbc // SpellPower.dbc
struct SpellPowerEntry struct SpellPowerEntry
{ {
//uint32 Id; // 0 m_ID //uint32 Id; // 0 m_ID
uint32 manaCost; // 45 m_manaCost uint32 manaCost; // 1 m_manaCost
uint32 manaCostPerlevel; // 46 m_manaCostPerLevel uint32 manaCostPerlevel; // 2 m_manaCostPerLevel
uint32 ManaCostPercentage; // 144 m_manaCostPct uint32 ManaCostPercentage; // 3 m_manaCostPct
uint32 manaPerSecond; // 47 m_manaPerSecond uint32 manaPerSecond; // 4 m_manaPerSecond
//uint32 PowerDisplayId; // 168 m_powerDisplayID - id from PowerDisplay.dbc, new in 3.1 //uint32 PowerDisplayId; // 5 m_powerDisplayID - id from PowerDisplay.dbc, new in 3.1
//uint32 unk1; // 6 4.0.0 //uint32 unk1; // 6 4.0.0
}; };
@@ -1877,10 +1875,10 @@ struct SpellShapeshiftEntry
struct SpellTargetRestrictionsEntry struct SpellTargetRestrictionsEntry
{ {
uint32 Id; // 0 m_ID uint32 Id; // 0 m_ID
uint32 MaxAffectedTargets; // 152 m_maxTargets uint32 MaxAffectedTargets; // 1 m_maxTargets
uint32 MaxTargetLevel; // 147 m_maxTargetLevel uint32 MaxTargetLevel; // 2 m_maxTargetLevel
uint32 TargetCreatureType; // 18 m_targetCreatureType uint32 TargetCreatureType; // 3 m_targetCreatureType
uint32 Targets; // 17 m_targets uint32 Targets; // 4 m_targets
}; };
// SpellReagents.dbc // SpellReagents.dbc