josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Random cleanup after last commit spree

Browse Source
This commit is contained in:
leak
2011-04-29 09:28:32 +02:00
parent 8583a7f714
commit e1647aaa29
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/Creature/Creature.h
+3 -1
View File
@@ -76,6 +76,8 @@ enum CreatureFlagsExtra
#define MAX_CREATURE_QUEST_ITEMS 6 #define MAX_CREATURE_QUEST_ITEMS 6
#define MAX_EQUIPMENT_ITEMS 3
// from `creature_template` table // from `creature_template` table
struct CreatureTemplate struct CreatureTemplate
{ {
@@ -228,7 +230,7 @@ struct PointOfInterestLocale
struct EquipmentInfo struct EquipmentInfo
{ {
uint32 ItemEntry[3]; uint32 ItemEntry[MAX_EQUIPMENT_ITEMS];
}; };
// Benchmarked: Faster than std::map (insert/find) // Benchmarked: Faster than std::map (insert/find)
src/server/game/Globals/ObjectMgr.cpp
+2 -4
View File
@@ -1170,7 +1170,7 @@ void ObjectMgr::LoadEquipmentTemplates()
equipmentInfo.ItemEntry[1] = fields[2].GetUInt32(); equipmentInfo.ItemEntry[1] = fields[2].GetUInt32();
equipmentInfo.ItemEntry[2] = fields[3].GetUInt32(); equipmentInfo.ItemEntry[2] = fields[3].GetUInt32();
for (uint8 i = 0; i < 3; ++i) for (uint8 i = 0; i < MAX_EQUIPMENT_ITEMS; ++i)
{ {
if (!equipmentInfo.ItemEntry[i]) if (!equipmentInfo.ItemEntry[i])
continue; continue;
@@ -5768,8 +5768,6 @@ void ObjectMgr::LoadPageTexts()
{ {
Field* fields = result->Fetch(); Field* fields = result->Fetch();
const char* text = fields[1].GetCString();
PageText pageText; PageText pageText;
pageText.Text = fields[1].GetString(); pageText.Text = fields[1].GetString();
@@ -5865,7 +5863,7 @@ void ObjectMgr::LoadInstanceTemplate()
InstanceTemplate instanceTemplate; InstanceTemplate instanceTemplate;
instanceTemplate.AllowMount = fields[3].GetBool(); instanceTemplate.AllowMount = fields[3].GetBool();
instanceTemplate.Parent = fields[1].GetUInt16(); instanceTemplate.Parent = uint32(fields[1].GetUInt16());
instanceTemplate.ScriptId = sObjectMgr->GetScriptId(fields[2].GetCString()); instanceTemplate.ScriptId = sObjectMgr->GetScriptId(fields[2].GetCString());
InstanceTemplateStore[mapID] = instanceTemplate; InstanceTemplateStore[mapID] = instanceTemplate;