mirror of
https://github.com/mangosfour/server.git
synced 2025-12-12 19:37:03 +00:00
Various Cleanups (game C-E)
This commit is contained in:
parent
f80629e307
commit
c5c09cee3c
40 changed files with 1826 additions and 1818 deletions
|
|
@ -846,7 +846,8 @@ ChatCommand * ChatHandler::getCommandTable()
|
||||||
|
|
||||||
SetDataForCommandInTable(commandTable, name.c_str(), fields[1].GetUInt16(), fields[2].GetCppString());
|
SetDataForCommandInTable(commandTable, name.c_str(), fields[1].GetUInt16(), fields[2].GetCppString());
|
||||||
|
|
||||||
} while(result->NextRow());
|
}
|
||||||
|
while (result->NextRow());
|
||||||
delete result;
|
delete result;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -1644,7 +1645,8 @@ valid examples:
|
||||||
{
|
{
|
||||||
propertyId*=10;
|
propertyId*=10;
|
||||||
propertyId += c-'0';
|
propertyId += c-'0';
|
||||||
} else if(c == '-')
|
}
|
||||||
|
else if (c == '-')
|
||||||
negativeNumber = true;
|
negativeNumber = true;
|
||||||
else
|
else
|
||||||
return false;
|
return false;
|
||||||
|
|
|
||||||
|
|
@ -51,7 +51,6 @@
|
||||||
// apply implementation of the singletons
|
// apply implementation of the singletons
|
||||||
#include "Policies/SingletonImp.h"
|
#include "Policies/SingletonImp.h"
|
||||||
|
|
||||||
|
|
||||||
ObjectGuid CreatureData::GetObjectGuid(uint32 lowguid) const
|
ObjectGuid CreatureData::GetObjectGuid(uint32 lowguid) const
|
||||||
{
|
{
|
||||||
// info existence checked at loading
|
// info existence checked at loading
|
||||||
|
|
@ -312,7 +311,8 @@ bool Creature::InitEntry(uint32 Entry, CreatureData const* data /*=NULL*/, GameE
|
||||||
LoadEquipment(cinfo->equipmentId); // else use from diff template
|
LoadEquipment(cinfo->equipmentId); // else use from diff template
|
||||||
}
|
}
|
||||||
else if (data && data->equipmentId != -1)
|
else if (data && data->equipmentId != -1)
|
||||||
{ // override, -1 means no equipment
|
{
|
||||||
|
// override, -1 means no equipment
|
||||||
LoadEquipment(data->equipmentId);
|
LoadEquipment(data->equipmentId);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -93,7 +93,8 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Texts(bool check_entry_use)
|
||||||
|
|
||||||
m_CreatureEventAI_TextMap[i] = temp;
|
m_CreatureEventAI_TextMap[i] = temp;
|
||||||
++count;
|
++count;
|
||||||
} while (result->NextRow());
|
}
|
||||||
|
while (result->NextRow());
|
||||||
|
|
||||||
delete result;
|
delete result;
|
||||||
|
|
||||||
|
|
@ -185,7 +186,8 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Summons(bool check_entry_use)
|
||||||
//Add to map
|
//Add to map
|
||||||
m_CreatureEventAI_Summon_Map[temp.id] = temp;
|
m_CreatureEventAI_Summon_Map[temp.id] = temp;
|
||||||
++Count;
|
++Count;
|
||||||
}while (result->NextRow());
|
}
|
||||||
|
while (result->NextRow());
|
||||||
|
|
||||||
delete result;
|
delete result;
|
||||||
|
|
||||||
|
|
@ -194,7 +196,8 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Summons(bool check_entry_use)
|
||||||
|
|
||||||
sLog.outString();
|
sLog.outString();
|
||||||
sLog.outString(">> Loaded %u CreatureEventAI summon definitions", Count);
|
sLog.outString(">> Loaded %u CreatureEventAI summon definitions", Count);
|
||||||
}else
|
}
|
||||||
|
else
|
||||||
{
|
{
|
||||||
BarGoLink bar(1);
|
BarGoLink bar(1);
|
||||||
bar.step();
|
bar.step();
|
||||||
|
|
@ -811,7 +814,8 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts()
|
||||||
//Add to list
|
//Add to list
|
||||||
m_CreatureEventAI_Event_Map[creature_id].push_back(temp);
|
m_CreatureEventAI_Event_Map[creature_id].push_back(temp);
|
||||||
++Count;
|
++Count;
|
||||||
} while (result->NextRow());
|
}
|
||||||
|
while (result->NextRow());
|
||||||
|
|
||||||
delete result;
|
delete result;
|
||||||
|
|
||||||
|
|
@ -834,7 +838,8 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts()
|
||||||
|
|
||||||
sLog.outString();
|
sLog.outString();
|
||||||
sLog.outString(">> Loaded %u CreatureEventAI scripts", Count);
|
sLog.outString(">> Loaded %u CreatureEventAI scripts", Count);
|
||||||
}else
|
}
|
||||||
|
else
|
||||||
{
|
{
|
||||||
BarGoLink bar(1);
|
BarGoLink bar(1);
|
||||||
bar.step();
|
bar.step();
|
||||||
|
|
|
||||||
|
|
@ -210,4 +210,5 @@ MANGOS_DLL_SPEC DBCStorage <ItemEntry> const* GetItemDisplaySto
|
||||||
MANGOS_DLL_SPEC DBCStorage <CreatureDisplayInfoEntry> const* GetCreatureDisplayStore();
|
MANGOS_DLL_SPEC DBCStorage <CreatureDisplayInfoEntry> const* GetCreatureDisplayStore();
|
||||||
MANGOS_DLL_SPEC DBCStorage <EmotesEntry> const* GetEmotesStore();
|
MANGOS_DLL_SPEC DBCStorage <EmotesEntry> const* GetEmotesStore();
|
||||||
MANGOS_DLL_SPEC DBCStorage <EmotesTextEntry> const* GetEmotesTextStore();
|
MANGOS_DLL_SPEC DBCStorage <EmotesTextEntry> const* GetEmotesTextStore();
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue