mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-12 19:37:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[11066] Remove tail whitespaces.

Browse source 
Signed-off-by: VladimirMangos <vladimir@getmangos.com>
This commit is contained in:
Skirnir 2011-01-24 23:41:11 +03:00 • committed by VladimirMangos
parent d5b982cbbe
commit 75b4f75f4d
58 changed files with 170 additions and 170 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -41,13 +41,13 @@ MaNGOS 0.16 (2 July 2010)
==== Server Features ==== ==== Server Features ====
* Added: Implemented SOAP in MaNGOS * Added: Implemented SOAP in MaNGOS
* Added: Camera framework for proper mind vision like spells use and grid code cleanups including remove unused cell-level thread locking. * Added: Camera framework for proper mind vision like spells use and grid code cleanups including remove unused cell-level thread locking.
* Added: New table character_stats for external tools. * Added: New table character_stats for external tools.
* Added: More user friendly output at DB version check fail. * Added: More user friendly output at DB version check fail.
* Improved: Update used utf8 cpp library version up to 2.2.4 * Improved: Update used utf8 cpp library version up to 2.2.4
* Improved: Character `data` field values finally replaced by normal table fields. * Improved: Character `data` field values finally replaced by normal table fields.
* Improved: Increase reserved stack size for mangosd up to 4Mb at Windows * Improved: Increase reserved stack size for mangosd up to 4Mb at Windows
* Improved: Rewritten realmd and mangosd RA code use ACE network classes and drop Sockets lib. * Improved: Rewritten realmd and mangosd RA code use ACE network classes and drop Sockets lib.
* Improved: OpenSSL lib upgrade to OpenSSL 1.0.0. * Improved: OpenSSL lib upgrade to OpenSSL 1.0.0.
* Improved: Use ACE config library instead dropped dotconfpp. * Improved: Use ACE config library instead dropped dotconfpp.

4
contrib/dbcEditer/SearchFrm.cpp
View file

@ -16,11 +16,11 @@ __fastcall TFrmSearch::TFrmSearch(TComponent* Owner)
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void __fastcall TFrmSearch::btOkClick(TObject *Sender) void __fastcall TFrmSearch::btOkClick(TObject *Sender)
{ {
ModalResult = mrOk; ModalResult = mrOk;
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void __fastcall TFrmSearch::btCancelClick(TObject *Sender) void __fastcall TFrmSearch::btCancelClick(TObject *Sender)
{ {
ModalResult = mrCancel; ModalResult = mrCancel;
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------

22
contrib/dbcEditer/bin/update.txt
View file

@ -1,11 +1,11 @@
1.4版更新 1.4版更新
1.修正退出时有时退不出的bug 1.修正退出时有时退不出的bug
2.加入可查找的功能 2.加入可查找的功能
3.加入列切换类型后立即刷新 3.加入列切换类型后立即刷新
4.加入可以当前单元格写入打开文件的功能 4.加入可以当前单元格写入打开文件的功能
5.加入每一列的宽度可调整 5.加入每一列的宽度可调整
6.加入支持文本显示，但不能修改，文本修改后不会存入 6.加入支持文本显示，但不能修改，文本修改后不会存入
1.41版 1.41版
1.可以固定和取消第一列，以方便查看Spell ID 1.可以固定和取消第一列，以方便查看Spell ID
2.可以行存，列存，行清，列清，调用计算器 2.可以行存，列存，行清，列清，调用计算器

6
contrib/dbcEditer/dbcedit.cpp
View file

@ -61,7 +61,7 @@ void TFrmMain::SaveToFile(const char * pszFileName)
char szFileName[255]; char szFileName[255];
FILE *stream; FILE *stream;
fnsplit(pszFileName, 0, 0, szFileName, 0); fnsplit(pszFileName, 0, 0, szFileName, 0);
@ -132,7 +132,7 @@ void TFrmMain::SaveToFile(const char * pszFileName)
} }
FileClose(iFileHandle); FileClose(iFileHandle);
fclose(stream); fclose(stream);
delete ini; delete ini;
ShowMessage("Save To File:"+NewFileName); ShowMessage("Save To File:"+NewFileName);
} }
@ -445,7 +445,7 @@ void __fastcall TFrmMain::Timer1Timer(TObject *Sender)
void __fastcall TFrmMain::N4Click(TObject *Sender) void __fastcall TFrmMain::N4Click(TObject *Sender)
{ {
if(!thOpen) return; if(!thOpen) return;
int iFileHandle; //Îļş¾ä±ú int iFileHandle; //Îļş¾ä±ú
char buf[4]; char buf[4];
int iVal; int iVal;

4
contrib/dbcEditer/dbcedit.h
View file

@ -89,11 +89,11 @@ private: // User declarations
thOpenFile *thOpen; thOpenFile *thOpen;
bool Term; bool Term;
public: // User declarations public: // User declarations
bool OpenOk; bool OpenOk;
AnsiString CurrentOpenFile; AnsiString CurrentOpenFile;
__fastcall TFrmMain(TComponent* Owner); __fastcall TFrmMain(TComponent* Owner);
void SaveToFile(const char * pszFileName); void SaveToFile(const char * pszFileName);

6
contrib/dbcEditer/thOpenSource.cpp
View file

@ -28,7 +28,7 @@
__fastcall thOpenFile::thOpenFile(bool CreateSuspended) __fastcall thOpenFile::thOpenFile(bool CreateSuspended)
: TThread(CreateSuspended) : TThread(CreateSuspended)
{ {
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void __fastcall thOpenFile::Execute() void __fastcall thOpenFile::Execute()
@ -57,7 +57,7 @@ void thOpenFile::ReadAndModifyFromBuff(char *pBuff, DWORD dwSize, const char* ps
char szNewFileName[MAX_PATH]; char szNewFileName[MAX_PATH];
DWORD w; DWORD w;
TIniFile *ini; TIniFile *ini;
TypePtr p(pBuff); TypePtr p(pBuff);
if('WDBC' != TAG(*p.dw)) if('WDBC' != TAG(*p.dw))
@ -95,7 +95,7 @@ void thOpenFile::ReadAndModifyFromBuff(char *pBuff, DWORD dwSize, const char* ps
delete ini; delete ini;
//int *ColType = new int[dwCols]; //int *ColType = new int[dwCols];
DWORD dwTextStartPos = dwRows*dwRowLen+20; DWORD dwTextStartPos = dwRows*dwRowLen+20;
char* pTextPtr = pBuff + dwTextStartPos; char* pTextPtr = pBuff + dwTextStartPos;
char pszTemp[MAX_PATH]; char pszTemp[MAX_PATH];

4
contrib/dbcEditer/thOpenSource.h
View file

@ -6,7 +6,7 @@
#include <Classes.hpp> #include <Classes.hpp>
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
class thOpenFile : public TThread class thOpenFile : public TThread
{ {
private: private:
protected: protected:
void __fastcall Execute(); void __fastcall Execute();
@ -14,7 +14,7 @@ protected:
public: public:
bool thEnd; bool thEnd;
int ColType[10000]; int ColType[10000];
__fastcall thOpenFile(bool CreateSuspended); __fastcall thOpenFile(bool CreateSuspended);
void LoadAndModify(const char * pszFileName); void LoadAndModify(const char * pszFileName);
void ReadAndModifyFromBuff(char *pBuff, DWORD dwSize, const char* pszFileName); void ReadAndModifyFromBuff(char *pBuff, DWORD dwSize, const char* pszFileName);

70
contrib/dbcformat/dbc.desc
View file

@ -43,7 +43,7 @@ ENDENTRY
ENTRY SpellEntry ENTRY SpellEntry
INDEX Id INDEX Id
UINT School UINT School
UNKNOWN [2] UNKNOWN [2]
UINT Category UINT Category
@ -51,17 +51,17 @@ ENTRY SpellEntry
UINT Attributes UINT Attributes
UINT AttributesEx UINT AttributesEx
UNKNOWN [3] UNKNOWN [3]
UINT Targets UINT Targets
UINT TargetCreatureType UINT TargetCreatureType
UINT RequiresSpellFocus UINT RequiresSpellFocus
UNKNOWN UNKNOWN
UINT CasterAuraState UINT CasterAuraState
UINT CastingTimeIndex UINT CastingTimeIndex
UINT RecoveryTime UINT RecoveryTime
UINT CategoryRecoveryTime UINT CategoryRecoveryTime
UINT InterruptFlags UINT InterruptFlags
UINT AuraInterruptFlags UINT AuraInterruptFlags
UINT ChannelInterruptFlags UINT ChannelInterruptFlags
UINT procFlags UINT procFlags
UINT procChance UINT procChance
UINT procCharges UINT procCharges
@ -71,41 +71,41 @@ ENTRY SpellEntry
UINT DurationIndex UINT DurationIndex
UINT powerType UINT powerType
UINT manaCost UINT manaCost
UINT manaCostPerlevel UINT manaCostPerlevel
UINT manaPerSecond UINT manaPerSecond
UINT manaPerSecondPerLevel UINT manaPerSecondPerLevel
UINT rangeIndex UINT rangeIndex
FLOAT speed FLOAT speed
UINT modalNextSpell UINT modalNextSpell
UNKNOWN UNKNOWN
UINT Totem[2] UINT Totem[2]
UINT Reagent[8] UINT Reagent[8]
UINT ReagentCount[8] UINT ReagentCount[8]
UINT EquippedItemClass UINT EquippedItemClass
UINT EquippedItemSubClass UINT EquippedItemSubClass
UINT Effect[3] // 59 - 61 UINT Effect[3] // 59 - 61
UINT EffectDieSides[3] UINT EffectDieSides[3]
UINT EffectBaseDice[3] UINT EffectBaseDice[3]
FLOAT EffectDicePerLevel[3] FLOAT EffectDicePerLevel[3]
FLOAT EffectRealPointsPerLevel[3] FLOAT EffectRealPointsPerLevel[3]
INT EffectBasePoints[3] // 74 - 76 INT EffectBasePoints[3] // 74 - 76
UNKNOWN [3] UNKNOWN [3]
UINT EffectImplicitTargetA[3] // 80 - 82 UINT EffectImplicitTargetA[3] // 80 - 82
UINT EffectImplicitTargetB[3] // 83 - 85 UINT EffectImplicitTargetB[3] // 83 - 85
UINT EffectRadiusIndex[3] UINT EffectRadiusIndex[3]
UINT EffectApplyAuraName[3] // 89 - 91 UINT EffectApplyAuraName[3] // 89 - 91
UINT EffectAmplitude[3] UINT EffectAmplitude[3]
UINT Effectunknown[3] UINT Effectunknown[3]
UINT EffectChainTarget[3] UINT EffectChainTarget[3]
UINT EffectItemType[3] UINT EffectItemType[3]
UINT EffectMiscValue[3] // 104 - 106 UINT EffectMiscValue[3] // 104 - 106
UINT EffectTriggerSpell[3] UINT EffectTriggerSpell[3]
FLOAT EffectPointsPerComboPoint[3] FLOAT EffectPointsPerComboPoint[3]
UINT SpellVisual UINT SpellVisual
UNKNOWN UNKNOWN
UINT SpellIconID UINT SpellIconID
UINT activeIconID UINT activeIconID
UINT spellPriority UINT spellPriority
UNUSED STR Name UNUSED STR Name
UNUSED STR NameAlt1 UNUSED STR NameAlt1
UNUSED STR NameAlt2 UNUSED STR NameAlt2
@ -198,7 +198,7 @@ ENTRY FactionEntry
UNKNOWN[7] UNKNOWN[7]
UINT something1 UINT something1
UINT something2 UINT something2
UINT something3 UINT something3
UINT something4 UINT something4
UINT something5 UINT something5
@ -208,7 +208,7 @@ ENTRY FactionEntry
UINT something9 UINT something9
UINT faction UINT faction
UNUSED STR name UNUSED STR name
UNKNOWN[17] UNKNOWN[17]
ENDENTRY ENDENTRY
@ -236,6 +236,6 @@ ENTRY ItemDisplayTemplateEntry
UNKNOWN[5] UNKNOWN[5]
UINT seed UINT seed
UNKNOWN [10] UNKNOWN [10]
UINT randomPropertyID UINT randomPropertyID
ENDENTRY ENDENTRY

8
contrib/extractor/CMakeLists.txt
View file

@ -14,11 +14,11 @@ project (MANGOS_MAP_EXTRACTOR)
add_subdirectory (libmpq) add_subdirectory (libmpq)
add_subdirectory (loadlib) add_subdirectory (loadlib)
include_directories (${MANGOS_MAP_EXTRACTOR_SOURCE_DIR}/libmpq) include_directories (${MANGOS_MAP_EXTRACTOR_SOURCE_DIR}/libmpq)
include_directories (${MANGOS_MAP_EXTRACTOR_SOURCE_DIR}/loadlib) include_directories (${MANGOS_MAP_EXTRACTOR_SOURCE_DIR}/loadlib)
link_directories (${MANGOS_MAP_EXTRACTOR_SOURCE_DIR}/libmpq) link_directories (${MANGOS_MAP_EXTRACTOR_SOURCE_DIR}/libmpq)
link_directories (${MANGOS_MAP_EXTRACTOR_SOURCE_DIR}/loadlib) link_directories (${MANGOS_MAP_EXTRACTOR_SOURCE_DIR}/loadlib)
add_executable (ad dbcfile.cpp mpq_libmpq.cpp System.cpp) add_executable (ad dbcfile.cpp mpq_libmpq.cpp System.cpp)

4
contrib/extractor/libmpq/common.cpp
View file

@ -109,7 +109,7 @@ int libmpq_decrypt_blocktable(mpq_archive *mpq_a, unsigned char *pbKey) {
ch = toupper(*pbKey++); ch = toupper(*pbKey++);
seed1 = mpq_a->buf[0x300 + ch] ^ (seed1 + seed2); seed1 = mpq_a->buf[0x300 + ch] ^ (seed1 + seed2);
seed2 = ch + seed1 + seed2 + (seed2 << 5) + 3; seed2 = ch + seed1 + seed2 + (seed2 << 5) + 3;
} }
/* Decrypt it */ /* Decrypt it */
seed2 = 0xEEEEEEEE; seed2 = 0xEEEEEEEE;
@ -704,7 +704,7 @@ int libmpq_file_read_file(mpq_archive *mpq_a, mpq_file *mpq_f, unsigned int file
unsigned int loaded = mpq_a->blocksize; unsigned int loaded = mpq_a->blocksize;
/* Check if data are loaded in the cache */ /* Check if data are loaded in the cache */
if (mpq_f->accessed == FALSE || blockpos != mpq_a->blockpos) { if (mpq_f->accessed == FALSE || blockpos != mpq_a->blockpos) {
/* Load one MPQ block into archive buffer */ /* Load one MPQ block into archive buffer */
loaded = libmpq_file_read_block(mpq_a, mpq_f, blockpos, (char *)mpq_a->blockbuf, mpq_a->blocksize); loaded = libmpq_file_read_block(mpq_a, mpq_f, blockpos, (char *)mpq_a->blockbuf, mpq_a->blocksize);

2
contrib/extractor/libmpq/explode.cpp
View file

@ -112,7 +112,7 @@ static unsigned short pkzip_code_asc[] = {
0x0300, 0x0D40, 0x1D00, 0x0D00, 0x1500, 0x0540, 0x0500, 0x1900, 0x0300, 0x0D40, 0x1D00, 0x0D00, 0x1500, 0x0540, 0x0500, 0x1900,
0x0900, 0x0940, 0x1100, 0x0100, 0x1E00, 0x0E00, 0x0140, 0x1600, 0x0900, 0x0940, 0x1100, 0x0100, 0x1E00, 0x0E00, 0x0140, 0x1600,
0x0600, 0x1A00, 0x0E40, 0x0640, 0x0A40, 0x0A00, 0x1200, 0x0200, 0x0600, 0x1A00, 0x0E40, 0x0640, 0x0A40, 0x0A00, 0x1200, 0x0200,
0x1C00, 0x0C00, 0x1400, 0x0400, 0x1800, 0x0800, 0x1000, 0x0000 0x1C00, 0x0C00, 0x1400, 0x0400, 0x1800, 0x0800, 0x1000, 0x0000
}; };
/* Local variables */ /* Local variables */

2
contrib/extractor/libmpq/huffman.cpp
View file

@ -309,7 +309,7 @@ static void libmpq_huff_build_tree(struct huffman_tree *ht, unsigned int cmp_typ
/* Loop while pointer has a negative value. */ /* Loop while pointer has a negative value. */
while (PTR_INT(ht->last) > 0) { /* ESI - Last entry */ while (PTR_INT(ht->last) > 0) { /* ESI - Last entry */
struct huffman_tree_item *temp; /* EAX */ struct huffman_tree_item *temp; /* EAX */
if (ht->last->next != NULL) { /* ESI->next */ if (ht->last->next != NULL) { /* ESI->next */
libmpq_huff_remove_item(ht->last); libmpq_huff_remove_item(ht->last);
} }

2
contrib/extractor/libmpq/mpq.cpp
View file

@ -601,7 +601,7 @@ int libmpq_file_getdata(mpq_archive *mpq_a, mpq_hash mpq_h, const int number, un
if (mpq_f->mpq_b->flags & LIBMPQ_FILE_COMPRESSED) { if (mpq_f->mpq_b->flags & LIBMPQ_FILE_COMPRESSED) {
// Free buffer for block positions // Free buffer for block positions
free(mpq_f->blockpos); free(mpq_f->blockpos);
} }
/* freeing the file structure */ /* freeing the file structure */

4
contrib/extractor/libmpq/wave.cpp
View file

@ -31,8 +31,8 @@
static unsigned long wave_table_1503f120[] = { static unsigned long wave_table_1503f120[] = {
0xFFFFFFFF, 0x00000000, 0xFFFFFFFF, 0x00000004, 0xFFFFFFFF, 0x00000002, 0xFFFFFFFF, 0x00000006, 0xFFFFFFFF, 0x00000000, 0xFFFFFFFF, 0x00000004, 0xFFFFFFFF, 0x00000002, 0xFFFFFFFF, 0x00000006,
0xFFFFFFFF, 0x00000001, 0xFFFFFFFF, 0x00000005, 0xFFFFFFFF, 0x00000003, 0xFFFFFFFF, 0x00000007, 0xFFFFFFFF, 0x00000001, 0xFFFFFFFF, 0x00000005, 0xFFFFFFFF, 0x00000003, 0xFFFFFFFF, 0x00000007,
0xFFFFFFFF, 0x00000001, 0xFFFFFFFF, 0x00000005, 0xFFFFFFFF, 0x00000003, 0xFFFFFFFF, 0x00000007, 0xFFFFFFFF, 0x00000001, 0xFFFFFFFF, 0x00000005, 0xFFFFFFFF, 0x00000003, 0xFFFFFFFF, 0x00000007,
0xFFFFFFFF, 0x00000002, 0xFFFFFFFF, 0x00000004, 0xFFFFFFFF, 0x00000006, 0xFFFFFFFF, 0x00000008 0xFFFFFFFF, 0x00000002, 0xFFFFFFFF, 0x00000004, 0xFFFFFFFF, 0x00000006, 0xFFFFFFFF, 0x00000008
}; };
static unsigned long wave_table_1503f1a0[] = { static unsigned long wave_table_1503f1a0[] = {

2
contrib/extractor/libmpq/wave.h
View file

@ -22,7 +22,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#ifndef _WAVE_H #ifndef _WAVE_H
#define _WAVE_H #define _WAVE_H

20
contrib/extractor/loadlib/adt.h
View file

@ -55,7 +55,7 @@ public:
uint32 light; uint32 light;
float height; float height;
} liquid[ADT_CELL_SIZE+1][ADT_CELL_SIZE+1]; } liquid[ADT_CELL_SIZE+1][ADT_CELL_SIZE+1];
// 1<<0 - ochen // 1<<0 - ochen
// 1<<1 - lava/slime // 1<<1 - lava/slime
// 1<<2 - water // 1<<2 - water
@ -197,7 +197,7 @@ public:
return 0; return 0;
} }
float *getLiquidHeightMap(adt_liquid_header *h) float *getLiquidHeightMap(adt_liquid_header *h)
{ {
if (h->formatFlags & ADT_LIQUID_HEADER_NO_HIGHT) if (h->formatFlags & ADT_LIQUID_HEADER_NO_HIGHT)
return 0; return 0;
@ -206,7 +206,7 @@ public:
return 0; return 0;
} }
uint8 *getLiquidLightMap(adt_liquid_header *h) uint8 *getLiquidLightMap(adt_liquid_header *h)
{ {
if (h->formatFlags&ADT_LIQUID_HEADER_FULL_LIGHT) if (h->formatFlags&ADT_LIQUID_HEADER_FULL_LIGHT)
return 0; return 0;
@ -219,7 +219,7 @@ public:
return 0; return 0;
} }
uint32 *getLiquidFullLightMap(adt_liquid_header *h) uint32 *getLiquidFullLightMap(adt_liquid_header *h)
{ {
if (!(h->formatFlags&ADT_LIQUID_HEADER_FULL_LIGHT)) if (!(h->formatFlags&ADT_LIQUID_HEADER_FULL_LIGHT))
return 0; return 0;
@ -232,7 +232,7 @@ public:
return 0; return 0;
} }
uint64 getLiquidShowMap(adt_liquid_header *h) uint64 getLiquidShowMap(adt_liquid_header *h)
{ {
if (h->offsData2a) if (h->offsData2a)
return *((uint64 *)((uint8*)this + 8 + h->offsData2a)); return *((uint64 *)((uint8*)this + 8 + h->offsData2a));
@ -256,11 +256,11 @@ class adt_MHDR
uint32 pad; uint32 pad;
uint32 offsMCIN; // MCIN uint32 offsMCIN; // MCIN
uint32 offsTex; // MTEX uint32 offsTex; // MTEX
uint32 offsModels; // MMDX uint32 offsModels; // MMDX
uint32 offsModelsIds; // MMID uint32 offsModelsIds; // MMID
uint32 offsMapObejcts; // MWMO uint32 offsMapObejcts; // MWMO
uint32 offsMapObejctsIds; // MWID uint32 offsMapObejctsIds; // MWID
uint32 offsDoodsDef; // MDDF uint32 offsDoodsDef; // MDDF
uint32 offsObjectsDef; // MODF uint32 offsObjectsDef; // MODF
uint32 offsMFBO; // MFBO uint32 offsMFBO; // MFBO
uint32 offsMH2O; // MH2O uint32 offsMH2O; // MH2O

4
contrib/extractor/loadlib/loadlib.h
View file

@ -12,9 +12,9 @@ typedef unsigned __int16 uint16;
typedef unsigned __int8 uint8; typedef unsigned __int8 uint8;
#else #else
#include <stdint.h> #include <stdint.h>
#ifndef uint64_t #ifndef uint64_t
#ifdef __linux__ #ifdef __linux__
#include <linux/types.h> #include <linux/types.h>
#endif #endif
#endif #endif
typedef int64_t int64; typedef int64_t int64;

2
contrib/git_id/git_id.cpp
View file

@ -122,7 +122,7 @@ bool find_path()
getcwd(cur_path, MAX_PATH); getcwd(cur_path, MAX_PATH);
size_t len = strlen(cur_path); size_t len = strlen(cur_path);
strncpy(base_path, cur_path, len+1); strncpy(base_path, cur_path, len+1);
if(cur_path[len-1] == '/' || cur_path[len-1] == '\\') if(cur_path[len-1] == '/' || cur_path[len-1] == '\\')
{ {
// we're in root, don't bother // we're in root, don't bother

4
contrib/vmap_extractor_v3/vmapextract/loadlib/loadlib.h
View file

@ -12,9 +12,9 @@ typedef unsigned __int16 uint16;
typedef unsigned __int8 uint8; typedef unsigned __int8 uint8;
#else #else
#include <stdint.h> #include <stdint.h>
#ifndef uint64_t #ifndef uint64_t
#ifdef __linux__ #ifdef __linux__
#include <linux/types.h> #include <linux/types.h>
#endif #endif
#endif #endif
typedef int64_t int64; typedef int64_t int64;

2
contrib/vmap_extractor_v3/vmapextract/model.h
View file

@ -35,7 +35,7 @@ private:
char outfilename; char outfilename;
}; };
class ModelInstance class ModelInstance
{ {
public: public:
Model *model; Model *model;

2
contrib/vmap_extractor_v3/vmapextract/mpq_libmpq04.h
View file

@ -30,7 +30,7 @@ public:
libmpq__file_unpacked_size(mpq_a, filenum, &size); libmpq__file_unpacked_size(mpq_a, filenum, &size);
char *buffer = new char[size]; char *buffer = new char[size];
libmpq__file_read(mpq_a, filenum, (unsigned char*)buffer, size, &transferred); libmpq__file_read(mpq_a, filenum, (unsigned char*)buffer, size, &transferred);
char seps[] = "\n"; char seps[] = "\n";

2
contrib/vmap_extractor_v3/vmapextract/vec3d.h
View file

@ -106,7 +106,7 @@ public:
in >> v.x >> v.y >> v.z; in >> v.x >> v.y >> v.z;
return in; return in;
} }
friend std::ostream& operator<<(std::ostream& out, const Vec3D& v) friend std::ostream& operator<<(std::ostream& out, const Vec3D& v)
{ {
out << v.x << " " << v.y << " " << v.z; out << v.x << " " << v.y << " " << v.z;

6
m4/pkg.m4
View file

@ -1,5 +1,5 @@
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
# #
# Copyright © 2004 Scott James Remnant <scott@netsplit.com>. # Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
@ -39,7 +39,7 @@ if test -n "$PKG_CONFIG"; then
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
PKG_CONFIG="" PKG_CONFIG=""
fi fi
fi[]dnl fi[]dnl
])# PKG_PROG_PKG_CONFIG ])# PKG_PROG_PKG_CONFIG
@ -118,7 +118,7 @@ if test $pkg_failed = yes; then
_PKG_SHORT_ERRORS_SUPPORTED _PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then if test $_pkg_short_errors_supported = yes; then
$1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
else else
$1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
fi fi
# Put the nasty error message in config.log where it belongs # Put the nasty error message in config.log where it belongs

12
sql/characters.sql
View file

@ -374,12 +374,12 @@ CREATE TABLE `character_aura` (
`spell` int(11) unsigned NOT NULL default '0', `spell` int(11) unsigned NOT NULL default '0',
`stackcount` int(11) NOT NULL default '1', `stackcount` int(11) NOT NULL default '1',
`remaincharges` int(11) NOT NULL default '0', `remaincharges` int(11) NOT NULL default '0',
`basepoints0` INT(11) NOT NULL DEFAULT '0', `basepoints0` INT(11) NOT NULL DEFAULT '0',
`basepoints1` INT(11) NOT NULL DEFAULT '0', `basepoints1` INT(11) NOT NULL DEFAULT '0',
`basepoints2` INT(11) NOT NULL DEFAULT '0', `basepoints2` INT(11) NOT NULL DEFAULT '0',
`maxduration0` INT(11) NOT NULL DEFAULT '0', `maxduration0` INT(11) NOT NULL DEFAULT '0',
`maxduration1` INT(11) NOT NULL DEFAULT '0', `maxduration1` INT(11) NOT NULL DEFAULT '0',
`maxduration2` INT(11) NOT NULL DEFAULT '0', `maxduration2` INT(11) NOT NULL DEFAULT '0',
`remaintime0` INT(11) NOT NULL DEFAULT '0', `remaintime0` INT(11) NOT NULL DEFAULT '0',
`remaintime1` INT(11) NOT NULL DEFAULT '0', `remaintime1` INT(11) NOT NULL DEFAULT '0',
`remaintime2` INT(11) NOT NULL DEFAULT '0', `remaintime2` INT(11) NOT NULL DEFAULT '0',
@ -1567,12 +1567,12 @@ CREATE TABLE `pet_aura` (
`spell` int(11) unsigned NOT NULL default '0', `spell` int(11) unsigned NOT NULL default '0',
`stackcount` int(11) NOT NULL default '1', `stackcount` int(11) NOT NULL default '1',
`remaincharges` int(11) NOT NULL default '0', `remaincharges` int(11) NOT NULL default '0',
`basepoints0` INT(11) NOT NULL DEFAULT '0', `basepoints0` INT(11) NOT NULL DEFAULT '0',
`basepoints1` INT(11) NOT NULL DEFAULT '0', `basepoints1` INT(11) NOT NULL DEFAULT '0',
`basepoints2` INT(11) NOT NULL DEFAULT '0', `basepoints2` INT(11) NOT NULL DEFAULT '0',
`maxduration0` INT(11) NOT NULL DEFAULT '0', `maxduration0` INT(11) NOT NULL DEFAULT '0',
`maxduration1` INT(11) NOT NULL DEFAULT '0', `maxduration1` INT(11) NOT NULL DEFAULT '0',
`maxduration2` INT(11) NOT NULL DEFAULT '0', `maxduration2` INT(11) NOT NULL DEFAULT '0',
`remaintime0` INT(11) NOT NULL DEFAULT '0', `remaintime0` INT(11) NOT NULL DEFAULT '0',
`remaintime1` INT(11) NOT NULL DEFAULT '0', `remaintime1` INT(11) NOT NULL DEFAULT '0',
`remaintime2` INT(11) NOT NULL DEFAULT '0', `remaintime2` INT(11) NOT NULL DEFAULT '0',

2
sql/updates/0.16/09977_01_mangos_spell_proc_event.sql
View file

@ -1,7 +1,7 @@
ALTER TABLE db_version CHANGE COLUMN required_9967_01_mangos_spell_proc_event required_9977_01_mangos_spell_proc_event bit; ALTER TABLE db_version CHANGE COLUMN required_9967_01_mangos_spell_proc_event required_9977_01_mangos_spell_proc_event bit;
DELETE FROM `spell_proc_event` WHERE `entry` IN (16180,16196,16198); DELETE FROM `spell_proc_event` WHERE `entry` IN (16180,16196,16198);
INSERT INTO `spell_proc_event` VALUES INSERT INTO `spell_proc_event` VALUES
(16180,0x00000000,11,0x000001C0,0x00000000,0x00000010,0x00000000,0x00000002,0.000000,0.000000, 0), (16180,0x00000000,11,0x000001C0,0x00000000,0x00000010,0x00000000,0x00000002,0.000000,0.000000, 0),
(16196,0x00000000,11,0x000001C0,0x00000000,0x00000010,0x00000000,0x00000002,0.000000,0.000000, 0), (16196,0x00000000,11,0x000001C0,0x00000000,0x00000010,0x00000000,0x00000002,0.000000,0.000000, 0),
(16198,0x00000000,11,0x000001C0,0x00000000,0x00000010,0x00000000,0x00000002,0.000000,0.000000, 0); (16198,0x00000000,11,0x000001C0,0x00000000,0x00000010,0x00000000,0x00000002,0.000000,0.000000, 0);

2
sql/updates/0.16/10036_01_mangos_spell_proc_event.sql
View file

@ -1,5 +1,5 @@
ALTER TABLE db_version CHANGE COLUMN required_10036_01_mangos_spell_chain required_10036_01_mangos_spell_proc_event bit; ALTER TABLE db_version CHANGE COLUMN required_10036_01_mangos_spell_chain required_10036_01_mangos_spell_proc_event bit;
DELETE FROM `spell_proc_event` WHERE `entry` IN (30881,30883,30884,30885,30886); DELETE FROM `spell_proc_event` WHERE `entry` IN (30881,30883,30884,30885,30886);
INSERT INTO `spell_proc_event` VALUES INSERT INTO `spell_proc_event` VALUES
(30881, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 30); (30881, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 30);

6
sql/updates/10156_01_characters_character_aura.sql
View file

@ -4,12 +4,12 @@ DELETE FROM `character_aura`;
ALTER TABLE `character_aura` ALTER TABLE `character_aura`
DROP COLUMN `effect_index`, DROP COLUMN `amount`, DROP COLUMN `maxduration`, DROP COLUMN `remaintime`; DROP COLUMN `effect_index`, DROP COLUMN `amount`, DROP COLUMN `maxduration`, DROP COLUMN `remaintime`;
ALTER TABLE `character_aura` ALTER TABLE `character_aura`
ADD COLUMN `basepoints0` INT(11) NOT NULL DEFAULT '0', ADD COLUMN `basepoints0` INT(11) NOT NULL DEFAULT '0',
ADD COLUMN `basepoints1` INT(11) NOT NULL DEFAULT '0', ADD COLUMN `basepoints1` INT(11) NOT NULL DEFAULT '0',
ADD COLUMN `basepoints2` INT(11) NOT NULL DEFAULT '0', ADD COLUMN `basepoints2` INT(11) NOT NULL DEFAULT '0',
ADD COLUMN `maxduration0` INT(11) NOT NULL DEFAULT '0', ADD COLUMN `maxduration0` INT(11) NOT NULL DEFAULT '0',
ADD COLUMN `maxduration1` INT(11) NOT NULL DEFAULT '0', ADD COLUMN `maxduration1` INT(11) NOT NULL DEFAULT '0',
ADD COLUMN `maxduration2` INT(11) NOT NULL DEFAULT '0', ADD COLUMN `maxduration2` INT(11) NOT NULL DEFAULT '0',
ADD COLUMN `remaintime0` INT(11) NOT NULL DEFAULT '0', ADD COLUMN `remaintime0` INT(11) NOT NULL DEFAULT '0',
ADD COLUMN `remaintime1` INT(11) NOT NULL DEFAULT '0', ADD COLUMN `remaintime1` INT(11) NOT NULL DEFAULT '0',
ADD COLUMN `remaintime2` INT(11) NOT NULL DEFAULT '0', ADD COLUMN `remaintime2` INT(11) NOT NULL DEFAULT '0',

6
sql/updates/10156_02_characters_pet_aura.sql
View file

@ -4,12 +4,12 @@ DELETE FROM `pet_aura`;
ALTER TABLE `pet_aura` ALTER TABLE `pet_aura`
DROP COLUMN `effect_index`, DROP COLUMN `amount`, DROP COLUMN `maxduration`, DROP COLUMN `remaintime`; DROP COLUMN `effect_index`, DROP COLUMN `amount`, DROP COLUMN `maxduration`, DROP COLUMN `remaintime`;
ALTER TABLE `pet_aura` ALTER TABLE `pet_aura`
ADD COLUMN `basepoints0` INT(11) NOT NULL DEFAULT '0', ADD COLUMN `basepoints0` INT(11) NOT NULL DEFAULT '0',
ADD COLUMN `basepoints1` INT(11) NOT NULL DEFAULT '0', ADD COLUMN `basepoints1` INT(11) NOT NULL DEFAULT '0',
ADD COLUMN `basepoints2` INT(11) NOT NULL DEFAULT '0', ADD COLUMN `basepoints2` INT(11) NOT NULL DEFAULT '0',
ADD COLUMN `maxduration0` INT(11) NOT NULL DEFAULT '0', ADD COLUMN `maxduration0` INT(11) NOT NULL DEFAULT '0',
ADD COLUMN `maxduration1` INT(11) NOT NULL DEFAULT '0', ADD COLUMN `maxduration1` INT(11) NOT NULL DEFAULT '0',
ADD COLUMN `maxduration2` INT(11) NOT NULL DEFAULT '0', ADD COLUMN `maxduration2` INT(11) NOT NULL DEFAULT '0',
ADD COLUMN `remaintime0` INT(11) NOT NULL DEFAULT '0', ADD COLUMN `remaintime0` INT(11) NOT NULL DEFAULT '0',
ADD COLUMN `remaintime1` INT(11) NOT NULL DEFAULT '0', ADD COLUMN `remaintime1` INT(11) NOT NULL DEFAULT '0',
ADD COLUMN `remaintime2` INT(11) NOT NULL DEFAULT '0', ADD COLUMN `remaintime2` INT(11) NOT NULL DEFAULT '0',

26
sql/updates/10217_01_mangos_playercreateinfo_spell.sql
View file

@ -3,7 +3,7 @@ ALTER TABLE db_version CHANGE COLUMN required_10208_01_mangos_playercreateinfo r
DELETE FROM playercreateinfo_spell WHERE spell=1843 ; DELETE FROM playercreateinfo_spell WHERE spell=1843 ;
DELETE FROM playercreateinfo_spell WHERE spell=21084; DELETE FROM playercreateinfo_spell WHERE spell=21084;
-- humans -- humans
INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES
(1, 1, 68398, 'Opening'), (1, 1, 68398, 'Opening'),
(1, 2, 20154, 'Seal of Righteousness'), (1, 2, 20154, 'Seal of Righteousness'),
(1, 2, 68398, 'Opening'), (1, 2, 68398, 'Opening'),
@ -16,7 +16,7 @@ INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES
(1, 9, 75445, 'Demonic Immolate'); (1, 9, 75445, 'Demonic Immolate');
-- dwarf -- dwarf
INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES
(3, 1, 68398, 'Opening'), (3, 1, 68398, 'Opening'),
(3, 2, 20154, 'Seal of Righteousness'), (3, 2, 20154, 'Seal of Righteousness'),
(3, 2, 68398, 'Opening'), (3, 2, 68398, 'Opening'),
@ -25,7 +25,7 @@ INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES
(3, 5, 68398, 'Opening'); (3, 5, 68398, 'Opening');
-- night elfs -- night elfs
INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES
(4, 1, 21009, 'Elusiveness'), (4, 1, 21009, 'Elusiveness'),
(4, 1, 68398, 'Opening'), (4, 1, 68398, 'Opening'),
(4, 3, 21009, 'Elusiveness'), (4, 3, 21009, 'Elusiveness'),
@ -38,7 +38,7 @@ INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES
(4, 11, 68398, 'Opening'); (4, 11, 68398, 'Opening');
-- gnome -- gnome
INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES
(7, 1, 68398, 'Opening'), (7, 1, 68398, 'Opening'),
(7, 4, 68398, 'Opening'), (7, 4, 68398, 'Opening'),
(7, 8, 68398, 'Opening'), (7, 8, 68398, 'Opening'),
@ -48,7 +48,7 @@ INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES
(7, 9, 75445, 'Demonic Immolate'); (7, 9, 75445, 'Demonic Immolate');
-- orc -- orc
INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES
(2, 1, 68398, 'Opening'), (2, 1, 68398, 'Opening'),
(2, 3, 68398, 'Opening'), (2, 3, 68398, 'Opening'),
(2, 4, 68398, 'Opening'), (2, 4, 68398, 'Opening'),
@ -60,7 +60,7 @@ INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES
(2, 9, 75445, 'Demonic Immolate'); (2, 9, 75445, 'Demonic Immolate');
-- undead -- undead
INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES
(5, 1, 68398, 'Opening'), (5, 1, 68398, 'Opening'),
(5, 4, 68398, 'Opening'), (5, 4, 68398, 'Opening'),
(5, 5, 68398, 'Opening'), (5, 5, 68398, 'Opening'),
@ -70,8 +70,8 @@ INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES
(5, 9, 68398, 'Opening'), (5, 9, 68398, 'Opening'),
(5, 9, 75445, 'Demonic Immolate'); (5, 9, 75445, 'Demonic Immolate');
-- tauren -- tauren
INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES
(6, 1, 68398, 'Opening'), (6, 1, 68398, 'Opening'),
(6, 3, 68398, 'Opening'), (6, 3, 68398, 'Opening'),
(6, 7, 68398, 'Opening'), (6, 7, 68398, 'Opening'),
@ -80,7 +80,7 @@ INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES
(6, 11, 68398, 'Opening'); (6, 11, 68398, 'Opening');
-- troll -- troll
INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES
(8, 1, 68398, 'Opening'), (8, 1, 68398, 'Opening'),
(8, 3, 68398, 'Opening'), (8, 3, 68398, 'Opening'),
(8, 4, 68398, 'Opening'), (8, 4, 68398, 'Opening'),
@ -91,7 +91,7 @@ INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES
(8, 8, 71761, 'Deep Freeze Immunity State'); (8, 8, 71761, 'Deep Freeze Immunity State');
-- bloodelf -- bloodelf
INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES
(10, 2, 20154, 'Seal of Righteousness'), (10, 2, 20154, 'Seal of Righteousness'),
(10, 2, 68398, 'Opening'), (10, 2, 68398, 'Opening'),
(10, 3, 68398, 'Opening'), (10, 3, 68398, 'Opening'),
@ -103,7 +103,7 @@ INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES
(10, 9, 75445, 'Demonic Immolate'); (10, 9, 75445, 'Demonic Immolate');
-- drarenei -- drarenei
INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES
(11, 1, 68398, 'Opening'), (11, 1, 68398, 'Opening'),
(11, 2, 20154, 'Seal of Righteousness'), (11, 2, 20154, 'Seal of Righteousness'),
(11, 2, 68398, 'Opening'), (11, 2, 68398, 'Opening'),
@ -114,8 +114,8 @@ INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES
(11, 8, 68398, 'Opening'), (11, 8, 68398, 'Opening'),
(11, 8, 71761, 'Deep Freeze Immunity State'); (11, 8, 71761, 'Deep Freeze Immunity State');
-- dk -- dk
INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES
(1, 6, 68398, 'Opening'), (1, 6, 68398, 'Opening'),
(2, 6, 68398, 'Opening'), (2, 6, 68398, 'Opening'),
(3, 6, 68398, 'Opening'), (3, 6, 68398, 'Opening'),

2
sql/updates/10254_01_characters_auctionhouse.sql
View file

@ -4,7 +4,7 @@ ALTER TABLE auctionhouse
ADD COLUMN houseid int(11) unsigned NOT NULL default '0' AFTER id; ADD COLUMN houseid int(11) unsigned NOT NULL default '0' AFTER id;
UPDATE auctionhouse, mangos.creature AS c, mangos.creature_template AS ct UPDATE auctionhouse, mangos.creature AS c, mangos.creature_template AS ct
SET houseid = SET houseid =
CASE ct.faction_A CASE ct.faction_A
WHEN 12 THEN 1 /* human */ WHEN 12 THEN 1 /* human */
WHEN 29 THEN 6 /* orc, and generic for horde */ WHEN 29 THEN 6 /* orc, and generic for horde */

2
sql/updates/10582_01_mangos_spell_proc_event.sql
View file

@ -1,7 +1,7 @@
ALTER TABLE db_version CHANGE COLUMN required_10551_01_mangos_spell_proc_event required_10582_01_mangos_spell_proc_event bit; ALTER TABLE db_version CHANGE COLUMN required_10551_01_mangos_spell_proc_event required_10582_01_mangos_spell_proc_event bit;
DELETE FROM spell_proc_event WHERE entry IN (67356, 67363, 67365, 67379, 67381, 67384, 67386, 67389, 67392); DELETE FROM spell_proc_event WHERE entry IN (67356, 67363, 67365, 67379, 67381, 67384, 67386, 67389, 67392);
INSERT INTO spell_proc_event(entry, SchoolMask, SpellFamilyName, INSERT INTO spell_proc_event(entry, SchoolMask, SpellFamilyName,
SpellFamilyMaskA0, SpellFamilyMaskA1, SpellFamilyMaskA2, SpellFamilyMaskA0, SpellFamilyMaskA1, SpellFamilyMaskA2,
SpellFamilyMaskB0, SpellFamilyMaskB1, SpellFamilyMaskB2, SpellFamilyMaskB0, SpellFamilyMaskB1, SpellFamilyMaskB2,
SpellFamilyMaskC0, SpellFamilyMaskC1, SpellFamilyMaskC2, SpellFamilyMaskC0, SpellFamilyMaskC1, SpellFamilyMaskC2,

4
sql/updates/10604_01_mangos_spell_proc_event.sql
View file

@ -1,9 +1,9 @@
ALTER TABLE db_version CHANGE COLUMN required_10582_01_mangos_spell_proc_event required_10604_01_mangos_spell_proc_event bit; ALTER TABLE db_version CHANGE COLUMN required_10582_01_mangos_spell_proc_event required_10604_01_mangos_spell_proc_event bit;
DELETE FROM spell_proc_event WHERE entry IN DELETE FROM spell_proc_event WHERE entry IN
(57907,62147,64952,64964,71174,71176,71178,71186,71191,71194,71198,71217,71226,71228); (57907,62147,64952,64964,71174,71176,71178,71186,71191,71194,71198,71217,71226,71228);
INSERT INTO spell_proc_event(entry, SchoolMask, SpellFamilyName, INSERT INTO spell_proc_event(entry, SchoolMask, SpellFamilyName,
SpellFamilyMaskA0, SpellFamilyMaskA1, SpellFamilyMaskA2, SpellFamilyMaskA0, SpellFamilyMaskA1, SpellFamilyMaskA2,
SpellFamilyMaskB0, SpellFamilyMaskB1, SpellFamilyMaskB2, SpellFamilyMaskB0, SpellFamilyMaskB1, SpellFamilyMaskB2,
SpellFamilyMaskC0, SpellFamilyMaskC1, SpellFamilyMaskC2, SpellFamilyMaskC0, SpellFamilyMaskC1, SpellFamilyMaskC2,

2
sql/updates/10762_01_mangos_spell_proc_event.sql
View file

@ -5,5 +5,5 @@ INSERT INTO spell_proc_event VALUES
(52437, 0x00, 4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000000, 0.000000, 0.000000, 0); (52437, 0x00, 4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000000, 0.000000, 0.000000, 0);

12
src/game/Chat.cpp
View file

@ -41,7 +41,7 @@
// |color|Hachievement_criteria:criteria_id|h[name]|h|r // |color|Hachievement_criteria:criteria_id|h[name]|h|r
// |color|Harea:area_id|h[name]|h|r // |color|Harea:area_id|h[name]|h|r
// |color|Hareatrigger:id|h[name]|h|r // |color|Hareatrigger:id|h[name]|h|r
// |color|Hareatrigger_target:id|h[name]|h|r // |color|Hareatrigger_target:id|h[name]|h|r
// |color|Hcreature:creature_guid|h[name]|h|r // |color|Hcreature:creature_guid|h[name]|h|r
// |color|Hcreature_entry:creature_id|h[name]|h|r // |color|Hcreature_entry:creature_id|h[name]|h|r
// |color|Henchant:recipe_spell_id|h[prof_name: recipe_name]|h|r - client, at shift click in recipes list dialog // |color|Henchant:recipe_spell_id|h[prof_name: recipe_name]|h|r - client, at shift click in recipes list dialog
@ -2222,7 +2222,7 @@ bool ChatHandler::ExtractOptFloat(char** args, float& val, float defVal)
* Function extract name-like string (from non-numeric or special symbol until whitespace) * Function extract name-like string (from non-numeric or special symbol until whitespace)
* *
* @param args variable pointer to non parsed args string, updated at function call to new position (with skipped white spaces) * @param args variable pointer to non parsed args string, updated at function call to new position (with skipped white spaces)
* @param lit optional explicit literal requirement. function fail if literal is not starting substring of lit. * @param lit optional explicit literal requirement. function fail if literal is not starting substring of lit.
* Note: function in same way fail if no any literal or literal not fit in this case. Need additional check for select specific fail case * Note: function in same way fail if no any literal or literal not fit in this case. Need additional check for select specific fail case
* @return name/number-like string without whitespaces, or NULL if args empty or not appropriate content. * @return name/number-like string without whitespaces, or NULL if args empty or not appropriate content.
*/ */
@ -2353,7 +2353,7 @@ char* ChatHandler::ExtractQuotedOrLiteralArg(char** args, bool asis /*= false*/)
} }
/** /**
* Function extract on/off literals as boolean values * Function extract on/off literals as boolean values
* *
* @param args variable pointer to non parsed args string, updated at function call to new position (with skipped white spaces) * @param args variable pointer to non parsed args string, updated at function call to new position (with skipped white spaces)
* @param val return extracted value if function success, in fail case original value unmodified * @param val return extracted value if function success, in fail case original value unmodified
@ -2417,7 +2417,7 @@ char* ChatHandler::ExtractLinkArg(char** args, char const* const* linkTypes /*=
if (*tail != 'H') // skip color part, some links can not have color part if (*tail != 'H') // skip color part, some links can not have color part
{ {
while (*tail && *tail != '|') while (*tail && *tail != '|')
++tail; ++tail;
if (!*tail) if (!*tail)
@ -2557,7 +2557,7 @@ char* ChatHandler::ExtractLinkArg(char** args, char const* const* linkTypes /*=
somethingPair[1] = somethingEnd; somethingPair[1] = somethingEnd;
} }
*args = tail; *args = tail;
SkipWhiteSpaces(args); SkipWhiteSpaces(args);
@ -2630,7 +2630,7 @@ char* ChatHandler::ExtractKeyFromLink(char** text, char const* linkType, char**
} }
/** /**
* Function extract data from shift-link "|color|LINKTYPE:RETURN:SOMETHING1|h[name]|h|r if LINKTYPE in linkTypes array * Function extract data from shift-link "|color|LINKTYPE:RETURN:SOMETHING1|h[name]|h|r if LINKTYPE in linkTypes array
* It also extract literal/quote if not shift-link in args * It also extract literal/quote if not shift-link in args
* *
* @param args variable pointer to non parsed args string, updated at function call to new position (with skipped white spaces) * @param args variable pointer to non parsed args string, updated at function call to new position (with skipped white spaces)

2
src/game/DBCStructure.h
View file

@ -732,7 +732,7 @@ struct CreatureDisplayInfoExtraEntry
//uint32 SkinColor; // 3 //uint32 SkinColor; // 3
//uint32 FaceType; // 4 //uint32 FaceType; // 4
//uint32 HairType; // 5 CharHairGeosets.dbc //uint32 HairType; // 5 CharHairGeosets.dbc
//uint32 HairStyle; // 6 CharSections.dbc, where GeneralType=3 //uint32 HairStyle; // 6 CharSections.dbc, where GeneralType=3
//uint32 BeardStyle; // 7 //uint32 BeardStyle; // 7
//uint32 Equipment[11]; // 8-18 equipped static items EQUIPMENT_SLOT_HEAD..EQUIPMENT_SLOT_HANDS, client show its by self //uint32 Equipment[11]; // 8-18 equipped static items EQUIPMENT_SLOT_HEAD..EQUIPMENT_SLOT_HANDS, client show its by self
//uint32 CanEquip; // 19 0..1 Can equip additional things when used for players //uint32 CanEquip; // 19 0..1 Can equip additional things when used for players

12
src/game/GameEventMgr.cpp
View file

@ -170,8 +170,8 @@ void GameEventMgr::LoadFromDB()
sLog.outString( ">> Loaded %u game events", count ); sLog.outString( ">> Loaded %u game events", count );
} }
std::map<uint16,int16> pool2event; // for check unique spawn event associated with pool std::map<uint16,int16> pool2event; // for check unique spawn event associated with pool
std::map<uint32,int16> creature2event; // for check unique spawn event associated with creature std::map<uint32,int16> creature2event; // for check unique spawn event associated with creature
std::map<uint32,int16> go2event; // for check unique spawn event associated with gameobject std::map<uint32,int16> go2event; // for check unique spawn event associated with gameobject
// list only positive event top pools, filled at creature/gameobject loading // list only positive event top pools, filled at creature/gameobject loading
@ -221,7 +221,7 @@ void GameEventMgr::LoadFromDB()
++count; ++count;
// spawn objects at event can be grouped in pools and then affected pools have stricter requirements for this case // spawn objects at event can be grouped in pools and then affected pools have stricter requirements for this case
if (event_id > 0) if (event_id > 0)
{ {
creature2event[guid] = event_id; creature2event[guid] = event_id;
@ -299,7 +299,7 @@ void GameEventMgr::LoadFromDB()
++count; ++count;
// spawn objects at event can be grouped in pools and then affected pools have stricter requirements for this case // spawn objects at event can be grouped in pools and then affected pools have stricter requirements for this case
if (event_id > 0) if (event_id > 0)
{ {
go2event[guid] = event_id; go2event[guid] = event_id;
@ -690,7 +690,7 @@ void GameEventMgr::GameEventSpawn(int16 event_id)
CreatureData const* data = sObjectMgr.GetCreatureData(*itr); CreatureData const* data = sObjectMgr.GetCreatureData(*itr);
if (data) if (data)
{ {
// negative event id for pool element meaning allow be used in next pool spawn // negative event id for pool element meaning allow be used in next pool spawn
if (event_id < 0) if (event_id < 0)
{ {
if (uint16 pool_id = sPoolMgr.IsPartOfAPool<Creature>(*itr)) if (uint16 pool_id = sPoolMgr.IsPartOfAPool<Creature>(*itr))
@ -737,7 +737,7 @@ void GameEventMgr::GameEventSpawn(int16 event_id)
GameObjectData const* data = sObjectMgr.GetGOData(*itr); GameObjectData const* data = sObjectMgr.GetGOData(*itr);
if (data) if (data)
{ {
// negative event id for pool element meaning allow be used in next pool spawn // negative event id for pool element meaning allow be used in next pool spawn
if (event_id < 0) if (event_id < 0)
{ {
if (uint16 pool_id = sPoolMgr.IsPartOfAPool<GameObject>(*itr)) if (uint16 pool_id = sPoolMgr.IsPartOfAPool<GameObject>(*itr))

2
src/game/GameObject.cpp
View file

@ -454,7 +454,7 @@ void GameObject::AddUniqueUse(Player* player)
m_firstUser = player->GetObjectGuid(); m_firstUser = player->GetObjectGuid();
m_UniqueUsers.insert(player->GetObjectGuid()); m_UniqueUsers.insert(player->GetObjectGuid());
} }
void GameObject::Delete() void GameObject::Delete()

6
src/game/GridMap.cpp
View file

@ -1035,7 +1035,7 @@ GridMap * TerrainInfo::GetGrid( const float x, const float y )
// half opt method // half opt method
int gx=(int)(32-x/SIZE_OF_GRIDS); //grid x int gx=(int)(32-x/SIZE_OF_GRIDS); //grid x
int gy=(int)(32-y/SIZE_OF_GRIDS); //grid y int gy=(int)(32-y/SIZE_OF_GRIDS); //grid y
//quick check if GridMap already loaded //quick check if GridMap already loaded
GridMap * pMap = m_GridMaps[gx][gy]; GridMap * pMap = m_GridMaps[gx][gy];
if(!pMap) if(!pMap)
@ -1134,7 +1134,7 @@ TerrainManager::~TerrainManager()
TerrainInfo * TerrainManager::LoadTerrain(const uint32 mapId) TerrainInfo * TerrainManager::LoadTerrain(const uint32 mapId)
{ {
Guard _guard(*this); Guard _guard(*this);
TerrainInfo * ptr = NULL; TerrainInfo * ptr = NULL;
TerrainDataMap::const_iterator iter = i_TerrainMap.find(mapId); TerrainDataMap::const_iterator iter = i_TerrainMap.find(mapId);
if(iter == i_TerrainMap.end()) if(iter == i_TerrainMap.end())
@ -1179,7 +1179,7 @@ void TerrainManager::UnloadAll()
{ {
for (TerrainDataMap::iterator it = i_TerrainMap.begin(); it != i_TerrainMap.end(); ++it) for (TerrainDataMap::iterator it = i_TerrainMap.begin(); it != i_TerrainMap.end(); ++it)
delete it->second; delete it->second;
i_TerrainMap.clear(); i_TerrainMap.clear();
} }

2
src/game/GridMap.h
View file

@ -245,7 +245,7 @@ public:
protected: protected:
friend class Map; friend class Map;
//load/unload terrain data //load/unload terrain data
GridMap * Load(const uint32 x, const uint32 y); GridMap * Load(const uint32 x, const uint32 y);
void Unload(const uint32 x, const uint32 y); void Unload(const uint32 x, const uint32 y);

2
src/game/ItemHandler.cpp
View file

@ -1132,7 +1132,7 @@ void WorldSession::HandleWrapItemOpcode(WorldPacket& recv_data)
} }
// cheating: non-wrapper wrapper (all empty wrappers is stackable) // cheating: non-wrapper wrapper (all empty wrappers is stackable)
if (!(gift->GetProto()->Flags & ITEM_FLAG_WRAPPER) || gift->GetMaxStackCount() == 1) if (!(gift->GetProto()->Flags & ITEM_FLAG_WRAPPER) || gift->GetMaxStackCount() == 1)
{ {
_player->SendEquipError( EQUIP_ERR_ITEM_NOT_FOUND, gift, NULL ); _player->SendEquipError( EQUIP_ERR_ITEM_NOT_FOUND, gift, NULL );
return; return;

6
src/game/Level2.cpp
View file

@ -2661,7 +2661,7 @@ bool ChatHandler::HandleTicketCommand(char* args)
if (num == 0) if (num == 0)
return false; return false;
// mgr numbering tickets start from 0 // mgr numbering tickets start from 0
ticket = sTicketMgr.GetGMTicketByOrderPos(num-1); ticket = sTicketMgr.GetGMTicketByOrderPos(num-1);
if (!ticket) if (!ticket)
@ -2708,7 +2708,7 @@ bool ChatHandler::HandleTicketCommand(char* args)
if (num == 0) if (num == 0)
return false; return false;
// mgr numbering tickets start from 0 // mgr numbering tickets start from 0
GMTicket* ticket = sTicketMgr.GetGMTicketByOrderPos(num-1); GMTicket* ticket = sTicketMgr.GetGMTicketByOrderPos(num-1);
if (!ticket) if (!ticket)
{ {
@ -2763,7 +2763,7 @@ bool ChatHandler::HandleDelTicketCommand(char *args)
if (num ==0) if (num ==0)
return false; return false;
// mgr numbering tickets start from 0 // mgr numbering tickets start from 0
GMTicket* ticket = sTicketMgr.GetGMTicketByOrderPos(num-1); GMTicket* ticket = sTicketMgr.GetGMTicketByOrderPos(num-1);
if (!ticket) if (!ticket)

6
src/game/Level3.cpp
View file

@ -1252,7 +1252,7 @@ bool ChatHandler::HandleAchievementCriteriaAddCommand(char* args)
return false; return false;
uint32 new_val; uint32 new_val;
if (maxValue) if (maxValue)
new_val = progress < maxValue && maxValue - progress > val ? progress + val : maxValue; new_val = progress < maxValue && maxValue - progress > val ? progress + val : maxValue;
else else
@ -4604,7 +4604,7 @@ bool ChatHandler::HandleListAurasCommand (char* /*args*/)
for (Unit::SpellAuraHolderMap::const_iterator itr = uAuras.begin(); itr != uAuras.end(); ++itr) for (Unit::SpellAuraHolderMap::const_iterator itr = uAuras.begin(); itr != uAuras.end(); ++itr)
{ {
bool talent = GetTalentSpellCost(itr->second->GetId()) > 0; bool talent = GetTalentSpellCost(itr->second->GetId()) > 0;
SpellAuraHolder *holder = itr->second; SpellAuraHolder *holder = itr->second;
char const* name = holder->GetSpellProto()->SpellName[GetSessionDbcLocale()]; char const* name = holder->GetSpellProto()->SpellName[GetSessionDbcLocale()];
@ -4613,7 +4613,7 @@ bool ChatHandler::HandleListAurasCommand (char* /*args*/)
Aura *aur = holder->GetAuraByEffectIndex(SpellEffectIndex(i)); Aura *aur = holder->GetAuraByEffectIndex(SpellEffectIndex(i));
if (!aur) if (!aur)
continue; continue;
if (m_session) if (m_session)
{ {
std::ostringstream ss_name; std::ostringstream ss_name;

2
src/game/LootHandler.cpp
View file

@ -448,7 +448,7 @@ void WorldSession::DoLootRelease(ObjectGuid lguid)
// normal persistence loot // normal persistence loot
default: default:
{ {
// must be destroyed only if no loot // must be destroyed only if no loot
if (pItem->loot.isLooted()) if (pItem->loot.isLooted())
{ {
pItem->SetLootState(ITEM_LOOT_REMOVED); pItem->SetLootState(ITEM_LOOT_REMOVED);

2
src/game/Map.cpp
View file

@ -267,7 +267,7 @@ bool Map::EnsureGridLoaded(const Cell &cell)
//otherwise there is a possibility of infinity chain (grid loading will be called many times for the same grid) //otherwise there is a possibility of infinity chain (grid loading will be called many times for the same grid)
//possible scenario: //possible scenario:
//active object A(loaded with loader.LoadN call and added to the map) //active object A(loaded with loader.LoadN call and added to the map)
//summons some active object B, while B added to map grid loading called again and so on.. //summons some active object B, while B added to map grid loading called again and so on..
setGridObjectDataLoaded(true,cell.GridX(), cell.GridY()); setGridObjectDataLoaded(true,cell.GridX(), cell.GridY());
ObjectGridLoader loader(*grid, this, cell); ObjectGridLoader loader(*grid, this, cell);
loader.LoadN(); loader.LoadN();

4
src/game/MapManager.cpp
View file

@ -92,7 +92,7 @@ Map* MapManager::CreateMap(uint32 id, const WorldObject* obj)
MANGOS_ASSERT(obj); MANGOS_ASSERT(obj);
//if(!obj->IsInWorld()) sLog.outError("GetMap: called for map %d with object (typeid %d, guid %d, mapid %d, instanceid %d) who is not in world!", id, obj->GetTypeId(), obj->GetGUIDLow(), obj->GetMapId(), obj->GetInstanceId()); //if(!obj->IsInWorld()) sLog.outError("GetMap: called for map %d with object (typeid %d, guid %d, mapid %d, instanceid %d) who is not in world!", id, obj->GetTypeId(), obj->GetGUIDLow(), obj->GetMapId(), obj->GetInstanceId());
Guard _guard(*this); Guard _guard(*this);
Map * m = NULL; Map * m = NULL;
const MapEntry* entry = sMapStore.LookupEntry(id); const MapEntry* entry = sMapStore.LookupEntry(id);
@ -136,7 +136,7 @@ Map* MapManager::FindMap(uint32 mapid, uint32 instanceId) const
MapMapType::const_iterator iter = i_maps.find(MapID(mapid, instanceId)); MapMapType::const_iterator iter = i_maps.find(MapID(mapid, instanceId));
if(iter == i_maps.end()) if(iter == i_maps.end())
return NULL; return NULL;
//this is a small workaround for transports //this is a small workaround for transports
if(instanceId == 0 && iter->second->Instanceable()) if(instanceId == 0 && iter->second->Instanceable())
{ {

2
src/game/Object.cpp
View file

@ -1075,7 +1075,7 @@ void WorldObject::Relocate(float x, float y, float z)
} }
void WorldObject::SetOrientation(float orientation) void WorldObject::SetOrientation(float orientation)
{ {
m_orientation = orientation; m_orientation = orientation;
if(isType(TYPEMASK_UNIT)) if(isType(TYPEMASK_UNIT))

4
src/game/Object.h
View file

@ -88,7 +88,7 @@ struct WorldLocation
//use this class to measure time between world update ticks //use this class to measure time between world update ticks
//essential for units updating their spells after cells become active //essential for units updating their spells after cells become active
class WorldUpdateCounter class WorldUpdateCounter
{ {
public: public:
@ -411,7 +411,7 @@ class MANGOS_DLL_SPEC WorldObject : public Object
~UpdateHelper() { } ~UpdateHelper() { }
void Update( uint32 time_diff ) void Update( uint32 time_diff )
{ {
m_obj->Update( m_obj->m_updateTracker.timeElapsed(), time_diff); m_obj->Update( m_obj->m_updateTracker.timeElapsed(), time_diff);
m_obj->m_updateTracker.Reset(); m_obj->m_updateTracker.Reset();
} }

2
src/game/ObjectGuid.cpp
View file

@ -47,7 +47,7 @@ std::string ObjectGuid::GetString() const
{ {
std::ostringstream str; std::ostringstream str;
str << GetTypeName(); str << GetTypeName();
if (IsPlayer()) if (IsPlayer())
{ {
std::string name; std::string name;

2
src/game/ObjectMgr.cpp
View file

@ -8925,7 +8925,7 @@ bool FindCreatureData::operator()( CreatureDataPair const& dataPair )
i_mapDist = new_dist; i_mapDist = new_dist;
} }
// skip not spawned (in any state), // skip not spawned (in any state),
uint16 pool_id = sPoolMgr.IsPartOfAPool<Creature>(dataPair.first); uint16 pool_id = sPoolMgr.IsPartOfAPool<Creature>(dataPair.first);
if (pool_id && !sPoolMgr.IsSpawnedObject<Creature>(dataPair.first)) if (pool_id && !sPoolMgr.IsSpawnedObject<Creature>(dataPair.first))
return false; return false;

2
src/game/Pet.cpp
View file

@ -43,7 +43,7 @@ m_declinedname(NULL), m_petModeFlags(PET_MODE_DEFAULT)
if(type == MINI_PET) // always passive if(type == MINI_PET) // always passive
charmInfo->SetReactState(REACT_PASSIVE); charmInfo->SetReactState(REACT_PASSIVE);
else if(type == PROTECTOR_PET) // always defensive else if(type == PROTECTOR_PET) // always defensive
charmInfo->SetReactState(REACT_DEFENSIVE); charmInfo->SetReactState(REACT_DEFENSIVE);
else if(type == GUARDIAN_PET) // always aggressive else if(type == GUARDIAN_PET) // always aggressive
charmInfo->SetReactState(REACT_AGGRESSIVE); charmInfo->SetReactState(REACT_AGGRESSIVE);

2
src/game/PoolManager.cpp
View file

@ -158,7 +158,7 @@ bool PoolGroup<T>::CheckPool() const
return true; return true;
} }
// Method to check event linking // Method to check event linking
template <class T> template <class T>
void PoolGroup<T>::CheckEventLinkAndReport(int16 event_id, std::map<uint32, int16> const& creature2event, std::map<uint32, int16> const& go2event) const void PoolGroup<T>::CheckEventLinkAndReport(int16 event_id, std::map<uint32, int16> const& creature2event, std::map<uint32, int16> const& go2event) const
{ {

2
src/game/ScriptMgr.cpp
View file

@ -915,7 +915,7 @@ char const* ScriptMgr::GetScriptLibraryVersion() const
{ {
if (!m_pGetScriptLibraryVersion) if (!m_pGetScriptLibraryVersion)
return ""; return "";
return m_pGetScriptLibraryVersion(); return m_pGetScriptLibraryVersion();
} }

2
src/game/SharedDefines.h
View file

@ -1947,7 +1947,7 @@ enum CreatureTypeFlags
CREATURE_TYPEFLAGS_UNK15 = 0x00004000, // Lua_UnitGUID, client does guid_low &= 0xFF000000 if this flag is set CREATURE_TYPEFLAGS_UNK15 = 0x00004000, // Lua_UnitGUID, client does guid_low &= 0xFF000000 if this flag is set
CREATURE_TYPEFLAGS_ENGINEERLOOT = 0x00008000, // Can be looted by engineer CREATURE_TYPEFLAGS_ENGINEERLOOT = 0x00008000, // Can be looted by engineer
CREATURE_TYPEFLAGS_EXOTIC = 0x00010000, // Can be tamed by hunter as exotic pet CREATURE_TYPEFLAGS_EXOTIC = 0x00010000, // Can be tamed by hunter as exotic pet
CREATURE_TYPEFLAGS_UNK18 = 0x00020000, // related to CreatureDisplayInfo and scaling in some way CREATURE_TYPEFLAGS_UNK18 = 0x00020000, // related to CreatureDisplayInfo and scaling in some way
CREATURE_TYPEFLAGS_UNK19 = 0x00040000, // ? Related to vehicle/siege weapons? CREATURE_TYPEFLAGS_UNK19 = 0x00040000, // ? Related to vehicle/siege weapons?
CREATURE_TYPEFLAGS_UNK20 = 0x00080000, // may be has something to do with missiles CREATURE_TYPEFLAGS_UNK20 = 0x00080000, // may be has something to do with missiles
CREATURE_TYPEFLAGS_UNK21 = 0x00100000, // no idea, but it used by client, may be related to rendering CREATURE_TYPEFLAGS_UNK21 = 0x00100000, // no idea, but it used by client, may be related to rendering

2
src/game/Transports.cpp
View file

@ -420,7 +420,7 @@ bool Transport::GenerateWaypoints(uint32 pathid, std::set<uint32> &mapids)
m_next = m_WayPoints.begin(); // will used in MoveToNextWayPoint for init m_curr m_next = m_WayPoints.begin(); // will used in MoveToNextWayPoint for init m_curr
MoveToNextWayPoint(); // m_curr -> first point MoveToNextWayPoint(); // m_curr -> first point
MoveToNextWayPoint(); // skip first point MoveToNextWayPoint(); // skip first point
m_pathTime = timer; m_pathTime = timer;

4
src/game/debugcmds.cpp
View file

@ -548,7 +548,7 @@ bool ChatHandler::HandleDebugGetItemStateCommand(char* args)
if (container != bag) if (container != bag)
{ {
PSendSysMessage("%s in bag %u at slot %u has a different container %s from slot %u!", PSendSysMessage("%s in bag %u at slot %u has a different container %s from slot %u!",
item2->GetGuidStr().c_str(), bag->GetSlot(), item2->GetSlot(), item2->GetGuidStr().c_str(), bag->GetSlot(), item2->GetSlot(),
container->GetGuidStr().c_str(), container->GetSlot()); container->GetGuidStr().c_str(), container->GetSlot());
error = true; continue; error = true; continue;
} }
@ -1091,7 +1091,7 @@ bool ChatHandler::HandleDebugSpellModsCommand(char* args)
if (!typeStr) if (!typeStr)
return false; return false;
uint16 opcode; uint16 opcode;
if (strncmp(typeStr, "flat", strlen(typeStr)) == 0) if (strncmp(typeStr, "flat", strlen(typeStr)) == 0)
opcode = SMSG_SET_FLAT_SPELL_MODIFIER; opcode = SMSG_SET_FLAT_SPELL_MODIFIER;
else if (strncmp(typeStr, "pct", strlen(typeStr)) == 0) else if (strncmp(typeStr, "pct", strlen(typeStr)) == 0)

2
src/shared/LockedQueue.h
View file

@ -124,7 +124,7 @@ namespace ACE_Based
{ {
this->_lock.release(); this->_lock.release();
} }
///! Checks if we're empty or not with locks held ///! Checks if we're empty or not with locks held
bool empty() bool empty()
{ {

2
src/shared/Timer.h
View file

@ -43,7 +43,7 @@ class WorldTimer
return newMSTime - oldMSTime; return newMSTime - oldMSTime;
} }
//get last world tick time //get last world tick time
static MANGOS_DLL_SPEC uint32 tickTime(); static MANGOS_DLL_SPEC uint32 tickTime();
//get previous world tick time //get previous world tick time
static MANGOS_DLL_SPEC uint32 tickPrevTime(); static MANGOS_DLL_SPEC uint32 tickPrevTime();

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "11065" #define REVISION_NR "11066"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__