diff options
2384 files changed, 9729 insertions, 969 deletions
diff --git a/contrib/extractor/System.cpp b/contrib/extractor/System.cpp index f9f684014c2..26401afc0b7 100644 --- a/contrib/extractor/System.cpp +++ b/contrib/extractor/System.cpp @@ -366,3 +366,4 @@ int main(int argc, char * arg[]) return 0; } + diff --git a/contrib/extractor/adt.cpp b/contrib/extractor/adt.cpp index 70316a358e4..d36b71af976 100644 --- a/contrib/extractor/adt.cpp +++ b/contrib/extractor/adt.cpp @@ -378,3 +378,4 @@ bool ConvertADT(char *filename, char *filename2) return true; } + diff --git a/contrib/extractor/adt.h b/contrib/extractor/adt.h index 52196c4e7e6..516ed88a86e 100644 --- a/contrib/extractor/adt.h +++ b/contrib/extractor/adt.h @@ -126,3 +126,5 @@ uint8 *MapLiqFlag; uint32 k, m, chunk_num; void LoadMapChunk(MPQFile &, chunk*); #endif + + diff --git a/contrib/extractor/dbcfile.cpp b/contrib/extractor/dbcfile.cpp index acfb35482ff..dbe379d27f7 100644 --- a/contrib/extractor/dbcfile.cpp +++ b/contrib/extractor/dbcfile.cpp @@ -67,3 +67,4 @@ DBCFile::Iterator DBCFile::end() assert(data); return Iterator(*this, stringTable); } + diff --git a/contrib/extractor/dbcfile.h b/contrib/extractor/dbcfile.h index 521ca67423c..7d709e80948 100644 --- a/contrib/extractor/dbcfile.h +++ b/contrib/extractor/dbcfile.h @@ -116,3 +116,4 @@ private: }; #endif + diff --git a/contrib/extractor/libmpq/common.cpp b/contrib/extractor/libmpq/common.cpp index 7376a500870..49b1895cc6c 100644 --- a/contrib/extractor/libmpq/common.cpp +++ b/contrib/extractor/libmpq/common.cpp @@ -799,3 +799,4 @@ int libmpq_file_read_file(mpq_archive *mpq_a, mpq_file *mpq_f, unsigned int file /* Return what we've read */ return bytesread; } + diff --git a/contrib/extractor/libmpq/common.h b/contrib/extractor/libmpq/common.h index 517d959b346..3212d014129 100644 --- a/contrib/extractor/libmpq/common.h +++ b/contrib/extractor/libmpq/common.h @@ -70,3 +70,4 @@ char *libmpq_conf_delete_char(char *buf, char *chars); int libmpq_conf_get_array(FILE *fp, char *search_value, char ***filelist, int *entries); int libmpq_free_listfile(char **filelist); int libmpq_read_listfile(mpq_archive *mpq_a, FILE *fp); + diff --git a/contrib/extractor/libmpq/explode.cpp b/contrib/extractor/libmpq/explode.cpp index 1401dd4ad5f..c3885cbbddd 100644 --- a/contrib/extractor/libmpq/explode.cpp +++ b/contrib/extractor/libmpq/explode.cpp @@ -426,3 +426,4 @@ unsigned int libmpq_pkzip_explode( } return LIBMPQ_PKZIP_CMP_ABORT; } + diff --git a/contrib/extractor/libmpq/explode.h b/contrib/extractor/libmpq/explode.h index d8b15868a39..ca20e887d5b 100644 --- a/contrib/extractor/libmpq/explode.h +++ b/contrib/extractor/libmpq/explode.h @@ -84,3 +84,4 @@ extern unsigned int libmpq_pkzip_explode( ); #endif /* _EXPLODE_H */ + diff --git a/contrib/extractor/libmpq/extract.cpp b/contrib/extractor/libmpq/extract.cpp index 21043b75ae8..c0db1930375 100644 --- a/contrib/extractor/libmpq/extract.cpp +++ b/contrib/extractor/libmpq/extract.cpp @@ -260,3 +260,4 @@ int libmpq_multi_decompress(char *out_buf, int *pout_length, char *in_buf, int i } return 1; } + diff --git a/contrib/extractor/libmpq/huffman.cpp b/contrib/extractor/libmpq/huffman.cpp index b126a887fd1..ff796d065fb 100644 --- a/contrib/extractor/libmpq/huffman.cpp +++ b/contrib/extractor/libmpq/huffman.cpp @@ -831,3 +831,4 @@ int libmpq_huff_init_tree(struct huffman_tree *ht, struct huffman_tree_item *hi, return 0; } + diff --git a/contrib/extractor/libmpq/huffman.h b/contrib/extractor/libmpq/huffman.h index cce32dd6718..9519c293074 100644 --- a/contrib/extractor/libmpq/huffman.h +++ b/contrib/extractor/libmpq/huffman.h @@ -103,3 +103,4 @@ struct huffman_tree { int libmpq_huff_init_tree(struct huffman_tree *ht, struct huffman_tree_item *hi, unsigned int cmp); int libmpq_huff_do_decompress(struct huffman_tree *ht, struct huffman_input_stream *is, unsigned char *out_buf, unsigned int out_length); #endif /* _HUFFMAN_H */ + diff --git a/contrib/extractor/libmpq/mpq.cpp b/contrib/extractor/libmpq/mpq.cpp index f1b262bff0f..a59d3dff2f1 100644 --- a/contrib/extractor/libmpq/mpq.cpp +++ b/contrib/extractor/libmpq/mpq.cpp @@ -624,3 +624,4 @@ int libmpq_file_getdata(mpq_archive *mpq_a, mpq_hash mpq_h, const int number, un free(mpq_f); return success?LIBMPQ_TOOLS_SUCCESS:LIBMPQ_EFILE_CORRUPT; } + diff --git a/contrib/extractor/libmpq/mpq.h b/contrib/extractor/libmpq/mpq.h index 58eef6bead2..008c7147aba 100644 --- a/contrib/extractor/libmpq/mpq.h +++ b/contrib/extractor/libmpq/mpq.h @@ -223,3 +223,4 @@ static decompress_table dcmp_table[] = { int libmpq_file_extract(mpq_archive *mpq_a, const int number, const char *filename); int libmpq_file_getdata(mpq_archive *mpq_a, mpq_hash mpq_h, const int number, unsigned char *dest); #endif /* _MPQ_H */ + diff --git a/contrib/extractor/libmpq/parser.cpp b/contrib/extractor/libmpq/parser.cpp index 5bd620aa74c..4b01067ec08 100644 --- a/contrib/extractor/libmpq/parser.cpp +++ b/contrib/extractor/libmpq/parser.cpp @@ -292,3 +292,4 @@ int libmpq_conf_get_array(FILE *fp, char *search_value, char ***filelist, int *e return found; } + diff --git a/contrib/extractor/libmpq/wave.cpp b/contrib/extractor/libmpq/wave.cpp index d5c59d8e085..7f16eb2fad1 100644 --- a/contrib/extractor/libmpq/wave.cpp +++ b/contrib/extractor/libmpq/wave.cpp @@ -183,3 +183,4 @@ int libmpq_wave_decompress(unsigned char *out_buf, int out_length, unsigned char } return (out.pb - out_buf); } + diff --git a/contrib/extractor/libmpq/wave.h b/contrib/extractor/libmpq/wave.h index 996e8c6777f..253c6a4f901 100644 --- a/contrib/extractor/libmpq/wave.h +++ b/contrib/extractor/libmpq/wave.h @@ -35,3 +35,4 @@ typedef union { int libmpq_wave_decompress(unsigned char *out_buf, int out_length, unsigned char *in_buf, int in_length, int channels); #endif /* _WAVE_H */ + diff --git a/contrib/extractor/libmpq/zconf.h b/contrib/extractor/libmpq/zconf.h index 3cea897eda7..e0468a22ecc 100644 --- a/contrib/extractor/libmpq/zconf.h +++ b/contrib/extractor/libmpq/zconf.h @@ -321,3 +321,4 @@ typedef uLong FAR uLongf; #endif #endif /* ZCONF_H */ + diff --git a/contrib/extractor/libmpq/zlib.h b/contrib/extractor/libmpq/zlib.h index 92edf96ff3e..2c786c36d89 100644 --- a/contrib/extractor/libmpq/zlib.h +++ b/contrib/extractor/libmpq/zlib.h @@ -1198,3 +1198,4 @@ ZEXTERN const uLongf * ZEXPORT get_crc_table OF((void)); #endif #endif /* ZLIB_H */ + diff --git a/contrib/extractor/mpq_libmpq.cpp b/contrib/extractor/mpq_libmpq.cpp index 41253b242b3..2a066a83b34 100644 --- a/contrib/extractor/mpq_libmpq.cpp +++ b/contrib/extractor/mpq_libmpq.cpp @@ -131,3 +131,4 @@ void MPQFile::close() buffer = 0; eof = true; } + diff --git a/contrib/extractor/mpq_libmpq.h b/contrib/extractor/mpq_libmpq.h index 9b4984a50e4..97b7b75035b 100644 --- a/contrib/extractor/mpq_libmpq.h +++ b/contrib/extractor/mpq_libmpq.h @@ -119,3 +119,4 @@ inline void flipcc(char *fcc) } #endif + diff --git a/contrib/vmap_assembler/vmap_assembler.cpp b/contrib/vmap_assembler/vmap_assembler.cpp index 233d4ba3c28..bf720099788 100644 --- a/contrib/vmap_assembler/vmap_assembler.cpp +++ b/contrib/vmap_assembler/vmap_assembler.cpp @@ -116,3 +116,4 @@ int main(int argc, char* argv[]) } return 0; } + diff --git a/contrib/vmap_debugger/G3D/AABSPTree.h b/contrib/vmap_debugger/G3D/AABSPTree.h index 30eca17d08e..1f4c4c80e59 100644 --- a/contrib/vmap_debugger/G3D/AABSPTree.h +++ b/contrib/vmap_debugger/G3D/AABSPTree.h @@ -1618,3 +1618,4 @@ public: + diff --git a/contrib/vmap_debugger/ModelContainerView.cpp b/contrib/vmap_debugger/ModelContainerView.cpp index e5d7b247e0f..fbfa565696f 100644 --- a/contrib/vmap_debugger/ModelContainerView.cpp +++ b/contrib/vmap_debugger/ModelContainerView.cpp @@ -568,3 +568,4 @@ int main(int argc, char** argv) { printf("%s <data dir> <vmapcmd.log file>\n",argv[0]); } } + diff --git a/contrib/vmap_debugger/ModelContainerView.h b/contrib/vmap_debugger/ModelContainerView.h index 3371d263808..c87231892da 100644 --- a/contrib/vmap_debugger/ModelContainerView.h +++ b/contrib/vmap_debugger/ModelContainerView.h @@ -87,3 +87,4 @@ namespace VMAP } #endif + diff --git a/contrib/vmap_extractor_v2/stormdll/StormDll.cpp b/contrib/vmap_extractor_v2/stormdll/StormDll.cpp index 2031180c7e3..c0772e9b2da 100644 --- a/contrib/vmap_extractor_v2/stormdll/StormDll.cpp +++ b/contrib/vmap_extractor_v2/stormdll/StormDll.cpp @@ -115,3 +115,4 @@ BOOL WINAPI SCOMP(Decompress)(char * pbOutBuffer, int * pdwOutLength, char * pbI SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + diff --git a/contrib/vmap_extractor_v2/stormdll/StormDll.h b/contrib/vmap_extractor_v2/stormdll/StormDll.h index 6d67820a22f..6be20e59bd7 100644 --- a/contrib/vmap_extractor_v2/stormdll/StormDll.h +++ b/contrib/vmap_extractor_v2/stormdll/StormDll.h @@ -65,3 +65,4 @@ BOOL WINAPI SCOMP(Decompress)(char * pbOutBuffer, int * pdwOutLength, char * pb #endif #endif // __STORM_H__ + diff --git a/contrib/vmap_extractor_v2/stormlib/GfxDecode.cpp b/contrib/vmap_extractor_v2/stormlib/GfxDecode.cpp index d9a5380f0e8..7fd3c855f1c 100644 --- a/contrib/vmap_extractor_v2/stormlib/GfxDecode.cpp +++ b/contrib/vmap_extractor_v2/stormlib/GfxDecode.cpp @@ -695,3 +695,4 @@ BYTE * WINAPI pcxGetData(BYTE *pFileBuf, DWORD uFileSize, BYTE uTransColor, WORD return data; } + diff --git a/contrib/vmap_extractor_v2/stormlib/SCommon.cpp b/contrib/vmap_extractor_v2/stormlib/SCommon.cpp index c1a7b71d2a7..f7e29ab7a24 100644 --- a/contrib/vmap_extractor_v2/stormlib/SCommon.cpp +++ b/contrib/vmap_extractor_v2/stormlib/SCommon.cpp @@ -1072,3 +1072,4 @@ void FreeMPQArchive(TMPQArchive *& ha) ha = NULL; } } + diff --git a/contrib/vmap_extractor_v2/stormlib/SCommon.h b/contrib/vmap_extractor_v2/stormlib/SCommon.h index b53be0ae2a8..b038c7f04dd 100644 --- a/contrib/vmap_extractor_v2/stormlib/SCommon.h +++ b/contrib/vmap_extractor_v2/stormlib/SCommon.h @@ -86,3 +86,4 @@ int SListFileSaveToMpq(TMPQArchive * ha); #endif // __SCOMMON_H__ + diff --git a/contrib/vmap_extractor_v2/stormlib/SCompression.cpp b/contrib/vmap_extractor_v2/stormlib/SCompression.cpp index 775961f4804..7162cd04f50 100644 --- a/contrib/vmap_extractor_v2/stormlib/SCompression.cpp +++ b/contrib/vmap_extractor_v2/stormlib/SCompression.cpp @@ -713,3 +713,4 @@ int WINAPI SCompSetDataCompression(int nDataCompression) } + diff --git a/contrib/vmap_extractor_v2/stormlib/SFileCompactArchive.cpp b/contrib/vmap_extractor_v2/stormlib/SFileCompactArchive.cpp index 96fb1e4a63d..b5a8530f61e 100644 --- a/contrib/vmap_extractor_v2/stormlib/SFileCompactArchive.cpp +++ b/contrib/vmap_extractor_v2/stormlib/SFileCompactArchive.cpp @@ -689,3 +689,4 @@ BOOL WINAPI SFileCompactArchive(HANDLE hMPQ, const char * szListFile, BOOL /* bR CompactCB = NULL; return (nError == ERROR_SUCCESS); } + diff --git a/contrib/vmap_extractor_v2/stormlib/SFileCreateArchiveEx.cpp b/contrib/vmap_extractor_v2/stormlib/SFileCreateArchiveEx.cpp index e55ad4c0f11..58f33e459ca 100644 --- a/contrib/vmap_extractor_v2/stormlib/SFileCreateArchiveEx.cpp +++ b/contrib/vmap_extractor_v2/stormlib/SFileCreateArchiveEx.cpp @@ -528,3 +528,4 @@ BOOL WINAPI SFileRenameFile(HANDLE hMPQ, const char * szFileName, const char * s return (nError == ERROR_SUCCESS); } + diff --git a/contrib/vmap_extractor_v2/stormlib/SFileExtractFile.cpp b/contrib/vmap_extractor_v2/stormlib/SFileExtractFile.cpp index 7f16cde0171..d6afc19426b 100644 --- a/contrib/vmap_extractor_v2/stormlib/SFileExtractFile.cpp +++ b/contrib/vmap_extractor_v2/stormlib/SFileExtractFile.cpp @@ -61,3 +61,4 @@ BOOL WINAPI SFileExtractFile(HANDLE hMpq, const char * szToExtract, const char * SetLastError(nError); return (BOOL)(nError == ERROR_SUCCESS); } + diff --git a/contrib/vmap_extractor_v2/stormlib/SFileFindFile.cpp b/contrib/vmap_extractor_v2/stormlib/SFileFindFile.cpp index ea5ce5a47a1..ff8ab2688fd 100644 --- a/contrib/vmap_extractor_v2/stormlib/SFileFindFile.cpp +++ b/contrib/vmap_extractor_v2/stormlib/SFileFindFile.cpp @@ -289,3 +289,4 @@ BOOL WINAPI SFileFindClose(HANDLE hFind) FreeMPQSearch(hs); return TRUE; } + diff --git a/contrib/vmap_extractor_v2/stormlib/SFileOpenArchive.cpp b/contrib/vmap_extractor_v2/stormlib/SFileOpenArchive.cpp index 468759e6d1c..b4a84e2d6ab 100644 --- a/contrib/vmap_extractor_v2/stormlib/SFileOpenArchive.cpp +++ b/contrib/vmap_extractor_v2/stormlib/SFileOpenArchive.cpp @@ -495,3 +495,4 @@ BOOL WINAPI SFileCloseArchive(HANDLE hMPQ) return TRUE; } + diff --git a/contrib/vmap_extractor_v2/stormlib/SFileOpenFileEx.cpp b/contrib/vmap_extractor_v2/stormlib/SFileOpenFileEx.cpp index bbda59e5e79..aae55cc6899 100644 --- a/contrib/vmap_extractor_v2/stormlib/SFileOpenFileEx.cpp +++ b/contrib/vmap_extractor_v2/stormlib/SFileOpenFileEx.cpp @@ -401,3 +401,4 @@ BOOL WINAPI SFileCloseFile(HANDLE hFile) FreeMPQFile(hf); return TRUE; } + diff --git a/contrib/vmap_extractor_v2/stormlib/SFileReadFile.cpp b/contrib/vmap_extractor_v2/stormlib/SFileReadFile.cpp index a1f94ae3bb1..288d63e9049 100644 --- a/contrib/vmap_extractor_v2/stormlib/SFileReadFile.cpp +++ b/contrib/vmap_extractor_v2/stormlib/SFileReadFile.cpp @@ -824,3 +824,4 @@ DWORD_PTR WINAPI SFileGetFileInfo(HANDLE hMpqOrFile, DWORD dwInfoType) SetLastError(ERROR_INVALID_PARAMETER); return 0xFFFFFFFF; } + diff --git a/contrib/vmap_extractor_v2/stormlib/SListFile.cpp b/contrib/vmap_extractor_v2/stormlib/SListFile.cpp index 628043c0a84..385e6e8ac40 100644 --- a/contrib/vmap_extractor_v2/stormlib/SListFile.cpp +++ b/contrib/vmap_extractor_v2/stormlib/SListFile.cpp @@ -559,3 +559,4 @@ BOOL SListFileFindClose(HANDLE hFind) return FALSE; } + diff --git a/contrib/vmap_extractor_v2/stormlib/StormDll.h b/contrib/vmap_extractor_v2/stormlib/StormDll.h index 6d67820a22f..6be20e59bd7 100644 --- a/contrib/vmap_extractor_v2/stormlib/StormDll.h +++ b/contrib/vmap_extractor_v2/stormlib/StormDll.h @@ -65,3 +65,4 @@ BOOL WINAPI SCOMP(Decompress)(char * pbOutBuffer, int * pdwOutLength, char * pb #endif #endif // __STORM_H__ + diff --git a/contrib/vmap_extractor_v2/stormlib/StormLib.h b/contrib/vmap_extractor_v2/stormlib/StormLib.h index 93e2eb41c4b..e3b9381b9f1 100644 --- a/contrib/vmap_extractor_v2/stormlib/StormLib.h +++ b/contrib/vmap_extractor_v2/stormlib/StormLib.h @@ -577,3 +577,4 @@ BYTE ** WINAPI cl2GetDirData(BYTE *fileBuf, BYTE *palette, USHORT xsize, USHORT BYTE * WINAPI pcxGetData(BYTE *filebuf, DWORD filesize, BYTE transcol, USHORT *xsize, USHORT *ysize); #endif // __STORMLIB_H_ + diff --git a/contrib/vmap_extractor_v2/stormlib/StormPort.h b/contrib/vmap_extractor_v2/stormlib/StormPort.h index 8670627809c..eb8b1e6d0d0 100644 --- a/contrib/vmap_extractor_v2/stormlib/StormPort.h +++ b/contrib/vmap_extractor_v2/stormlib/StormPort.h @@ -276,3 +276,4 @@ #endif #endif // __STORMPORT_H__ + diff --git a/contrib/vmap_extractor_v2/stormlib/StormPortLinux.cpp b/contrib/vmap_extractor_v2/stormlib/StormPortLinux.cpp index 03c51f0d4dc..09eeef58949 100644 --- a/contrib/vmap_extractor_v2/stormlib/StormPortLinux.cpp +++ b/contrib/vmap_extractor_v2/stormlib/StormPortLinux.cpp @@ -166,3 +166,4 @@ BOOL MoveFile(const char *lpExistingFileName, const char *lpNewFileName) } #endif + diff --git a/contrib/vmap_extractor_v2/stormlib/StormPortMac.cpp b/contrib/vmap_extractor_v2/stormlib/StormPortMac.cpp index 976b8fbe8e8..0904ab30f76 100644 --- a/contrib/vmap_extractor_v2/stormlib/StormPortMac.cpp +++ b/contrib/vmap_extractor_v2/stormlib/StormPortMac.cpp @@ -760,3 +760,4 @@ DWORD GetFileAttributes(const char * szFileName) } #endif + diff --git a/contrib/vmap_extractor_v2/stormlib/bzip2/bzlib.h b/contrib/vmap_extractor_v2/stormlib/bzip2/bzlib.h index c84589d1fbd..25b2d140eb2 100644 --- a/contrib/vmap_extractor_v2/stormlib/bzip2/bzlib.h +++ b/contrib/vmap_extractor_v2/stormlib/bzip2/bzlib.h @@ -321,3 +321,4 @@ BZ_EXTERN const char * BZ_API(BZ2_bzerror) ( /*-------------------------------------------------------------*/ /*--- end bzlib.h ---*/ /*-------------------------------------------------------------*/ + diff --git a/contrib/vmap_extractor_v2/stormlib/bzip2/bzlib_private.h b/contrib/vmap_extractor_v2/stormlib/bzip2/bzlib_private.h index 23a19f8070e..85b20c6e8a6 100644 --- a/contrib/vmap_extractor_v2/stormlib/bzip2/bzlib_private.h +++ b/contrib/vmap_extractor_v2/stormlib/bzip2/bzlib_private.h @@ -535,3 +535,4 @@ BZ2_hbCreateDecodeTables ( Int32*, Int32*, Int32*, UChar*, /*-------------------------------------------------------------*/ /*--- end bzlib_private.h ---*/ /*-------------------------------------------------------------*/ + diff --git a/contrib/vmap_extractor_v2/stormlib/huffman/huff.cpp b/contrib/vmap_extractor_v2/stormlib/huffman/huff.cpp index 235319b9252..d4410dc9beb 100644 --- a/contrib/vmap_extractor_v2/stormlib/huffman/huff.cpp +++ b/contrib/vmap_extractor_v2/stormlib/huffman/huff.cpp @@ -1450,4 +1450,5 @@ unsigned char THuffmannTree::Table1502A630[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -};
\ No newline at end of file +}; + diff --git a/contrib/vmap_extractor_v2/stormlib/huffman/huff.h b/contrib/vmap_extractor_v2/stormlib/huffman/huff.h index 0deaa2e4a0f..af7cdc14539 100644 --- a/contrib/vmap_extractor_v2/stormlib/huffman/huff.h +++ b/contrib/vmap_extractor_v2/stormlib/huffman/huff.h @@ -140,3 +140,4 @@ class THuffmannTree }; #endif // __HUFFMAN_H__ + diff --git a/contrib/vmap_extractor_v2/stormlib/pklib/pklib.h b/contrib/vmap_extractor_v2/stormlib/pklib/pklib.h index a06bee1de4c..d4c405b240d 100644 --- a/contrib/vmap_extractor_v2/stormlib/pklib/pklib.h +++ b/contrib/vmap_extractor_v2/stormlib/pklib/pklib.h @@ -135,3 +135,4 @@ unsigned long PKEXPORT crc32pk(char *buffer, unsigned int *size, unsigned long * #endif #endif // __PKLIB_H__ + diff --git a/contrib/vmap_extractor_v2/stormlib/wave/wave.cpp b/contrib/vmap_extractor_v2/stormlib/wave/wave.cpp index 74ab1cd7e72..1400fad37de 100644 --- a/contrib/vmap_extractor_v2/stormlib/wave/wave.cpp +++ b/contrib/vmap_extractor_v2/stormlib/wave/wave.cpp @@ -354,3 +354,4 @@ int DecompressWave(unsigned char * pbOutBuffer, int dwOutLength, unsigned char * } return (int)(out.pb - pbOutBuffer); } + diff --git a/contrib/vmap_extractor_v2/stormlib/wave/wave.h b/contrib/vmap_extractor_v2/stormlib/wave/wave.h index 81b5add9cfc..bc116b91ce7 100644 --- a/contrib/vmap_extractor_v2/stormlib/wave/wave.h +++ b/contrib/vmap_extractor_v2/stormlib/wave/wave.h @@ -20,3 +20,4 @@ int CompressWave (unsigned char * pbOutBuffer, int dwOutLength, short * pwInBu int DecompressWave(unsigned char * pbOutBuffer, int dwOutLength, unsigned char * pbInBuffer, int dwInLength, int nChannels); #endif // __WAVE_H__ + diff --git a/contrib/vmap_extractor_v2/stormlib/zlib/contrib/delphi2/d_zlib.cpp b/contrib/vmap_extractor_v2/stormlib/zlib/contrib/delphi2/d_zlib.cpp index f5dea59b762..25b15e30a8c 100644 --- a/contrib/vmap_extractor_v2/stormlib/zlib/contrib/delphi2/d_zlib.cpp +++ b/contrib/vmap_extractor_v2/stormlib/zlib/contrib/delphi2/d_zlib.cpp @@ -15,3 +15,4 @@ USEUNIT("trees.c"); // To add a file to the library use the Project menu 'Add to Project'. + diff --git a/contrib/vmap_extractor_v2/stormlib/zlib/contrib/delphi2/zlib.cpp b/contrib/vmap_extractor_v2/stormlib/zlib/contrib/delphi2/zlib.cpp index bf6953ba198..0673927e015 100644 --- a/contrib/vmap_extractor_v2/stormlib/zlib/contrib/delphi2/zlib.cpp +++ b/contrib/vmap_extractor_v2/stormlib/zlib/contrib/delphi2/zlib.cpp @@ -20,3 +20,4 @@ USEUNIT("zutil.c"); // To add a file to the library use the Project menu 'Add to Project'. + diff --git a/contrib/vmap_extractor_v2/stormlib/zlib/contrib/delphi2/zlib32.cpp b/contrib/vmap_extractor_v2/stormlib/zlib/contrib/delphi2/zlib32.cpp index 7372f6b985f..0458f5447cb 100644 --- a/contrib/vmap_extractor_v2/stormlib/zlib/contrib/delphi2/zlib32.cpp +++ b/contrib/vmap_extractor_v2/stormlib/zlib/contrib/delphi2/zlib32.cpp @@ -40,3 +40,4 @@ int WINAPI DllEntryPoint(HINSTANCE hinst, unsigned long reason, void*) { return 1; } + diff --git a/contrib/vmap_extractor_v2/stormlib/zlib/contrib/iostream/test.cpp b/contrib/vmap_extractor_v2/stormlib/zlib/contrib/iostream/test.cpp index 7d265b3b5c0..e416a1c7649 100644 --- a/contrib/vmap_extractor_v2/stormlib/zlib/contrib/iostream/test.cpp +++ b/contrib/vmap_extractor_v2/stormlib/zlib/contrib/iostream/test.cpp @@ -22,3 +22,4 @@ int main() { return 0; } + diff --git a/contrib/vmap_extractor_v2/stormlib/zlib/contrib/iostream/zfstream.cpp b/contrib/vmap_extractor_v2/stormlib/zlib/contrib/iostream/zfstream.cpp index e4585cedb02..2959b3b349b 100644 --- a/contrib/vmap_extractor_v2/stormlib/zlib/contrib/iostream/zfstream.cpp +++ b/contrib/vmap_extractor_v2/stormlib/zlib/contrib/iostream/zfstream.cpp @@ -327,3 +327,4 @@ gzofstream::gzofstream( int fd, int io_mode ) : } gzofstream::~gzofstream() { } + diff --git a/contrib/vmap_extractor_v2/stormlib/zlib/contrib/iostream/zfstream.h b/contrib/vmap_extractor_v2/stormlib/zlib/contrib/iostream/zfstream.h index 28675f7ce93..81ff4e26258 100644 --- a/contrib/vmap_extractor_v2/stormlib/zlib/contrib/iostream/zfstream.h +++ b/contrib/vmap_extractor_v2/stormlib/zlib/contrib/iostream/zfstream.h @@ -140,3 +140,4 @@ inline gzomanip<int> setcompressionstrategy(int l) + diff --git a/contrib/vmap_extractor_v2/stormlib/zlib/contrib/iostream2/zstream.h b/contrib/vmap_extractor_v2/stormlib/zlib/contrib/iostream2/zstream.h index 43d2332b79b..a69b189a16f 100644 --- a/contrib/vmap_extractor_v2/stormlib/zlib/contrib/iostream2/zstream.h +++ b/contrib/vmap_extractor_v2/stormlib/zlib/contrib/iostream2/zstream.h @@ -305,3 +305,4 @@ inline ostream& operator<<(ozstream& zs, const T& x) { } #endif + diff --git a/contrib/vmap_extractor_v2/stormlib/zlib/contrib/iostream2/zstream_test.cpp b/contrib/vmap_extractor_v2/stormlib/zlib/contrib/iostream2/zstream_test.cpp index 6273f62d62a..b2fc9e66902 100644 --- a/contrib/vmap_extractor_v2/stormlib/zlib/contrib/iostream2/zstream_test.cpp +++ b/contrib/vmap_extractor_v2/stormlib/zlib/contrib/iostream2/zstream_test.cpp @@ -23,3 +23,4 @@ void main() { delete[] x; delete[] y; } + diff --git a/contrib/vmap_extractor_v2/stormlib/zlib/contrib/minizip/unzip.h b/contrib/vmap_extractor_v2/stormlib/zlib/contrib/minizip/unzip.h index a4bd3596f8b..44bd2b493c1 100644 --- a/contrib/vmap_extractor_v2/stormlib/zlib/contrib/minizip/unzip.h +++ b/contrib/vmap_extractor_v2/stormlib/zlib/contrib/minizip/unzip.h @@ -273,3 +273,4 @@ extern int ZEXPORT unzGetLocalExtrafield OF((unzFile file, #endif #endif /* _unz_H */ + diff --git a/contrib/vmap_extractor_v2/stormlib/zlib/contrib/minizip/zip.h b/contrib/vmap_extractor_v2/stormlib/zlib/contrib/minizip/zip.h index 2c519d294d7..f6ed94c180f 100644 --- a/contrib/vmap_extractor_v2/stormlib/zlib/contrib/minizip/zip.h +++ b/contrib/vmap_extractor_v2/stormlib/zlib/contrib/minizip/zip.h @@ -148,3 +148,4 @@ extern int ZEXPORT zipClose OF((zipFile file, #endif #endif /* _zip_H */ + diff --git a/contrib/vmap_extractor_v2/stormlib/zlib/deflate.h b/contrib/vmap_extractor_v2/stormlib/zlib/deflate.h index 2b7fd6528f9..1f5d73ce85d 100644 --- a/contrib/vmap_extractor_v2/stormlib/zlib/deflate.h +++ b/contrib/vmap_extractor_v2/stormlib/zlib/deflate.h @@ -316,3 +316,4 @@ void _tr_stored_block OF((deflate_state *s, charf *buf, ulg stored_len, #endif #endif + diff --git a/contrib/vmap_extractor_v2/stormlib/zlib/infblock.h b/contrib/vmap_extractor_v2/stormlib/zlib/infblock.h index 8176340aa6a..0754c173476 100644 --- a/contrib/vmap_extractor_v2/stormlib/zlib/infblock.h +++ b/contrib/vmap_extractor_v2/stormlib/zlib/infblock.h @@ -37,3 +37,4 @@ extern void inflate_set_dictionary OF(( extern int inflate_blocks_sync_point OF(( inflate_blocks_statef *s)); + diff --git a/contrib/vmap_extractor_v2/stormlib/zlib/infcodes.h b/contrib/vmap_extractor_v2/stormlib/zlib/infcodes.h index 63933e78d6a..7e237254d41 100644 --- a/contrib/vmap_extractor_v2/stormlib/zlib/infcodes.h +++ b/contrib/vmap_extractor_v2/stormlib/zlib/infcodes.h @@ -25,3 +25,4 @@ extern void inflate_codes_free OF(( inflate_codes_statef *, z_streamp )); + diff --git a/contrib/vmap_extractor_v2/stormlib/zlib/inffast.h b/contrib/vmap_extractor_v2/stormlib/zlib/inffast.h index ec13e09319f..ba2d3a85c49 100644 --- a/contrib/vmap_extractor_v2/stormlib/zlib/inffast.h +++ b/contrib/vmap_extractor_v2/stormlib/zlib/inffast.h @@ -15,3 +15,4 @@ extern int inflate_fast OF(( inflate_huft *, inflate_blocks_statef *, z_streamp )); + diff --git a/contrib/vmap_extractor_v2/stormlib/zlib/inffixed.h b/contrib/vmap_extractor_v2/stormlib/zlib/inffixed.h index 77f7e763145..708d69016ea 100644 --- a/contrib/vmap_extractor_v2/stormlib/zlib/inffixed.h +++ b/contrib/vmap_extractor_v2/stormlib/zlib/inffixed.h @@ -149,3 +149,4 @@ local inflate_huft fixed_td[] = { {{{80,5}},4}, {{{88,5}},769}, {{{84,5}},49}, {{{92,5}},12289}, {{{82,5}},13}, {{{90,5}},3073}, {{{86,5}},193}, {{{192,5}},24577} }; + diff --git a/contrib/vmap_extractor_v2/stormlib/zlib/inftrees.h b/contrib/vmap_extractor_v2/stormlib/zlib/inftrees.h index b4a5d6f9e0e..abd115caf7a 100644 --- a/contrib/vmap_extractor_v2/stormlib/zlib/inftrees.h +++ b/contrib/vmap_extractor_v2/stormlib/zlib/inftrees.h @@ -56,3 +56,4 @@ extern int inflate_trees_fixed OF(( inflate_huft * FAR *, /* literal/length tree result */ inflate_huft * FAR *, /* distance tree result */ z_streamp)); /* for memory allocation */ + diff --git a/contrib/vmap_extractor_v2/stormlib/zlib/infutil.h b/contrib/vmap_extractor_v2/stormlib/zlib/infutil.h index 9e4f939b44c..404a8042ebb 100644 --- a/contrib/vmap_extractor_v2/stormlib/zlib/infutil.h +++ b/contrib/vmap_extractor_v2/stormlib/zlib/infutil.h @@ -96,3 +96,4 @@ extern int inflate_flush OF(( struct internal_state {int dummy;}; /* for buggy compilers */ #endif + diff --git a/contrib/vmap_extractor_v2/stormlib/zlib/trees.h b/contrib/vmap_extractor_v2/stormlib/zlib/trees.h index 72facf900f7..ba8cd78357b 100644 --- a/contrib/vmap_extractor_v2/stormlib/zlib/trees.h +++ b/contrib/vmap_extractor_v2/stormlib/zlib/trees.h @@ -126,3 +126,4 @@ local const int base_dist[D_CODES] = { 1024, 1536, 2048, 3072, 4096, 6144, 8192, 12288, 16384, 24576 }; + diff --git a/contrib/vmap_extractor_v2/stormlib/zlib/zconf.h b/contrib/vmap_extractor_v2/stormlib/zlib/zconf.h index 1ca5af55a7f..a22b4b058e6 100644 --- a/contrib/vmap_extractor_v2/stormlib/zlib/zconf.h +++ b/contrib/vmap_extractor_v2/stormlib/zlib/zconf.h @@ -277,3 +277,4 @@ typedef uLong FAR uLongf; #endif #endif /* _ZCONF_H */ + diff --git a/contrib/vmap_extractor_v2/stormlib/zlib/zlib.h b/contrib/vmap_extractor_v2/stormlib/zlib/zlib.h index dbdd2cf7074..4f6380eeb9c 100644 --- a/contrib/vmap_extractor_v2/stormlib/zlib/zlib.h +++ b/contrib/vmap_extractor_v2/stormlib/zlib/zlib.h @@ -891,3 +891,4 @@ ZEXTERN const uLongf * ZEXPORT get_crc_table OF((void)); #endif #endif /* _ZLIB_H */ + diff --git a/contrib/vmap_extractor_v2/stormlib/zlib/zutil.h b/contrib/vmap_extractor_v2/stormlib/zlib/zutil.h index 0d5f2115b43..c11cd2ef1f5 100644 --- a/contrib/vmap_extractor_v2/stormlib/zlib/zutil.h +++ b/contrib/vmap_extractor_v2/stormlib/zlib/zutil.h @@ -218,3 +218,4 @@ void zcfree OF((voidpf opaque, voidpf ptr)); #define TRY_FREE(s, p) {if (p) ZFREE(s, p);} #endif /* _Z_UTIL_H */ + diff --git a/contrib/vmap_extractor_v2/vmapextract/adtfile.cpp b/contrib/vmap_extractor_v2/vmapextract/adtfile.cpp index 28d645a00d5..f624a3263cd 100644 --- a/contrib/vmap_extractor_v2/vmapextract/adtfile.cpp +++ b/contrib/vmap_extractor_v2/vmapextract/adtfile.cpp @@ -225,3 +225,4 @@ ADTFile::~ADTFile() } + diff --git a/contrib/vmap_extractor_v2/vmapextract/adtfile.h b/contrib/vmap_extractor_v2/vmapextract/adtfile.h index 96ab97f338a..959e1a05f7f 100644 --- a/contrib/vmap_extractor_v2/vmapextract/adtfile.h +++ b/contrib/vmap_extractor_v2/vmapextract/adtfile.h @@ -122,3 +122,4 @@ void fixnamen(char *name, size_t len); #endif + diff --git a/contrib/vmap_extractor_v2/vmapextract/dbcfile.cpp b/contrib/vmap_extractor_v2/vmapextract/dbcfile.cpp index 090021bfd1a..909f7afd570 100644 --- a/contrib/vmap_extractor_v2/vmapextract/dbcfile.cpp +++ b/contrib/vmap_extractor_v2/vmapextract/dbcfile.cpp @@ -73,3 +73,4 @@ DBCFile::Iterator DBCFile::end() return Iterator(*this, stringTable); } + diff --git a/contrib/vmap_extractor_v2/vmapextract/dbcfile.h b/contrib/vmap_extractor_v2/vmapextract/dbcfile.h index 002e7eeeb20..4106342a2cc 100644 --- a/contrib/vmap_extractor_v2/vmapextract/dbcfile.h +++ b/contrib/vmap_extractor_v2/vmapextract/dbcfile.h @@ -137,3 +137,4 @@ private: }; #endif + diff --git a/contrib/vmap_extractor_v2/vmapextract/model.cpp b/contrib/vmap_extractor_v2/vmapextract/model.cpp index 1d0c17d52e6..e5106dca65a 100644 --- a/contrib/vmap_extractor_v2/vmapextract/model.cpp +++ b/contrib/vmap_extractor_v2/vmapextract/model.cpp @@ -166,3 +166,4 @@ ModelInstance::ModelInstance(MPQFile &f,const char* ModelInstName,const char*Map ); } } + diff --git a/contrib/vmap_extractor_v2/vmapextract/model.h b/contrib/vmap_extractor_v2/vmapextract/model.h index a2bdee9465b..4e1a37328f3 100644 --- a/contrib/vmap_extractor_v2/vmapextract/model.h +++ b/contrib/vmap_extractor_v2/vmapextract/model.h @@ -58,3 +58,4 @@ public: }; #endif + diff --git a/contrib/vmap_extractor_v2/vmapextract/modelheaders.h b/contrib/vmap_extractor_v2/vmapextract/modelheaders.h index c35b983c19b..30adf61801f 100644 --- a/contrib/vmap_extractor_v2/vmapextract/modelheaders.h +++ b/contrib/vmap_extractor_v2/vmapextract/modelheaders.h @@ -79,4 +79,5 @@ struct ModelHeader { #pragma pack(pop) -#endif
\ No newline at end of file +#endif + diff --git a/contrib/vmap_extractor_v2/vmapextract/mpq.cpp b/contrib/vmap_extractor_v2/vmapextract/mpq.cpp index c501525cd30..cd9d62869aa 100644 --- a/contrib/vmap_extractor_v2/vmapextract/mpq.cpp +++ b/contrib/vmap_extractor_v2/vmapextract/mpq.cpp @@ -134,3 +134,4 @@ char* MPQFile::getPointer() return buffer + pointer; } + diff --git a/contrib/vmap_extractor_v2/vmapextract/mpq.h b/contrib/vmap_extractor_v2/vmapextract/mpq.h index 6364fcba64c..dc51998ba25 100644 --- a/contrib/vmap_extractor_v2/vmapextract/mpq.h +++ b/contrib/vmap_extractor_v2/vmapextract/mpq.h @@ -67,3 +67,4 @@ inline void flipcc(char *fcc) #endif + diff --git a/contrib/vmap_extractor_v2/vmapextract/vec3d.h b/contrib/vmap_extractor_v2/vmapextract/vec3d.h index 4f3cad15ad0..c6d2ae57ed2 100644 --- a/contrib/vmap_extractor_v2/vmapextract/vec3d.h +++ b/contrib/vmap_extractor_v2/vmapextract/vec3d.h @@ -228,3 +228,4 @@ inline void rotate(float x0, float y0, float *x, float *y, float angle) #endif + diff --git a/contrib/vmap_extractor_v2/vmapextract/vmapexport.cpp b/contrib/vmap_extractor_v2/vmapextract/vmapexport.cpp index 07bb4addf53..3dd58a4e3d5 100644 --- a/contrib/vmap_extractor_v2/vmapextract/vmapexport.cpp +++ b/contrib/vmap_extractor_v2/vmapextract/vmapexport.cpp @@ -570,3 +570,4 @@ int main(int argc, char ** argv) } printf("Extract %s. Work complete. No errors.",versionString); } + diff --git a/contrib/vmap_extractor_v2/vmapextract/wdtfile.cpp b/contrib/vmap_extractor_v2/vmapextract/wdtfile.cpp index 36f3d653f95..290d0b2feeb 100644 --- a/contrib/vmap_extractor_v2/vmapextract/wdtfile.cpp +++ b/contrib/vmap_extractor_v2/vmapextract/wdtfile.cpp @@ -118,3 +118,4 @@ ADTFile* WDTFile::GetMap(int x, int z) sprintf(name,"World\\Maps\\%s\\%s_%d_%d.adt", filename.c_str(), filename.c_str(), x, z); return new ADTFile(name); } + diff --git a/contrib/vmap_extractor_v2/vmapextract/wdtfile.h b/contrib/vmap_extractor_v2/vmapextract/wdtfile.h index 0baef22f185..e9dcc77562d 100644 --- a/contrib/vmap_extractor_v2/vmapextract/wdtfile.h +++ b/contrib/vmap_extractor_v2/vmapextract/wdtfile.h @@ -28,3 +28,4 @@ private: }; #endif + diff --git a/contrib/vmap_extractor_v2/vmapextract/wmo.cpp b/contrib/vmap_extractor_v2/vmapextract/wmo.cpp index 9b10bea01a7..f1868ccf64a 100644 --- a/contrib/vmap_extractor_v2/vmapextract/wmo.cpp +++ b/contrib/vmap_extractor_v2/vmapextract/wmo.cpp @@ -529,3 +529,4 @@ WMOInstance::WMOInstance(MPQFile &f,const char* WmoInstName,const char*MapName, + diff --git a/contrib/vmap_extractor_v2/vmapextract/wmo.h b/contrib/vmap_extractor_v2/vmapextract/wmo.h index c59ef552a07..832f9265434 100644 --- a/contrib/vmap_extractor_v2/vmapextract/wmo.h +++ b/contrib/vmap_extractor_v2/vmapextract/wmo.h @@ -105,3 +105,4 @@ public: }; #endif + diff --git a/dep/ACE_wrappers/ace/ACE.cpp b/dep/ACE_wrappers/ace/ACE.cpp index 4980b2d7344..7ccf15ed341 100644 --- a/dep/ACE_wrappers/ace/ACE.cpp +++ b/dep/ACE_wrappers/ace/ACE.cpp @@ -3442,3 +3442,4 @@ ACE::wild_match(const char* str, const char* pat, bool case_sensitive) // Close versioned namespace, if enabled by the user. ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/ACE.h b/dep/ACE_wrappers/ace/ACE.h index 654bbb3230f..ea7a3fa02e4 100644 --- a/dep/ACE_wrappers/ace/ACE.h +++ b/dep/ACE_wrappers/ace/ACE.h @@ -822,3 +822,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_ACE_H */ + diff --git a/dep/ACE_wrappers/ace/ACE_crc32.cpp b/dep/ACE_wrappers/ace/ACE_crc32.cpp index 70d93e6b598..e29a6426187 100644 --- a/dep/ACE_wrappers/ace/ACE_crc32.cpp +++ b/dep/ACE_wrappers/ace/ACE_crc32.cpp @@ -159,3 +159,4 @@ ACE::crc32 (const iovec *iov, int len, ACE_UINT32 crc) ACE_END_VERSIONED_NAMESPACE_DECL #undef COMPUTE + diff --git a/dep/ACE_wrappers/ace/ACE_crc_ccitt.cpp b/dep/ACE_wrappers/ace/ACE_crc_ccitt.cpp index ef7f5d65bd1..4e9b4a2f98e 100644 --- a/dep/ACE_wrappers/ace/ACE_crc_ccitt.cpp +++ b/dep/ACE_wrappers/ace/ACE_crc_ccitt.cpp @@ -126,3 +126,4 @@ ACE::crc_ccitt (const iovec *iov, int len, ACE_UINT16 crc) ACE_END_VERSIONED_NAMESPACE_DECL #undef COMPUTE + diff --git a/dep/ACE_wrappers/ace/ACE_export.h b/dep/ACE_wrappers/ace/ACE_export.h index 8ad2a33ebaf..60e79b01f1f 100644 --- a/dep/ACE_wrappers/ace/ACE_export.h +++ b/dep/ACE_wrappers/ace/ACE_export.h @@ -74,3 +74,4 @@ #endif /* ACE_EXPORT_H */ // End of auto generated file. + diff --git a/dep/ACE_wrappers/ace/ARGV.cpp b/dep/ACE_wrappers/ace/ARGV.cpp index edfd4efa790..a30809b2ec1 100644 --- a/dep/ACE_wrappers/ace/ARGV.cpp +++ b/dep/ACE_wrappers/ace/ARGV.cpp @@ -381,3 +381,4 @@ ACE_ARGV_T<CHAR_TYPE>::create_buf_from_queue (void) ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_ARGV_CPP */ + diff --git a/dep/ACE_wrappers/ace/ARGV.h b/dep/ACE_wrappers/ace/ARGV.h index 66e71810a95..c2995a451f2 100644 --- a/dep/ACE_wrappers/ace/ARGV.h +++ b/dep/ACE_wrappers/ace/ARGV.h @@ -331,3 +331,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_ARGUMENT_VECTOR_H */ + diff --git a/dep/ACE_wrappers/ace/ATM_Acceptor.cpp b/dep/ACE_wrappers/ace/ATM_Acceptor.cpp index 1aa6c6d7096..0a58b7f3b1f 100644 --- a/dep/ACE_wrappers/ace/ATM_Acceptor.cpp +++ b/dep/ACE_wrappers/ace/ATM_Acceptor.cpp @@ -307,3 +307,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_ATM */ + diff --git a/dep/ACE_wrappers/ace/ATM_Acceptor.h b/dep/ACE_wrappers/ace/ATM_Acceptor.h index c69e2f8540d..900cec098c5 100644 --- a/dep/ACE_wrappers/ace/ATM_Acceptor.h +++ b/dep/ACE_wrappers/ace/ATM_Acceptor.h @@ -121,3 +121,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_ATM */ #include /**/ "ace/post.h" #endif /* ACE_ATM_ACCEPTOR_H */ + diff --git a/dep/ACE_wrappers/ace/ATM_Addr.cpp b/dep/ACE_wrappers/ace/ATM_Addr.cpp index 739a8076359..8b4781c5e80 100644 --- a/dep/ACE_wrappers/ace/ATM_Addr.cpp +++ b/dep/ACE_wrappers/ace/ATM_Addr.cpp @@ -520,3 +520,4 @@ ACE_ATM_Addr::dump (void) const ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_ATM */ + diff --git a/dep/ACE_wrappers/ace/ATM_Addr.h b/dep/ACE_wrappers/ace/ATM_Addr.h index 7fa93f1492c..c111aa44843 100644 --- a/dep/ACE_wrappers/ace/ATM_Addr.h +++ b/dep/ACE_wrappers/ace/ATM_Addr.h @@ -195,3 +195,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_ATM */ #include /**/ "ace/post.h" #endif /* ACE_ATM_ADDR_H */ + diff --git a/dep/ACE_wrappers/ace/ATM_Connector.cpp b/dep/ACE_wrappers/ace/ATM_Connector.cpp index c1ce226adce..7d68ed88bd2 100644 --- a/dep/ACE_wrappers/ace/ATM_Connector.cpp +++ b/dep/ACE_wrappers/ace/ATM_Connector.cpp @@ -136,3 +136,4 @@ ACE_ATM_Connector::connect (ACE_ATM_Stream &new_stream, ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_ATM */ + diff --git a/dep/ACE_wrappers/ace/ATM_Connector.h b/dep/ACE_wrappers/ace/ATM_Connector.h index cbeedeea7f6..e8657e91a23 100644 --- a/dep/ACE_wrappers/ace/ATM_Connector.h +++ b/dep/ACE_wrappers/ace/ATM_Connector.h @@ -162,3 +162,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_ATM */ #include /**/ "ace/post.h" #endif /* ACE_ATM_CONNECTOR_H */ + diff --git a/dep/ACE_wrappers/ace/ATM_Params.cpp b/dep/ACE_wrappers/ace/ATM_Params.cpp index 70a05f1d71b..d3e5116b0f8 100644 --- a/dep/ACE_wrappers/ace/ATM_Params.cpp +++ b/dep/ACE_wrappers/ace/ATM_Params.cpp @@ -18,3 +18,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_ATM */ + diff --git a/dep/ACE_wrappers/ace/ATM_Params.h b/dep/ACE_wrappers/ace/ATM_Params.h index d1e8c923118..a244644915d 100644 --- a/dep/ACE_wrappers/ace/ATM_Params.h +++ b/dep/ACE_wrappers/ace/ATM_Params.h @@ -212,3 +212,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_ATM */ #include /**/ "ace/post.h" #endif /* ACE_ATM_PARAMS_H */ + diff --git a/dep/ACE_wrappers/ace/ATM_QoS.cpp b/dep/ACE_wrappers/ace/ATM_QoS.cpp index d5405d042a6..60e4cafad3f 100644 --- a/dep/ACE_wrappers/ace/ATM_QoS.cpp +++ b/dep/ACE_wrappers/ace/ATM_QoS.cpp @@ -629,3 +629,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_ATM */ + diff --git a/dep/ACE_wrappers/ace/ATM_QoS.h b/dep/ACE_wrappers/ace/ATM_QoS.h index 4e35f3fddb4..3e839fb50d1 100644 --- a/dep/ACE_wrappers/ace/ATM_QoS.h +++ b/dep/ACE_wrappers/ace/ATM_QoS.h @@ -113,3 +113,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_ATM */ #include /**/ "ace/post.h" #endif /* ACE_ATM_QoS_H */ + diff --git a/dep/ACE_wrappers/ace/ATM_Stream.cpp b/dep/ACE_wrappers/ace/ATM_Stream.cpp index affb891475a..83b4625436d 100644 --- a/dep/ACE_wrappers/ace/ATM_Stream.cpp +++ b/dep/ACE_wrappers/ace/ATM_Stream.cpp @@ -288,3 +288,4 @@ ACE_ATM_Stream::get_vpi_vci (ACE_UINT16 &vpi, ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_ATM */ + diff --git a/dep/ACE_wrappers/ace/ATM_Stream.h b/dep/ACE_wrappers/ace/ATM_Stream.h index 41ffb0da32e..e880f7197d4 100644 --- a/dep/ACE_wrappers/ace/ATM_Stream.h +++ b/dep/ACE_wrappers/ace/ATM_Stream.h @@ -105,3 +105,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_ATM */ #include /**/ "ace/post.h" #endif /* ACE_ATM_STREAM_H */ + diff --git a/dep/ACE_wrappers/ace/Acceptor.cpp b/dep/ACE_wrappers/ace/Acceptor.cpp index 1ba51af5e5a..01b7f8da632 100644 --- a/dep/ACE_wrappers/ace/Acceptor.cpp +++ b/dep/ACE_wrappers/ace/Acceptor.cpp @@ -1233,3 +1233,4 @@ ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::operator ACE_PEER_ACCEPT ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_ACCEPTOR_CPP */ + diff --git a/dep/ACE_wrappers/ace/Acceptor.h b/dep/ACE_wrappers/ace/Acceptor.h index 88329be53a4..855b2f877a3 100644 --- a/dep/ACE_wrappers/ace/Acceptor.h +++ b/dep/ACE_wrappers/ace/Acceptor.h @@ -686,3 +686,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_ACCEPTOR_H */ + diff --git a/dep/ACE_wrappers/ace/Activation_Queue.cpp b/dep/ACE_wrappers/ace/Activation_Queue.cpp index f18ada06eb1..9701af2e236 100644 --- a/dep/ACE_wrappers/ace/Activation_Queue.cpp +++ b/dep/ACE_wrappers/ace/Activation_Queue.cpp @@ -136,3 +136,4 @@ ACE_Activation_Queue::enqueue (ACE_Method_Request *mr, } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Activation_Queue.h b/dep/ACE_wrappers/ace/Activation_Queue.h index 454640474c1..69197c1b72d 100644 --- a/dep/ACE_wrappers/ace/Activation_Queue.h +++ b/dep/ACE_wrappers/ace/Activation_Queue.h @@ -171,3 +171,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_ACTIVATION_QUEUE_H */ + diff --git a/dep/ACE_wrappers/ace/Active_Map_Manager.cpp b/dep/ACE_wrappers/ace/Active_Map_Manager.cpp index 6ec891b5d10..0f3d5485cde 100644 --- a/dep/ACE_wrappers/ace/Active_Map_Manager.cpp +++ b/dep/ACE_wrappers/ace/Active_Map_Manager.cpp @@ -7,3 +7,4 @@ ACE_RCSID(ace, Active_Map_Manager, "$Id: Active_Map_Manager.cpp 80826 2008-03-04 #if !defined (__ACE_INLINE__) #include "ace/Active_Map_Manager.inl" #endif /* __ACE_INLINE__ */ + diff --git a/dep/ACE_wrappers/ace/Active_Map_Manager.h b/dep/ACE_wrappers/ace/Active_Map_Manager.h index d1558b1463b..174009910a6 100644 --- a/dep/ACE_wrappers/ace/Active_Map_Manager.h +++ b/dep/ACE_wrappers/ace/Active_Map_Manager.h @@ -114,3 +114,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_ACTIVE_MAP_MANAGER_H */ + diff --git a/dep/ACE_wrappers/ace/Active_Map_Manager_T.cpp b/dep/ACE_wrappers/ace/Active_Map_Manager_T.cpp index 732cc295117..1d87e44bc54 100644 --- a/dep/ACE_wrappers/ace/Active_Map_Manager_T.cpp +++ b/dep/ACE_wrappers/ace/Active_Map_Manager_T.cpp @@ -20,3 +20,4 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Active_Map_Manager) ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_ACTIVE_MAP_MANAGER_T_CPP */ + diff --git a/dep/ACE_wrappers/ace/Active_Map_Manager_T.h b/dep/ACE_wrappers/ace/Active_Map_Manager_T.h index f63d4353723..7930628dc94 100644 --- a/dep/ACE_wrappers/ace/Active_Map_Manager_T.h +++ b/dep/ACE_wrappers/ace/Active_Map_Manager_T.h @@ -209,3 +209,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_ACTIVE_MAP_MANAGER_T_H */ + diff --git a/dep/ACE_wrappers/ace/Addr.cpp b/dep/ACE_wrappers/ace/Addr.cpp index fb338f9ac17..db6e29c7273 100644 --- a/dep/ACE_wrappers/ace/Addr.cpp +++ b/dep/ACE_wrappers/ace/Addr.cpp @@ -71,3 +71,4 @@ ACE_Addr::dump (void) const } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Addr.h b/dep/ACE_wrappers/ace/Addr.h index e58ffe2c0f5..fa9b5d757b6 100644 --- a/dep/ACE_wrappers/ace/Addr.h +++ b/dep/ACE_wrappers/ace/Addr.h @@ -101,3 +101,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_ADDR_H */ + diff --git a/dep/ACE_wrappers/ace/Arg_Shifter.cpp b/dep/ACE_wrappers/ace/Arg_Shifter.cpp index 43d5074db9d..da1337d9f4b 100644 --- a/dep/ACE_wrappers/ace/Arg_Shifter.cpp +++ b/dep/ACE_wrappers/ace/Arg_Shifter.cpp @@ -228,3 +228,4 @@ ACE_Arg_Shifter_T<CHAR_TYPE>::num_ignored_args (void) const ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_ATOMIC_OP_T_CPP */ + diff --git a/dep/ACE_wrappers/ace/Arg_Shifter.h b/dep/ACE_wrappers/ace/Arg_Shifter.h index e143e57d1a7..b5700c9f98f 100644 --- a/dep/ACE_wrappers/ace/Arg_Shifter.h +++ b/dep/ACE_wrappers/ace/Arg_Shifter.h @@ -219,3 +219,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_ARG_SHIFTER_H */ + diff --git a/dep/ACE_wrappers/ace/Argv_Type_Converter.cpp b/dep/ACE_wrappers/ace/Argv_Type_Converter.cpp index d594e65450c..6b0860caaee 100644 --- a/dep/ACE_wrappers/ace/Argv_Type_Converter.cpp +++ b/dep/ACE_wrappers/ace/Argv_Type_Converter.cpp @@ -202,3 +202,4 @@ ACE_Argv_Type_Converter::cleanup (void) #endif // ACE_USES_WCHAR ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Argv_Type_Converter.h b/dep/ACE_wrappers/ace/Argv_Type_Converter.h index ee2c541ed74..957a431a6c3 100644 --- a/dep/ACE_wrappers/ace/Argv_Type_Converter.h +++ b/dep/ACE_wrappers/ace/Argv_Type_Converter.h @@ -117,3 +117,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_ARGV_TYPE_CONVERTER_H */ + diff --git a/dep/ACE_wrappers/ace/Array.h b/dep/ACE_wrappers/ace/Array.h index 3caaa7b719b..8ef7f094ac8 100644 --- a/dep/ACE_wrappers/ace/Array.h +++ b/dep/ACE_wrappers/ace/Array.h @@ -27,3 +27,4 @@ #include /**/ "ace/post.h" #endif /* ACE_ARRAY_H */ + diff --git a/dep/ACE_wrappers/ace/Array_Base.cpp b/dep/ACE_wrappers/ace/Array_Base.cpp index 49e42e1ad98..8136d2e5309 100644 --- a/dep/ACE_wrappers/ace/Array_Base.cpp +++ b/dep/ACE_wrappers/ace/Array_Base.cpp @@ -233,3 +233,4 @@ ACE_Array_Iterator<T>::next (T *&item) ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_ARRAY_BASE_CPP */ + diff --git a/dep/ACE_wrappers/ace/Array_Base.h b/dep/ACE_wrappers/ace/Array_Base.h index 44e2812552d..feef89eda01 100644 --- a/dep/ACE_wrappers/ace/Array_Base.h +++ b/dep/ACE_wrappers/ace/Array_Base.h @@ -254,3 +254,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_ARRAY_BASE_H */ + diff --git a/dep/ACE_wrappers/ace/Array_Map.cpp b/dep/ACE_wrappers/ace/Array_Map.cpp index 5530a8b54b6..c66a21ddc73 100644 --- a/dep/ACE_wrappers/ace/Array_Map.cpp +++ b/dep/ACE_wrappers/ace/Array_Map.cpp @@ -297,3 +297,4 @@ operator< (ACE_Array_Map<Key, Value, EqualTo> const & lhs, ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_ARRAY_MAP_CPP */ + diff --git a/dep/ACE_wrappers/ace/Array_Map.h b/dep/ACE_wrappers/ace/Array_Map.h index ce06334217d..18c0dbe1b39 100644 --- a/dep/ACE_wrappers/ace/Array_Map.h +++ b/dep/ACE_wrappers/ace/Array_Map.h @@ -298,3 +298,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_ARRAY_MAP_H */ + diff --git a/dep/ACE_wrappers/ace/Assert.cpp b/dep/ACE_wrappers/ace/Assert.cpp index 4a71c9e5a9d..3faf3426d07 100644 --- a/dep/ACE_wrappers/ace/Assert.cpp +++ b/dep/ACE_wrappers/ace/Assert.cpp @@ -22,3 +22,4 @@ __ace_assert(const char *file, int line, const ACE_TCHAR *expression) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Assert.h b/dep/ACE_wrappers/ace/Assert.h index cf28a4a89fe..5bdf56f0531 100644 --- a/dep/ACE_wrappers/ace/Assert.h +++ b/dep/ACE_wrappers/ace/Assert.h @@ -36,3 +36,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_ASSERT */ + diff --git a/dep/ACE_wrappers/ace/Asynch_Acceptor.cpp b/dep/ACE_wrappers/ace/Asynch_Acceptor.cpp index 12aeebe0db6..50122caa9a5 100644 --- a/dep/ACE_wrappers/ace/Asynch_Acceptor.cpp +++ b/dep/ACE_wrappers/ace/Asynch_Acceptor.cpp @@ -512,3 +512,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_WIN32 || ACE_HAS_AIO_CALLS */ #endif /* ACE_ASYNCH_ACCEPTOR_C */ + diff --git a/dep/ACE_wrappers/ace/Asynch_Acceptor.h b/dep/ACE_wrappers/ace/Asynch_Acceptor.h index 29872d59482..e14126d3f1f 100644 --- a/dep/ACE_wrappers/ace/Asynch_Acceptor.h +++ b/dep/ACE_wrappers/ace/Asynch_Acceptor.h @@ -279,3 +279,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */ #include /**/ "ace/post.h" #endif /* ACE_ASYNCH_ACCEPTOR_H */ + diff --git a/dep/ACE_wrappers/ace/Asynch_Connector.cpp b/dep/ACE_wrappers/ace/Asynch_Connector.cpp index 3d493069f00..3a5fac78068 100644 --- a/dep/ACE_wrappers/ace/Asynch_Connector.cpp +++ b/dep/ACE_wrappers/ace/Asynch_Connector.cpp @@ -294,3 +294,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_WIN32 || ACE_HAS_AIO_CALLS */ #endif /* ACE_ASYNCH_CONNECTOR_CPP */ + diff --git a/dep/ACE_wrappers/ace/Asynch_Connector.h b/dep/ACE_wrappers/ace/Asynch_Connector.h index 7c7969cc20d..64781ad36a5 100644 --- a/dep/ACE_wrappers/ace/Asynch_Connector.h +++ b/dep/ACE_wrappers/ace/Asynch_Connector.h @@ -169,3 +169,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_WIN32 || ACE_HAS_AIO_CALLS */ #include /**/ "ace/post.h" #endif /* ACE_ASYNCH_CONNECTOR_H */ + diff --git a/dep/ACE_wrappers/ace/Asynch_IO.cpp b/dep/ACE_wrappers/ace/Asynch_IO.cpp index 26bba31a3a9..f004fb0d234 100644 --- a/dep/ACE_wrappers/ace/Asynch_IO.cpp +++ b/dep/ACE_wrappers/ace/Asynch_IO.cpp @@ -1412,3 +1412,4 @@ ACE_Asynch_Write_Dgram::Result::~Result (void) ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */ + diff --git a/dep/ACE_wrappers/ace/Asynch_IO.h b/dep/ACE_wrappers/ace/Asynch_IO.h index 6aeb21fe58e..3b5004ce46e 100644 --- a/dep/ACE_wrappers/ace/Asynch_IO.h +++ b/dep/ACE_wrappers/ace/Asynch_IO.h @@ -1732,3 +1732,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_WIN32 || ACE_HAS_AIO_CALLS*/ #include /**/ "ace/post.h" #endif /* ACE_ASYNCH_IO_H */ + diff --git a/dep/ACE_wrappers/ace/Asynch_IO_Impl.cpp b/dep/ACE_wrappers/ace/Asynch_IO_Impl.cpp index b4b47eda55c..5bfc8b4c749 100644 --- a/dep/ACE_wrappers/ace/Asynch_IO_Impl.cpp +++ b/dep/ACE_wrappers/ace/Asynch_IO_Impl.cpp @@ -115,3 +115,4 @@ ACE_Asynch_Write_Dgram_Result_Impl::ACE_Asynch_Write_Dgram_Result_Impl (void) ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */ + diff --git a/dep/ACE_wrappers/ace/Asynch_IO_Impl.h b/dep/ACE_wrappers/ace/Asynch_IO_Impl.h index 06eb5c10a87..9e6652e7e8e 100644 --- a/dep/ACE_wrappers/ace/Asynch_IO_Impl.h +++ b/dep/ACE_wrappers/ace/Asynch_IO_Impl.h @@ -814,3 +814,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */ #include /**/ "ace/post.h" #endif /* ACE_ASYNCH_IO_IMPL_H */ + diff --git a/dep/ACE_wrappers/ace/Asynch_Pseudo_Task.cpp b/dep/ACE_wrappers/ace/Asynch_Pseudo_Task.cpp index 94f0d6980ed..34715c2bba4 100644 --- a/dep/ACE_wrappers/ace/Asynch_Pseudo_Task.cpp +++ b/dep/ACE_wrappers/ace/Asynch_Pseudo_Task.cpp @@ -128,3 +128,4 @@ ACE_Asynch_Pseudo_Task::resume_io_handler (ACE_HANDLE handle) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Asynch_Pseudo_Task.h b/dep/ACE_wrappers/ace/Asynch_Pseudo_Task.h index 6e2c3a1d427..4c5a94feca4 100644 --- a/dep/ACE_wrappers/ace/Asynch_Pseudo_Task.h +++ b/dep/ACE_wrappers/ace/Asynch_Pseudo_Task.h @@ -71,3 +71,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_ASYNCH_PSEUDO_TASK_H */ + diff --git a/dep/ACE_wrappers/ace/Atomic_Op.cpp b/dep/ACE_wrappers/ace/Atomic_Op.cpp index 57139ac853b..473c482adcd 100644 --- a/dep/ACE_wrappers/ace/Atomic_Op.cpp +++ b/dep/ACE_wrappers/ace/Atomic_Op.cpp @@ -308,3 +308,4 @@ ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>::dump (void) const ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_BUILTIN_ATOMIC_OP */ + diff --git a/dep/ACE_wrappers/ace/Atomic_Op.h b/dep/ACE_wrappers/ace/Atomic_Op.h index 196b9208f3a..c750999af4c 100644 --- a/dep/ACE_wrappers/ace/Atomic_Op.h +++ b/dep/ACE_wrappers/ace/Atomic_Op.h @@ -258,3 +258,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /*ACE_ATOMIC_OP_H*/ + diff --git a/dep/ACE_wrappers/ace/Atomic_Op_Sparc.h b/dep/ACE_wrappers/ace/Atomic_Op_Sparc.h index 75b9ad6eaa2..d521520c9ec 100644 --- a/dep/ACE_wrappers/ace/Atomic_Op_Sparc.h +++ b/dep/ACE_wrappers/ace/Atomic_Op_Sparc.h @@ -12,3 +12,4 @@ extern "C" } #endif /* ACE_ATOMIC_OP_SPARC_H */ + diff --git a/dep/ACE_wrappers/ace/Atomic_Op_T.cpp b/dep/ACE_wrappers/ace/Atomic_Op_T.cpp index 7f14370c6dd..bb47112e10a 100644 --- a/dep/ACE_wrappers/ace/Atomic_Op_T.cpp +++ b/dep/ACE_wrappers/ace/Atomic_Op_T.cpp @@ -80,3 +80,4 @@ ACE_Atomic_Op<ACE_LOCK, TYPE>::ACE_Atomic_Op ( ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_ATOMIC_OP_T_CPP */ + diff --git a/dep/ACE_wrappers/ace/Atomic_Op_T.h b/dep/ACE_wrappers/ace/Atomic_Op_T.h index 13bd7dbbf88..afd163c58e9 100644 --- a/dep/ACE_wrappers/ace/Atomic_Op_T.h +++ b/dep/ACE_wrappers/ace/Atomic_Op_T.h @@ -367,3 +367,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /*ACE_ATOMIC_OP_T_H*/ + diff --git a/dep/ACE_wrappers/ace/Auto_Event.cpp b/dep/ACE_wrappers/ace/Auto_Event.cpp index 51efcf7605b..875b7ad05cd 100644 --- a/dep/ACE_wrappers/ace/Auto_Event.cpp +++ b/dep/ACE_wrappers/ace/Auto_Event.cpp @@ -47,3 +47,4 @@ ACE_Auto_Event::dump (void) const } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Auto_Event.h b/dep/ACE_wrappers/ace/Auto_Event.h index 042f82ed2ff..307c89cddae 100644 --- a/dep/ACE_wrappers/ace/Auto_Event.h +++ b/dep/ACE_wrappers/ace/Auto_Event.h @@ -71,3 +71,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_AUTO_EVENT_H */ + diff --git a/dep/ACE_wrappers/ace/Auto_Functor.cpp b/dep/ACE_wrappers/ace/Auto_Functor.cpp index 9d0dc79aa52..f0f8296e0be 100644 --- a/dep/ACE_wrappers/ace/Auto_Functor.cpp +++ b/dep/ACE_wrappers/ace/Auto_Functor.cpp @@ -37,3 +37,4 @@ ACE_Utils::Auto_Functor<X,Functor>::reset(X * p, Functor f) ACE_END_VERSIONED_NAMESPACE_DECL #endif /*ACE_AUTO_FUNCTOR_CPP*/ + diff --git a/dep/ACE_wrappers/ace/Auto_Functor.h b/dep/ACE_wrappers/ace/Auto_Functor.h index 2c2b81eb265..339054506be 100644 --- a/dep/ACE_wrappers/ace/Auto_Functor.h +++ b/dep/ACE_wrappers/ace/Auto_Functor.h @@ -125,3 +125,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_AUTO_FUNCTOR_H*/ + diff --git a/dep/ACE_wrappers/ace/Auto_IncDec_T.cpp b/dep/ACE_wrappers/ace/Auto_IncDec_T.cpp index ccef122edcf..668b4c81cdc 100644 --- a/dep/ACE_wrappers/ace/Auto_IncDec_T.cpp +++ b/dep/ACE_wrappers/ace/Auto_IncDec_T.cpp @@ -32,3 +32,4 @@ ACE_Auto_IncDec<ACE_SAFELY_INCREMENTABLE_DECREMENTABLE>::dump (void) const ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_AUTO_INCDEC_T_CPP */ + diff --git a/dep/ACE_wrappers/ace/Auto_IncDec_T.h b/dep/ACE_wrappers/ace/Auto_IncDec_T.h index 01677101db5..bc46b8b2f50 100644 --- a/dep/ACE_wrappers/ace/Auto_IncDec_T.h +++ b/dep/ACE_wrappers/ace/Auto_IncDec_T.h @@ -89,3 +89,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_AUTO_INCDEC_T_H */ + diff --git a/dep/ACE_wrappers/ace/Auto_Ptr.cpp b/dep/ACE_wrappers/ace/Auto_Ptr.cpp index 791bd482a23..56fc9af0ee5 100644 --- a/dep/ACE_wrappers/ace/Auto_Ptr.cpp +++ b/dep/ACE_wrappers/ace/Auto_Ptr.cpp @@ -19,3 +19,4 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Auto_Basic_Array_Ptr) ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_AUTO_PTR_CPP */ + diff --git a/dep/ACE_wrappers/ace/Auto_Ptr.h b/dep/ACE_wrappers/ace/Auto_Ptr.h index 3183019aceb..d7547c440e2 100644 --- a/dep/ACE_wrappers/ace/Auto_Ptr.h +++ b/dep/ACE_wrappers/ace/Auto_Ptr.h @@ -240,3 +240,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_AUTO_PTR_H */ + diff --git a/dep/ACE_wrappers/ace/Barrier.cpp b/dep/ACE_wrappers/ace/Barrier.cpp index f3f4454b724..515a73f95a9 100644 --- a/dep/ACE_wrappers/ace/Barrier.cpp +++ b/dep/ACE_wrappers/ace/Barrier.cpp @@ -195,3 +195,4 @@ ACE_Process_Barrier::dump (void) const ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_THREADS */ + diff --git a/dep/ACE_wrappers/ace/Barrier.h b/dep/ACE_wrappers/ace/Barrier.h index 189ff07e4cc..5fc9b9e8b7d 100644 --- a/dep/ACE_wrappers/ace/Barrier.h +++ b/dep/ACE_wrappers/ace/Barrier.h @@ -213,3 +213,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_BARRIER_H */ + diff --git a/dep/ACE_wrappers/ace/Base_Thread_Adapter.cpp b/dep/ACE_wrappers/ace/Base_Thread_Adapter.cpp index 94386ee1df7..d74f1934161 100644 --- a/dep/ACE_wrappers/ace/Base_Thread_Adapter.cpp +++ b/dep/ACE_wrappers/ace/Base_Thread_Adapter.cpp @@ -126,3 +126,4 @@ ACE_THREAD_ADAPTER_NAME (void *args) return status; } + diff --git a/dep/ACE_wrappers/ace/Base_Thread_Adapter.h b/dep/ACE_wrappers/ace/Base_Thread_Adapter.h index b36d18e4f13..beee7210f42 100644 --- a/dep/ACE_wrappers/ace/Base_Thread_Adapter.h +++ b/dep/ACE_wrappers/ace/Base_Thread_Adapter.h @@ -193,3 +193,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_BASE_THREAD_ADAPTER_H */ + diff --git a/dep/ACE_wrappers/ace/Based_Pointer_Repository.cpp b/dep/ACE_wrappers/ace/Based_Pointer_Repository.cpp index 4ebe8b82c7a..c9bf92f78ee 100644 --- a/dep/ACE_wrappers/ace/Based_Pointer_Repository.cpp +++ b/dep/ACE_wrappers/ace/Based_Pointer_Repository.cpp @@ -117,3 +117,4 @@ template ACE_Singleton<ACE_Based_Pointer_Repository, ACE_SYNCH_RW_MUTEX> * #endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Based_Pointer_Repository.h b/dep/ACE_wrappers/ace/Based_Pointer_Repository.h index f674a8de78d..047e34dca28 100644 --- a/dep/ACE_wrappers/ace/Based_Pointer_Repository.h +++ b/dep/ACE_wrappers/ace/Based_Pointer_Repository.h @@ -89,3 +89,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_BASED_POINTER_REPOSITORY_H */ + diff --git a/dep/ACE_wrappers/ace/Based_Pointer_T.cpp b/dep/ACE_wrappers/ace/Based_Pointer_T.cpp index b85774db48d..81943797418 100644 --- a/dep/ACE_wrappers/ace/Based_Pointer_T.cpp +++ b/dep/ACE_wrappers/ace/Based_Pointer_T.cpp @@ -119,3 +119,4 @@ ACE_Based_Pointer<CONCRETE>::ACE_Based_Pointer (const ACE_Based_Pointer<CONCRETE ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_BASED_POINTER_T_CPP */ + diff --git a/dep/ACE_wrappers/ace/Based_Pointer_T.h b/dep/ACE_wrappers/ace/Based_Pointer_T.h index 802e73ca0d3..39437bbb3c9 100644 --- a/dep/ACE_wrappers/ace/Based_Pointer_T.h +++ b/dep/ACE_wrappers/ace/Based_Pointer_T.h @@ -203,3 +203,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_BASED_POINTER_T_H */ + diff --git a/dep/ACE_wrappers/ace/Basic_Stats.cpp b/dep/ACE_wrappers/ace/Basic_Stats.cpp index fe678333d89..760afa35e6d 100644 --- a/dep/ACE_wrappers/ace/Basic_Stats.cpp +++ b/dep/ACE_wrappers/ace/Basic_Stats.cpp @@ -76,3 +76,4 @@ ACE_Basic_Stats::dump_results (const ACE_TCHAR *msg, ACE_UINT32 sf) const } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Basic_Stats.h b/dep/ACE_wrappers/ace/Basic_Stats.h index bff1ff29f65..fcc9996d8ba 100644 --- a/dep/ACE_wrappers/ace/Basic_Stats.h +++ b/dep/ACE_wrappers/ace/Basic_Stats.h @@ -85,3 +85,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_BASIC_STATS_H */ + diff --git a/dep/ACE_wrappers/ace/Basic_Types.cpp b/dep/ACE_wrappers/ace/Basic_Types.cpp index 42ae83c0b2a..f7c87cdb9ce 100644 --- a/dep/ACE_wrappers/ace/Basic_Types.cpp +++ b/dep/ACE_wrappers/ace/Basic_Types.cpp @@ -137,3 +137,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_LACKS_LONGLONG_T */ + diff --git a/dep/ACE_wrappers/ace/Basic_Types.h b/dep/ACE_wrappers/ace/Basic_Types.h index 8e46abf305d..9b57fd81c43 100644 --- a/dep/ACE_wrappers/ace/Basic_Types.h +++ b/dep/ACE_wrappers/ace/Basic_Types.h @@ -888,3 +888,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL # include /**/ "ace/post.h" #endif /* ACE_BASIC_TYPES_H */ + diff --git a/dep/ACE_wrappers/ace/Bound_Ptr.h b/dep/ACE_wrappers/ace/Bound_Ptr.h index ec7384e0d6c..16ea929002e 100644 --- a/dep/ACE_wrappers/ace/Bound_Ptr.h +++ b/dep/ACE_wrappers/ace/Bound_Ptr.h @@ -386,3 +386,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_BOUND_PTR_H */ + diff --git a/dep/ACE_wrappers/ace/CDR_Base.cpp b/dep/ACE_wrappers/ace/CDR_Base.cpp index dab8978fd61..e7647006b65 100644 --- a/dep/ACE_wrappers/ace/CDR_Base.cpp +++ b/dep/ACE_wrappers/ace/CDR_Base.cpp @@ -797,3 +797,4 @@ ACE_CDR::Float::operator!= (const ACE_CDR::Float & /* rhs */) const #endif /* _UNICOS */ ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/CDR_Base.h b/dep/ACE_wrappers/ace/CDR_Base.h index d840bbe097e..c3b2e368514 100644 --- a/dep/ACE_wrappers/ace/CDR_Base.h +++ b/dep/ACE_wrappers/ace/CDR_Base.h @@ -377,3 +377,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_CDR_BASE_H */ + diff --git a/dep/ACE_wrappers/ace/CDR_Size.cpp b/dep/ACE_wrappers/ace/CDR_Size.cpp index 7c96aae7ee9..074631080c4 100644 --- a/dep/ACE_wrappers/ace/CDR_Size.cpp +++ b/dep/ACE_wrappers/ace/CDR_Size.cpp @@ -260,3 +260,4 @@ operator<< (ACE_SizeCDR &ss, const ACE_CString &x) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/CDR_Size.h b/dep/ACE_wrappers/ace/CDR_Size.h index a0b3c462ca8..777c29acc4d 100644 --- a/dep/ACE_wrappers/ace/CDR_Size.h +++ b/dep/ACE_wrappers/ace/CDR_Size.h @@ -239,3 +239,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_CDR_SIZE_H */ + diff --git a/dep/ACE_wrappers/ace/CDR_Stream.cpp b/dep/ACE_wrappers/ace/CDR_Stream.cpp index da2a1c3de52..1282f75358a 100644 --- a/dep/ACE_wrappers/ace/CDR_Stream.cpp +++ b/dep/ACE_wrappers/ace/CDR_Stream.cpp @@ -2066,3 +2066,4 @@ operator<< (std::ostream &os, ACE_OutputCDR::from_octet x) #endif /* GEN_OSTREAM_OPS */ ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/CDR_Stream.h b/dep/ACE_wrappers/ace/CDR_Stream.h index a9c789f41d7..348433a0de4 100644 --- a/dep/ACE_wrappers/ace/CDR_Stream.h +++ b/dep/ACE_wrappers/ace/CDR_Stream.h @@ -1400,3 +1400,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_CDR_STREAM_H */ + diff --git a/dep/ACE_wrappers/ace/CE_Screen_Output.cpp b/dep/ACE_wrappers/ace/CE_Screen_Output.cpp index dfd3d717a1f..c5cdc43d208 100644 --- a/dep/ACE_wrappers/ace/CE_Screen_Output.cpp +++ b/dep/ACE_wrappers/ace/CE_Screen_Output.cpp @@ -156,3 +156,4 @@ ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (FILE* pFile) ACE_END_VERSIONED_NAMESPACE_DECL #endif // ACE_HAS_WINCE + diff --git a/dep/ACE_wrappers/ace/CE_Screen_Output.h b/dep/ACE_wrappers/ace/CE_Screen_Output.h index ba2bc7c02b5..e4a3e3d92b0 100644 --- a/dep/ACE_wrappers/ace/CE_Screen_Output.h +++ b/dep/ACE_wrappers/ace/CE_Screen_Output.h @@ -107,3 +107,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #endif // ACE_HAS_WINCE #endif // ACE_CE_SCREEN_OUTPUT_H + diff --git a/dep/ACE_wrappers/ace/CORBA_macros.h b/dep/ACE_wrappers/ace/CORBA_macros.h index beab26b7f04..ce45893b0a2 100644 --- a/dep/ACE_wrappers/ace/CORBA_macros.h +++ b/dep/ACE_wrappers/ace/CORBA_macros.h @@ -573,3 +573,4 @@ #include /**/ "ace/post.h" #endif /* ACE_CORBA_MACROS_H */ + diff --git a/dep/ACE_wrappers/ace/Cache_Map_Manager_T.cpp b/dep/ACE_wrappers/ace/Cache_Map_Manager_T.cpp index f87031eb0d7..59303acb515 100644 --- a/dep/ACE_wrappers/ace/Cache_Map_Manager_T.cpp +++ b/dep/ACE_wrappers/ace/Cache_Map_Manager_T.cpp @@ -418,3 +418,4 @@ ACE_Cache_Map_Iterator<KEY, VALUE, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_CACHE_MAP_MANAGER_T_CPP */ + diff --git a/dep/ACE_wrappers/ace/Cache_Map_Manager_T.h b/dep/ACE_wrappers/ace/Cache_Map_Manager_T.h index 060a8b38aac..1476597ab54 100644 --- a/dep/ACE_wrappers/ace/Cache_Map_Manager_T.h +++ b/dep/ACE_wrappers/ace/Cache_Map_Manager_T.h @@ -403,3 +403,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_CACHE_MAP_MANAGER_T_H */ + diff --git a/dep/ACE_wrappers/ace/Cached_Connect_Strategy_T.cpp b/dep/ACE_wrappers/ace/Cached_Connect_Strategy_T.cpp index 1f9ad0abde6..abf546c514f 100644 --- a/dep/ACE_wrappers/ace/Cached_Connect_Strategy_T.cpp +++ b/dep/ACE_wrappers/ace/Cached_Connect_Strategy_T.cpp @@ -732,3 +732,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #undef ACE_T2 #endif /* ACE_CACHED_CONNECT_STRATEGY_T_CPP */ + diff --git a/dep/ACE_wrappers/ace/Cached_Connect_Strategy_T.h b/dep/ACE_wrappers/ace/Cached_Connect_Strategy_T.h index 15517ddc38c..9f3227b54f1 100644 --- a/dep/ACE_wrappers/ace/Cached_Connect_Strategy_T.h +++ b/dep/ACE_wrappers/ace/Cached_Connect_Strategy_T.h @@ -260,3 +260,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* CACHED_CONNECT_STRATEGY_T_H */ + diff --git a/dep/ACE_wrappers/ace/Caching_Strategies_T.cpp b/dep/ACE_wrappers/ace/Caching_Strategies_T.cpp index 2b0fd4e764a..f7c047fb5bb 100644 --- a/dep/ACE_wrappers/ace/Caching_Strategies_T.cpp +++ b/dep/ACE_wrappers/ace/Caching_Strategies_T.cpp @@ -57,3 +57,4 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Null_Caching_Strategy) ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_CACHING_STRATEGIES_T_CPP */ + diff --git a/dep/ACE_wrappers/ace/Caching_Strategies_T.h b/dep/ACE_wrappers/ace/Caching_Strategies_T.h index e4b0817aa26..d78332e41f5 100644 --- a/dep/ACE_wrappers/ace/Caching_Strategies_T.h +++ b/dep/ACE_wrappers/ace/Caching_Strategies_T.h @@ -550,3 +550,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_CACHING_STRATEGIES_H */ + diff --git a/dep/ACE_wrappers/ace/Caching_Utility_T.cpp b/dep/ACE_wrappers/ace/Caching_Utility_T.cpp index a03a4575891..15e402985cc 100644 --- a/dep/ACE_wrappers/ace/Caching_Utility_T.cpp +++ b/dep/ACE_wrappers/ace/Caching_Utility_T.cpp @@ -497,3 +497,4 @@ ACE_Null_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::minimum ( ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_CACHING_UTILITY_T_CPP */ + diff --git a/dep/ACE_wrappers/ace/Caching_Utility_T.h b/dep/ACE_wrappers/ace/Caching_Utility_T.h index 5428682d099..9859159be4c 100644 --- a/dep/ACE_wrappers/ace/Caching_Utility_T.h +++ b/dep/ACE_wrappers/ace/Caching_Utility_T.h @@ -345,3 +345,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_CACHING_UTILITY_H */ + diff --git a/dep/ACE_wrappers/ace/Capabilities.cpp b/dep/ACE_wrappers/ace/Capabilities.cpp index 5d46e75472a..4f8151d1bc6 100644 --- a/dep/ACE_wrappers/ace/Capabilities.cpp +++ b/dep/ACE_wrappers/ace/Capabilities.cpp @@ -353,3 +353,4 @@ ACE_Capabilities::getent (const ACE_TCHAR *fname, const ACE_TCHAR *name) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Capabilities.h b/dep/ACE_wrappers/ace/Capabilities.h index e893d987c08..459afd1c681 100644 --- a/dep/ACE_wrappers/ace/Capabilities.h +++ b/dep/ACE_wrappers/ace/Capabilities.h @@ -219,3 +219,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* __ACE_CAPABILITIES_H__ */ + diff --git a/dep/ACE_wrappers/ace/Cleanup.cpp b/dep/ACE_wrappers/ace/Cleanup.cpp index 752ffb40b4f..960e74fffa4 100644 --- a/dep/ACE_wrappers/ace/Cleanup.cpp +++ b/dep/ACE_wrappers/ace/Cleanup.cpp @@ -190,3 +190,4 @@ ACE_OS_Exit_Info::call_hooks (void) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Cleanup.h b/dep/ACE_wrappers/ace/Cleanup.h index 8ea0360580c..c38db701360 100644 --- a/dep/ACE_wrappers/ace/Cleanup.h +++ b/dep/ACE_wrappers/ace/Cleanup.h @@ -135,3 +135,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL # include /**/ "ace/post.h" #endif /* ACE_CLEANUP_H */ + diff --git a/dep/ACE_wrappers/ace/Cleanup_Strategies_T.cpp b/dep/ACE_wrappers/ace/Cleanup_Strategies_T.cpp index 32965993774..b6e95e9692b 100644 --- a/dep/ACE_wrappers/ace/Cleanup_Strategies_T.cpp +++ b/dep/ACE_wrappers/ace/Cleanup_Strategies_T.cpp @@ -93,3 +93,4 @@ ACE_Null_Cleanup_Strategy<KEY, VALUE, CONTAINER>::cleanup (CONTAINER &, ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_CLEANUP_STRATEGIES_T_CPP */ + diff --git a/dep/ACE_wrappers/ace/Cleanup_Strategies_T.h b/dep/ACE_wrappers/ace/Cleanup_Strategies_T.h index ca51b47b10f..776ae28441b 100644 --- a/dep/ACE_wrappers/ace/Cleanup_Strategies_T.h +++ b/dep/ACE_wrappers/ace/Cleanup_Strategies_T.h @@ -147,3 +147,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* CLEANUP_STRATEGIES_H */ + diff --git a/dep/ACE_wrappers/ace/Codecs.cpp b/dep/ACE_wrappers/ace/Codecs.cpp index a9fffb79b98..d0bb0778304 100644 --- a/dep/ACE_wrappers/ace/Codecs.cpp +++ b/dep/ACE_wrappers/ace/Codecs.cpp @@ -232,3 +232,4 @@ ACE_Base64::init () } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Codecs.h b/dep/ACE_wrappers/ace/Codecs.h index 2c4227dd0ad..0e0f13ac319 100644 --- a/dep/ACE_wrappers/ace/Codecs.h +++ b/dep/ACE_wrappers/ace/Codecs.h @@ -119,3 +119,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_CODECS_H */ + diff --git a/dep/ACE_wrappers/ace/Codeset_IBM1047.cpp b/dep/ACE_wrappers/ace/Codeset_IBM1047.cpp index 91582cf4ef3..62488c8927c 100644 --- a/dep/ACE_wrappers/ace/Codeset_IBM1047.cpp +++ b/dep/ACE_wrappers/ace/Codeset_IBM1047.cpp @@ -307,3 +307,4 @@ ACE_ISO8859_IBM1047::write_char_array (ACE_OutputCDR &out, ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_EBCDIC */ + diff --git a/dep/ACE_wrappers/ace/Codeset_IBM1047.h b/dep/ACE_wrappers/ace/Codeset_IBM1047.h index 3caa8881fbf..7e0df2b5c08 100644 --- a/dep/ACE_wrappers/ace/Codeset_IBM1047.h +++ b/dep/ACE_wrappers/ace/Codeset_IBM1047.h @@ -125,3 +125,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_CODESET_IMB1047_H */ + diff --git a/dep/ACE_wrappers/ace/Codeset_Registry.cpp b/dep/ACE_wrappers/ace/Codeset_Registry.cpp index c23ef37231a..789340af33c 100644 --- a/dep/ACE_wrappers/ace/Codeset_Registry.cpp +++ b/dep/ACE_wrappers/ace/Codeset_Registry.cpp @@ -109,3 +109,4 @@ ACE_Codeset_Registry::get_max_bytes_i (ACE_CDR::ULong codeset_id) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Codeset_Registry.h b/dep/ACE_wrappers/ace/Codeset_Registry.h index e72c435f82b..80887d9a106 100644 --- a/dep/ACE_wrappers/ace/Codeset_Registry.h +++ b/dep/ACE_wrappers/ace/Codeset_Registry.h @@ -102,3 +102,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_CODESET_REGISTRY_H */ + diff --git a/dep/ACE_wrappers/ace/Codeset_Registry_db.cpp b/dep/ACE_wrappers/ace/Codeset_Registry_db.cpp index 32b38631c6f..1f900db9b4f 100644 --- a/dep/ACE_wrappers/ace/Codeset_Registry_db.cpp +++ b/dep/ACE_wrappers/ace/Codeset_Registry_db.cpp @@ -31,3 +31,4 @@ ACE_Codeset_Registry::registry_db_[] = size_t const ACE_Codeset_Registry::num_registry_entries_ = 9; ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Codeset_Symbols.h b/dep/ACE_wrappers/ace/Codeset_Symbols.h index 6ffe198c1a9..2cfb6bc26b6 100644 --- a/dep/ACE_wrappers/ace/Codeset_Symbols.h +++ b/dep/ACE_wrappers/ace/Codeset_Symbols.h @@ -218,3 +218,4 @@ #define ACE_CODESET_ID_TAO_BACKWARD_COMPATIBLE 0xf54414F0U #endif // CODESET_SYMBOLS_H + diff --git a/dep/ACE_wrappers/ace/Condition_Recursive_Thread_Mutex.cpp b/dep/ACE_wrappers/ace/Condition_Recursive_Thread_Mutex.cpp index 2a12b132f24..658100f1818 100644 --- a/dep/ACE_wrappers/ace/Condition_Recursive_Thread_Mutex.cpp +++ b/dep/ACE_wrappers/ace/Condition_Recursive_Thread_Mutex.cpp @@ -127,3 +127,4 @@ ACE_Condition_Recursive_Thread_Mutex::ACE_Condition_Recursive_Thread_Mutex ( ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_THREADS */ + diff --git a/dep/ACE_wrappers/ace/Condition_Recursive_Thread_Mutex.h b/dep/ACE_wrappers/ace/Condition_Recursive_Thread_Mutex.h index f3c4b525780..8625aa2fcea 100644 --- a/dep/ACE_wrappers/ace/Condition_Recursive_Thread_Mutex.h +++ b/dep/ACE_wrappers/ace/Condition_Recursive_Thread_Mutex.h @@ -116,3 +116,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_CONDITION_RECURSIVE_THREAD_MUTEX_H */ + diff --git a/dep/ACE_wrappers/ace/Condition_T.cpp b/dep/ACE_wrappers/ace/Condition_T.cpp index a2ebff1538e..6bc7ce579ce 100644 --- a/dep/ACE_wrappers/ace/Condition_T.cpp +++ b/dep/ACE_wrappers/ace/Condition_T.cpp @@ -120,3 +120,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_THREADS */ #endif /* ACE_CONDITION_T_CPP */ + diff --git a/dep/ACE_wrappers/ace/Condition_T.h b/dep/ACE_wrappers/ace/Condition_T.h index 936ce821777..8e6132ec92c 100644 --- a/dep/ACE_wrappers/ace/Condition_T.h +++ b/dep/ACE_wrappers/ace/Condition_T.h @@ -165,3 +165,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_CONDITION_T_H */ + diff --git a/dep/ACE_wrappers/ace/Condition_Thread_Mutex.cpp b/dep/ACE_wrappers/ace/Condition_Thread_Mutex.cpp index c9f2620e432..d1142f72172 100644 --- a/dep/ACE_wrappers/ace/Condition_Thread_Mutex.cpp +++ b/dep/ACE_wrappers/ace/Condition_Thread_Mutex.cpp @@ -124,3 +124,4 @@ ACE_Condition_Thread_Mutex::broadcast (void) ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_THREADS */ + diff --git a/dep/ACE_wrappers/ace/Condition_Thread_Mutex.h b/dep/ACE_wrappers/ace/Condition_Thread_Mutex.h index 693ff0820aa..bc47ae2514a 100644 --- a/dep/ACE_wrappers/ace/Condition_Thread_Mutex.h +++ b/dep/ACE_wrappers/ace/Condition_Thread_Mutex.h @@ -188,3 +188,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_CONDITION_THREAD_MUTEX_H */ + diff --git a/dep/ACE_wrappers/ace/Configuration.cpp b/dep/ACE_wrappers/ace/Configuration.cpp index 734482f0e55..fd8548d9e8d 100644 --- a/dep/ACE_wrappers/ace/Configuration.cpp +++ b/dep/ACE_wrappers/ace/Configuration.cpp @@ -2146,3 +2146,4 @@ ACE_Configuration_Heap::remove_value (const ACE_Configuration_Section_Key& key, } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Configuration.h b/dep/ACE_wrappers/ace/Configuration.h index a0098c8ec7e..55bd705bf64 100644 --- a/dep/ACE_wrappers/ace/Configuration.h +++ b/dep/ACE_wrappers/ace/Configuration.h @@ -892,3 +892,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_CONFIGURATION_H */ + diff --git a/dep/ACE_wrappers/ace/Configuration_Import_Export.cpp b/dep/ACE_wrappers/ace/Configuration_Import_Export.cpp index 88e6d66f2b9..bd5a79b143a 100644 --- a/dep/ACE_wrappers/ace/Configuration_Import_Export.cpp +++ b/dep/ACE_wrappers/ace/Configuration_Import_Export.cpp @@ -668,3 +668,4 @@ ACE_Ini_ImpExp::squish (ACE_TCHAR *src) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Configuration_Import_Export.h b/dep/ACE_wrappers/ace/Configuration_Import_Export.h index e93544bee29..ec47bafa144 100644 --- a/dep/ACE_wrappers/ace/Configuration_Import_Export.h +++ b/dep/ACE_wrappers/ace/Configuration_Import_Export.h @@ -213,3 +213,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_CONFIGURATION_IMPORT_EXPORT_H */ + diff --git a/dep/ACE_wrappers/ace/Connection_Recycling_Strategy.cpp b/dep/ACE_wrappers/ace/Connection_Recycling_Strategy.cpp index 78b08884340..6f32c9a2de2 100644 --- a/dep/ACE_wrappers/ace/Connection_Recycling_Strategy.cpp +++ b/dep/ACE_wrappers/ace/Connection_Recycling_Strategy.cpp @@ -11,3 +11,4 @@ ACE_Connection_Recycling_Strategy::~ACE_Connection_Recycling_Strategy (void) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Connection_Recycling_Strategy.h b/dep/ACE_wrappers/ace/Connection_Recycling_Strategy.h index 75169638dcf..0770c3a6c26 100644 --- a/dep/ACE_wrappers/ace/Connection_Recycling_Strategy.h +++ b/dep/ACE_wrappers/ace/Connection_Recycling_Strategy.h @@ -61,3 +61,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /*ACE_CONNECTION_RECYCLING_STRATEGY*/ + diff --git a/dep/ACE_wrappers/ace/Connector.cpp b/dep/ACE_wrappers/ace/Connector.cpp index 3e68abc097a..6372ffb1a5a 100644 --- a/dep/ACE_wrappers/ace/Connector.cpp +++ b/dep/ACE_wrappers/ace/Connector.cpp @@ -964,3 +964,4 @@ ACE_Strategy_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::concurrency_strategy ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_CONNECTOR_C */ + diff --git a/dep/ACE_wrappers/ace/Connector.h b/dep/ACE_wrappers/ace/Connector.h index b13fc56c131..73689356501 100644 --- a/dep/ACE_wrappers/ace/Connector.h +++ b/dep/ACE_wrappers/ace/Connector.h @@ -561,3 +561,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_CONNECTOR_H */ + diff --git a/dep/ACE_wrappers/ace/Containers.cpp b/dep/ACE_wrappers/ace/Containers.cpp index 244a9ad4b1b..754ef0e5194 100644 --- a/dep/ACE_wrappers/ace/Containers.cpp +++ b/dep/ACE_wrappers/ace/Containers.cpp @@ -10,3 +10,4 @@ ACE_RCSID (ace, #include "ace/Containers.inl" #endif /* __ACE_INLINE__ */ + diff --git a/dep/ACE_wrappers/ace/Containers.h b/dep/ACE_wrappers/ace/Containers.h index ecff8e368e4..f6f1d35bb60 100644 --- a/dep/ACE_wrappers/ace/Containers.h +++ b/dep/ACE_wrappers/ace/Containers.h @@ -69,3 +69,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_CONTAINERS_H */ + diff --git a/dep/ACE_wrappers/ace/Containers_T.cpp b/dep/ACE_wrappers/ace/Containers_T.cpp index f4b6bd8a7f0..29a4b35743c 100644 --- a/dep/ACE_wrappers/ace/Containers_T.cpp +++ b/dep/ACE_wrappers/ace/Containers_T.cpp @@ -1930,3 +1930,4 @@ ACE_Array<T>::operator== (const ACE_Array<T> &s) const ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_CONTAINERS_T_CPP */ + diff --git a/dep/ACE_wrappers/ace/Containers_T.h b/dep/ACE_wrappers/ace/Containers_T.h index 7245b51b612..8969d3cf969 100644 --- a/dep/ACE_wrappers/ace/Containers_T.h +++ b/dep/ACE_wrappers/ace/Containers_T.h @@ -2071,3 +2071,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_CONTAINERS_T_H */ + diff --git a/dep/ACE_wrappers/ace/Copy_Disabled.cpp b/dep/ACE_wrappers/ace/Copy_Disabled.cpp index 6878311197d..92cc98cd1ef 100644 --- a/dep/ACE_wrappers/ace/Copy_Disabled.cpp +++ b/dep/ACE_wrappers/ace/Copy_Disabled.cpp @@ -21,3 +21,4 @@ ACE_Copy_Disabled::ACE_Copy_Disabled (void) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Copy_Disabled.h b/dep/ACE_wrappers/ace/Copy_Disabled.h index f7b40e26422..4dd6c2216b5 100644 --- a/dep/ACE_wrappers/ace/Copy_Disabled.h +++ b/dep/ACE_wrappers/ace/Copy_Disabled.h @@ -63,3 +63,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_COPY_DISABLED_H */ + diff --git a/dep/ACE_wrappers/ace/Countdown_Time.cpp b/dep/ACE_wrappers/ace/Countdown_Time.cpp index dbb2ca55ad1..3b3eede4364 100644 --- a/dep/ACE_wrappers/ace/Countdown_Time.cpp +++ b/dep/ACE_wrappers/ace/Countdown_Time.cpp @@ -64,3 +64,4 @@ ACE_Countdown_Time::update (void) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Countdown_Time.h b/dep/ACE_wrappers/ace/Countdown_Time.h index c12cfb10874..cc76bed02f4 100644 --- a/dep/ACE_wrappers/ace/Countdown_Time.h +++ b/dep/ACE_wrappers/ace/Countdown_Time.h @@ -78,3 +78,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_COUNTDOWN_TIME_H */ + diff --git a/dep/ACE_wrappers/ace/DEV.cpp b/dep/ACE_wrappers/ace/DEV.cpp index 42178a68e6b..7b4fb00f2b2 100644 --- a/dep/ACE_wrappers/ace/DEV.cpp +++ b/dep/ACE_wrappers/ace/DEV.cpp @@ -41,3 +41,4 @@ ACE_DEV::close (void) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/DEV.h b/dep/ACE_wrappers/ace/DEV.h index 86f8d5dc863..6a6a7419e37 100644 --- a/dep/ACE_wrappers/ace/DEV.h +++ b/dep/ACE_wrappers/ace/DEV.h @@ -76,3 +76,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_DEV_H */ + diff --git a/dep/ACE_wrappers/ace/DEV_Addr.cpp b/dep/ACE_wrappers/ace/DEV_Addr.cpp index 64bbb50873c..73abb6568aa 100644 --- a/dep/ACE_wrappers/ace/DEV_Addr.cpp +++ b/dep/ACE_wrappers/ace/DEV_Addr.cpp @@ -106,3 +106,4 @@ ACE_DEV_Addr::operator= (const ACE_DEV_Addr &sa) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/DEV_Addr.h b/dep/ACE_wrappers/ace/DEV_Addr.h index 49ec5023a7c..f658cb0207d 100644 --- a/dep/ACE_wrappers/ace/DEV_Addr.h +++ b/dep/ACE_wrappers/ace/DEV_Addr.h @@ -88,3 +88,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_DEV_ADDR_H */ + diff --git a/dep/ACE_wrappers/ace/DEV_Connector.cpp b/dep/ACE_wrappers/ace/DEV_Connector.cpp index bdc2530acd8..02763c95296 100644 --- a/dep/ACE_wrappers/ace/DEV_Connector.cpp +++ b/dep/ACE_wrappers/ace/DEV_Connector.cpp @@ -51,3 +51,4 @@ ACE_DEV_Connector::connect (ACE_DEV_IO &new_io, } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/DEV_Connector.h b/dep/ACE_wrappers/ace/DEV_Connector.h index 32a7223f4c4..565d7ae024a 100644 --- a/dep/ACE_wrappers/ace/DEV_Connector.h +++ b/dep/ACE_wrappers/ace/DEV_Connector.h @@ -108,3 +108,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_DEV_CONNECTOR_H */ + diff --git a/dep/ACE_wrappers/ace/DEV_IO.cpp b/dep/ACE_wrappers/ace/DEV_IO.cpp index b9a8e1f46b9..e3c92041f28 100644 --- a/dep/ACE_wrappers/ace/DEV_IO.cpp +++ b/dep/ACE_wrappers/ace/DEV_IO.cpp @@ -129,3 +129,4 @@ ACE_DEV_IO::recv (size_t n, ...) const } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/DEV_IO.h b/dep/ACE_wrappers/ace/DEV_IO.h index 3b1c3deb334..e19cfd35603 100644 --- a/dep/ACE_wrappers/ace/DEV_IO.h +++ b/dep/ACE_wrappers/ace/DEV_IO.h @@ -183,3 +183,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_DEV_IO_H */ + diff --git a/dep/ACE_wrappers/ace/DLL.cpp b/dep/ACE_wrappers/ace/DLL.cpp index cad25110032..43cfa2efa84 100644 --- a/dep/ACE_wrappers/ace/DLL.cpp +++ b/dep/ACE_wrappers/ace/DLL.cpp @@ -265,3 +265,4 @@ ACE_DLL::set_handle (ACE_SHLIB_HANDLE handle, } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/DLL.h b/dep/ACE_wrappers/ace/DLL.h index fa748e8d944..a9700daafc0 100644 --- a/dep/ACE_wrappers/ace/DLL.h +++ b/dep/ACE_wrappers/ace/DLL.h @@ -194,3 +194,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_DLL_H */ + diff --git a/dep/ACE_wrappers/ace/DLL_Manager.cpp b/dep/ACE_wrappers/ace/DLL_Manager.cpp index 90049a04220..9463aa5e1bc 100644 --- a/dep/ACE_wrappers/ace/DLL_Manager.cpp +++ b/dep/ACE_wrappers/ace/DLL_Manager.cpp @@ -785,3 +785,4 @@ ACE_DLL_Manager::unload_dll (ACE_DLL_Handle *dll_handle, int force_unload) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/DLL_Manager.h b/dep/ACE_wrappers/ace/DLL_Manager.h index 63b9ee04a84..0e571b6c03a 100644 --- a/dep/ACE_wrappers/ace/DLL_Manager.h +++ b/dep/ACE_wrappers/ace/DLL_Manager.h @@ -267,3 +267,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_DLL_MANAGER_H */ + diff --git a/dep/ACE_wrappers/ace/Date_Time.cpp b/dep/ACE_wrappers/ace/Date_Time.cpp index eff0f273fe7..8b26d0dd925 100644 --- a/dep/ACE_wrappers/ace/Date_Time.cpp +++ b/dep/ACE_wrappers/ace/Date_Time.cpp @@ -8,3 +8,4 @@ #endif /* __ACE_INLINE__ */ ACE_RCSID(ace, Date_Time, "$Id: Date_Time.cpp 80826 2008-03-04 14:51:23Z wotte $") + diff --git a/dep/ACE_wrappers/ace/Date_Time.h b/dep/ACE_wrappers/ace/Date_Time.h index a15d435eeb8..7e91549d2a5 100644 --- a/dep/ACE_wrappers/ace/Date_Time.h +++ b/dep/ACE_wrappers/ace/Date_Time.h @@ -123,3 +123,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_DATE_TIME_H */ + diff --git a/dep/ACE_wrappers/ace/Default_Constants.h b/dep/ACE_wrappers/ace/Default_Constants.h index 13e99e9171b..9eefd496b9b 100644 --- a/dep/ACE_wrappers/ace/Default_Constants.h +++ b/dep/ACE_wrappers/ace/Default_Constants.h @@ -571,3 +571,4 @@ #include /**/ "ace/post.h" #endif /*ACE_DEFAULT_CONSTANTS_H*/ + diff --git a/dep/ACE_wrappers/ace/Dev_Poll_Reactor.cpp b/dep/ACE_wrappers/ace/Dev_Poll_Reactor.cpp index 60a71d29962..2cd90d17738 100644 --- a/dep/ACE_wrappers/ace/Dev_Poll_Reactor.cpp +++ b/dep/ACE_wrappers/ace/Dev_Poll_Reactor.cpp @@ -2514,3 +2514,4 @@ ACE_Dev_Poll_Reactor::Token_Guard::acquire (ACE_Time_Value *max_wait) ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_EVENT_POLL || ACE_HAS_DEV_POLL */ + diff --git a/dep/ACE_wrappers/ace/Dev_Poll_Reactor.h b/dep/ACE_wrappers/ace/Dev_Poll_Reactor.h index 38d9c013a8b..c675999bb4c 100644 --- a/dep/ACE_wrappers/ace/Dev_Poll_Reactor.h +++ b/dep/ACE_wrappers/ace/Dev_Poll_Reactor.h @@ -1250,3 +1250,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_DEV_POLL_REACTOR_H */ + diff --git a/dep/ACE_wrappers/ace/Dirent.cpp b/dep/ACE_wrappers/ace/Dirent.cpp index df1290e1e53..180642fc0f9 100644 --- a/dep/ACE_wrappers/ace/Dirent.cpp +++ b/dep/ACE_wrappers/ace/Dirent.cpp @@ -5,3 +5,4 @@ #if !defined (__ACE_INLINE__) #include "ace/Dirent.inl" #endif /* __ACE_INLINE__ */ + diff --git a/dep/ACE_wrappers/ace/Dirent.h b/dep/ACE_wrappers/ace/Dirent.h index 2dd5d0a19fb..036a942c611 100644 --- a/dep/ACE_wrappers/ace/Dirent.h +++ b/dep/ACE_wrappers/ace/Dirent.h @@ -120,3 +120,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_DIRENT_H */ + diff --git a/dep/ACE_wrappers/ace/Dirent_Selector.cpp b/dep/ACE_wrappers/ace/Dirent_Selector.cpp index 8fcb5775b29..875a466e5b3 100644 --- a/dep/ACE_wrappers/ace/Dirent_Selector.cpp +++ b/dep/ACE_wrappers/ace/Dirent_Selector.cpp @@ -57,3 +57,4 @@ ACE_Dirent_Selector::close (void) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Dirent_Selector.h b/dep/ACE_wrappers/ace/Dirent_Selector.h index 20673c473a9..3356f18723d 100644 --- a/dep/ACE_wrappers/ace/Dirent_Selector.h +++ b/dep/ACE_wrappers/ace/Dirent_Selector.h @@ -73,3 +73,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_DIRENT_SELECTOR_H */ + diff --git a/dep/ACE_wrappers/ace/Dump.cpp b/dep/ACE_wrappers/ace/Dump.cpp index 6e5c2d0c3ea..fce6bcc277a 100644 --- a/dep/ACE_wrappers/ace/Dump.cpp +++ b/dep/ACE_wrappers/ace/Dump.cpp @@ -139,3 +139,4 @@ ACE_ODB::remove_object (const void *this_ptr) ACE_ODB *ACE_ODB::instance_ = 0; ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Dump.h b/dep/ACE_wrappers/ace/Dump.h index 4ccd64adb95..354b162cfb6 100644 --- a/dep/ACE_wrappers/ace/Dump.h +++ b/dep/ACE_wrappers/ace/Dump.h @@ -170,3 +170,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_DUMP_H */ + diff --git a/dep/ACE_wrappers/ace/Dump_T.cpp b/dep/ACE_wrappers/ace/Dump_T.cpp index da2b62a6fa3..5432b1b6e51 100644 --- a/dep/ACE_wrappers/ace/Dump_T.cpp +++ b/dep/ACE_wrappers/ace/Dump_T.cpp @@ -46,3 +46,4 @@ ACE_Dumpable_Adapter<Concrete>::dump (void) const ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_DUMP_T_CPP */ + diff --git a/dep/ACE_wrappers/ace/Dump_T.h b/dep/ACE_wrappers/ace/Dump_T.h index 92b57addce6..4134df75392 100644 --- a/dep/ACE_wrappers/ace/Dump_T.h +++ b/dep/ACE_wrappers/ace/Dump_T.h @@ -80,3 +80,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_DUMP_T_H */ + diff --git a/dep/ACE_wrappers/ace/Dynamic.cpp b/dep/ACE_wrappers/ace/Dynamic.cpp index 4eaedad0cfe..2a3f8b0f26d 100644 --- a/dep/ACE_wrappers/ace/Dynamic.cpp +++ b/dep/ACE_wrappers/ace/Dynamic.cpp @@ -32,3 +32,4 @@ template ACE_TSS_Singleton<ACE_Dynamic, ACE_Null_Mutex> * #endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Dynamic.h b/dep/ACE_wrappers/ace/Dynamic.h index 70dfcd8d90a..6906ebf1267 100644 --- a/dep/ACE_wrappers/ace/Dynamic.h +++ b/dep/ACE_wrappers/ace/Dynamic.h @@ -73,3 +73,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_DYNAMIC_H */ + diff --git a/dep/ACE_wrappers/ace/Dynamic_Message_Strategy.cpp b/dep/ACE_wrappers/ace/Dynamic_Message_Strategy.cpp index 9211f3313a6..e6c89e5238e 100644 --- a/dep/ACE_wrappers/ace/Dynamic_Message_Strategy.cpp +++ b/dep/ACE_wrappers/ace/Dynamic_Message_Strategy.cpp @@ -203,3 +203,4 @@ ACE_Laxity_Message_Strategy::dump (void) const // Dump the state of the strategy. ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Dynamic_Message_Strategy.h b/dep/ACE_wrappers/ace/Dynamic_Message_Strategy.h index 090ad3a8f82..db6a51bb70e 100644 --- a/dep/ACE_wrappers/ace/Dynamic_Message_Strategy.h +++ b/dep/ACE_wrappers/ace/Dynamic_Message_Strategy.h @@ -215,3 +215,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_DYNAMIC_MESSAGE_STRATEGY_H */ + diff --git a/dep/ACE_wrappers/ace/Dynamic_Service.cpp b/dep/ACE_wrappers/ace/Dynamic_Service.cpp index 28d6e4526f2..900419bd846 100644 --- a/dep/ACE_wrappers/ace/Dynamic_Service.cpp +++ b/dep/ACE_wrappers/ace/Dynamic_Service.cpp @@ -61,3 +61,4 @@ ACE_Dynamic_Service<TYPE>::instance (const ACE_Service_Gestalt* conf, ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_DYNAMIC_SERVICE_CPP */ + diff --git a/dep/ACE_wrappers/ace/Dynamic_Service.h b/dep/ACE_wrappers/ace/Dynamic_Service.h index b90095c766d..fb2469c5418 100644 --- a/dep/ACE_wrappers/ace/Dynamic_Service.h +++ b/dep/ACE_wrappers/ace/Dynamic_Service.h @@ -87,3 +87,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_DYNAMIC_SERVICE_H */ + diff --git a/dep/ACE_wrappers/ace/Dynamic_Service_Base.cpp b/dep/ACE_wrappers/ace/Dynamic_Service_Base.cpp index 91eec162ce0..174b009d7b6 100644 --- a/dep/ACE_wrappers/ace/Dynamic_Service_Base.cpp +++ b/dep/ACE_wrappers/ace/Dynamic_Service_Base.cpp @@ -99,3 +99,4 @@ ACE_Dynamic_Service_Base::instance (const ACE_Service_Gestalt* repo, } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Dynamic_Service_Base.h b/dep/ACE_wrappers/ace/Dynamic_Service_Base.h index 095e883a8fe..4491a9407d8 100644 --- a/dep/ACE_wrappers/ace/Dynamic_Service_Base.h +++ b/dep/ACE_wrappers/ace/Dynamic_Service_Base.h @@ -72,3 +72,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_DYNAMIC_SERVICE_BASE_H */ + diff --git a/dep/ACE_wrappers/ace/Dynamic_Service_Dependency.cpp b/dep/ACE_wrappers/ace/Dynamic_Service_Dependency.cpp index df7cd0f5d48..9a371ff3c16 100644 --- a/dep/ACE_wrappers/ace/Dynamic_Service_Dependency.cpp +++ b/dep/ACE_wrappers/ace/Dynamic_Service_Dependency.cpp @@ -49,3 +49,4 @@ ACE_Dynamic_Service_Dependency::init (const ACE_Service_Gestalt *cfg, ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Dynamic_Service_Dependency.h b/dep/ACE_wrappers/ace/Dynamic_Service_Dependency.h index 0f187d0037a..ce4c1d3e7cd 100644 --- a/dep/ACE_wrappers/ace/Dynamic_Service_Dependency.h +++ b/dep/ACE_wrappers/ace/Dynamic_Service_Dependency.h @@ -68,3 +68,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_DYNAMIC_SERVICE_DEPENDENCY_H */ + diff --git a/dep/ACE_wrappers/ace/Encoding_Converter.cpp b/dep/ACE_wrappers/ace/Encoding_Converter.cpp index b5fd2b35402..e01c15ef865 100644 --- a/dep/ACE_wrappers/ace/Encoding_Converter.cpp +++ b/dep/ACE_wrappers/ace/Encoding_Converter.cpp @@ -10,3 +10,4 @@ ACE_Encoding_Converter::~ACE_Encoding_Converter (void) ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_USES_WCHAR */ + diff --git a/dep/ACE_wrappers/ace/Encoding_Converter.h b/dep/ACE_wrappers/ace/Encoding_Converter.h index 34d22fa29a1..8833d3fced8 100644 --- a/dep/ACE_wrappers/ace/Encoding_Converter.h +++ b/dep/ACE_wrappers/ace/Encoding_Converter.h @@ -68,3 +68,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_ENCODING_CONVERTER_H */ + diff --git a/dep/ACE_wrappers/ace/Encoding_Converter_Factory.cpp b/dep/ACE_wrappers/ace/Encoding_Converter_Factory.cpp index f603ae3e893..3cd365f3ae1 100644 --- a/dep/ACE_wrappers/ace/Encoding_Converter_Factory.cpp +++ b/dep/ACE_wrappers/ace/Encoding_Converter_Factory.cpp @@ -72,3 +72,4 @@ ACE_Encoding_Converter_Factory::create ( ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_USES_WCHAR */ + diff --git a/dep/ACE_wrappers/ace/Encoding_Converter_Factory.h b/dep/ACE_wrappers/ace/Encoding_Converter_Factory.h index 1441c690bef..c1311451db5 100644 --- a/dep/ACE_wrappers/ace/Encoding_Converter_Factory.h +++ b/dep/ACE_wrappers/ace/Encoding_Converter_Factory.h @@ -52,3 +52,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_ENCODING_CONVERTER_FACTORY_H */ + diff --git a/dep/ACE_wrappers/ace/Env_Value_T.cpp b/dep/ACE_wrappers/ace/Env_Value_T.cpp index 1997bbea484..15ff7524ccf 100644 --- a/dep/ACE_wrappers/ace/Env_Value_T.cpp +++ b/dep/ACE_wrappers/ace/Env_Value_T.cpp @@ -10,3 +10,4 @@ #endif /* __ACE_INLINE__ */ #endif /* ACE_ENV_VALUE_T_CPP */ + diff --git a/dep/ACE_wrappers/ace/Env_Value_T.h b/dep/ACE_wrappers/ace/Env_Value_T.h index df2178a0f11..05b4706c122 100644 --- a/dep/ACE_wrappers/ace/Env_Value_T.h +++ b/dep/ACE_wrappers/ace/Env_Value_T.h @@ -164,3 +164,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_ENV_VALUE_T_H */ + diff --git a/dep/ACE_wrappers/ace/Event.cpp b/dep/ACE_wrappers/ace/Event.cpp index ea5f86d99d1..a5461de4bd9 100644 --- a/dep/ACE_wrappers/ace/Event.cpp +++ b/dep/ACE_wrappers/ace/Event.cpp @@ -91,3 +91,4 @@ ACE_Event::dump (void) const } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Event.h b/dep/ACE_wrappers/ace/Event.h index 887b504d8f9..69d819b3978 100644 --- a/dep/ACE_wrappers/ace/Event.h +++ b/dep/ACE_wrappers/ace/Event.h @@ -141,3 +141,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_EVENT_H */ + diff --git a/dep/ACE_wrappers/ace/Event_Handler.cpp b/dep/ACE_wrappers/ace/Event_Handler.cpp index 9e0a10e6ac7..916998eea52 100644 --- a/dep/ACE_wrappers/ace/Event_Handler.cpp +++ b/dep/ACE_wrappers/ace/Event_Handler.cpp @@ -394,3 +394,4 @@ ACE_Notification_Buffer::ACE_Notification_Buffer (ACE_Event_Handler *eh, } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Event_Handler.h b/dep/ACE_wrappers/ace/Event_Handler.h index 28a762892ad..e97cca48a46 100644 --- a/dep/ACE_wrappers/ace/Event_Handler.h +++ b/dep/ACE_wrappers/ace/Event_Handler.h @@ -386,3 +386,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_EVENT_HANDLER_H */ + diff --git a/dep/ACE_wrappers/ace/Event_Handler_T.cpp b/dep/ACE_wrappers/ace/Event_Handler_T.cpp index 45d9d4e2767..76fb69877e5 100644 --- a/dep/ACE_wrappers/ace/Event_Handler_T.cpp +++ b/dep/ACE_wrappers/ace/Event_Handler_T.cpp @@ -123,3 +123,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_TEMPLATE_TYPEDEFS */ #endif /* ACE_EVENT_HANDLER_T_CPP */ + diff --git a/dep/ACE_wrappers/ace/Event_Handler_T.h b/dep/ACE_wrappers/ace/Event_Handler_T.h index 7f81b347482..47cc5fd56bf 100644 --- a/dep/ACE_wrappers/ace/Event_Handler_T.h +++ b/dep/ACE_wrappers/ace/Event_Handler_T.h @@ -189,3 +189,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_TEMPLATE_TYPEDEFS */ #include /**/ "ace/post.h" #endif /* ACE_EVENT_HANDLER_H */ + diff --git a/dep/ACE_wrappers/ace/Exception_Macros.h b/dep/ACE_wrappers/ace/Exception_Macros.h index bb74b1a2129..32805184d04 100644 --- a/dep/ACE_wrappers/ace/Exception_Macros.h +++ b/dep/ACE_wrappers/ace/Exception_Macros.h @@ -53,3 +53,4 @@ #include /**/ "ace/post.h" #endif /* ACE_EXCEPTION_MACROS_H */ + diff --git a/dep/ACE_wrappers/ace/FIFO.cpp b/dep/ACE_wrappers/ace/FIFO.cpp index e3970015c43..c5ace7f90d9 100644 --- a/dep/ACE_wrappers/ace/FIFO.cpp +++ b/dep/ACE_wrappers/ace/FIFO.cpp @@ -76,3 +76,4 @@ ACE_FIFO::close (void) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/FIFO.h b/dep/ACE_wrappers/ace/FIFO.h index 2d590563a99..a1ef6038e35 100644 --- a/dep/ACE_wrappers/ace/FIFO.h +++ b/dep/ACE_wrappers/ace/FIFO.h @@ -83,3 +83,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_FIFO_H */ + diff --git a/dep/ACE_wrappers/ace/FIFO_Recv.cpp b/dep/ACE_wrappers/ace/FIFO_Recv.cpp index 254e30f21d1..08eb20fb469 100644 --- a/dep/ACE_wrappers/ace/FIFO_Recv.cpp +++ b/dep/ACE_wrappers/ace/FIFO_Recv.cpp @@ -86,3 +86,4 @@ ACE_FIFO_Recv::ACE_FIFO_Recv (const ACE_TCHAR *fifo_name, } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/FIFO_Recv.h b/dep/ACE_wrappers/ace/FIFO_Recv.h index c19d102c82a..7c9ffbec84e 100644 --- a/dep/ACE_wrappers/ace/FIFO_Recv.h +++ b/dep/ACE_wrappers/ace/FIFO_Recv.h @@ -83,3 +83,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_FIFO_RECV_H */ + diff --git a/dep/ACE_wrappers/ace/FIFO_Recv_Msg.cpp b/dep/ACE_wrappers/ace/FIFO_Recv_Msg.cpp index f389d03d276..5a8cb5c04d5 100644 --- a/dep/ACE_wrappers/ace/FIFO_Recv_Msg.cpp +++ b/dep/ACE_wrappers/ace/FIFO_Recv_Msg.cpp @@ -65,3 +65,4 @@ ACE_FIFO_Recv_Msg::ACE_FIFO_Recv_Msg (const ACE_TCHAR *fifo_name, } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/FIFO_Recv_Msg.h b/dep/ACE_wrappers/ace/FIFO_Recv_Msg.h index 80b7bdda91c..5490814c56b 100644 --- a/dep/ACE_wrappers/ace/FIFO_Recv_Msg.h +++ b/dep/ACE_wrappers/ace/FIFO_Recv_Msg.h @@ -136,3 +136,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_FIFO_RECV_MSG_H */ + diff --git a/dep/ACE_wrappers/ace/FIFO_Send.cpp b/dep/ACE_wrappers/ace/FIFO_Send.cpp index 720e63c5425..79ea87682d3 100644 --- a/dep/ACE_wrappers/ace/FIFO_Send.cpp +++ b/dep/ACE_wrappers/ace/FIFO_Send.cpp @@ -56,3 +56,4 @@ ACE_FIFO_Send::ACE_FIFO_Send (const ACE_TCHAR *fifo_name, } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/FIFO_Send.h b/dep/ACE_wrappers/ace/FIFO_Send.h index cc0fc282f83..7c0928cceaf 100644 --- a/dep/ACE_wrappers/ace/FIFO_Send.h +++ b/dep/ACE_wrappers/ace/FIFO_Send.h @@ -73,3 +73,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_FIFO_SEND_H */ + diff --git a/dep/ACE_wrappers/ace/FIFO_Send_Msg.cpp b/dep/ACE_wrappers/ace/FIFO_Send_Msg.cpp index b3bbae00aed..441a850c354 100644 --- a/dep/ACE_wrappers/ace/FIFO_Send_Msg.cpp +++ b/dep/ACE_wrappers/ace/FIFO_Send_Msg.cpp @@ -78,3 +78,4 @@ ACE_FIFO_Send_Msg::ACE_FIFO_Send_Msg (const ACE_TCHAR *fifo_name, } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/FIFO_Send_Msg.h b/dep/ACE_wrappers/ace/FIFO_Send_Msg.h index 504d8972187..ff746969156 100644 --- a/dep/ACE_wrappers/ace/FIFO_Send_Msg.h +++ b/dep/ACE_wrappers/ace/FIFO_Send_Msg.h @@ -89,3 +89,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_FIFO_SEND_MSG_H */ + diff --git a/dep/ACE_wrappers/ace/FILE.cpp b/dep/ACE_wrappers/ace/FILE.cpp index 8fe88d1b09c..50b6342bc89 100644 --- a/dep/ACE_wrappers/ace/FILE.cpp +++ b/dep/ACE_wrappers/ace/FILE.cpp @@ -145,3 +145,4 @@ ACE_FILE::unlink (void) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/FILE.h b/dep/ACE_wrappers/ace/FILE.h index 407a03379e5..44d5ac71d20 100644 --- a/dep/ACE_wrappers/ace/FILE.h +++ b/dep/ACE_wrappers/ace/FILE.h @@ -137,3 +137,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_FILE_H */ + diff --git a/dep/ACE_wrappers/ace/FILE_Addr.cpp b/dep/ACE_wrappers/ace/FILE_Addr.cpp index 6d8fbeb775b..4b95a7db874 100644 --- a/dep/ACE_wrappers/ace/FILE_Addr.cpp +++ b/dep/ACE_wrappers/ace/FILE_Addr.cpp @@ -122,3 +122,4 @@ ACE_FILE_Addr::dump (void) const #endif /* ACE_HAS_DUMP */ } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/FILE_Addr.h b/dep/ACE_wrappers/ace/FILE_Addr.h index 432275b9665..0604b689e5b 100644 --- a/dep/ACE_wrappers/ace/FILE_Addr.h +++ b/dep/ACE_wrappers/ace/FILE_Addr.h @@ -87,3 +87,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_FILE_ADDR_H */ + diff --git a/dep/ACE_wrappers/ace/FILE_Connector.cpp b/dep/ACE_wrappers/ace/FILE_Connector.cpp index b59b1e8913d..b4f4d09e3c6 100644 --- a/dep/ACE_wrappers/ace/FILE_Connector.cpp +++ b/dep/ACE_wrappers/ace/FILE_Connector.cpp @@ -82,3 +82,4 @@ ACE_FILE_Connector::connect (ACE_FILE_IO &new_io, } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/FILE_Connector.h b/dep/ACE_wrappers/ace/FILE_Connector.h index c6d3963736c..4f87e209d66 100644 --- a/dep/ACE_wrappers/ace/FILE_Connector.h +++ b/dep/ACE_wrappers/ace/FILE_Connector.h @@ -111,3 +111,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_FILE_CONNECTOR_H */ + diff --git a/dep/ACE_wrappers/ace/FILE_IO.cpp b/dep/ACE_wrappers/ace/FILE_IO.cpp index d6bf084dfae..c68df3e0416 100644 --- a/dep/ACE_wrappers/ace/FILE_IO.cpp +++ b/dep/ACE_wrappers/ace/FILE_IO.cpp @@ -143,3 +143,4 @@ ACE_FILE_IO::recvv (iovec *io_vec) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/FILE_IO.h b/dep/ACE_wrappers/ace/FILE_IO.h index 951069e3652..a1a470b8d30 100644 --- a/dep/ACE_wrappers/ace/FILE_IO.h +++ b/dep/ACE_wrappers/ace/FILE_IO.h @@ -168,3 +168,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_FILE_IO_H */ + diff --git a/dep/ACE_wrappers/ace/File_Lock.cpp b/dep/ACE_wrappers/ace/File_Lock.cpp index eeba6f61430..2b06ff26640 100644 --- a/dep/ACE_wrappers/ace/File_Lock.cpp +++ b/dep/ACE_wrappers/ace/File_Lock.cpp @@ -70,3 +70,4 @@ ACE_File_Lock::~ACE_File_Lock (void) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/File_Lock.h b/dep/ACE_wrappers/ace/File_Lock.h index 12f8ed64f38..c0629762d15 100644 --- a/dep/ACE_wrappers/ace/File_Lock.h +++ b/dep/ACE_wrappers/ace/File_Lock.h @@ -168,3 +168,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_FILE_LOCK_H */ + diff --git a/dep/ACE_wrappers/ace/Filecache.cpp b/dep/ACE_wrappers/ace/Filecache.cpp index 3a7e3da0a4c..cfb70f94f68 100644 --- a/dep/ACE_wrappers/ace/Filecache.cpp +++ b/dep/ACE_wrappers/ace/Filecache.cpp @@ -752,3 +752,4 @@ ACE_Filecache_Object::update (void) const } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Filecache.h b/dep/ACE_wrappers/ace/Filecache.h index 60b8a90f620..c6dba10f339 100644 --- a/dep/ACE_wrappers/ace/Filecache.h +++ b/dep/ACE_wrappers/ace/Filecache.h @@ -351,3 +351,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_FILECACHE_H */ + diff --git a/dep/ACE_wrappers/ace/Flag_Manip.cpp b/dep/ACE_wrappers/ace/Flag_Manip.cpp index f9ac4083fa0..252ea6240da 100644 --- a/dep/ACE_wrappers/ace/Flag_Manip.cpp +++ b/dep/ACE_wrappers/ace/Flag_Manip.cpp @@ -93,3 +93,4 @@ ACE::clr_flags (ACE_HANDLE handle, int flags) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Flag_Manip.h b/dep/ACE_wrappers/ace/Flag_Manip.h index 0457dcb4d95..6bd797e5606 100644 --- a/dep/ACE_wrappers/ace/Flag_Manip.h +++ b/dep/ACE_wrappers/ace/Flag_Manip.h @@ -56,3 +56,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_FLAG_MANIP_H */ + diff --git a/dep/ACE_wrappers/ace/Framework_Component.cpp b/dep/ACE_wrappers/ace/Framework_Component.cpp index 48d3043594b..446df96fa31 100644 --- a/dep/ACE_wrappers/ace/Framework_Component.cpp +++ b/dep/ACE_wrappers/ace/Framework_Component.cpp @@ -277,3 +277,4 @@ ACE_Framework_Repository::ACE_Framework_Repository (int size) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Framework_Component.h b/dep/ACE_wrappers/ace/Framework_Component.h index 941960bf047..fecd8ccf3bb 100644 --- a/dep/ACE_wrappers/ace/Framework_Component.h +++ b/dep/ACE_wrappers/ace/Framework_Component.h @@ -208,3 +208,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_FRAMEWORK_COMPONENT_H */ + diff --git a/dep/ACE_wrappers/ace/Framework_Component_T.cpp b/dep/ACE_wrappers/ace/Framework_Component_T.cpp index 6f0be7b5e2a..b4e8130086c 100644 --- a/dep/ACE_wrappers/ace/Framework_Component_T.cpp +++ b/dep/ACE_wrappers/ace/Framework_Component_T.cpp @@ -31,3 +31,4 @@ ACE_Framework_Component_T<Concrete>::close_singleton (void) ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_FRAMEWORK_COMPONENT_T_CPP */ + diff --git a/dep/ACE_wrappers/ace/Framework_Component_T.h b/dep/ACE_wrappers/ace/Framework_Component_T.h index 2dcef43e384..f8d365a86c0 100644 --- a/dep/ACE_wrappers/ace/Framework_Component_T.h +++ b/dep/ACE_wrappers/ace/Framework_Component_T.h @@ -69,3 +69,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_FRAMEWORK_COMPONENT_T_H */ + diff --git a/dep/ACE_wrappers/ace/Free_List.cpp b/dep/ACE_wrappers/ace/Free_List.cpp index 4da723f4898..924665572de 100644 --- a/dep/ACE_wrappers/ace/Free_List.cpp +++ b/dep/ACE_wrappers/ace/Free_List.cpp @@ -161,3 +161,4 @@ ACE_Locked_Free_List<T, ACE_LOCK>::dealloc (size_t n) ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_FREE_LIST_CPP */ + diff --git a/dep/ACE_wrappers/ace/Free_List.h b/dep/ACE_wrappers/ace/Free_List.h index 3d429dcafcb..ba1f0e4dded 100644 --- a/dep/ACE_wrappers/ace/Free_List.h +++ b/dep/ACE_wrappers/ace/Free_List.h @@ -148,3 +148,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_FREE_LIST_H */ + diff --git a/dep/ACE_wrappers/ace/Functor.cpp b/dep/ACE_wrappers/ace/Functor.cpp index 429aaac9f22..618adcf5a61 100644 --- a/dep/ACE_wrappers/ace/Functor.cpp +++ b/dep/ACE_wrappers/ace/Functor.cpp @@ -41,3 +41,4 @@ ACE_Command_Base::~ACE_Command_Base (void) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Functor.h b/dep/ACE_wrappers/ace/Functor.h index 8504cf0764b..d8f393c68b6 100644 --- a/dep/ACE_wrappers/ace/Functor.h +++ b/dep/ACE_wrappers/ace/Functor.h @@ -591,3 +591,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_FUNCTOR_H */ + diff --git a/dep/ACE_wrappers/ace/Functor_String.cpp b/dep/ACE_wrappers/ace/Functor_String.cpp index c113f5cdf6f..798c9d26286 100644 --- a/dep/ACE_wrappers/ace/Functor_String.cpp +++ b/dep/ACE_wrappers/ace/Functor_String.cpp @@ -5,3 +5,4 @@ #endif /* __ACE_INLINE__ */ ACE_RCSID(ace, Functor, "$Id: Functor_String.cpp 80826 2008-03-04 14:51:23Z wotte $") + diff --git a/dep/ACE_wrappers/ace/Functor_String.h b/dep/ACE_wrappers/ace/Functor_String.h index 6070fcf1bea..5fabef1f625 100644 --- a/dep/ACE_wrappers/ace/Functor_String.h +++ b/dep/ACE_wrappers/ace/Functor_String.h @@ -139,3 +139,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /*ACE_FUNCTOR_STRING_H*/ + diff --git a/dep/ACE_wrappers/ace/Functor_T.cpp b/dep/ACE_wrappers/ace/Functor_T.cpp index 213b501aac1..b3018ade8b7 100644 --- a/dep/ACE_wrappers/ace/Functor_T.cpp +++ b/dep/ACE_wrappers/ace/Functor_T.cpp @@ -47,3 +47,4 @@ ACE_Command_Callback<RECEIVER, ACTION>::execute (void *arg) ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_FUNCTOR_T_CPP */ + diff --git a/dep/ACE_wrappers/ace/Functor_T.h b/dep/ACE_wrappers/ace/Functor_T.h index f055c3c885e..4a3a621366c 100644 --- a/dep/ACE_wrappers/ace/Functor_T.h +++ b/dep/ACE_wrappers/ace/Functor_T.h @@ -156,3 +156,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_FUNCTOR_T_H */ + diff --git a/dep/ACE_wrappers/ace/Future.cpp b/dep/ACE_wrappers/ace/Future.cpp index e3693bd29b6..af1321c4bd8 100644 --- a/dep/ACE_wrappers/ace/Future.cpp +++ b/dep/ACE_wrappers/ace/Future.cpp @@ -434,3 +434,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_THREADS */ #endif /* ACE_FUTURE_CPP */ + diff --git a/dep/ACE_wrappers/ace/Future.h b/dep/ACE_wrappers/ace/Future.h index e30159eaf96..d86efd5a485 100644 --- a/dep/ACE_wrappers/ace/Future.h +++ b/dep/ACE_wrappers/ace/Future.h @@ -385,3 +385,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_FUTURE_H */ + diff --git a/dep/ACE_wrappers/ace/Future_Set.cpp b/dep/ACE_wrappers/ace/Future_Set.cpp index fceca83dd5a..7c1ae7d9341 100644 --- a/dep/ACE_wrappers/ace/Future_Set.cpp +++ b/dep/ACE_wrappers/ace/Future_Set.cpp @@ -134,3 +134,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_THREADS */ #endif /* ACE_FUTURE_SET_CPP */ + diff --git a/dep/ACE_wrappers/ace/Future_Set.h b/dep/ACE_wrappers/ace/Future_Set.h index a954d299746..b41fc673986 100644 --- a/dep/ACE_wrappers/ace/Future_Set.h +++ b/dep/ACE_wrappers/ace/Future_Set.h @@ -144,3 +144,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_THREADS */ #include /**/ "ace/post.h" #endif /* ACE_FUTURE_SET_H */ + diff --git a/dep/ACE_wrappers/ace/Get_Opt.cpp b/dep/ACE_wrappers/ace/Get_Opt.cpp index 915ff8a87a9..9725171701d 100644 --- a/dep/ACE_wrappers/ace/Get_Opt.cpp +++ b/dep/ACE_wrappers/ace/Get_Opt.cpp @@ -732,3 +732,4 @@ ACE_Get_Opt::ACE_Get_Opt_Long_Option::~ACE_Get_Opt_Long_Option (void) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Get_Opt.h b/dep/ACE_wrappers/ace/Get_Opt.h index 3b4a420d91c..e00518954e6 100644 --- a/dep/ACE_wrappers/ace/Get_Opt.h +++ b/dep/ACE_wrappers/ace/Get_Opt.h @@ -492,3 +492,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_GET_OPT_H */ + diff --git a/dep/ACE_wrappers/ace/Global_Macros.h b/dep/ACE_wrappers/ace/Global_Macros.h index d1bf6420b05..12f6a2465c6 100644 --- a/dep/ACE_wrappers/ace/Global_Macros.h +++ b/dep/ACE_wrappers/ace/Global_Macros.h @@ -1119,3 +1119,4 @@ ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (AC #include /**/ "ace/post.h" #endif /*ACE_GLOBAL_MACROS_H*/ + diff --git a/dep/ACE_wrappers/ace/Guard_T.cpp b/dep/ACE_wrappers/ace/Guard_T.cpp index a21fc2e2fc7..d35e27c4d99 100644 --- a/dep/ACE_wrappers/ace/Guard_T.cpp +++ b/dep/ACE_wrappers/ace/Guard_T.cpp @@ -59,3 +59,4 @@ ACE_Read_Guard<ACE_LOCK>::dump (void) const ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_GUARD_T_CPP */ + diff --git a/dep/ACE_wrappers/ace/Guard_T.h b/dep/ACE_wrappers/ace/Guard_T.h index 46d555505af..a70bdda713a 100644 --- a/dep/ACE_wrappers/ace/Guard_T.h +++ b/dep/ACE_wrappers/ace/Guard_T.h @@ -363,3 +363,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_GUARD_T_H */ + diff --git a/dep/ACE_wrappers/ace/Handle_Gobbler.h b/dep/ACE_wrappers/ace/Handle_Gobbler.h index 9d6890a03fc..9e9805a676f 100644 --- a/dep/ACE_wrappers/ace/Handle_Gobbler.h +++ b/dep/ACE_wrappers/ace/Handle_Gobbler.h @@ -66,3 +66,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_HANDLE_GOBBLER_H */ + diff --git a/dep/ACE_wrappers/ace/Handle_Ops.cpp b/dep/ACE_wrappers/ace/Handle_Ops.cpp index 0ec856cf1c9..213fa933d7a 100644 --- a/dep/ACE_wrappers/ace/Handle_Ops.cpp +++ b/dep/ACE_wrappers/ace/Handle_Ops.cpp @@ -46,3 +46,4 @@ ACE::handle_timed_open (ACE_Time_Value *timeout, } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Handle_Ops.h b/dep/ACE_wrappers/ace/Handle_Ops.h index c615380f8dd..16ee852725d 100644 --- a/dep/ACE_wrappers/ace/Handle_Ops.h +++ b/dep/ACE_wrappers/ace/Handle_Ops.h @@ -48,3 +48,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_HANDLE_OPS_H */ + diff --git a/dep/ACE_wrappers/ace/Handle_Set.cpp b/dep/ACE_wrappers/ace/Handle_Set.cpp index 8eb5186cc21..288d0010169 100644 --- a/dep/ACE_wrappers/ace/Handle_Set.cpp +++ b/dep/ACE_wrappers/ace/Handle_Set.cpp @@ -568,3 +568,4 @@ ACE_Handle_Set_Iterator::reset_state (void) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Handle_Set.h b/dep/ACE_wrappers/ace/Handle_Set.h index a2967222175..6e33055b4f6 100644 --- a/dep/ACE_wrappers/ace/Handle_Set.h +++ b/dep/ACE_wrappers/ace/Handle_Set.h @@ -238,3 +238,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_HANDLE_SET */ + diff --git a/dep/ACE_wrappers/ace/Hash_Cache_Map_Manager_T.cpp b/dep/ACE_wrappers/ace/Hash_Cache_Map_Manager_T.cpp index 2d9f163c5d3..6601bd4bdd7 100644 --- a/dep/ACE_wrappers/ace/Hash_Cache_Map_Manager_T.cpp +++ b/dep/ACE_wrappers/ace/Hash_Cache_Map_Manager_T.cpp @@ -230,3 +230,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #undef ACE_T2 #endif /* ACE_HASH_CACHE_MAP_MANAGER_T_CPP */ + diff --git a/dep/ACE_wrappers/ace/Hash_Cache_Map_Manager_T.h b/dep/ACE_wrappers/ace/Hash_Cache_Map_Manager_T.h index 7d54e1fba93..5326c97d33f 100644 --- a/dep/ACE_wrappers/ace/Hash_Cache_Map_Manager_T.h +++ b/dep/ACE_wrappers/ace/Hash_Cache_Map_Manager_T.h @@ -212,3 +212,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* HASH_CACHE_MAP_MANAGER_T_H */ + diff --git a/dep/ACE_wrappers/ace/Hash_Map_Manager.h b/dep/ACE_wrappers/ace/Hash_Map_Manager.h index d6c0c4b8ae3..0e253eb4cb9 100644 --- a/dep/ACE_wrappers/ace/Hash_Map_Manager.h +++ b/dep/ACE_wrappers/ace/Hash_Map_Manager.h @@ -29,3 +29,4 @@ #include /**/ "ace/post.h" #endif /* ACE_HASH_MAP_MANAGER_H */ + diff --git a/dep/ACE_wrappers/ace/Hash_Map_Manager_T.cpp b/dep/ACE_wrappers/ace/Hash_Map_Manager_T.cpp index 6e55236f95f..d628ebdcec0 100644 --- a/dep/ACE_wrappers/ace/Hash_Map_Manager_T.cpp +++ b/dep/ACE_wrappers/ace/Hash_Map_Manager_T.cpp @@ -528,3 +528,4 @@ ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_ ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HASH_MAP_MANAGER_T_CPP */ + diff --git a/dep/ACE_wrappers/ace/Hash_Map_Manager_T.h b/dep/ACE_wrappers/ace/Hash_Map_Manager_T.h index 7585b1961bb..9ef8e23c7ea 100644 --- a/dep/ACE_wrappers/ace/Hash_Map_Manager_T.h +++ b/dep/ACE_wrappers/ace/Hash_Map_Manager_T.h @@ -1301,3 +1301,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_HASH_MAP_MANAGER_T_H */ + diff --git a/dep/ACE_wrappers/ace/Hash_Map_With_Allocator_T.cpp b/dep/ACE_wrappers/ace/Hash_Map_With_Allocator_T.cpp index a5310e89fb3..09a5abf1d9c 100644 --- a/dep/ACE_wrappers/ace/Hash_Map_With_Allocator_T.cpp +++ b/dep/ACE_wrappers/ace/Hash_Map_With_Allocator_T.cpp @@ -33,3 +33,4 @@ ACE_Hash_Map_With_Allocator<EXT_ID, INT_ID>::ACE_Hash_Map_With_Allocator (size_t ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HASH_MAP_WITH_ALLOCATOR_T_CPP */ + diff --git a/dep/ACE_wrappers/ace/Hash_Map_With_Allocator_T.h b/dep/ACE_wrappers/ace/Hash_Map_With_Allocator_T.h index 5d5dabc093b..cb42eee5929 100644 --- a/dep/ACE_wrappers/ace/Hash_Map_With_Allocator_T.h +++ b/dep/ACE_wrappers/ace/Hash_Map_With_Allocator_T.h @@ -110,3 +110,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_HASH_MAP_WITH_ALLOCATOR_T_H */ + diff --git a/dep/ACE_wrappers/ace/Hash_Multi_Map_Manager_T.cpp b/dep/ACE_wrappers/ace/Hash_Multi_Map_Manager_T.cpp index f4ea66fbb22..939bf967433 100644 --- a/dep/ACE_wrappers/ace/Hash_Multi_Map_Manager_T.cpp +++ b/dep/ACE_wrappers/ace/Hash_Multi_Map_Manager_T.cpp @@ -603,3 +603,4 @@ ACE_Hash_Multi_Map_Const_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, A ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_Hash_Multi_Map_Manager_T_CPP */ + diff --git a/dep/ACE_wrappers/ace/Hash_Multi_Map_Manager_T.h b/dep/ACE_wrappers/ace/Hash_Multi_Map_Manager_T.h index e9a8ad0d182..1719819213d 100644 --- a/dep/ACE_wrappers/ace/Hash_Multi_Map_Manager_T.h +++ b/dep/ACE_wrappers/ace/Hash_Multi_Map_Manager_T.h @@ -965,3 +965,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_HASH_MULTI_MAP_MANAGER_T_H */ + diff --git a/dep/ACE_wrappers/ace/Hashable.cpp b/dep/ACE_wrappers/ace/Hashable.cpp index 94c25faf1c8..c3c9bc43a1a 100644 --- a/dep/ACE_wrappers/ace/Hashable.cpp +++ b/dep/ACE_wrappers/ace/Hashable.cpp @@ -34,3 +34,4 @@ ACE_Hashable::hash (void) const } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Hashable.h b/dep/ACE_wrappers/ace/Hashable.h index 83f26ffee19..88e272cd8b9 100644 --- a/dep/ACE_wrappers/ace/Hashable.h +++ b/dep/ACE_wrappers/ace/Hashable.h @@ -63,3 +63,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /*ACE_HASHABLE_H*/ + diff --git a/dep/ACE_wrappers/ace/High_Res_Timer.cpp b/dep/ACE_wrappers/ace/High_Res_Timer.cpp index 8350de991f7..181c1da5682 100644 --- a/dep/ACE_wrappers/ace/High_Res_Timer.cpp +++ b/dep/ACE_wrappers/ace/High_Res_Timer.cpp @@ -533,3 +533,4 @@ ACE_High_Res_Timer::get_env_global_scale_factor (const ACE_TCHAR *env) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/High_Res_Timer.h b/dep/ACE_wrappers/ace/High_Res_Timer.h index 482205f1376..83584c39b19 100644 --- a/dep/ACE_wrappers/ace/High_Res_Timer.h +++ b/dep/ACE_wrappers/ace/High_Res_Timer.h @@ -313,3 +313,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_HIGH_RES_TIMER_H */ + diff --git a/dep/ACE_wrappers/ace/ICMP_Socket.cpp b/dep/ACE_wrappers/ace/ICMP_Socket.cpp index 6178858f989..51f8a9b2064 100644 --- a/dep/ACE_wrappers/ace/ICMP_Socket.cpp +++ b/dep/ACE_wrappers/ace/ICMP_Socket.cpp @@ -184,3 +184,4 @@ ACE_ICMP_Socket::calculate_checksum (unsigned short * paddress, ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_ICMP_SUPPORT == 1 */ + diff --git a/dep/ACE_wrappers/ace/ICMP_Socket.h b/dep/ACE_wrappers/ace/ICMP_Socket.h index 251ec307a4b..edb179ffb3a 100644 --- a/dep/ACE_wrappers/ace/ICMP_Socket.h +++ b/dep/ACE_wrappers/ace/ICMP_Socket.h @@ -108,3 +108,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_ICMP_SOCKET_H */ + diff --git a/dep/ACE_wrappers/ace/INET_Addr.cpp b/dep/ACE_wrappers/ace/INET_Addr.cpp index 2b03349bca6..6da4417f08e 100644 --- a/dep/ACE_wrappers/ace/INET_Addr.cpp +++ b/dep/ACE_wrappers/ace/INET_Addr.cpp @@ -1158,3 +1158,4 @@ ACE_INET_Addr::get_ip_address (void) const } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/INET_Addr.h b/dep/ACE_wrappers/ace/INET_Addr.h index 2902ebb4631..aadd0de1022 100644 --- a/dep/ACE_wrappers/ace/INET_Addr.h +++ b/dep/ACE_wrappers/ace/INET_Addr.h @@ -388,3 +388,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_INET_ADDR_H */ + diff --git a/dep/ACE_wrappers/ace/IOStream.cpp b/dep/ACE_wrappers/ace/IOStream.cpp index 7ace37ee81b..0b6ac17ca6f 100644 --- a/dep/ACE_wrappers/ace/IOStream.cpp +++ b/dep/ACE_wrappers/ace/IOStream.cpp @@ -663,3 +663,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #endif /* !ACE_LACKS_ACE_IOSTREAM */ #endif /* ACE_IOSTREAM_CPP */ + diff --git a/dep/ACE_wrappers/ace/IOStream.h b/dep/ACE_wrappers/ace/IOStream.h index 8a135a5e426..d7995a8e4f6 100644 --- a/dep/ACE_wrappers/ace/IOStream.h +++ b/dep/ACE_wrappers/ace/IOStream.h @@ -510,3 +510,4 @@ typedef ostream& (*__omanip_)(ostream&); #include /**/ "ace/post.h" #endif /* ACE_IOSTREAM_H */ + diff --git a/dep/ACE_wrappers/ace/IOStream_T.cpp b/dep/ACE_wrappers/ace/IOStream_T.cpp index 3e7817d7c61..3bf109b6737 100644 --- a/dep/ACE_wrappers/ace/IOStream_T.cpp +++ b/dep/ACE_wrappers/ace/IOStream_T.cpp @@ -245,3 +245,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_STRING_CLASS */ #endif /* ACE_LACKS_ACE_IOSTREAM */ #endif /* ACE_IOSTREAM_T_CPP */ + diff --git a/dep/ACE_wrappers/ace/IOStream_T.h b/dep/ACE_wrappers/ace/IOStream_T.h index 286f1a714d5..e0046f921a3 100644 --- a/dep/ACE_wrappers/ace/IOStream_T.h +++ b/dep/ACE_wrappers/ace/IOStream_T.h @@ -295,3 +295,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_IOSTREAM_T_H */ + diff --git a/dep/ACE_wrappers/ace/IO_Cntl_Msg.cpp b/dep/ACE_wrappers/ace/IO_Cntl_Msg.cpp index c730f97101c..213237298c4 100644 --- a/dep/ACE_wrappers/ace/IO_Cntl_Msg.cpp +++ b/dep/ACE_wrappers/ace/IO_Cntl_Msg.cpp @@ -49,3 +49,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #endif + diff --git a/dep/ACE_wrappers/ace/IO_Cntl_Msg.h b/dep/ACE_wrappers/ace/IO_Cntl_Msg.h index 1b20f53d46a..e99d0189620 100644 --- a/dep/ACE_wrappers/ace/IO_Cntl_Msg.h +++ b/dep/ACE_wrappers/ace/IO_Cntl_Msg.h @@ -110,3 +110,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_IO_CNTL_MSG_H */ + diff --git a/dep/ACE_wrappers/ace/IO_SAP.cpp b/dep/ACE_wrappers/ace/IO_SAP.cpp index 37200bfea7a..bfb693f9871 100644 --- a/dep/ACE_wrappers/ace/IO_SAP.cpp +++ b/dep/ACE_wrappers/ace/IO_SAP.cpp @@ -140,3 +140,4 @@ ACE_IO_SAP::disable (int value) const } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/IO_SAP.h b/dep/ACE_wrappers/ace/IO_SAP.h index b460c2346aa..94f717c7981 100644 --- a/dep/ACE_wrappers/ace/IO_SAP.h +++ b/dep/ACE_wrappers/ace/IO_SAP.h @@ -94,3 +94,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_IO_SAP_H */ + diff --git a/dep/ACE_wrappers/ace/IPC_SAP.cpp b/dep/ACE_wrappers/ace/IPC_SAP.cpp index bc3e9f7afe0..d257bf60ea5 100644 --- a/dep/ACE_wrappers/ace/IPC_SAP.cpp +++ b/dep/ACE_wrappers/ace/IPC_SAP.cpp @@ -191,3 +191,4 @@ ACE_IPC_SAP::disable (int value) const } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/IPC_SAP.h b/dep/ACE_wrappers/ace/IPC_SAP.h index 43a2125c575..cc924a24ade 100644 --- a/dep/ACE_wrappers/ace/IPC_SAP.h +++ b/dep/ACE_wrappers/ace/IPC_SAP.h @@ -94,3 +94,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_IPC_SAP_H */ + diff --git a/dep/ACE_wrappers/ace/If_Then_Else.h b/dep/ACE_wrappers/ace/If_Then_Else.h index eca1d9dd83a..67f08f6f8e4 100644 --- a/dep/ACE_wrappers/ace/If_Then_Else.h +++ b/dep/ACE_wrappers/ace/If_Then_Else.h @@ -87,3 +87,4 @@ namespace ACE ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_IF_THEN_ELSE_H */ + diff --git a/dep/ACE_wrappers/ace/Init_ACE.cpp b/dep/ACE_wrappers/ace/Init_ACE.cpp index f0c953f824e..655ef539d6f 100644 --- a/dep/ACE_wrappers/ace/Init_ACE.cpp +++ b/dep/ACE_wrappers/ace/Init_ACE.cpp @@ -43,3 +43,4 @@ ACE::fini (void) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Init_ACE.h b/dep/ACE_wrappers/ace/Init_ACE.h index 2492f6930de..9f2afa34669 100644 --- a/dep/ACE_wrappers/ace/Init_ACE.h +++ b/dep/ACE_wrappers/ace/Init_ACE.h @@ -60,3 +60,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_INIT_ACE_H */ + diff --git a/dep/ACE_wrappers/ace/Intrusive_Auto_Ptr.cpp b/dep/ACE_wrappers/ace/Intrusive_Auto_Ptr.cpp index 4f9890353c1..0b27e72e02e 100644 --- a/dep/ACE_wrappers/ace/Intrusive_Auto_Ptr.cpp +++ b/dep/ACE_wrappers/ace/Intrusive_Auto_Ptr.cpp @@ -20,3 +20,4 @@ ACE_Intrusive_Auto_Ptr<X>::~ACE_Intrusive_Auto_Ptr (void) ACE_END_VERSIONED_NAMESPACE_DECL #endif /* !ACE_INTRUSIVE_AUTO_PTR_CPP */ + diff --git a/dep/ACE_wrappers/ace/Intrusive_Auto_Ptr.h b/dep/ACE_wrappers/ace/Intrusive_Auto_Ptr.h index 9c6ad348236..85d52f7f1c5 100644 --- a/dep/ACE_wrappers/ace/Intrusive_Auto_Ptr.h +++ b/dep/ACE_wrappers/ace/Intrusive_Auto_Ptr.h @@ -163,3 +163,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_INTRUSIVE_AUTO_PTR_H */ + diff --git a/dep/ACE_wrappers/ace/Intrusive_List.cpp b/dep/ACE_wrappers/ace/Intrusive_List.cpp index bdb17837d64..e8a3a951e1d 100644 --- a/dep/ACE_wrappers/ace/Intrusive_List.cpp +++ b/dep/ACE_wrappers/ace/Intrusive_List.cpp @@ -151,3 +151,4 @@ ACE_Intrusive_List<T>::check_invariants (void) ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_INTRUSIVE_LIST_CPP */ + diff --git a/dep/ACE_wrappers/ace/Intrusive_List.h b/dep/ACE_wrappers/ace/Intrusive_List.h index 146d11b357f..24e7cedfc13 100644 --- a/dep/ACE_wrappers/ace/Intrusive_List.h +++ b/dep/ACE_wrappers/ace/Intrusive_List.h @@ -142,3 +142,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_INTRUSIVE_LIST_H */ + diff --git a/dep/ACE_wrappers/ace/Intrusive_List_Node.cpp b/dep/ACE_wrappers/ace/Intrusive_List_Node.cpp index 1e14537a4d2..347bb677de6 100644 --- a/dep/ACE_wrappers/ace/Intrusive_List_Node.cpp +++ b/dep/ACE_wrappers/ace/Intrusive_List_Node.cpp @@ -25,3 +25,4 @@ ACE_Intrusive_List_Node<T>::ACE_Intrusive_List_Node (void) ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_INTRUSIVE_LIST_NODE_CPP */ + diff --git a/dep/ACE_wrappers/ace/Intrusive_List_Node.h b/dep/ACE_wrappers/ace/Intrusive_List_Node.h index 32780b8f387..21ea961f220 100644 --- a/dep/ACE_wrappers/ace/Intrusive_List_Node.h +++ b/dep/ACE_wrappers/ace/Intrusive_List_Node.h @@ -83,3 +83,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_INTRUSIVE_LIST_NODE_H */ + diff --git a/dep/ACE_wrappers/ace/LOCK_SOCK_Acceptor.cpp b/dep/ACE_wrappers/ace/LOCK_SOCK_Acceptor.cpp index bea8c9015f3..aa525a9b226 100644 --- a/dep/ACE_wrappers/ace/LOCK_SOCK_Acceptor.cpp +++ b/dep/ACE_wrappers/ace/LOCK_SOCK_Acceptor.cpp @@ -33,3 +33,4 @@ ACE_LOCK_SOCK_Acceptor<ACE_LOCK>::lock (void) ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_LOCK_SOCK_ACCEPTOR_CPP */ + diff --git a/dep/ACE_wrappers/ace/LOCK_SOCK_Acceptor.h b/dep/ACE_wrappers/ace/LOCK_SOCK_Acceptor.h index 6fa5eb0087b..6429a2888c8 100644 --- a/dep/ACE_wrappers/ace/LOCK_SOCK_Acceptor.h +++ b/dep/ACE_wrappers/ace/LOCK_SOCK_Acceptor.h @@ -65,3 +65,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_LOCK_SOCK_ACCEPTOR_H */ + diff --git a/dep/ACE_wrappers/ace/LSOCK.cpp b/dep/ACE_wrappers/ace/LSOCK.cpp index 2db68b5ed86..17c210aa9fc 100644 --- a/dep/ACE_wrappers/ace/LSOCK.cpp +++ b/dep/ACE_wrappers/ace/LSOCK.cpp @@ -179,3 +179,4 @@ ACE_LSOCK::recv_handle (ACE_HANDLE &handle, char *pbuf, ssize_t *len) const ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */ + diff --git a/dep/ACE_wrappers/ace/LSOCK.h b/dep/ACE_wrappers/ace/LSOCK.h index 7cf7abc478c..250362cdaef 100644 --- a/dep/ACE_wrappers/ace/LSOCK.h +++ b/dep/ACE_wrappers/ace/LSOCK.h @@ -82,3 +82,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */ #include /**/ "ace/post.h" #endif /* ACE_LOCAL_SOCK_H */ + diff --git a/dep/ACE_wrappers/ace/LSOCK_Acceptor.cpp b/dep/ACE_wrappers/ace/LSOCK_Acceptor.cpp index 0259697ea5f..ece671beae3 100644 --- a/dep/ACE_wrappers/ace/LSOCK_Acceptor.cpp +++ b/dep/ACE_wrappers/ace/LSOCK_Acceptor.cpp @@ -141,3 +141,4 @@ ACE_LSOCK_Acceptor::remove (void) ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */ + diff --git a/dep/ACE_wrappers/ace/LSOCK_Acceptor.h b/dep/ACE_wrappers/ace/LSOCK_Acceptor.h index f5a4067ca0a..1168c389ab6 100644 --- a/dep/ACE_wrappers/ace/LSOCK_Acceptor.h +++ b/dep/ACE_wrappers/ace/LSOCK_Acceptor.h @@ -93,3 +93,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */ #include /**/ "ace/post.h" #endif /* ACE_LOCAL_SOCK_ACCEPTOR_H */ + diff --git a/dep/ACE_wrappers/ace/LSOCK_CODgram.cpp b/dep/ACE_wrappers/ace/LSOCK_CODgram.cpp index e1e2c0b01cd..9f2b23574be 100644 --- a/dep/ACE_wrappers/ace/LSOCK_CODgram.cpp +++ b/dep/ACE_wrappers/ace/LSOCK_CODgram.cpp @@ -60,3 +60,4 @@ ACE_LSOCK_CODgram::ACE_LSOCK_CODgram (const ACE_Addr &remote, ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */ + diff --git a/dep/ACE_wrappers/ace/LSOCK_CODgram.h b/dep/ACE_wrappers/ace/LSOCK_CODgram.h index 87062051d00..1ea5ba00386 100644 --- a/dep/ACE_wrappers/ace/LSOCK_CODgram.h +++ b/dep/ACE_wrappers/ace/LSOCK_CODgram.h @@ -76,3 +76,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */ #include /**/ "ace/post.h" #endif /* ACE_LOCAL_SOCK_CODGRAM_H */ + diff --git a/dep/ACE_wrappers/ace/LSOCK_Connector.cpp b/dep/ACE_wrappers/ace/LSOCK_Connector.cpp index c1e21b9d542..efb2063320e 100644 --- a/dep/ACE_wrappers/ace/LSOCK_Connector.cpp +++ b/dep/ACE_wrappers/ace/LSOCK_Connector.cpp @@ -57,3 +57,4 @@ ACE_LSOCK_Connector::ACE_LSOCK_Connector (ACE_LSOCK_Stream &new_stream, ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */ + diff --git a/dep/ACE_wrappers/ace/LSOCK_Connector.h b/dep/ACE_wrappers/ace/LSOCK_Connector.h index 03d0fd0a5b1..84946d63a66 100644 --- a/dep/ACE_wrappers/ace/LSOCK_Connector.h +++ b/dep/ACE_wrappers/ace/LSOCK_Connector.h @@ -89,3 +89,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */ #include /**/ "ace/post.h" #endif /* ACE_LOCAL_SOCK_CONNECTOR_H */ + diff --git a/dep/ACE_wrappers/ace/LSOCK_Dgram.cpp b/dep/ACE_wrappers/ace/LSOCK_Dgram.cpp index 60e630f0bc0..5cb18a611a4 100644 --- a/dep/ACE_wrappers/ace/LSOCK_Dgram.cpp +++ b/dep/ACE_wrappers/ace/LSOCK_Dgram.cpp @@ -69,3 +69,4 @@ ACE_LSOCK_Dgram::ACE_LSOCK_Dgram (const ACE_Addr &local, ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */ + diff --git a/dep/ACE_wrappers/ace/LSOCK_Dgram.h b/dep/ACE_wrappers/ace/LSOCK_Dgram.h index e21a3ce9e62..17fad2b7b43 100644 --- a/dep/ACE_wrappers/ace/LSOCK_Dgram.h +++ b/dep/ACE_wrappers/ace/LSOCK_Dgram.h @@ -72,3 +72,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */ #include /**/ "ace/post.h" #endif /* ACE_LOCAL_SOCK_DGRAM_H */ + diff --git a/dep/ACE_wrappers/ace/LSOCK_Stream.cpp b/dep/ACE_wrappers/ace/LSOCK_Stream.cpp index f8eae91243d..ab8110c7732 100644 --- a/dep/ACE_wrappers/ace/LSOCK_Stream.cpp +++ b/dep/ACE_wrappers/ace/LSOCK_Stream.cpp @@ -135,3 +135,4 @@ ACE_LSOCK_Stream::recv_msg (iovec iov[], ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */ + diff --git a/dep/ACE_wrappers/ace/LSOCK_Stream.h b/dep/ACE_wrappers/ace/LSOCK_Stream.h index 3476a51df7b..e95641ba725 100644 --- a/dep/ACE_wrappers/ace/LSOCK_Stream.h +++ b/dep/ACE_wrappers/ace/LSOCK_Stream.h @@ -80,3 +80,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */ #include /**/ "ace/post.h" #endif /* ACE_LOCAL_SOCK_STREAM_H */ + diff --git a/dep/ACE_wrappers/ace/Lib_Find.cpp b/dep/ACE_wrappers/ace/Lib_Find.cpp index 913e94e941d..3654751bb58 100644 --- a/dep/ACE_wrappers/ace/Lib_Find.cpp +++ b/dep/ACE_wrappers/ace/Lib_Find.cpp @@ -767,3 +767,4 @@ ACE::strrepl (wchar_t *s, wchar_t search, wchar_t replace) #endif /* ACE_HAS_WCHAR */ ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Lib_Find.h b/dep/ACE_wrappers/ace/Lib_Find.h index 133b83ffb7b..1651eb77f43 100644 --- a/dep/ACE_wrappers/ace/Lib_Find.h +++ b/dep/ACE_wrappers/ace/Lib_Find.h @@ -129,3 +129,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_LIB_FIND_H */ + diff --git a/dep/ACE_wrappers/ace/Local_Memory_Pool.cpp b/dep/ACE_wrappers/ace/Local_Memory_Pool.cpp index 559b6656f30..ebec0ad75aa 100644 --- a/dep/ACE_wrappers/ace/Local_Memory_Pool.cpp +++ b/dep/ACE_wrappers/ace/Local_Memory_Pool.cpp @@ -142,3 +142,4 @@ ACE_Local_Memory_Pool::round_up (size_t nbytes) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Local_Memory_Pool.h b/dep/ACE_wrappers/ace/Local_Memory_Pool.h index 4216a97a713..f02b101c0dc 100644 --- a/dep/ACE_wrappers/ace/Local_Memory_Pool.h +++ b/dep/ACE_wrappers/ace/Local_Memory_Pool.h @@ -131,3 +131,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_LOCAL_MEMORY_POOL_H */ + diff --git a/dep/ACE_wrappers/ace/Local_Name_Space.cpp b/dep/ACE_wrappers/ace/Local_Name_Space.cpp index b3e13d7d900..deba2ab215d 100644 --- a/dep/ACE_wrappers/ace/Local_Name_Space.cpp +++ b/dep/ACE_wrappers/ace/Local_Name_Space.cpp @@ -167,3 +167,4 @@ ACE_NS_Internal::type (void) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Local_Name_Space.h b/dep/ACE_wrappers/ace/Local_Name_Space.h index c9606d02bf2..09aadcaa4de 100644 --- a/dep/ACE_wrappers/ace/Local_Name_Space.h +++ b/dep/ACE_wrappers/ace/Local_Name_Space.h @@ -130,3 +130,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_LOCAL_NAME_SPACE_H */ + diff --git a/dep/ACE_wrappers/ace/Local_Name_Space_T.cpp b/dep/ACE_wrappers/ace/Local_Name_Space_T.cpp index 9acfd1df7a5..1c249586767 100644 --- a/dep/ACE_wrappers/ace/Local_Name_Space_T.cpp +++ b/dep/ACE_wrappers/ace/Local_Name_Space_T.cpp @@ -964,3 +964,4 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::dump (void) const ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_LOCAL_NAME_SPACE_T_CPP */ + diff --git a/dep/ACE_wrappers/ace/Local_Name_Space_T.h b/dep/ACE_wrappers/ace/Local_Name_Space_T.h index 9822a22a6e7..1263cebd5ab 100644 --- a/dep/ACE_wrappers/ace/Local_Name_Space_T.h +++ b/dep/ACE_wrappers/ace/Local_Name_Space_T.h @@ -278,3 +278,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_LOCAL_NAME_SPACE_T_H */ + diff --git a/dep/ACE_wrappers/ace/Local_Tokens.cpp b/dep/ACE_wrappers/ace/Local_Tokens.cpp index b41c8c31dd0..2fc6eed1acf 100644 --- a/dep/ACE_wrappers/ace/Local_Tokens.cpp +++ b/dep/ACE_wrappers/ace/Local_Tokens.cpp @@ -1621,3 +1621,4 @@ ACE_Local_WLock::clone (void) const ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_TOKENS_LIBRARY */ + diff --git a/dep/ACE_wrappers/ace/Local_Tokens.h b/dep/ACE_wrappers/ace/Local_Tokens.h index 373e846719e..611643b7752 100644 --- a/dep/ACE_wrappers/ace/Local_Tokens.h +++ b/dep/ACE_wrappers/ace/Local_Tokens.h @@ -1119,3 +1119,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" #endif /* ACE_LOCAL_MUTEX_H */ + diff --git a/dep/ACE_wrappers/ace/Lock.cpp b/dep/ACE_wrappers/ace/Lock.cpp index eae8c3bd8d0..f3fd45f4b95 100644 --- a/dep/ACE_wrappers/ace/Lock.cpp +++ b/dep/ACE_wrappers/ace/Lock.cpp @@ -86,3 +86,4 @@ ACE_Adaptive_Lock::dump (void) const } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Lock.h b/dep/ACE_wrappers/ace/Lock.h index 36f99939b56..8a2db49e3d0 100644 --- a/dep/ACE_wrappers/ace/Lock.h +++ b/dep/ACE_wrappers/ace/Lock.h @@ -159,3 +159,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_LOCK_H */ + diff --git a/dep/ACE_wrappers/ace/Lock_Adapter_T.cpp b/dep/ACE_wrappers/ace/Lock_Adapter_T.cpp index fbe43afd217..c4685def246 100644 --- a/dep/ACE_wrappers/ace/Lock_Adapter_T.cpp +++ b/dep/ACE_wrappers/ace/Lock_Adapter_T.cpp @@ -115,3 +115,4 @@ ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::tryacquire_write_upgrade (void) ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_LOCK_ADAPTER_T_CPP */ + diff --git a/dep/ACE_wrappers/ace/Lock_Adapter_T.h b/dep/ACE_wrappers/ace/Lock_Adapter_T.h index 4c09f7d3ae8..1f0f4521dc5 100644 --- a/dep/ACE_wrappers/ace/Lock_Adapter_T.h +++ b/dep/ACE_wrappers/ace/Lock_Adapter_T.h @@ -121,3 +121,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_LOCK_ADAPTER_T_H */ + diff --git a/dep/ACE_wrappers/ace/Log_Msg.cpp b/dep/ACE_wrappers/ace/Log_Msg.cpp index 10d5b422d70..1fe455c56c3 100644 --- a/dep/ACE_wrappers/ace/Log_Msg.cpp +++ b/dep/ACE_wrappers/ace/Log_Msg.cpp @@ -2524,3 +2524,4 @@ ACE_Log_Msg::inherit_hook (ACE_OS_Thread_Descriptor *thr_desc, } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Log_Msg.h b/dep/ACE_wrappers/ace/Log_Msg.h index 69904a4db79..f799a6500ae 100644 --- a/dep/ACE_wrappers/ace/Log_Msg.h +++ b/dep/ACE_wrappers/ace/Log_Msg.h @@ -745,3 +745,4 @@ ACE_TSS_CLEANUP_NAME (void *ptr); #include /**/ "ace/post.h" #endif /* ACE_LOG_MSG_H */ + diff --git a/dep/ACE_wrappers/ace/Log_Msg_Backend.cpp b/dep/ACE_wrappers/ace/Log_Msg_Backend.cpp index 1d739471fa9..f8ed295fec5 100644 --- a/dep/ACE_wrappers/ace/Log_Msg_Backend.cpp +++ b/dep/ACE_wrappers/ace/Log_Msg_Backend.cpp @@ -12,3 +12,4 @@ ACE_Log_Msg_Backend::~ACE_Log_Msg_Backend (void) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Log_Msg_Backend.h b/dep/ACE_wrappers/ace/Log_Msg_Backend.h index ba3dba1c948..f9de2b8bf5b 100644 --- a/dep/ACE_wrappers/ace/Log_Msg_Backend.h +++ b/dep/ACE_wrappers/ace/Log_Msg_Backend.h @@ -86,3 +86,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_LOG_MSG_BACKEND_H */ + diff --git a/dep/ACE_wrappers/ace/Log_Msg_Callback.cpp b/dep/ACE_wrappers/ace/Log_Msg_Callback.cpp index b38113d24ba..b227843733d 100644 --- a/dep/ACE_wrappers/ace/Log_Msg_Callback.cpp +++ b/dep/ACE_wrappers/ace/Log_Msg_Callback.cpp @@ -11,3 +11,4 @@ ACE_Log_Msg_Callback::~ACE_Log_Msg_Callback (void) { } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Log_Msg_Callback.h b/dep/ACE_wrappers/ace/Log_Msg_Callback.h index f743987b472..4a3f6f77495 100644 --- a/dep/ACE_wrappers/ace/Log_Msg_Callback.h +++ b/dep/ACE_wrappers/ace/Log_Msg_Callback.h @@ -67,3 +67,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_LOG_MSG_CALLBACK_H */ + diff --git a/dep/ACE_wrappers/ace/Log_Msg_IPC.cpp b/dep/ACE_wrappers/ace/Log_Msg_IPC.cpp index b6319517a7b..7c61ac45979 100644 --- a/dep/ACE_wrappers/ace/Log_Msg_IPC.cpp +++ b/dep/ACE_wrappers/ace/Log_Msg_IPC.cpp @@ -109,3 +109,4 @@ ACE_Log_Msg_IPC::log (ACE_Log_Record &log_record) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Log_Msg_IPC.h b/dep/ACE_wrappers/ace/Log_Msg_IPC.h index c06b5f62f69..09c975b1c73 100644 --- a/dep/ACE_wrappers/ace/Log_Msg_IPC.h +++ b/dep/ACE_wrappers/ace/Log_Msg_IPC.h @@ -77,3 +77,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_LOG_MSG_H */ + diff --git a/dep/ACE_wrappers/ace/Log_Msg_NT_Event_Log.cpp b/dep/ACE_wrappers/ace/Log_Msg_NT_Event_Log.cpp index 5cfed4b25c2..c895373c95d 100644 --- a/dep/ACE_wrappers/ace/Log_Msg_NT_Event_Log.cpp +++ b/dep/ACE_wrappers/ace/Log_Msg_NT_Event_Log.cpp @@ -160,3 +160,4 @@ ACE_Log_Msg_NT_Event_Log::log (ACE_Log_Record &log_record) ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_LOG_MSG_NT_EVENT_LOG */ + diff --git a/dep/ACE_wrappers/ace/Log_Msg_NT_Event_Log.h b/dep/ACE_wrappers/ace/Log_Msg_NT_Event_Log.h index 777f8e97f9a..66920903ab6 100644 --- a/dep/ACE_wrappers/ace/Log_Msg_NT_Event_Log.h +++ b/dep/ACE_wrappers/ace/Log_Msg_NT_Event_Log.h @@ -70,3 +70,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_LOG_MSG_NT_EVENT_LOG_H */ + diff --git a/dep/ACE_wrappers/ace/Log_Msg_UNIX_Syslog.cpp b/dep/ACE_wrappers/ace/Log_Msg_UNIX_Syslog.cpp index 50e78754653..715886cef18 100644 --- a/dep/ACE_wrappers/ace/Log_Msg_UNIX_Syslog.cpp +++ b/dep/ACE_wrappers/ace/Log_Msg_UNIX_Syslog.cpp @@ -205,3 +205,4 @@ ACE_Log_Msg_UNIX_Syslog::convert_log_mask (int lm_mask) ACE_END_VERSIONED_NAMESPACE_DECL #endif /* !ACE_LACKS_UNIX_SYSLOG */ + diff --git a/dep/ACE_wrappers/ace/Log_Msg_UNIX_Syslog.h b/dep/ACE_wrappers/ace/Log_Msg_UNIX_Syslog.h index 3c762e8daa9..c781d6ab3e1 100644 --- a/dep/ACE_wrappers/ace/Log_Msg_UNIX_Syslog.h +++ b/dep/ACE_wrappers/ace/Log_Msg_UNIX_Syslog.h @@ -74,3 +74,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_LOG_MSG_UNIX_SYSLOG_H */ + diff --git a/dep/ACE_wrappers/ace/Log_Priority.h b/dep/ACE_wrappers/ace/Log_Priority.h index 3801ef39857..6abffaa0756 100644 --- a/dep/ACE_wrappers/ace/Log_Priority.h +++ b/dep/ACE_wrappers/ace/Log_Priority.h @@ -83,3 +83,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_LOG_PRIORITY_H */ + diff --git a/dep/ACE_wrappers/ace/Log_Record.cpp b/dep/ACE_wrappers/ace/Log_Record.cpp index f3ea5d6591c..8142dad0d1d 100644 --- a/dep/ACE_wrappers/ace/Log_Record.cpp +++ b/dep/ACE_wrappers/ace/Log_Record.cpp @@ -410,3 +410,4 @@ ACE_Log_Record::print (const ACE_TCHAR host_name[], #endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */ ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Log_Record.h b/dep/ACE_wrappers/ace/Log_Record.h index 9e9e2a92d18..be3e0b29e1e 100644 --- a/dep/ACE_wrappers/ace/Log_Record.h +++ b/dep/ACE_wrappers/ace/Log_Record.h @@ -221,3 +221,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_LOG_RECORD_H */ + diff --git a/dep/ACE_wrappers/ace/Logging_Strategy.cpp b/dep/ACE_wrappers/ace/Logging_Strategy.cpp index 05d913bc916..36f2726db51 100644 --- a/dep/ACE_wrappers/ace/Logging_Strategy.cpp +++ b/dep/ACE_wrappers/ace/Logging_Strategy.cpp @@ -564,3 +564,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL // Logging_Strategy. ACE_FACTORY_DEFINE (ACE, ACE_Logging_Strategy) + diff --git a/dep/ACE_wrappers/ace/Logging_Strategy.h b/dep/ACE_wrappers/ace/Logging_Strategy.h index bac0d956642..8af68b32593 100644 --- a/dep/ACE_wrappers/ace/Logging_Strategy.h +++ b/dep/ACE_wrappers/ace/Logging_Strategy.h @@ -193,3 +193,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL ACE_FACTORY_DECLARE (ACE, ACE_Logging_Strategy) #endif /* ACE_LOGGING_STRATEGY_H */ + diff --git a/dep/ACE_wrappers/ace/MEM_Acceptor.cpp b/dep/ACE_wrappers/ace/MEM_Acceptor.cpp index 920c3ca9c48..76bafc1ef05 100644 --- a/dep/ACE_wrappers/ace/MEM_Acceptor.cpp +++ b/dep/ACE_wrappers/ace/MEM_Acceptor.cpp @@ -263,3 +263,4 @@ ACE_MEM_Acceptor::shared_accept_finish (ACE_MEM_Stream new_stream, ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */ + diff --git a/dep/ACE_wrappers/ace/MEM_Acceptor.h b/dep/ACE_wrappers/ace/MEM_Acceptor.h index 58582c4d041..b982ab81642 100644 --- a/dep/ACE_wrappers/ace/MEM_Acceptor.h +++ b/dep/ACE_wrappers/ace/MEM_Acceptor.h @@ -190,3 +190,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_MEM_ACCEPTOR_H */ + diff --git a/dep/ACE_wrappers/ace/MEM_Addr.cpp b/dep/ACE_wrappers/ace/MEM_Addr.cpp index 1f6c457ff12..92069775459 100644 --- a/dep/ACE_wrappers/ace/MEM_Addr.cpp +++ b/dep/ACE_wrappers/ace/MEM_Addr.cpp @@ -168,3 +168,4 @@ ACE_MEM_Addr::dump (void) const ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */ + diff --git a/dep/ACE_wrappers/ace/MEM_Addr.h b/dep/ACE_wrappers/ace/MEM_Addr.h index 35887b5cc15..be67b507982 100644 --- a/dep/ACE_wrappers/ace/MEM_Addr.h +++ b/dep/ACE_wrappers/ace/MEM_Addr.h @@ -153,3 +153,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_MEM_ADDR_H */ + diff --git a/dep/ACE_wrappers/ace/MEM_Connector.cpp b/dep/ACE_wrappers/ace/MEM_Connector.cpp index 33c15be3ca3..21b8d94fa3a 100644 --- a/dep/ACE_wrappers/ace/MEM_Connector.cpp +++ b/dep/ACE_wrappers/ace/MEM_Connector.cpp @@ -147,3 +147,4 @@ ACE_MEM_Connector::connect (ACE_MEM_Stream &new_stream, ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */ + diff --git a/dep/ACE_wrappers/ace/MEM_Connector.h b/dep/ACE_wrappers/ace/MEM_Connector.h index 49b15e7df99..d976d8d91bf 100644 --- a/dep/ACE_wrappers/ace/MEM_Connector.h +++ b/dep/ACE_wrappers/ace/MEM_Connector.h @@ -177,3 +177,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_MEM_CONNECTOR_H */ + diff --git a/dep/ACE_wrappers/ace/MEM_IO.cpp b/dep/ACE_wrappers/ace/MEM_IO.cpp index f98d6c326bb..b1c31619354 100644 --- a/dep/ACE_wrappers/ace/MEM_IO.cpp +++ b/dep/ACE_wrappers/ace/MEM_IO.cpp @@ -572,3 +572,4 @@ ACE_MEM_IO::recv (size_t n, ...) const ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */ + diff --git a/dep/ACE_wrappers/ace/MEM_IO.h b/dep/ACE_wrappers/ace/MEM_IO.h index 8e3f79c0b60..bbea3b3936d 100644 --- a/dep/ACE_wrappers/ace/MEM_IO.h +++ b/dep/ACE_wrappers/ace/MEM_IO.h @@ -308,3 +308,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_SOCK_IO_H */ + diff --git a/dep/ACE_wrappers/ace/MEM_SAP.cpp b/dep/ACE_wrappers/ace/MEM_SAP.cpp index 6f18b7abe1c..3710802c206 100644 --- a/dep/ACE_wrappers/ace/MEM_SAP.cpp +++ b/dep/ACE_wrappers/ace/MEM_SAP.cpp @@ -95,3 +95,4 @@ ACE_MEM_SAP::close_shm_malloc (void) #endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */ ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/MEM_SAP.h b/dep/ACE_wrappers/ace/MEM_SAP.h index 8694481cc18..e50b14b0853 100644 --- a/dep/ACE_wrappers/ace/MEM_SAP.h +++ b/dep/ACE_wrappers/ace/MEM_SAP.h @@ -167,3 +167,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_SOCK_IO_H */ + diff --git a/dep/ACE_wrappers/ace/MEM_Stream.cpp b/dep/ACE_wrappers/ace/MEM_Stream.cpp index afcbd4f98d0..3ad616314ad 100644 --- a/dep/ACE_wrappers/ace/MEM_Stream.cpp +++ b/dep/ACE_wrappers/ace/MEM_Stream.cpp @@ -45,3 +45,4 @@ ACE_MEM_Stream::close (void) ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */ + diff --git a/dep/ACE_wrappers/ace/MEM_Stream.h b/dep/ACE_wrappers/ace/MEM_Stream.h index f0a2380c398..7148e9f15ad 100644 --- a/dep/ACE_wrappers/ace/MEM_Stream.h +++ b/dep/ACE_wrappers/ace/MEM_Stream.h @@ -156,3 +156,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_MEM_STREAM_H */ + diff --git a/dep/ACE_wrappers/ace/MMAP_Memory_Pool.cpp b/dep/ACE_wrappers/ace/MMAP_Memory_Pool.cpp index b759816dd76..f323d111a1b 100644 --- a/dep/ACE_wrappers/ace/MMAP_Memory_Pool.cpp +++ b/dep/ACE_wrappers/ace/MMAP_Memory_Pool.cpp @@ -592,3 +592,4 @@ ACE_Lite_MMAP_Memory_Pool::sync (void *, size_t, int) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/MMAP_Memory_Pool.h b/dep/ACE_wrappers/ace/MMAP_Memory_Pool.h index b11077d42ff..aca39757152 100644 --- a/dep/ACE_wrappers/ace/MMAP_Memory_Pool.h +++ b/dep/ACE_wrappers/ace/MMAP_Memory_Pool.h @@ -345,3 +345,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_MMAP_MEMORY_POOL_H */ + diff --git a/dep/ACE_wrappers/ace/Malloc.cpp b/dep/ACE_wrappers/ace/Malloc.cpp index c175e5448a1..b9684654c10 100644 --- a/dep/ACE_wrappers/ace/Malloc.cpp +++ b/dep/ACE_wrappers/ace/Malloc.cpp @@ -185,3 +185,4 @@ ACE_Malloc_Stats::dump (void) const #endif /*ACE_HAS_MALLOC_STATS*/ ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Malloc.h b/dep/ACE_wrappers/ace/Malloc.h index 7b59f8ae1d0..5974f012652 100644 --- a/dep/ACE_wrappers/ace/Malloc.h +++ b/dep/ACE_wrappers/ace/Malloc.h @@ -394,3 +394,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_MALLOC_H */ + diff --git a/dep/ACE_wrappers/ace/Malloc_Allocator.cpp b/dep/ACE_wrappers/ace/Malloc_Allocator.cpp index 4da0e5f8fef..9c53da4a172 100644 --- a/dep/ACE_wrappers/ace/Malloc_Allocator.cpp +++ b/dep/ACE_wrappers/ace/Malloc_Allocator.cpp @@ -359,3 +359,4 @@ ACE_Static_Allocator_Base::dump (void) const } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Malloc_Allocator.h b/dep/ACE_wrappers/ace/Malloc_Allocator.h index 1a562108f95..bd01df8e6a2 100644 --- a/dep/ACE_wrappers/ace/Malloc_Allocator.h +++ b/dep/ACE_wrappers/ace/Malloc_Allocator.h @@ -144,3 +144,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* MALLOC_ALLOCATOR_H */ + diff --git a/dep/ACE_wrappers/ace/Malloc_Base.h b/dep/ACE_wrappers/ace/Malloc_Base.h index 6a13d020ad6..7cd204064bb 100644 --- a/dep/ACE_wrappers/ace/Malloc_Base.h +++ b/dep/ACE_wrappers/ace/Malloc_Base.h @@ -166,3 +166,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_MALLOC_BASE_H */ + diff --git a/dep/ACE_wrappers/ace/Malloc_T.cpp b/dep/ACE_wrappers/ace/Malloc_T.cpp index 1becd84920e..8411a39f9c5 100644 --- a/dep/ACE_wrappers/ace/Malloc_T.cpp +++ b/dep/ACE_wrappers/ace/Malloc_T.cpp @@ -1260,3 +1260,4 @@ ACE_Malloc_FIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::start (void) ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_MALLOC_T_CPP */ + diff --git a/dep/ACE_wrappers/ace/Malloc_T.h b/dep/ACE_wrappers/ace/Malloc_T.h index 2d610eb5915..ade2e37f9e4 100644 --- a/dep/ACE_wrappers/ace/Malloc_T.h +++ b/dep/ACE_wrappers/ace/Malloc_T.h @@ -929,3 +929,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_MALLOC_H */ + diff --git a/dep/ACE_wrappers/ace/Managed_Object.cpp b/dep/ACE_wrappers/ace/Managed_Object.cpp index 1e7e9eeb215..efe86c34c46 100644 --- a/dep/ACE_wrappers/ace/Managed_Object.cpp +++ b/dep/ACE_wrappers/ace/Managed_Object.cpp @@ -23,3 +23,4 @@ ACE_Cleanup_Adapter<TYPE>::~ACE_Cleanup_Adapter (void) ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_MANAGED_OBJECT_CPP */ + diff --git a/dep/ACE_wrappers/ace/Managed_Object.h b/dep/ACE_wrappers/ace/Managed_Object.h index d29dc1a5432..f4ac54834d4 100644 --- a/dep/ACE_wrappers/ace/Managed_Object.h +++ b/dep/ACE_wrappers/ace/Managed_Object.h @@ -166,3 +166,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_MANAGED_OBJECT_H */ + diff --git a/dep/ACE_wrappers/ace/Manual_Event.cpp b/dep/ACE_wrappers/ace/Manual_Event.cpp index 0b3caead8ec..33183c53f4d 100644 --- a/dep/ACE_wrappers/ace/Manual_Event.cpp +++ b/dep/ACE_wrappers/ace/Manual_Event.cpp @@ -46,3 +46,4 @@ ACE_Manual_Event::dump (void) const } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Manual_Event.h b/dep/ACE_wrappers/ace/Manual_Event.h index 4686e35d39d..6a46535e6c5 100644 --- a/dep/ACE_wrappers/ace/Manual_Event.h +++ b/dep/ACE_wrappers/ace/Manual_Event.h @@ -72,3 +72,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_MANUAL_EVENT_H */ + diff --git a/dep/ACE_wrappers/ace/Map.h b/dep/ACE_wrappers/ace/Map.h index ec675fb1fed..2ea515fd2dc 100644 --- a/dep/ACE_wrappers/ace/Map.h +++ b/dep/ACE_wrappers/ace/Map.h @@ -30,3 +30,4 @@ #include /**/ "ace/post.h" #endif /* ACE_MAP_H */ + diff --git a/dep/ACE_wrappers/ace/Map_Manager.cpp b/dep/ACE_wrappers/ace/Map_Manager.cpp index f1c8fbd63fb..6c070367f00 100644 --- a/dep/ACE_wrappers/ace/Map_Manager.cpp +++ b/dep/ACE_wrappers/ace/Map_Manager.cpp @@ -699,3 +699,4 @@ ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK>::dump (void) const ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_MAP_MANAGER_CPP */ + diff --git a/dep/ACE_wrappers/ace/Map_Manager.h b/dep/ACE_wrappers/ace/Map_Manager.h index 4e361216f29..b6e141621fa 100644 --- a/dep/ACE_wrappers/ace/Map_Manager.h +++ b/dep/ACE_wrappers/ace/Map_Manager.h @@ -717,3 +717,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_MAP_MANAGER_H */ + diff --git a/dep/ACE_wrappers/ace/Map_T.cpp b/dep/ACE_wrappers/ace/Map_T.cpp index ef3184c5c2e..e5edc166bd3 100644 --- a/dep/ACE_wrappers/ace/Map_T.cpp +++ b/dep/ACE_wrappers/ace/Map_T.cpp @@ -1341,3 +1341,4 @@ ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::rend_impl (void) ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_MAP_T_CPP */ + diff --git a/dep/ACE_wrappers/ace/Map_T.h b/dep/ACE_wrappers/ace/Map_T.h index 08947e0e0a4..1882b354e52 100644 --- a/dep/ACE_wrappers/ace/Map_T.h +++ b/dep/ACE_wrappers/ace/Map_T.h @@ -1609,3 +1609,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_MAP_T_H */ + diff --git a/dep/ACE_wrappers/ace/Mem_Map.cpp b/dep/ACE_wrappers/ace/Mem_Map.cpp index 15b20ec2024..1c79d93f33c 100644 --- a/dep/ACE_wrappers/ace/Mem_Map.cpp +++ b/dep/ACE_wrappers/ace/Mem_Map.cpp @@ -308,3 +308,4 @@ ACE_Mem_Map::remove (void) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Mem_Map.h b/dep/ACE_wrappers/ace/Mem_Map.h index 14410cbf3f0..5ef4634cfbd 100644 --- a/dep/ACE_wrappers/ace/Mem_Map.h +++ b/dep/ACE_wrappers/ace/Mem_Map.h @@ -233,3 +233,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_MEM_MAP_H */ + diff --git a/dep/ACE_wrappers/ace/Memory_Pool.h b/dep/ACE_wrappers/ace/Memory_Pool.h index a36e74334c2..d95778754c7 100644 --- a/dep/ACE_wrappers/ace/Memory_Pool.h +++ b/dep/ACE_wrappers/ace/Memory_Pool.h @@ -29,3 +29,4 @@ #include /**/ "ace/post.h" #endif /* ACE_MEMORY_POOL_H */ + diff --git a/dep/ACE_wrappers/ace/Message_Block.cpp b/dep/ACE_wrappers/ace/Message_Block.cpp index 9a1fd1adf38..072693613ea 100644 --- a/dep/ACE_wrappers/ace/Message_Block.cpp +++ b/dep/ACE_wrappers/ace/Message_Block.cpp @@ -1271,3 +1271,4 @@ ACE_Data_Block::base (char *msg_data, } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Message_Block.h b/dep/ACE_wrappers/ace/Message_Block.h index 4f3a3d9727c..ea039a386a4 100644 --- a/dep/ACE_wrappers/ace/Message_Block.h +++ b/dep/ACE_wrappers/ace/Message_Block.h @@ -869,3 +869,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_MESSAGE_BLOCK_H */ + diff --git a/dep/ACE_wrappers/ace/Message_Block_T.cpp b/dep/ACE_wrappers/ace/Message_Block_T.cpp index bb38ca69448..ade7d1b8ef4 100644 --- a/dep/ACE_wrappers/ace/Message_Block_T.cpp +++ b/dep/ACE_wrappers/ace/Message_Block_T.cpp @@ -52,3 +52,4 @@ ACE_Locked_Data_Block<ACE_LOCK>::clone_nocopy (ACE_Message_Block::Message_Flags ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_MESSAGE_BLOCK_T_CPP */ + diff --git a/dep/ACE_wrappers/ace/Message_Block_T.h b/dep/ACE_wrappers/ace/Message_Block_T.h index b57a25bdc95..25615fa4508 100644 --- a/dep/ACE_wrappers/ace/Message_Block_T.h +++ b/dep/ACE_wrappers/ace/Message_Block_T.h @@ -86,3 +86,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_MESSAGE_BLOCK_T_H */ + diff --git a/dep/ACE_wrappers/ace/Message_Queue.cpp b/dep/ACE_wrappers/ace/Message_Queue.cpp index fefd67e6797..ba04916c563 100644 --- a/dep/ACE_wrappers/ace/Message_Queue.cpp +++ b/dep/ACE_wrappers/ace/Message_Queue.cpp @@ -26,3 +26,4 @@ ACE_Message_Queue_Base::state (void) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Message_Queue.h b/dep/ACE_wrappers/ace/Message_Queue.h index 15018a6342f..c9734213409 100644 --- a/dep/ACE_wrappers/ace/Message_Queue.h +++ b/dep/ACE_wrappers/ace/Message_Queue.h @@ -235,3 +235,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_MESSAGE_QUEUE_H */ + diff --git a/dep/ACE_wrappers/ace/Message_Queue_NT.cpp b/dep/ACE_wrappers/ace/Message_Queue_NT.cpp index 706eeb86248..a8c9c8859b7 100644 --- a/dep/ACE_wrappers/ace/Message_Queue_NT.cpp +++ b/dep/ACE_wrappers/ace/Message_Queue_NT.cpp @@ -235,3 +235,4 @@ ACE_Message_Queue_NT::dump (void) const #endif /* ACE_HAS_WIN32_OVERLAPPED_IO */ ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Message_Queue_NT.h b/dep/ACE_wrappers/ace/Message_Queue_NT.h index cde4028ed61..ffdc9eb4da2 100644 --- a/dep/ACE_wrappers/ace/Message_Queue_NT.h +++ b/dep/ACE_wrappers/ace/Message_Queue_NT.h @@ -229,3 +229,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_MESSAGE_QUEUE_NT_H */ + diff --git a/dep/ACE_wrappers/ace/Message_Queue_T.cpp b/dep/ACE_wrappers/ace/Message_Queue_T.cpp index 742ecf3a85d..7ba4fac659f 100644 --- a/dep/ACE_wrappers/ace/Message_Queue_T.cpp +++ b/dep/ACE_wrappers/ace/Message_Queue_T.cpp @@ -2964,3 +2964,4 @@ ACE_Message_Queue_Factory<ACE_SYNCH_USE>::create_NT_message_queue (size_t max_th ACE_END_VERSIONED_NAMESPACE_DECL #endif /* !ACE_MESSAGE_QUEUE_T_CPP */ + diff --git a/dep/ACE_wrappers/ace/Message_Queue_T.h b/dep/ACE_wrappers/ace/Message_Queue_T.h index e1e9953e892..b4c764b4de8 100644 --- a/dep/ACE_wrappers/ace/Message_Queue_T.h +++ b/dep/ACE_wrappers/ace/Message_Queue_T.h @@ -1561,3 +1561,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_MESSAGE_QUEUE_T_H */ + diff --git a/dep/ACE_wrappers/ace/Message_Queue_Vx.cpp b/dep/ACE_wrappers/ace/Message_Queue_Vx.cpp index 9aa465d36e5..e224f5078e9 100644 --- a/dep/ACE_wrappers/ace/Message_Queue_Vx.cpp +++ b/dep/ACE_wrappers/ace/Message_Queue_Vx.cpp @@ -366,3 +366,4 @@ ACE_Message_Queue_Vx::peek_dequeue_head (ACE_Message_Block *&, #endif /* ACE_VXWORKS */ ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Message_Queue_Vx.h b/dep/ACE_wrappers/ace/Message_Queue_Vx.h index b93330ac02b..a442394e25a 100644 --- a/dep/ACE_wrappers/ace/Message_Queue_Vx.h +++ b/dep/ACE_wrappers/ace/Message_Queue_Vx.h @@ -225,3 +225,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_MESSAGE_QUEUE_VX_H */ + diff --git a/dep/ACE_wrappers/ace/Method_Object.h b/dep/ACE_wrappers/ace/Method_Object.h index 5af98f531a3..cb330d4ae2b 100644 --- a/dep/ACE_wrappers/ace/Method_Object.h +++ b/dep/ACE_wrappers/ace/Method_Object.h @@ -36,3 +36,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_METHOD_OBJECT_H */ + diff --git a/dep/ACE_wrappers/ace/Method_Request.cpp b/dep/ACE_wrappers/ace/Method_Request.cpp index 972087c5d8b..528bf147433 100644 --- a/dep/ACE_wrappers/ace/Method_Request.cpp +++ b/dep/ACE_wrappers/ace/Method_Request.cpp @@ -28,3 +28,4 @@ ACE_Method_Request::priority (unsigned long prio) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Method_Request.h b/dep/ACE_wrappers/ace/Method_Request.h index 156f112472f..56548a71e92 100644 --- a/dep/ACE_wrappers/ace/Method_Request.h +++ b/dep/ACE_wrappers/ace/Method_Request.h @@ -98,3 +98,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_METHOD_REQUEST_H */ + diff --git a/dep/ACE_wrappers/ace/Metrics_Cache.h b/dep/ACE_wrappers/ace/Metrics_Cache.h index 7e174d1e8d0..b318ab028de 100644 --- a/dep/ACE_wrappers/ace/Metrics_Cache.h +++ b/dep/ACE_wrappers/ace/Metrics_Cache.h @@ -138,3 +138,4 @@ METRICS_PTR->report_##NAME##_stop(); \ #endif /* ACE_ENABLE_TIMEPROBES && ACE_COMPILE_TIMEPROBES */ #endif /* ACE_METRICS_CACHE_H */ + diff --git a/dep/ACE_wrappers/ace/Metrics_Cache_T.cpp b/dep/ACE_wrappers/ace/Metrics_Cache_T.cpp index f94c3f06309..12ee533aa09 100644 --- a/dep/ACE_wrappers/ace/Metrics_Cache_T.cpp +++ b/dep/ACE_wrappers/ace/Metrics_Cache_T.cpp @@ -235,3 +235,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #endif /* defined (ACE_COMPILE_TIMEPROBES) */ #endif /* ACE_METRICS_CACHE_CPP */ + diff --git a/dep/ACE_wrappers/ace/Metrics_Cache_T.h b/dep/ACE_wrappers/ace/Metrics_Cache_T.h index dba5c961ca3..5785163c413 100644 --- a/dep/ACE_wrappers/ace/Metrics_Cache_T.h +++ b/dep/ACE_wrappers/ace/Metrics_Cache_T.h @@ -241,3 +241,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #endif /* defined (ACE_COMPILE_TIMEPROBES) */ #endif /* ACE_METRICS_CACHE_T_H */ + diff --git a/dep/ACE_wrappers/ace/Min_Max.h b/dep/ACE_wrappers/ace/Min_Max.h index 373862973f8..fe22b7e9a77 100644 --- a/dep/ACE_wrappers/ace/Min_Max.h +++ b/dep/ACE_wrappers/ace/Min_Max.h @@ -68,3 +68,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_MIN_MAX_H */ + diff --git a/dep/ACE_wrappers/ace/Module.cpp b/dep/ACE_wrappers/ace/Module.cpp index bffbd59331a..ab974cae479 100644 --- a/dep/ACE_wrappers/ace/Module.cpp +++ b/dep/ACE_wrappers/ace/Module.cpp @@ -271,3 +271,4 @@ ACE_Module<ACE_SYNCH_USE>::close_i (int which, ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_MODULE_CPP */ + diff --git a/dep/ACE_wrappers/ace/Module.h b/dep/ACE_wrappers/ace/Module.h index 29690a5f3db..e749b6365cd 100644 --- a/dep/ACE_wrappers/ace/Module.h +++ b/dep/ACE_wrappers/ace/Module.h @@ -213,3 +213,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_MODULE_H */ + diff --git a/dep/ACE_wrappers/ace/Monitor_Admin.cpp b/dep/ACE_wrappers/ace/Monitor_Admin.cpp index 5c60b2b902e..059ee78c180 100644 --- a/dep/ACE_wrappers/ace/Monitor_Admin.cpp +++ b/dep/ACE_wrappers/ace/Monitor_Admin.cpp @@ -111,3 +111,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_MONITOR_FRAMEWORK==1 */ + diff --git a/dep/ACE_wrappers/ace/Monitor_Admin.h b/dep/ACE_wrappers/ace/Monitor_Admin.h index 1b383fbe420..4120d8a1c5e 100644 --- a/dep/ACE_wrappers/ace/Monitor_Admin.h +++ b/dep/ACE_wrappers/ace/Monitor_Admin.h @@ -107,3 +107,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif // MONITOR_ADMIN_H + diff --git a/dep/ACE_wrappers/ace/Monitor_Admin_Manager.cpp b/dep/ACE_wrappers/ace/Monitor_Admin_Manager.cpp index aed71e54a02..61ebb226af4 100644 --- a/dep/ACE_wrappers/ace/Monitor_Admin_Manager.cpp +++ b/dep/ACE_wrappers/ace/Monitor_Admin_Manager.cpp @@ -40,3 +40,4 @@ ACE_FACTORY_DEFINE (ACE, MC_ADMINMANAGER) #endif /* ACE_HAS_MONITOR_FRAMEWORK==1 */ + diff --git a/dep/ACE_wrappers/ace/Monitor_Admin_Manager.h b/dep/ACE_wrappers/ace/Monitor_Admin_Manager.h index 72977383fdd..16ae520feb2 100644 --- a/dep/ACE_wrappers/ace/Monitor_Admin_Manager.h +++ b/dep/ACE_wrappers/ace/Monitor_Admin_Manager.h @@ -68,3 +68,4 @@ ACE_FACTORY_DECLARE (ACE, MC_ADMINMANAGER) #include /**/ "ace/post.h" #endif // MONITOR_ADMIN_MANAGER_H + diff --git a/dep/ACE_wrappers/ace/Monitor_Base.cpp b/dep/ACE_wrappers/ace/Monitor_Base.cpp index a4f3b847e06..dfcb1032b2f 100644 --- a/dep/ACE_wrappers/ace/Monitor_Base.cpp +++ b/dep/ACE_wrappers/ace/Monitor_Base.cpp @@ -400,3 +400,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_MONITOR_FRAMEWORK==1 */ + diff --git a/dep/ACE_wrappers/ace/Monitor_Base.h b/dep/ACE_wrappers/ace/Monitor_Base.h index 2557e6ea7dd..1ed230f0061 100644 --- a/dep/ACE_wrappers/ace/Monitor_Base.h +++ b/dep/ACE_wrappers/ace/Monitor_Base.h @@ -150,3 +150,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif // MONITOR_BASE_H + diff --git a/dep/ACE_wrappers/ace/Monitor_Control_Action.cpp b/dep/ACE_wrappers/ace/Monitor_Control_Action.cpp index 5ab52b36941..4a4757a5111 100644 --- a/dep/ACE_wrappers/ace/Monitor_Control_Action.cpp +++ b/dep/ACE_wrappers/ace/Monitor_Control_Action.cpp @@ -43,3 +43,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_MONITOR_FRAMEWORK==1 */ + diff --git a/dep/ACE_wrappers/ace/Monitor_Control_Action.h b/dep/ACE_wrappers/ace/Monitor_Control_Action.h index 7831aabd4c1..ba51b56d382 100644 --- a/dep/ACE_wrappers/ace/Monitor_Control_Action.h +++ b/dep/ACE_wrappers/ace/Monitor_Control_Action.h @@ -63,3 +63,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif // MONITOR_CONTROL_ACTION_H + diff --git a/dep/ACE_wrappers/ace/Monitor_Control_Types.cpp b/dep/ACE_wrappers/ace/Monitor_Control_Types.cpp index 782227c5684..e9934a96f74 100644 --- a/dep/ACE_wrappers/ace/Monitor_Control_Types.cpp +++ b/dep/ACE_wrappers/ace/Monitor_Control_Types.cpp @@ -76,3 +76,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_MONITOR_FRAMEWORK==1 */ + diff --git a/dep/ACE_wrappers/ace/Monitor_Control_Types.h b/dep/ACE_wrappers/ace/Monitor_Control_Types.h index c426188541a..db0a12ce046 100644 --- a/dep/ACE_wrappers/ace/Monitor_Control_Types.h +++ b/dep/ACE_wrappers/ace/Monitor_Control_Types.h @@ -122,3 +122,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif // MONITOR_CONTROL_TYPES_H + diff --git a/dep/ACE_wrappers/ace/Monitor_Point_Registry.cpp b/dep/ACE_wrappers/ace/Monitor_Point_Registry.cpp index a6d5e983613..0a66ac4c986 100644 --- a/dep/ACE_wrappers/ace/Monitor_Point_Registry.cpp +++ b/dep/ACE_wrappers/ace/Monitor_Point_Registry.cpp @@ -170,3 +170,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_MONITOR_FRAMEWORK==1 */ + diff --git a/dep/ACE_wrappers/ace/Monitor_Point_Registry.h b/dep/ACE_wrappers/ace/Monitor_Point_Registry.h index 82dba6caf7d..2c08d695ec1 100644 --- a/dep/ACE_wrappers/ace/Monitor_Point_Registry.h +++ b/dep/ACE_wrappers/ace/Monitor_Point_Registry.h @@ -98,3 +98,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif // MONITOR_POINT_REGISTRY_H + diff --git a/dep/ACE_wrappers/ace/Monitor_Size.cpp b/dep/ACE_wrappers/ace/Monitor_Size.cpp index f968f9b9bb8..d7dbaadf853 100644 --- a/dep/ACE_wrappers/ace/Monitor_Size.cpp +++ b/dep/ACE_wrappers/ace/Monitor_Size.cpp @@ -45,3 +45,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_MONITOR_FRAMEWORK==1 */ + diff --git a/dep/ACE_wrappers/ace/Monitor_Size.h b/dep/ACE_wrappers/ace/Monitor_Size.h index 42ec3131233..bca6815af73 100644 --- a/dep/ACE_wrappers/ace/Monitor_Size.h +++ b/dep/ACE_wrappers/ace/Monitor_Size.h @@ -62,3 +62,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif // SIZE_MONITOR_H + diff --git a/dep/ACE_wrappers/ace/Msg_WFMO_Reactor.cpp b/dep/ACE_wrappers/ace/Msg_WFMO_Reactor.cpp index e06b698169f..2b834daa823 100644 --- a/dep/ACE_wrappers/ace/Msg_WFMO_Reactor.cpp +++ b/dep/ACE_wrappers/ace/Msg_WFMO_Reactor.cpp @@ -83,3 +83,4 @@ ACE_Msg_WFMO_Reactor::poll_remaining_handles (DWORD slot) ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_WIN32 && !ACE_LACKS_MSG_WFMO */ + diff --git a/dep/ACE_wrappers/ace/Msg_WFMO_Reactor.h b/dep/ACE_wrappers/ace/Msg_WFMO_Reactor.h index 3c1eadd5b40..714f4ce7a26 100644 --- a/dep/ACE_wrappers/ace/Msg_WFMO_Reactor.h +++ b/dep/ACE_wrappers/ace/Msg_WFMO_Reactor.h @@ -118,3 +118,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_MSG_WFMO_REACTOR_H */ + diff --git a/dep/ACE_wrappers/ace/Multihomed_INET_Addr.cpp b/dep/ACE_wrappers/ace/Multihomed_INET_Addr.cpp index 04ba3a0ce08..f5c50a6c278 100644 --- a/dep/ACE_wrappers/ace/Multihomed_INET_Addr.cpp +++ b/dep/ACE_wrappers/ace/Multihomed_INET_Addr.cpp @@ -298,3 +298,4 @@ ACE_Multihomed_INET_Addr::~ACE_Multihomed_INET_Addr (void) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Multihomed_INET_Addr.h b/dep/ACE_wrappers/ace/Multihomed_INET_Addr.h index b05ccf9582a..88a3fbe3424 100644 --- a/dep/ACE_wrappers/ace/Multihomed_INET_Addr.h +++ b/dep/ACE_wrappers/ace/Multihomed_INET_Addr.h @@ -196,3 +196,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_MULTIHOMED_INET_ADDR_H */ + diff --git a/dep/ACE_wrappers/ace/Mutex.cpp b/dep/ACE_wrappers/ace/Mutex.cpp index 8adcb6f9c64..8203a1c4ced 100644 --- a/dep/ACE_wrappers/ace/Mutex.cpp +++ b/dep/ACE_wrappers/ace/Mutex.cpp @@ -123,3 +123,4 @@ ACE_Mutex::~ACE_Mutex (void) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Mutex.h b/dep/ACE_wrappers/ace/Mutex.h index e738745940a..d0440263472 100644 --- a/dep/ACE_wrappers/ace/Mutex.h +++ b/dep/ACE_wrappers/ace/Mutex.h @@ -190,3 +190,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_MUTEX_H */ + diff --git a/dep/ACE_wrappers/ace/NT_Service.cpp b/dep/ACE_wrappers/ace/NT_Service.cpp index 6323bb1e2d1..2cd94793c52 100644 --- a/dep/ACE_wrappers/ace/NT_Service.cpp +++ b/dep/ACE_wrappers/ace/NT_Service.cpp @@ -616,3 +616,4 @@ ACE_NT_Service::wait_for_service_state (DWORD desired_state, ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_WIN32 && !ACE_LACKS_WIN32_SERVICES */ + diff --git a/dep/ACE_wrappers/ace/NT_Service.h b/dep/ACE_wrappers/ace/NT_Service.h index 0e1e0a16a84..bc6e39036b2 100644 --- a/dep/ACE_wrappers/ace/NT_Service.h +++ b/dep/ACE_wrappers/ace/NT_Service.h @@ -437,3 +437,4 @@ extern VOID WINAPI ace_nt_svc_main_##SVCNAME (DWORD dwArgc, \ #include /**/ "ace/post.h" #endif /* ACE_SERVICE_OBJECT_H */ + diff --git a/dep/ACE_wrappers/ace/Name_Proxy.cpp b/dep/ACE_wrappers/ace/Name_Proxy.cpp index 5755e971eec..19ff0be473d 100644 --- a/dep/ACE_wrappers/ace/Name_Proxy.cpp +++ b/dep/ACE_wrappers/ace/Name_Proxy.cpp @@ -207,3 +207,4 @@ ACE_Name_Proxy::~ACE_Name_Proxy (void) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Name_Proxy.h b/dep/ACE_wrappers/ace/Name_Proxy.h index a60a118f457..24ca63a30af 100644 --- a/dep/ACE_wrappers/ace/Name_Proxy.h +++ b/dep/ACE_wrappers/ace/Name_Proxy.h @@ -99,3 +99,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_NAME_PROXY_H */ + diff --git a/dep/ACE_wrappers/ace/Name_Request_Reply.cpp b/dep/ACE_wrappers/ace/Name_Request_Reply.cpp index 18329ab9df0..ff160d8574a 100644 --- a/dep/ACE_wrappers/ace/Name_Request_Reply.cpp +++ b/dep/ACE_wrappers/ace/Name_Request_Reply.cpp @@ -575,3 +575,4 @@ ACE_Name_Reply::dump (void) const } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Name_Request_Reply.h b/dep/ACE_wrappers/ace/Name_Request_Reply.h index 30f1386dc3d..2c32c4cf32c 100644 --- a/dep/ACE_wrappers/ace/Name_Request_Reply.h +++ b/dep/ACE_wrappers/ace/Name_Request_Reply.h @@ -263,3 +263,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_NAME_REQUEST_REPLY_H */ + diff --git a/dep/ACE_wrappers/ace/Name_Space.cpp b/dep/ACE_wrappers/ace/Name_Space.cpp index 806abd7d118..724d3206c16 100644 --- a/dep/ACE_wrappers/ace/Name_Space.cpp +++ b/dep/ACE_wrappers/ace/Name_Space.cpp @@ -71,3 +71,4 @@ ACE_Name_Space::~ACE_Name_Space (void) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Name_Space.h b/dep/ACE_wrappers/ace/Name_Space.h index 966c8f46b65..ccd4d4dbfe9 100644 --- a/dep/ACE_wrappers/ace/Name_Space.h +++ b/dep/ACE_wrappers/ace/Name_Space.h @@ -163,3 +163,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_NAME_SPACE_H */ + diff --git a/dep/ACE_wrappers/ace/Naming_Context.cpp b/dep/ACE_wrappers/ace/Naming_Context.cpp index 0b1f7fefe25..424e0d95f7e 100644 --- a/dep/ACE_wrappers/ace/Naming_Context.cpp +++ b/dep/ACE_wrappers/ace/Naming_Context.cpp @@ -647,3 +647,4 @@ ACE_STATIC_SVC_DEFINE (ACE_Naming_Context, ACE_Service_Type::DELETE_OBJ, 0) ACE_STATIC_SVC_REQUIRE (ACE_Naming_Context) + diff --git a/dep/ACE_wrappers/ace/Naming_Context.h b/dep/ACE_wrappers/ace/Naming_Context.h index db8ca9173e8..2ac80a74526 100644 --- a/dep/ACE_wrappers/ace/Naming_Context.h +++ b/dep/ACE_wrappers/ace/Naming_Context.h @@ -385,3 +385,4 @@ ACE_STATIC_SVC_DECLARE_EXPORT (ACE, ACE_Naming_Context) #include /**/ "ace/post.h" #endif /* ACE_NAMING_CONTEXT_H */ + diff --git a/dep/ACE_wrappers/ace/Netlink_Addr.cpp b/dep/ACE_wrappers/ace/Netlink_Addr.cpp index 888febb0aa5..0f73345b9c5 100644 --- a/dep/ACE_wrappers/ace/Netlink_Addr.cpp +++ b/dep/ACE_wrappers/ace/Netlink_Addr.cpp @@ -66,3 +66,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #endif + diff --git a/dep/ACE_wrappers/ace/Netlink_Addr.h b/dep/ACE_wrappers/ace/Netlink_Addr.h index b596068c517..cd1c20fd474 100644 --- a/dep/ACE_wrappers/ace/Netlink_Addr.h +++ b/dep/ACE_wrappers/ace/Netlink_Addr.h @@ -118,3 +118,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Node.cpp b/dep/ACE_wrappers/ace/Node.cpp index b1b36fd73d2..03cbdba05da 100644 --- a/dep/ACE_wrappers/ace/Node.cpp +++ b/dep/ACE_wrappers/ace/Node.cpp @@ -44,3 +44,4 @@ ACE_Node<T, C>::ACE_Node (const ACE_Node<T, C> &s) ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_NODE_CPP */ + diff --git a/dep/ACE_wrappers/ace/Node.h b/dep/ACE_wrappers/ace/Node.h index 57433a70e47..bf47b15915b 100644 --- a/dep/ACE_wrappers/ace/Node.h +++ b/dep/ACE_wrappers/ace/Node.h @@ -83,3 +83,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_NODE_H */ + diff --git a/dep/ACE_wrappers/ace/Notification_Queue.cpp b/dep/ACE_wrappers/ace/Notification_Queue.cpp index 09d9934a218..1faada20c59 100644 --- a/dep/ACE_wrappers/ace/Notification_Queue.cpp +++ b/dep/ACE_wrappers/ace/Notification_Queue.cpp @@ -226,3 +226,4 @@ ACE_Notification_Queue::pop_next_notification( } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Notification_Queue.h b/dep/ACE_wrappers/ace/Notification_Queue.h index a9ad1ad245b..b2ed768fd7a 100644 --- a/dep/ACE_wrappers/ace/Notification_Queue.h +++ b/dep/ACE_wrappers/ace/Notification_Queue.h @@ -154,3 +154,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_NOTIFICATION_QUEUE_H */ + diff --git a/dep/ACE_wrappers/ace/Notification_Strategy.cpp b/dep/ACE_wrappers/ace/Notification_Strategy.cpp index 1e022e07953..4ffdda52097 100644 --- a/dep/ACE_wrappers/ace/Notification_Strategy.cpp +++ b/dep/ACE_wrappers/ace/Notification_Strategy.cpp @@ -20,3 +20,4 @@ ACE_Notification_Strategy::~ACE_Notification_Strategy (void) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Notification_Strategy.h b/dep/ACE_wrappers/ace/Notification_Strategy.h index ba4c558db21..7467ca06f4b 100644 --- a/dep/ACE_wrappers/ace/Notification_Strategy.h +++ b/dep/ACE_wrappers/ace/Notification_Strategy.h @@ -73,3 +73,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /*ACE_NOTIFICATION_STRATEGY_H */ + diff --git a/dep/ACE_wrappers/ace/Null_Barrier.h b/dep/ACE_wrappers/ace/Null_Barrier.h index 5cd9ef8386f..64e3516d2a6 100644 --- a/dep/ACE_wrappers/ace/Null_Barrier.h +++ b/dep/ACE_wrappers/ace/Null_Barrier.h @@ -57,3 +57,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_NULL_BARRIER_H */ + diff --git a/dep/ACE_wrappers/ace/Null_Condition.h b/dep/ACE_wrappers/ace/Null_Condition.h index 02131e2134e..c693b0a69eb 100644 --- a/dep/ACE_wrappers/ace/Null_Condition.h +++ b/dep/ACE_wrappers/ace/Null_Condition.h @@ -83,3 +83,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_NULL_CONDITION_H */ + diff --git a/dep/ACE_wrappers/ace/Null_Mutex.h b/dep/ACE_wrappers/ace/Null_Mutex.h index 5c8f6f6da0d..5bfbea7e23b 100644 --- a/dep/ACE_wrappers/ace/Null_Mutex.h +++ b/dep/ACE_wrappers/ace/Null_Mutex.h @@ -230,3 +230,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_NULL_MUTEX_H */ + diff --git a/dep/ACE_wrappers/ace/Null_Semaphore.h b/dep/ACE_wrappers/ace/Null_Semaphore.h index d7a48cce4d1..4b8112876f6 100644 --- a/dep/ACE_wrappers/ace/Null_Semaphore.h +++ b/dep/ACE_wrappers/ace/Null_Semaphore.h @@ -103,3 +103,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_NULL_SEMAPHORE_H */ + diff --git a/dep/ACE_wrappers/ace/Numeric_Limits.h b/dep/ACE_wrappers/ace/Numeric_Limits.h index 356c81e710d..b4ee307fe5c 100644 --- a/dep/ACE_wrappers/ace/Numeric_Limits.h +++ b/dep/ACE_wrappers/ace/Numeric_Limits.h @@ -268,3 +268,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_NUMERIC_LIMITS_H */ + diff --git a/dep/ACE_wrappers/ace/OS.cpp b/dep/ACE_wrappers/ace/OS.cpp index 0fd57bdd5e7..ed4c108089f 100644 --- a/dep/ACE_wrappers/ace/OS.cpp +++ b/dep/ACE_wrappers/ace/OS.cpp @@ -51,3 +51,4 @@ ACE_RCSID(ace, OS, "$Id: OS.cpp 80826 2008-03-04 14:51:23Z wotte $") #include "ace/OS_NS_time.cpp" #include "ace/OS_NS_unistd.cpp" #include "ace/OS_NS_wchar.cpp" + diff --git a/dep/ACE_wrappers/ace/OS.h b/dep/ACE_wrappers/ace/OS.h index ec6c4ef9eb9..9283ed6f417 100644 --- a/dep/ACE_wrappers/ace/OS.h +++ b/dep/ACE_wrappers/ace/OS.h @@ -327,3 +327,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_OS_H */ + diff --git a/dep/ACE_wrappers/ace/OS_Dirent.h b/dep/ACE_wrappers/ace/OS_Dirent.h index d05dc170991..e9c0984390c 100644 --- a/dep/ACE_wrappers/ace/OS_Dirent.h +++ b/dep/ACE_wrappers/ace/OS_Dirent.h @@ -30,3 +30,4 @@ #include /**/ "ace/post.h" #endif /* ACE_OS_DIRENT_H */ + diff --git a/dep/ACE_wrappers/ace/OS_Errno.cpp b/dep/ACE_wrappers/ace/OS_Errno.cpp index 15bdbcf2734..1e1eab82218 100644 --- a/dep/ACE_wrappers/ace/OS_Errno.cpp +++ b/dep/ACE_wrappers/ace/OS_Errno.cpp @@ -45,3 +45,4 @@ ACE_CE_Errno::fini () ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_WINCE_BROKEN_ERRNO */ + diff --git a/dep/ACE_wrappers/ace/OS_Errno.h b/dep/ACE_wrappers/ace/OS_Errno.h index ce6500b07fa..41e33692cb9 100644 --- a/dep/ACE_wrappers/ace/OS_Errno.h +++ b/dep/ACE_wrappers/ace/OS_Errno.h @@ -99,3 +99,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_OS_ERRNO_H */ + diff --git a/dep/ACE_wrappers/ace/OS_Log_Msg_Attributes.cpp b/dep/ACE_wrappers/ace/OS_Log_Msg_Attributes.cpp index ead88768017..227ead2726c 100644 --- a/dep/ACE_wrappers/ace/OS_Log_Msg_Attributes.cpp +++ b/dep/ACE_wrappers/ace/OS_Log_Msg_Attributes.cpp @@ -7,3 +7,4 @@ #endif /* ACE_HAS_INLINED_OSCALLS */ ACE_RCSID(ace, OS_Log_Msg_Attributes, "$Id: OS_Log_Msg_Attributes.cpp 80826 2008-03-04 14:51:23Z wotte $") + diff --git a/dep/ACE_wrappers/ace/OS_Log_Msg_Attributes.h b/dep/ACE_wrappers/ace/OS_Log_Msg_Attributes.h index f8761995793..ff6bc1180c2 100644 --- a/dep/ACE_wrappers/ace/OS_Log_Msg_Attributes.h +++ b/dep/ACE_wrappers/ace/OS_Log_Msg_Attributes.h @@ -88,3 +88,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_OS_LOG_MSG_ATTRIBUTES_H */ + diff --git a/dep/ACE_wrappers/ace/OS_Memory.h b/dep/ACE_wrappers/ace/OS_Memory.h index ef5746b7cbd..60590c02159 100644 --- a/dep/ACE_wrappers/ace/OS_Memory.h +++ b/dep/ACE_wrappers/ace/OS_Memory.h @@ -336,3 +336,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_OS_MEMORY_H */ + diff --git a/dep/ACE_wrappers/ace/OS_NS_Thread.cpp b/dep/ACE_wrappers/ace/OS_NS_Thread.cpp index e5c37092ad2..187f4bf4078 100644 --- a/dep/ACE_wrappers/ace/OS_NS_Thread.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_Thread.cpp @@ -5331,3 +5331,4 @@ vx_execae (FUNCPTR entry, char* arg, int prio, int opt, int stacksz, ...) return ret > 0 ? _vx_call_rc : 255; } #endif /* ACE_VXWORKS && !__RTP__ */ + diff --git a/dep/ACE_wrappers/ace/OS_NS_Thread.h b/dep/ACE_wrappers/ace/OS_NS_Thread.h index 36fe609b5ea..a16e3750d20 100644 --- a/dep/ACE_wrappers/ace/OS_NS_Thread.h +++ b/dep/ACE_wrappers/ace/OS_NS_Thread.h @@ -2023,3 +2023,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL # include /**/ "ace/post.h" #endif /* ACE_OS_NS_THREAD_H */ + diff --git a/dep/ACE_wrappers/ace/OS_NS_arpa_inet.cpp b/dep/ACE_wrappers/ace/OS_NS_arpa_inet.cpp index 93a896520d0..cb496c9d0eb 100644 --- a/dep/ACE_wrappers/ace/OS_NS_arpa_inet.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_arpa_inet.cpp @@ -51,3 +51,4 @@ ACE_OS::inet_aton (const char *host_name, struct in_addr *addr) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/OS_NS_arpa_inet.h b/dep/ACE_wrappers/ace/OS_NS_arpa_inet.h index fc8e660ac1f..dba0f6bd4da 100644 --- a/dep/ACE_wrappers/ace/OS_NS_arpa_inet.h +++ b/dep/ACE_wrappers/ace/OS_NS_arpa_inet.h @@ -72,3 +72,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL # include /**/ "ace/post.h" #endif /* ACE_OS_NS_ARPA_INET_H */ + diff --git a/dep/ACE_wrappers/ace/OS_NS_ctype.cpp b/dep/ACE_wrappers/ace/OS_NS_ctype.cpp index d9245606015..e8bd11f6c24 100644 --- a/dep/ACE_wrappers/ace/OS_NS_ctype.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_ctype.cpp @@ -9,3 +9,4 @@ ACE_RCSID(ace, OS_NS_ctype, "$Id: OS_NS_ctype.cpp 80826 2008-03-04 14:51:23Z wot # include "ace/OS_NS_ctype.inl" #endif /* ACE_HAS_INLINED_OSCALLS */ + diff --git a/dep/ACE_wrappers/ace/OS_NS_ctype.h b/dep/ACE_wrappers/ace/OS_NS_ctype.h index fc15e13035b..c03143eea90 100644 --- a/dep/ACE_wrappers/ace/OS_NS_ctype.h +++ b/dep/ACE_wrappers/ace/OS_NS_ctype.h @@ -128,3 +128,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL # include /**/ "ace/post.h" #endif /* ACE_OS_NS_CTYPE_H */ + diff --git a/dep/ACE_wrappers/ace/OS_NS_dirent.cpp b/dep/ACE_wrappers/ace/OS_NS_dirent.cpp index 73fea0f13d2..4a3672c28c5 100644 --- a/dep/ACE_wrappers/ace/OS_NS_dirent.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_dirent.cpp @@ -272,3 +272,4 @@ ACE_OS::scandir_emulation (const ACE_TCHAR *dirname, #endif /* !ACE_HAS_SCANDIR */ ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/OS_NS_dirent.h b/dep/ACE_wrappers/ace/OS_NS_dirent.h index 82042f52236..72f06b91648 100644 --- a/dep/ACE_wrappers/ace/OS_NS_dirent.h +++ b/dep/ACE_wrappers/ace/OS_NS_dirent.h @@ -151,3 +151,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL # include /**/ "ace/post.h" #endif /* ACE_OS_NS_DIRENT_H */ + diff --git a/dep/ACE_wrappers/ace/OS_NS_dlfcn.cpp b/dep/ACE_wrappers/ace/OS_NS_dlfcn.cpp index 24218ff4302..54580ba6523 100644 --- a/dep/ACE_wrappers/ace/OS_NS_dlfcn.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_dlfcn.cpp @@ -8,3 +8,4 @@ ACE_RCSID(ace, OS_NS_dlfcn, "$Id: OS_NS_dlfcn.cpp 80826 2008-03-04 14:51:23Z wot # include "ace/OS_NS_dlfcn.inl" #endif /* ACE_HAS_INLINED_OSCALLS */ + diff --git a/dep/ACE_wrappers/ace/OS_NS_dlfcn.h b/dep/ACE_wrappers/ace/OS_NS_dlfcn.h index 45cf625dc30..13a8e7d0cfa 100644 --- a/dep/ACE_wrappers/ace/OS_NS_dlfcn.h +++ b/dep/ACE_wrappers/ace/OS_NS_dlfcn.h @@ -67,3 +67,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL # include /**/ "ace/post.h" #endif /* ACE_OS_NS_DLFCN_H */ + diff --git a/dep/ACE_wrappers/ace/OS_NS_errno.cpp b/dep/ACE_wrappers/ace/OS_NS_errno.cpp index ada256d1cbd..ea3213c0832 100644 --- a/dep/ACE_wrappers/ace/OS_NS_errno.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_errno.cpp @@ -9,3 +9,4 @@ ACE_RCSID(ace, OS_NS_errno, "$Id: OS_NS_errno.cpp 80826 2008-03-04 14:51:23Z wot # include "ace/OS_NS_errno.inl" #endif /* ACE_HAS_INLINED_OSCALLS */ + diff --git a/dep/ACE_wrappers/ace/OS_NS_errno.h b/dep/ACE_wrappers/ace/OS_NS_errno.h index 1bf0d216aa1..9ab6d1b1f38 100644 --- a/dep/ACE_wrappers/ace/OS_NS_errno.h +++ b/dep/ACE_wrappers/ace/OS_NS_errno.h @@ -98,3 +98,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL # include /**/ "ace/post.h" #endif /* ACE_OS_NS_ERRNO_H */ + diff --git a/dep/ACE_wrappers/ace/OS_NS_fcntl.cpp b/dep/ACE_wrappers/ace/OS_NS_fcntl.cpp index aa90f7930fd..a50e900330a 100644 --- a/dep/ACE_wrappers/ace/OS_NS_fcntl.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_fcntl.cpp @@ -243,3 +243,4 @@ ACE_OS::open (const wchar_t *filename, #endif /* ACE_HAS_WCHAR */ ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/OS_NS_fcntl.h b/dep/ACE_wrappers/ace/OS_NS_fcntl.h index 539ac306ff2..1fc765ce0bd 100644 --- a/dep/ACE_wrappers/ace/OS_NS_fcntl.h +++ b/dep/ACE_wrappers/ace/OS_NS_fcntl.h @@ -81,3 +81,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL # include /**/ "ace/post.h" #endif /* ACE_OS_NS_FCNTL_H */ + diff --git a/dep/ACE_wrappers/ace/OS_NS_macros.h b/dep/ACE_wrappers/ace/OS_NS_macros.h index a949ce2472c..b80db9eebdb 100644 --- a/dep/ACE_wrappers/ace/OS_NS_macros.h +++ b/dep/ACE_wrappers/ace/OS_NS_macros.h @@ -112,3 +112,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL # include /**/ "ace/post.h" #endif /* ACE_OS_NS_MACROS_H */ + diff --git a/dep/ACE_wrappers/ace/OS_NS_math.cpp b/dep/ACE_wrappers/ace/OS_NS_math.cpp index ae9554c0625..7cbfd89336c 100644 --- a/dep/ACE_wrappers/ace/OS_NS_math.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_math.cpp @@ -8,3 +8,4 @@ ACE_RCSID(ace, OS_NS_math, "$Id: OS_NS_math.cpp 80826 2008-03-04 14:51:23Z wotte # include "ace/OS_NS_math.inl" #endif /* ACE_HAS_INLINED_OSCALLS */ + diff --git a/dep/ACE_wrappers/ace/OS_NS_math.h b/dep/ACE_wrappers/ace/OS_NS_math.h index 9d001d01b25..0ed1d6ce892 100644 --- a/dep/ACE_wrappers/ace/OS_NS_math.h +++ b/dep/ACE_wrappers/ace/OS_NS_math.h @@ -113,3 +113,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL # include /**/ "ace/post.h" #endif /* ACE_OS_NS_MATH_H */ + diff --git a/dep/ACE_wrappers/ace/OS_NS_netdb.cpp b/dep/ACE_wrappers/ace/OS_NS_netdb.cpp index 8cee46be209..f4fa87906a9 100644 --- a/dep/ACE_wrappers/ace/OS_NS_netdb.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_netdb.cpp @@ -419,3 +419,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL # endif /* defined (ACE_LACKS_NETDB_REENTRANT_FUNCTIONS) */ + diff --git a/dep/ACE_wrappers/ace/OS_NS_netdb.h b/dep/ACE_wrappers/ace/OS_NS_netdb.h index 0c6bdf43556..2cf78998db1 100644 --- a/dep/ACE_wrappers/ace/OS_NS_netdb.h +++ b/dep/ACE_wrappers/ace/OS_NS_netdb.h @@ -144,3 +144,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL # include /**/ "ace/post.h" #endif /* ACE_OS_NS_NETDB_H */ + diff --git a/dep/ACE_wrappers/ace/OS_NS_poll.cpp b/dep/ACE_wrappers/ace/OS_NS_poll.cpp index 0c8523d890f..f31c48e4ac1 100644 --- a/dep/ACE_wrappers/ace/OS_NS_poll.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_poll.cpp @@ -8,3 +8,4 @@ ACE_RCSID(ace, OS_NS_poll, "$Id: OS_NS_poll.cpp 80826 2008-03-04 14:51:23Z wotte # include "ace/OS_NS_poll.inl" #endif /* ACE_HAS_INLINED_OSCALLS */ + diff --git a/dep/ACE_wrappers/ace/OS_NS_poll.h b/dep/ACE_wrappers/ace/OS_NS_poll.h index b18893b1932..bf20577bc6b 100644 --- a/dep/ACE_wrappers/ace/OS_NS_poll.h +++ b/dep/ACE_wrappers/ace/OS_NS_poll.h @@ -64,3 +64,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL # include /**/ "ace/post.h" #endif /* ACE_OS_NS_POLL_H */ + diff --git a/dep/ACE_wrappers/ace/OS_NS_pwd.cpp b/dep/ACE_wrappers/ace/OS_NS_pwd.cpp index 7a3e5c59b04..1c8387a16fa 100644 --- a/dep/ACE_wrappers/ace/OS_NS_pwd.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_pwd.cpp @@ -8,3 +8,4 @@ ACE_RCSID(ace, OS_NS_pwd, "$Id: OS_NS_pwd.cpp 80826 2008-03-04 14:51:23Z wotte $ # include "ace/OS_NS_pwd.inl" #endif /* ACE_HAS_INLINED_OSCALLS */ + diff --git a/dep/ACE_wrappers/ace/OS_NS_pwd.h b/dep/ACE_wrappers/ace/OS_NS_pwd.h index 3291d60129f..a70a6d3f3bc 100644 --- a/dep/ACE_wrappers/ace/OS_NS_pwd.h +++ b/dep/ACE_wrappers/ace/OS_NS_pwd.h @@ -79,3 +79,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL # include /**/ "ace/post.h" #endif /* ACE_OS_NS_PWD_H */ + diff --git a/dep/ACE_wrappers/ace/OS_NS_regex.cpp b/dep/ACE_wrappers/ace/OS_NS_regex.cpp index 62533a2f45a..df532281eac 100644 --- a/dep/ACE_wrappers/ace/OS_NS_regex.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_regex.cpp @@ -8,3 +8,4 @@ ACE_RCSID(ace, OS_NS_regex, "$Id: OS_NS_regex.cpp 80826 2008-03-04 14:51:23Z wot # include "ace/OS_NS_regex.inl" #endif /* ACE_HAS_INLINED_OSCALLS */ + diff --git a/dep/ACE_wrappers/ace/OS_NS_regex.h b/dep/ACE_wrappers/ace/OS_NS_regex.h index eccdb69dd5d..8684d087d5d 100644 --- a/dep/ACE_wrappers/ace/OS_NS_regex.h +++ b/dep/ACE_wrappers/ace/OS_NS_regex.h @@ -63,3 +63,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL # include /**/ "ace/post.h" #endif /* ACE_OS_NS_REGEX_H */ + diff --git a/dep/ACE_wrappers/ace/OS_NS_signal.cpp b/dep/ACE_wrappers/ace/OS_NS_signal.cpp index bb1c4130564..e0b3b612676 100644 --- a/dep/ACE_wrappers/ace/OS_NS_signal.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_signal.cpp @@ -24,3 +24,4 @@ siginfo_t::siginfo_t (ACE_HANDLE *handles) ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/OS_NS_signal.h b/dep/ACE_wrappers/ace/OS_NS_signal.h index 57b9e3dd169..d9abed0a666 100644 --- a/dep/ACE_wrappers/ace/OS_NS_signal.h +++ b/dep/ACE_wrappers/ace/OS_NS_signal.h @@ -151,3 +151,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL # include /**/ "ace/post.h" #endif /* ACE_OS_NS_SIGNAL_H */ + diff --git a/dep/ACE_wrappers/ace/OS_NS_stdio.cpp b/dep/ACE_wrappers/ace/OS_NS_stdio.cpp index 42bedf0ac7b..01ceec72279 100644 --- a/dep/ACE_wrappers/ace/OS_NS_stdio.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_stdio.cpp @@ -460,3 +460,4 @@ ACE_OS::vaswprintf_emulation(wchar_t **bufp, const wchar_t *format, va_list argp #endif /* ACE_HAS_WCHAR */ ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/OS_NS_stdio.h b/dep/ACE_wrappers/ace/OS_NS_stdio.h index 306249d94bc..a27d90822c9 100644 --- a/dep/ACE_wrappers/ace/OS_NS_stdio.h +++ b/dep/ACE_wrappers/ace/OS_NS_stdio.h @@ -540,3 +540,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL # include /**/ "ace/post.h" #endif /* ACE_OS_NS_STDIO_H */ + diff --git a/dep/ACE_wrappers/ace/OS_NS_stdlib.cpp b/dep/ACE_wrappers/ace/OS_NS_stdlib.cpp index 737be33ec5a..78d01380c0f 100644 --- a/dep/ACE_wrappers/ace/OS_NS_stdlib.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_stdlib.cpp @@ -870,3 +870,4 @@ ACE_OS::setprogname_emulation (const char* progname) #endif /* !ACE_HAS_SETPROGNAME */ ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/OS_NS_stdlib.h b/dep/ACE_wrappers/ace/OS_NS_stdlib.h index dcc5f7ae4b3..237956efc7e 100644 --- a/dep/ACE_wrappers/ace/OS_NS_stdlib.h +++ b/dep/ACE_wrappers/ace/OS_NS_stdlib.h @@ -330,3 +330,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL # include /**/ "ace/post.h" #endif /* ACE_OS_NS_STDLIB_H */ + diff --git a/dep/ACE_wrappers/ace/OS_NS_string.cpp b/dep/ACE_wrappers/ace/OS_NS_string.cpp index cd5da7ee514..924d8199af9 100644 --- a/dep/ACE_wrappers/ace/OS_NS_string.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_string.cpp @@ -375,3 +375,4 @@ ACE_OS::strtok_r_emulation (ACE_WCHAR_T *s, # endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSTOK */ ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/OS_NS_string.h b/dep/ACE_wrappers/ace/OS_NS_string.h index dd6020a704c..d75fbce6ece 100644 --- a/dep/ACE_wrappers/ace/OS_NS_string.h +++ b/dep/ACE_wrappers/ace/OS_NS_string.h @@ -469,3 +469,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL # include /**/ "ace/post.h" #endif /* ACE_OS_NS_STRING_H */ + diff --git a/dep/ACE_wrappers/ace/OS_NS_strings.cpp b/dep/ACE_wrappers/ace/OS_NS_strings.cpp index 5b5cfcf4917..74510861fe0 100644 --- a/dep/ACE_wrappers/ace/OS_NS_strings.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_strings.cpp @@ -82,3 +82,4 @@ ACE_OS::strncasecmp_emulation (const char *s, #endif /* ACE_LACKS_STRCASECMP */ ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/OS_NS_strings.h b/dep/ACE_wrappers/ace/OS_NS_strings.h index 9a9775230ec..7f1ad48c831 100644 --- a/dep/ACE_wrappers/ace/OS_NS_strings.h +++ b/dep/ACE_wrappers/ace/OS_NS_strings.h @@ -84,3 +84,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL # include /**/ "ace/post.h" #endif /* ACE_OS_NS_STRINGS_H */ + diff --git a/dep/ACE_wrappers/ace/OS_NS_stropts.cpp b/dep/ACE_wrappers/ace/OS_NS_stropts.cpp index 847340b9a9e..0917715924a 100644 --- a/dep/ACE_wrappers/ace/OS_NS_stropts.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_stropts.cpp @@ -193,3 +193,4 @@ ACE_OS::ioctl (ACE_HANDLE socket, #endif /* !(defined (ACE_HAS_WINCE) && (UNDER_CE < 500)) */ ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/OS_NS_stropts.h b/dep/ACE_wrappers/ace/OS_NS_stropts.h index 7be61a75423..edae88c3e25 100644 --- a/dep/ACE_wrappers/ace/OS_NS_stropts.h +++ b/dep/ACE_wrappers/ace/OS_NS_stropts.h @@ -170,3 +170,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL # include /**/ "ace/post.h" #endif /* ACE_OS_NS_STROPTS_H */ + diff --git a/dep/ACE_wrappers/ace/OS_NS_sys_mman.cpp b/dep/ACE_wrappers/ace/OS_NS_sys_mman.cpp index d0b02a9e056..d4224bb5d59 100644 --- a/dep/ACE_wrappers/ace/OS_NS_sys_mman.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_sys_mman.cpp @@ -8,3 +8,4 @@ ACE_RCSID(ace, OS_NS_sys_mman, "$Id: OS_NS_sys_mman.cpp 80826 2008-03-04 14:51:2 # include "ace/OS_NS_sys_mman.inl" #endif /* ACE_HAS_INLINED_OSCALLS */ + diff --git a/dep/ACE_wrappers/ace/OS_NS_sys_mman.h b/dep/ACE_wrappers/ace/OS_NS_sys_mman.h index c4dd05e83c5..b9015a7fa61 100644 --- a/dep/ACE_wrappers/ace/OS_NS_sys_mman.h +++ b/dep/ACE_wrappers/ace/OS_NS_sys_mman.h @@ -95,3 +95,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL # include /**/ "ace/post.h" #endif /* ACE_OS_NS_SYS_MMAN_H */ + diff --git a/dep/ACE_wrappers/ace/OS_NS_sys_msg.cpp b/dep/ACE_wrappers/ace/OS_NS_sys_msg.cpp index 3e2b177b765..4cc59b49b2a 100644 --- a/dep/ACE_wrappers/ace/OS_NS_sys_msg.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_sys_msg.cpp @@ -8,3 +8,4 @@ ACE_RCSID(ace, OS_NS_sys_msg, "$Id: OS_NS_sys_msg.cpp 80826 2008-03-04 14:51:23Z # include "ace/OS_NS_sys_msg.inl" #endif /* ACE_HAS_INLINED_OSCALLS */ + diff --git a/dep/ACE_wrappers/ace/OS_NS_sys_msg.h b/dep/ACE_wrappers/ace/OS_NS_sys_msg.h index 24b4f5057c6..a2599407d8a 100644 --- a/dep/ACE_wrappers/ace/OS_NS_sys_msg.h +++ b/dep/ACE_wrappers/ace/OS_NS_sys_msg.h @@ -75,3 +75,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL # include /**/ "ace/post.h" #endif /* ACE_OS_NS_SYS_MSG_H */ + diff --git a/dep/ACE_wrappers/ace/OS_NS_sys_resource.cpp b/dep/ACE_wrappers/ace/OS_NS_sys_resource.cpp index 58d29f604f9..516d9e4d003 100644 --- a/dep/ACE_wrappers/ace/OS_NS_sys_resource.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_sys_resource.cpp @@ -8,3 +8,4 @@ ACE_RCSID(ace, OS_NS_sys_resource, "$Id: OS_NS_sys_resource.cpp 80826 2008-03-04 # include "ace/OS_NS_sys_resource.inl" #endif /* ACE_HAS_INLINED_OSCALLS */ + diff --git a/dep/ACE_wrappers/ace/OS_NS_sys_resource.h b/dep/ACE_wrappers/ace/OS_NS_sys_resource.h index 009cb13560e..5b9a7abea92 100644 --- a/dep/ACE_wrappers/ace/OS_NS_sys_resource.h +++ b/dep/ACE_wrappers/ace/OS_NS_sys_resource.h @@ -65,3 +65,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL # include /**/ "ace/post.h" #endif /* ACE_OS_NS_SYS_RESOURCE_H */ + diff --git a/dep/ACE_wrappers/ace/OS_NS_sys_select.cpp b/dep/ACE_wrappers/ace/OS_NS_sys_select.cpp index 9c6588ad43e..afe41b7a3e7 100644 --- a/dep/ACE_wrappers/ace/OS_NS_sys_select.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_sys_select.cpp @@ -8,3 +8,4 @@ ACE_RCSID(ace, OS_NS_sys_select, "$Id: OS_NS_sys_select.cpp 80826 2008-03-04 14: # include "ace/OS_NS_sys_select.inl" #endif /* ACE_HAS_INLINED_OSCALLS */ + diff --git a/dep/ACE_wrappers/ace/OS_NS_sys_select.h b/dep/ACE_wrappers/ace/OS_NS_sys_select.h index 94e7d84ab50..8425f3eb66c 100644 --- a/dep/ACE_wrappers/ace/OS_NS_sys_select.h +++ b/dep/ACE_wrappers/ace/OS_NS_sys_select.h @@ -75,3 +75,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL # include /**/ "ace/post.h" #endif /* ACE_OS_NS_SYS_SELECT_H */ + diff --git a/dep/ACE_wrappers/ace/OS_NS_sys_sendfile.cpp b/dep/ACE_wrappers/ace/OS_NS_sys_sendfile.cpp index 8f48c7a2030..bf0911d5653 100644 --- a/dep/ACE_wrappers/ace/OS_NS_sys_sendfile.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_sys_sendfile.cpp @@ -51,3 +51,4 @@ ACE_OS::sendfile_emulation (ACE_HANDLE out_fd, #endif /* !ACE_HAS_SENDFILE */ ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/OS_NS_sys_sendfile.h b/dep/ACE_wrappers/ace/OS_NS_sys_sendfile.h index 621444f3c34..85487530097 100644 --- a/dep/ACE_wrappers/ace/OS_NS_sys_sendfile.h +++ b/dep/ACE_wrappers/ace/OS_NS_sys_sendfile.h @@ -63,3 +63,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_OS_NS_SYS_SENDFILE_H */ + diff --git a/dep/ACE_wrappers/ace/OS_NS_sys_shm.cpp b/dep/ACE_wrappers/ace/OS_NS_sys_shm.cpp index 4c2353935da..db4792c9476 100644 --- a/dep/ACE_wrappers/ace/OS_NS_sys_shm.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_sys_shm.cpp @@ -8,3 +8,4 @@ ACE_RCSID(ace, OS_NS_sys_shm, "$Id: OS_NS_sys_shm.cpp 80826 2008-03-04 14:51:23Z # include "ace/OS_NS_sys_shm.inl" #endif /* ACE_HAS_INLINED_OSCALLS */ + diff --git a/dep/ACE_wrappers/ace/OS_NS_sys_shm.h b/dep/ACE_wrappers/ace/OS_NS_sys_shm.h index 9f34b482bc9..bd5cbadc80b 100644 --- a/dep/ACE_wrappers/ace/OS_NS_sys_shm.h +++ b/dep/ACE_wrappers/ace/OS_NS_sys_shm.h @@ -72,3 +72,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL # include /**/ "ace/post.h" #endif /* ACE_OS_NS_SYS_SHM_H */ + diff --git a/dep/ACE_wrappers/ace/OS_NS_sys_socket.cpp b/dep/ACE_wrappers/ace/OS_NS_sys_socket.cpp index 36fc8a946fa..4c14784dd53 100644 --- a/dep/ACE_wrappers/ace/OS_NS_sys_socket.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_sys_socket.cpp @@ -159,3 +159,4 @@ ACE_OS::socket_fini (void) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/OS_NS_sys_socket.h b/dep/ACE_wrappers/ace/OS_NS_sys_socket.h index 3f0fe8799bf..c545a2c017a 100644 --- a/dep/ACE_wrappers/ace/OS_NS_sys_socket.h +++ b/dep/ACE_wrappers/ace/OS_NS_sys_socket.h @@ -300,3 +300,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL # include /**/ "ace/post.h" #endif /* ACE_OS_NS_SYS_SOCKET_H */ + diff --git a/dep/ACE_wrappers/ace/OS_NS_sys_stat.cpp b/dep/ACE_wrappers/ace/OS_NS_sys_stat.cpp index 1cba079cf76..fbb98a3f1ec 100644 --- a/dep/ACE_wrappers/ace/OS_NS_sys_stat.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_sys_stat.cpp @@ -8,3 +8,4 @@ ACE_RCSID(ace, OS_NS_sys_stat, "$Id: OS_NS_sys_stat.cpp 80826 2008-03-04 14:51:2 # include "ace/OS_NS_sys_stat.inl" #endif /* ACE_HAS_INLINED_OSCALLS */ + diff --git a/dep/ACE_wrappers/ace/OS_NS_sys_stat.h b/dep/ACE_wrappers/ace/OS_NS_sys_stat.h index 36e11a9ebde..6aeb8f3095c 100644 --- a/dep/ACE_wrappers/ace/OS_NS_sys_stat.h +++ b/dep/ACE_wrappers/ace/OS_NS_sys_stat.h @@ -147,3 +147,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL # include /**/ "ace/post.h" #endif /* ACE_OS_NS_SYS_STAT_H */ + diff --git a/dep/ACE_wrappers/ace/OS_NS_sys_time.cpp b/dep/ACE_wrappers/ace/OS_NS_sys_time.cpp index e1be6798811..25c80834830 100644 --- a/dep/ACE_wrappers/ace/OS_NS_sys_time.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_sys_time.cpp @@ -8,3 +8,4 @@ ACE_RCSID(ace, OS_NS_sys_time, "$Id: OS_NS_sys_time.cpp 80826 2008-03-04 14:51:2 # include "ace/OS_NS_sys_time.inl" #endif /* ACE_HAS_INLINED_OSCALLS */ + diff --git a/dep/ACE_wrappers/ace/OS_NS_sys_time.h b/dep/ACE_wrappers/ace/OS_NS_sys_time.h index 3d9aa2dd9ba..1efb8c036fd 100644 --- a/dep/ACE_wrappers/ace/OS_NS_sys_time.h +++ b/dep/ACE_wrappers/ace/OS_NS_sys_time.h @@ -67,3 +67,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL # include /**/ "ace/post.h" #endif /* ACE_OS_NS_SYS_TIME_H */ + diff --git a/dep/ACE_wrappers/ace/OS_NS_sys_uio.cpp b/dep/ACE_wrappers/ace/OS_NS_sys_uio.cpp index c0d59f62db4..e4cac846e57 100644 --- a/dep/ACE_wrappers/ace/OS_NS_sys_uio.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_sys_uio.cpp @@ -128,3 +128,4 @@ ACE_OS::writev_emulation (ACE_HANDLE handle, const iovec *iov, int n) # endif /* ACE_LACKS_WRITEV */ ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/OS_NS_sys_uio.h b/dep/ACE_wrappers/ace/OS_NS_sys_uio.h index d08df3d1cd9..c0e54d09770 100644 --- a/dep/ACE_wrappers/ace/OS_NS_sys_uio.h +++ b/dep/ACE_wrappers/ace/OS_NS_sys_uio.h @@ -78,3 +78,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL # include /**/ "ace/post.h" #endif /* ACE_OS_NS_SYS_UIO_H */ + diff --git a/dep/ACE_wrappers/ace/OS_NS_sys_utsname.cpp b/dep/ACE_wrappers/ace/OS_NS_sys_utsname.cpp index 0f64e716a7c..d5450bcf35b 100644 --- a/dep/ACE_wrappers/ace/OS_NS_sys_utsname.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_sys_utsname.cpp @@ -235,3 +235,4 @@ ACE_OS::uname (ACE_utsname *name) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/OS_NS_sys_utsname.h b/dep/ACE_wrappers/ace/OS_NS_sys_utsname.h index 978fecf9ecd..fe3cda91b21 100644 --- a/dep/ACE_wrappers/ace/OS_NS_sys_utsname.h +++ b/dep/ACE_wrappers/ace/OS_NS_sys_utsname.h @@ -69,3 +69,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL # include /**/ "ace/post.h" #endif /* ACE_OS_NS_SYS_UTSNAME_H */ + diff --git a/dep/ACE_wrappers/ace/OS_NS_sys_wait.cpp b/dep/ACE_wrappers/ace/OS_NS_sys_wait.cpp index 2f83bb28efb..beec3030232 100644 --- a/dep/ACE_wrappers/ace/OS_NS_sys_wait.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_sys_wait.cpp @@ -7,3 +7,4 @@ ACE_RCSID(ace, OS_NS_sys_wait, "$Id: OS_NS_sys_wait.cpp 80826 2008-03-04 14:51:2 #if !defined (ACE_HAS_INLINED_OSCALLS) # include "ace/OS_NS_sys_wait.inl" #endif /* ACE_HAS_INLINED_OSCALLS */ + diff --git a/dep/ACE_wrappers/ace/OS_NS_sys_wait.h b/dep/ACE_wrappers/ace/OS_NS_sys_wait.h index c71b3e3a57e..801b9b08bb6 100644 --- a/dep/ACE_wrappers/ace/OS_NS_sys_wait.h +++ b/dep/ACE_wrappers/ace/OS_NS_sys_wait.h @@ -85,3 +85,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL # include /**/ "ace/post.h" #endif /* ACE_OS_NS_SYS_WAIT_H */ + diff --git a/dep/ACE_wrappers/ace/OS_NS_time.cpp b/dep/ACE_wrappers/ace/OS_NS_time.cpp index b68c657ed4c..1ac31e31080 100644 --- a/dep/ACE_wrappers/ace/OS_NS_time.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_time.cpp @@ -635,3 +635,4 @@ ACE_OS::strptime_getnum (const char *buf, #endif /* ACE_LACKS_STRPTIME && !ACE_REFUSE_STRPTIME_EMULATION */ ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/OS_NS_time.h b/dep/ACE_wrappers/ace/OS_NS_time.h index 66304d1e010..61b51ffebf1 100644 --- a/dep/ACE_wrappers/ace/OS_NS_time.h +++ b/dep/ACE_wrappers/ace/OS_NS_time.h @@ -286,3 +286,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL # include /**/ "ace/post.h" #endif /* ACE_OS_NS_TIME_H */ + diff --git a/dep/ACE_wrappers/ace/OS_NS_unistd.cpp b/dep/ACE_wrappers/ace/OS_NS_unistd.cpp index d5d538fec60..7aa77e4f693 100644 --- a/dep/ACE_wrappers/ace/OS_NS_unistd.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_unistd.cpp @@ -898,3 +898,4 @@ ACE_OS::write_n (ACE_HANDLE handle, } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/OS_NS_unistd.h b/dep/ACE_wrappers/ace/OS_NS_unistd.h index fce6dc8b132..576cf37bae4 100644 --- a/dep/ACE_wrappers/ace/OS_NS_unistd.h +++ b/dep/ACE_wrappers/ace/OS_NS_unistd.h @@ -380,3 +380,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL # include /**/ "ace/post.h" #endif /* ACE_OS_NS_UNISTD_H */ + diff --git a/dep/ACE_wrappers/ace/OS_NS_wchar.cpp b/dep/ACE_wrappers/ace/OS_NS_wchar.cpp index c5217eff649..a29f0597224 100644 --- a/dep/ACE_wrappers/ace/OS_NS_wchar.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_wchar.cpp @@ -375,3 +375,4 @@ ACE_OS::wcsstr_emulation (const wchar_t *string, #endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSSTR */ ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/OS_NS_wchar.h b/dep/ACE_wrappers/ace/OS_NS_wchar.h index 4a9843ab845..e1201d3884f 100644 --- a/dep/ACE_wrappers/ace/OS_NS_wchar.h +++ b/dep/ACE_wrappers/ace/OS_NS_wchar.h @@ -197,3 +197,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL # include /**/ "ace/post.h" #endif /* ACE_OS_NS_STDIO_H */ + diff --git a/dep/ACE_wrappers/ace/OS_QoS.cpp b/dep/ACE_wrappers/ace/OS_QoS.cpp index e24b32c8541..0adf6efc01e 100644 --- a/dep/ACE_wrappers/ace/OS_QoS.cpp +++ b/dep/ACE_wrappers/ace/OS_QoS.cpp @@ -474,3 +474,4 @@ ACE_Accept_QoS_Params::callback_data (unsigned long cd) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/OS_QoS.h b/dep/ACE_wrappers/ace/OS_QoS.h index 74d46afce0e..022a17bee30 100644 --- a/dep/ACE_wrappers/ace/OS_QoS.h +++ b/dep/ACE_wrappers/ace/OS_QoS.h @@ -447,3 +447,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_OS_QOS_H */ + diff --git a/dep/ACE_wrappers/ace/OS_String.h b/dep/ACE_wrappers/ace/OS_String.h index 2d7aa86ad85..10ea346fc9c 100644 --- a/dep/ACE_wrappers/ace/OS_String.h +++ b/dep/ACE_wrappers/ace/OS_String.h @@ -30,3 +30,4 @@ #include /**/ "ace/post.h" #endif /* ACE_OS_STRING_H */ + diff --git a/dep/ACE_wrappers/ace/OS_TLI.cpp b/dep/ACE_wrappers/ace/OS_TLI.cpp index c874388f46f..c2754b7b36d 100644 --- a/dep/ACE_wrappers/ace/OS_TLI.cpp +++ b/dep/ACE_wrappers/ace/OS_TLI.cpp @@ -7,3 +7,4 @@ ACE_RCSID(ace, OS_TLI, "$Id: OS_TLI.cpp 80826 2008-03-04 14:51:23Z wotte $") #if !defined (ACE_HAS_INLINED_OSCALLS) # include "ace/OS_TLI.inl" #endif /* !ACE_HAS_INLINED_OSCALLS */ + diff --git a/dep/ACE_wrappers/ace/OS_TLI.h b/dep/ACE_wrappers/ace/OS_TLI.h index 61a6cd5c026..8e607acd4b4 100644 --- a/dep/ACE_wrappers/ace/OS_TLI.h +++ b/dep/ACE_wrappers/ace/OS_TLI.h @@ -283,3 +283,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_OS_TLI_H */ + diff --git a/dep/ACE_wrappers/ace/OS_Thread_Adapter.cpp b/dep/ACE_wrappers/ace/OS_Thread_Adapter.cpp index f65d1acaff2..7fa4d1a4896 100644 --- a/dep/ACE_wrappers/ace/OS_Thread_Adapter.cpp +++ b/dep/ACE_wrappers/ace/OS_Thread_Adapter.cpp @@ -151,3 +151,4 @@ ACE_OS_Thread_Adapter::invoke (void) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/OS_Thread_Adapter.h b/dep/ACE_wrappers/ace/OS_Thread_Adapter.h index 7b41c5609f9..d51bc772168 100644 --- a/dep/ACE_wrappers/ace/OS_Thread_Adapter.h +++ b/dep/ACE_wrappers/ace/OS_Thread_Adapter.h @@ -70,3 +70,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_THREAD_ADAPTER_H */ + diff --git a/dep/ACE_wrappers/ace/OS_main.cpp b/dep/ACE_wrappers/ace/OS_main.cpp index cf9e0bc8436..18bcae32d50 100644 --- a/dep/ACE_wrappers/ace/OS_main.cpp +++ b/dep/ACE_wrappers/ace/OS_main.cpp @@ -125,3 +125,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL # endif /* !ACE_HAS_WINCE */ # endif /* ACE_HAS_NONSTATIC_OBJECT_MANAGER && !ACE_HAS_WINCE && !ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER */ + diff --git a/dep/ACE_wrappers/ace/OS_main.h b/dep/ACE_wrappers/ace/OS_main.h index 71be8c08e31..502aa5da67e 100644 --- a/dep/ACE_wrappers/ace/OS_main.h +++ b/dep/ACE_wrappers/ace/OS_main.h @@ -303,3 +303,4 @@ int ace_main_i # include /**/ "ace/post.h" #endif /* ACE_OS_MAIN_H */ + diff --git a/dep/ACE_wrappers/ace/Obchunk.cpp b/dep/ACE_wrappers/ace/Obchunk.cpp index cbe56af7de7..71a69d1a3e7 100644 --- a/dep/ACE_wrappers/ace/Obchunk.cpp +++ b/dep/ACE_wrappers/ace/Obchunk.cpp @@ -34,3 +34,4 @@ ACE_Obchunk::ACE_Obchunk (size_t size) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Obchunk.h b/dep/ACE_wrappers/ace/Obchunk.h index b76a7f7e3cf..1cb7c24b76c 100644 --- a/dep/ACE_wrappers/ace/Obchunk.h +++ b/dep/ACE_wrappers/ace/Obchunk.h @@ -75,3 +75,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_OBCHUNK_H */ + diff --git a/dep/ACE_wrappers/ace/Object_Manager.cpp b/dep/ACE_wrappers/ace/Object_Manager.cpp index fbe0b5c46dc..bd97cc9ecaf 100644 --- a/dep/ACE_wrappers/ace/Object_Manager.cpp +++ b/dep/ACE_wrappers/ace/Object_Manager.cpp @@ -887,3 +887,4 @@ ACE_Static_Object_Lock::cleanup_lock (void) #endif /* ACE_HAS_THREADS */ ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Object_Manager.h b/dep/ACE_wrappers/ace/Object_Manager.h index 2b603b0a3a9..741b9e3eebf 100644 --- a/dep/ACE_wrappers/ace/Object_Manager.h +++ b/dep/ACE_wrappers/ace/Object_Manager.h @@ -464,3 +464,4 @@ ACE_FACTORY_DECLARE (ACE, ACE_Service_Manager) #include /**/ "ace/post.h" #endif /* ACE_OBJECT_MANAGER_H */ + diff --git a/dep/ACE_wrappers/ace/Object_Manager_Base.cpp b/dep/ACE_wrappers/ace/Object_Manager_Base.cpp index 16b271df165..cc615fa48b9 100644 --- a/dep/ACE_wrappers/ace/Object_Manager_Base.cpp +++ b/dep/ACE_wrappers/ace/Object_Manager_Base.cpp @@ -504,3 +504,4 @@ static ACE_OS_Object_Manager_Manager ACE_OS_Object_Manager_Manager_instance; #endif /* ! ACE_HAS_NONSTATIC_OBJECT_MANAGER */ ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Object_Manager_Base.h b/dep/ACE_wrappers/ace/Object_Manager_Base.h index 8335253c457..d1058874d7d 100644 --- a/dep/ACE_wrappers/ace/Object_Manager_Base.h +++ b/dep/ACE_wrappers/ace/Object_Manager_Base.h @@ -246,3 +246,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_OBJECT_MANAGER_BASE_H */ + diff --git a/dep/ACE_wrappers/ace/Obstack.h b/dep/ACE_wrappers/ace/Obstack.h index b7b75e7351a..24ccd6bdfbf 100644 --- a/dep/ACE_wrappers/ace/Obstack.h +++ b/dep/ACE_wrappers/ace/Obstack.h @@ -29,3 +29,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_OBSTACK_H */ + diff --git a/dep/ACE_wrappers/ace/Obstack_T.cpp b/dep/ACE_wrappers/ace/Obstack_T.cpp index 5c6863fc607..b63e0ce1f3d 100644 --- a/dep/ACE_wrappers/ace/Obstack_T.cpp +++ b/dep/ACE_wrappers/ace/Obstack_T.cpp @@ -224,3 +224,4 @@ ACE_Obstack_T<CHAR>::freeze (void) ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_OBSTACK_T_CPP */ + diff --git a/dep/ACE_wrappers/ace/Obstack_T.h b/dep/ACE_wrappers/ace/Obstack_T.h index c94cbc7cf9c..130d818199b 100644 --- a/dep/ACE_wrappers/ace/Obstack_T.h +++ b/dep/ACE_wrappers/ace/Obstack_T.h @@ -132,3 +132,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_OBSTACK_T_H */ + diff --git a/dep/ACE_wrappers/ace/PI_Malloc.cpp b/dep/ACE_wrappers/ace/PI_Malloc.cpp index 979ddd6ba4c..4e27441f405 100644 --- a/dep/ACE_wrappers/ace/PI_Malloc.cpp +++ b/dep/ACE_wrappers/ace/PI_Malloc.cpp @@ -163,3 +163,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1*/ #endif /* ACE_PI_MALLOC_CPP */ + diff --git a/dep/ACE_wrappers/ace/PI_Malloc.h b/dep/ACE_wrappers/ace/PI_Malloc.h index 679b71b98ca..a1167fb6fad 100644 --- a/dep/ACE_wrappers/ace/PI_Malloc.h +++ b/dep/ACE_wrappers/ace/PI_Malloc.h @@ -211,3 +211,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_PI_MALLOC_H */ + diff --git a/dep/ACE_wrappers/ace/POSIX_Asynch_IO.cpp b/dep/ACE_wrappers/ace/POSIX_Asynch_IO.cpp index f585ad66555..26b9eb33164 100644 --- a/dep/ACE_wrappers/ace/POSIX_Asynch_IO.cpp +++ b/dep/ACE_wrappers/ace/POSIX_Asynch_IO.cpp @@ -2419,3 +2419,4 @@ ACE_POSIX_Asynch_Write_Dgram::ACE_POSIX_Asynch_Write_Dgram ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_AIO_CALLS */ + diff --git a/dep/ACE_wrappers/ace/POSIX_Asynch_IO.h b/dep/ACE_wrappers/ace/POSIX_Asynch_IO.h index 0f3ed30b41b..79e46f47c79 100644 --- a/dep/ACE_wrappers/ace/POSIX_Asynch_IO.h +++ b/dep/ACE_wrappers/ace/POSIX_Asynch_IO.h @@ -1300,3 +1300,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_AIO_CALLS */ #endif /* ACE_POSIX_ASYNCH_IO_H */ + diff --git a/dep/ACE_wrappers/ace/POSIX_CB_Proactor.cpp b/dep/ACE_wrappers/ace/POSIX_CB_Proactor.cpp index 4c6a2b95bb4..8bf356d5f58 100644 --- a/dep/ACE_wrappers/ace/POSIX_CB_Proactor.cpp +++ b/dep/ACE_wrappers/ace/POSIX_CB_Proactor.cpp @@ -183,3 +183,4 @@ ACE_POSIX_CB_Proactor::handle_events_i (u_long milli_seconds) ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_AIO_CALLS && !ACE_HAS_BROKEN_SIGEVENT_STRUCT */ + diff --git a/dep/ACE_wrappers/ace/POSIX_CB_Proactor.h b/dep/ACE_wrappers/ace/POSIX_CB_Proactor.h index fc76f82e228..1900a9422c5 100644 --- a/dep/ACE_wrappers/ace/POSIX_CB_Proactor.h +++ b/dep/ACE_wrappers/ace/POSIX_CB_Proactor.h @@ -95,3 +95,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_AIO_CALLS */ #endif /* ACE_POSIX_CB_PROACTOR_H*/ + diff --git a/dep/ACE_wrappers/ace/POSIX_Proactor.cpp b/dep/ACE_wrappers/ace/POSIX_Proactor.cpp index fc14d884b00..8079ac40fd8 100644 --- a/dep/ACE_wrappers/ace/POSIX_Proactor.cpp +++ b/dep/ACE_wrappers/ace/POSIX_Proactor.cpp @@ -2062,3 +2062,4 @@ ACE_POSIX_Wakeup_Completion::complete (size_t /* bytes_transferred */, ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_AIO_CALLS */ + diff --git a/dep/ACE_wrappers/ace/POSIX_Proactor.h b/dep/ACE_wrappers/ace/POSIX_Proactor.h index 991a27515ec..e3088d756a5 100644 --- a/dep/ACE_wrappers/ace/POSIX_Proactor.h +++ b/dep/ACE_wrappers/ace/POSIX_Proactor.h @@ -657,3 +657,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_AIO_CALLS && ACE_HAS_POSIX_REALTIME_SIGNALS */ #endif /* ACE_POSIX_PROACTOR_H */ + diff --git a/dep/ACE_wrappers/ace/Pagefile_Memory_Pool.cpp b/dep/ACE_wrappers/ace/Pagefile_Memory_Pool.cpp index 476a33f4f23..37ac4016fad 100644 --- a/dep/ACE_wrappers/ace/Pagefile_Memory_Pool.cpp +++ b/dep/ACE_wrappers/ace/Pagefile_Memory_Pool.cpp @@ -383,3 +383,4 @@ ACE_Pagefile_Memory_Pool::map (int &first_time, ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_WIN32 && !ACE_HAS_PHARLAP */ + diff --git a/dep/ACE_wrappers/ace/Pagefile_Memory_Pool.h b/dep/ACE_wrappers/ace/Pagefile_Memory_Pool.h index 002ae823d71..888ca897fac 100644 --- a/dep/ACE_wrappers/ace/Pagefile_Memory_Pool.h +++ b/dep/ACE_wrappers/ace/Pagefile_Memory_Pool.h @@ -199,3 +199,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_MEMORY_POOL_H */ + diff --git a/dep/ACE_wrappers/ace/Pair.h b/dep/ACE_wrappers/ace/Pair.h index 39e8575644c..e1d8b526639 100644 --- a/dep/ACE_wrappers/ace/Pair.h +++ b/dep/ACE_wrappers/ace/Pair.h @@ -30,3 +30,4 @@ #include /**/ "ace/post.h" #endif /* ACE_PAIR_H */ + diff --git a/dep/ACE_wrappers/ace/Pair_T.cpp b/dep/ACE_wrappers/ace/Pair_T.cpp index 35e5803e6d8..64233f3baac 100644 --- a/dep/ACE_wrappers/ace/Pair_T.cpp +++ b/dep/ACE_wrappers/ace/Pair_T.cpp @@ -14,3 +14,4 @@ #endif /* __ACE_INLINE__ */ #endif /* ACE_PAIR_T_CPP */ + diff --git a/dep/ACE_wrappers/ace/Pair_T.h b/dep/ACE_wrappers/ace/Pair_T.h index 2f744ec4d0a..09629b49a26 100644 --- a/dep/ACE_wrappers/ace/Pair_T.h +++ b/dep/ACE_wrappers/ace/Pair_T.h @@ -127,3 +127,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_PAIR_T_H */ + diff --git a/dep/ACE_wrappers/ace/Parse_Node.cpp b/dep/ACE_wrappers/ace/Parse_Node.cpp index 80e980fca0f..1132a345feb 100644 --- a/dep/ACE_wrappers/ace/Parse_Node.cpp +++ b/dep/ACE_wrappers/ace/Parse_Node.cpp @@ -883,3 +883,4 @@ ACE_Service_Type_Factory::name (void) const ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_USES_CLASSIC_SVC_CONF == 1 */ + diff --git a/dep/ACE_wrappers/ace/Parse_Node.h b/dep/ACE_wrappers/ace/Parse_Node.h index 034deef3116..232b3890396 100644 --- a/dep/ACE_wrappers/ace/Parse_Node.h +++ b/dep/ACE_wrappers/ace/Parse_Node.h @@ -521,3 +521,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_PARSE_NODE_H */ + diff --git a/dep/ACE_wrappers/ace/Ping_Socket.cpp b/dep/ACE_wrappers/ace/Ping_Socket.cpp index 70601c78a6a..a09e3731a80 100644 --- a/dep/ACE_wrappers/ace/Ping_Socket.cpp +++ b/dep/ACE_wrappers/ace/Ping_Socket.cpp @@ -375,3 +375,4 @@ ACE_Ping_Socket::make_echo_check (ACE_INET_Addr & remote_addr, ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_ICMP_SUPPORT == 1 */ + diff --git a/dep/ACE_wrappers/ace/Ping_Socket.h b/dep/ACE_wrappers/ace/Ping_Socket.h index 213f37fbd47..6681d013dbc 100644 --- a/dep/ACE_wrappers/ace/Ping_Socket.h +++ b/dep/ACE_wrappers/ace/Ping_Socket.h @@ -116,3 +116,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_PING_SOCKET_H */ + diff --git a/dep/ACE_wrappers/ace/Pipe.cpp b/dep/ACE_wrappers/ace/Pipe.cpp index a05b92596df..717f72e52ea 100644 --- a/dep/ACE_wrappers/ace/Pipe.cpp +++ b/dep/ACE_wrappers/ace/Pipe.cpp @@ -358,3 +358,4 @@ ACE_Pipe::recv (size_t n, ...) const } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Pipe.h b/dep/ACE_wrappers/ace/Pipe.h index 1034b4e117c..0dd37ed14d0 100644 --- a/dep/ACE_wrappers/ace/Pipe.h +++ b/dep/ACE_wrappers/ace/Pipe.h @@ -163,3 +163,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_PIPE_H */ + diff --git a/dep/ACE_wrappers/ace/Priority_Reactor.cpp b/dep/ACE_wrappers/ace/Priority_Reactor.cpp index 9d11bdc4715..10a3a80567e 100644 --- a/dep/ACE_wrappers/ace/Priority_Reactor.cpp +++ b/dep/ACE_wrappers/ace/Priority_Reactor.cpp @@ -186,3 +186,4 @@ ACE_Priority_Reactor::dump (void) const } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Priority_Reactor.h b/dep/ACE_wrappers/ace/Priority_Reactor.h index 3bac29a6770..bdca70ece7a 100644 --- a/dep/ACE_wrappers/ace/Priority_Reactor.h +++ b/dep/ACE_wrappers/ace/Priority_Reactor.h @@ -98,3 +98,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_PRIORITY_REACTOR_H */ + diff --git a/dep/ACE_wrappers/ace/Proactor.cpp b/dep/ACE_wrappers/ace/Proactor.cpp index f7771aec114..c56f352e789 100644 --- a/dep/ACE_wrappers/ace/Proactor.cpp +++ b/dep/ACE_wrappers/ace/Proactor.cpp @@ -1174,3 +1174,4 @@ ACE_Proactor::event_loop_done (void) ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */ + diff --git a/dep/ACE_wrappers/ace/Proactor.h b/dep/ACE_wrappers/ace/Proactor.h index 6b3f34f358f..04e4aac19a5 100644 --- a/dep/ACE_wrappers/ace/Proactor.h +++ b/dep/ACE_wrappers/ace/Proactor.h @@ -689,3 +689,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_PROACTOR_H */ + diff --git a/dep/ACE_wrappers/ace/Proactor_Impl.cpp b/dep/ACE_wrappers/ace/Proactor_Impl.cpp index 3375540d946..8a7d9b8e6e0 100644 --- a/dep/ACE_wrappers/ace/Proactor_Impl.cpp +++ b/dep/ACE_wrappers/ace/Proactor_Impl.cpp @@ -19,3 +19,4 @@ ACE_Proactor_Impl::~ACE_Proactor_Impl (void) ACE_END_VERSIONED_NAMESPACE_DECL #endif + diff --git a/dep/ACE_wrappers/ace/Proactor_Impl.h b/dep/ACE_wrappers/ace/Proactor_Impl.h index 9668206b2e7..dc79c8f57c1 100644 --- a/dep/ACE_wrappers/ace/Proactor_Impl.h +++ b/dep/ACE_wrappers/ace/Proactor_Impl.h @@ -263,3 +263,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */ #include /**/ "ace/post.h" #endif /* ACE_PROACTOR_IMPL_H */ + diff --git a/dep/ACE_wrappers/ace/Process.cpp b/dep/ACE_wrappers/ace/Process.cpp index 1871e304401..a39a02beb52 100644 --- a/dep/ACE_wrappers/ace/Process.cpp +++ b/dep/ACE_wrappers/ace/Process.cpp @@ -1389,3 +1389,4 @@ ACE_Managed_Process::unmanage (void) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Process.h b/dep/ACE_wrappers/ace/Process.h index 33fad9fa0b7..908d3d0cf97 100644 --- a/dep/ACE_wrappers/ace/Process.h +++ b/dep/ACE_wrappers/ace/Process.h @@ -633,3 +633,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_PROCESS_H */ + diff --git a/dep/ACE_wrappers/ace/Process_Manager.cpp b/dep/ACE_wrappers/ace/Process_Manager.cpp index 46af3f5098f..95c92329a65 100644 --- a/dep/ACE_wrappers/ace/Process_Manager.cpp +++ b/dep/ACE_wrappers/ace/Process_Manager.cpp @@ -1021,3 +1021,4 @@ ACE_Process_Manager::notify_proc_handler (size_t i, } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Process_Manager.h b/dep/ACE_wrappers/ace/Process_Manager.h index e2a569480ec..53b5ad7d55b 100644 --- a/dep/ACE_wrappers/ace/Process_Manager.h +++ b/dep/ACE_wrappers/ace/Process_Manager.h @@ -475,3 +475,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_PROCESS_MANAGER_H */ + diff --git a/dep/ACE_wrappers/ace/Process_Mutex.cpp b/dep/ACE_wrappers/ace/Process_Mutex.cpp index 95d6529d933..fb86e8af00a 100644 --- a/dep/ACE_wrappers/ace/Process_Mutex.cpp +++ b/dep/ACE_wrappers/ace/Process_Mutex.cpp @@ -88,3 +88,4 @@ ACE_Process_Mutex::~ACE_Process_Mutex (void) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Process_Mutex.h b/dep/ACE_wrappers/ace/Process_Mutex.h index b2b7b269829..8f23211a378 100644 --- a/dep/ACE_wrappers/ace/Process_Mutex.h +++ b/dep/ACE_wrappers/ace/Process_Mutex.h @@ -214,3 +214,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_PROCESS_MUTEX_H */ + diff --git a/dep/ACE_wrappers/ace/Process_Semaphore.cpp b/dep/ACE_wrappers/ace/Process_Semaphore.cpp index 9c84b955eed..8be6ecf292c 100644 --- a/dep/ACE_wrappers/ace/Process_Semaphore.cpp +++ b/dep/ACE_wrappers/ace/Process_Semaphore.cpp @@ -109,3 +109,4 @@ ACE_Malloc_Lock_Adapter_T<ACE_Process_Semaphore>::operator () (const ACE_TCHAR * } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Process_Semaphore.h b/dep/ACE_wrappers/ace/Process_Semaphore.h index d2f34797322..7a3e148ace3 100644 --- a/dep/ACE_wrappers/ace/Process_Semaphore.h +++ b/dep/ACE_wrappers/ace/Process_Semaphore.h @@ -159,3 +159,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_PROCESS_SEMAPHORE_H */ + diff --git a/dep/ACE_wrappers/ace/Profile_Timer.cpp b/dep/ACE_wrappers/ace/Profile_Timer.cpp index 081afa18c6d..2680ad06810 100644 --- a/dep/ACE_wrappers/ace/Profile_Timer.cpp +++ b/dep/ACE_wrappers/ace/Profile_Timer.cpp @@ -441,3 +441,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #endif /* defined (ACE_HAS_PRUSAGE_T) || defined (ACE_HAS_GETRUSAGE) && !defined (ACE_WIN32) */ + diff --git a/dep/ACE_wrappers/ace/Profile_Timer.h b/dep/ACE_wrappers/ace/Profile_Timer.h index 247c2796ff1..c46cdab2168 100644 --- a/dep/ACE_wrappers/ace/Profile_Timer.h +++ b/dep/ACE_wrappers/ace/Profile_Timer.h @@ -137,3 +137,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_PROFILE_TIMER_H */ + diff --git a/dep/ACE_wrappers/ace/RB_Tree.cpp b/dep/ACE_wrappers/ace/RB_Tree.cpp index 88bbd50bdab..efbcad514c0 100644 --- a/dep/ACE_wrappers/ace/RB_Tree.cpp +++ b/dep/ACE_wrappers/ace/RB_Tree.cpp @@ -1248,3 +1248,4 @@ ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::~ACE_RB_Tr ACE_END_VERSIONED_NAMESPACE_DECL #endif /* !ACE_RB_TREE_CPP */ + diff --git a/dep/ACE_wrappers/ace/RB_Tree.h b/dep/ACE_wrappers/ace/RB_Tree.h index 86948e36ce2..536d7073ccc 100644 --- a/dep/ACE_wrappers/ace/RB_Tree.h +++ b/dep/ACE_wrappers/ace/RB_Tree.h @@ -902,3 +902,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ! defined (ACE_RB_TREE_H) */ + diff --git a/dep/ACE_wrappers/ace/RW_Mutex.cpp b/dep/ACE_wrappers/ace/RW_Mutex.cpp index b8734bb620e..0bf52665615 100644 --- a/dep/ACE_wrappers/ace/RW_Mutex.cpp +++ b/dep/ACE_wrappers/ace/RW_Mutex.cpp @@ -53,3 +53,4 @@ ACE_RW_Mutex::~ACE_RW_Mutex (void) ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_THREADS */ + diff --git a/dep/ACE_wrappers/ace/RW_Mutex.h b/dep/ACE_wrappers/ace/RW_Mutex.h index e5719ad10ac..ffb31124475 100644 --- a/dep/ACE_wrappers/ace/RW_Mutex.h +++ b/dep/ACE_wrappers/ace/RW_Mutex.h @@ -139,3 +139,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_RW_MUTEX_H */ + diff --git a/dep/ACE_wrappers/ace/RW_Process_Mutex.cpp b/dep/ACE_wrappers/ace/RW_Process_Mutex.cpp index a39de3e346a..72a23b89d67 100644 --- a/dep/ACE_wrappers/ace/RW_Process_Mutex.cpp +++ b/dep/ACE_wrappers/ace/RW_Process_Mutex.cpp @@ -52,3 +52,4 @@ ACE_RW_Process_Mutex::dump (void) const } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/RW_Process_Mutex.h b/dep/ACE_wrappers/ace/RW_Process_Mutex.h index bd9ff309e76..d6bb39f67c9 100644 --- a/dep/ACE_wrappers/ace/RW_Process_Mutex.h +++ b/dep/ACE_wrappers/ace/RW_Process_Mutex.h @@ -142,3 +142,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_RW_PROCESS_MUTEX_H */ + diff --git a/dep/ACE_wrappers/ace/RW_Thread_Mutex.cpp b/dep/ACE_wrappers/ace/RW_Thread_Mutex.cpp index 281f2d4815b..bd1b2ad6111 100644 --- a/dep/ACE_wrappers/ace/RW_Thread_Mutex.cpp +++ b/dep/ACE_wrappers/ace/RW_Thread_Mutex.cpp @@ -43,3 +43,4 @@ ACE_RW_Thread_Mutex::dump (void) const ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_THREADS */ + diff --git a/dep/ACE_wrappers/ace/RW_Thread_Mutex.h b/dep/ACE_wrappers/ace/RW_Thread_Mutex.h index 49028296696..b8c1c341754 100644 --- a/dep/ACE_wrappers/ace/RW_Thread_Mutex.h +++ b/dep/ACE_wrappers/ace/RW_Thread_Mutex.h @@ -72,3 +72,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_RW_THREAD_MUTEX_H */ + diff --git a/dep/ACE_wrappers/ace/Reactor.cpp b/dep/ACE_wrappers/ace/Reactor.cpp index fa44b18c1a8..024a36129d2 100644 --- a/dep/ACE_wrappers/ace/Reactor.cpp +++ b/dep/ACE_wrappers/ace/Reactor.cpp @@ -510,3 +510,4 @@ ACE_Reactor::cancel_timer (long timer_id, } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Reactor.h b/dep/ACE_wrappers/ace/Reactor.h index f3d2a37ae15..223c25b103f 100644 --- a/dep/ACE_wrappers/ace/Reactor.h +++ b/dep/ACE_wrappers/ace/Reactor.h @@ -878,3 +878,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_REACTOR_H */ + diff --git a/dep/ACE_wrappers/ace/Reactor_Impl.cpp b/dep/ACE_wrappers/ace/Reactor_Impl.cpp index dceba327691..fe0ce99d0b8 100644 --- a/dep/ACE_wrappers/ace/Reactor_Impl.cpp +++ b/dep/ACE_wrappers/ace/Reactor_Impl.cpp @@ -13,3 +13,4 @@ ACE_Reactor_Impl::~ACE_Reactor_Impl (void) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Reactor_Impl.h b/dep/ACE_wrappers/ace/Reactor_Impl.h index a4b4de6de06..d943e9ee5ec 100644 --- a/dep/ACE_wrappers/ace/Reactor_Impl.h +++ b/dep/ACE_wrappers/ace/Reactor_Impl.h @@ -567,3 +567,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_REACTOR_IMPL_H */ + diff --git a/dep/ACE_wrappers/ace/Reactor_Notification_Strategy.cpp b/dep/ACE_wrappers/ace/Reactor_Notification_Strategy.cpp index ca09498ece8..8c216b092de 100644 --- a/dep/ACE_wrappers/ace/Reactor_Notification_Strategy.cpp +++ b/dep/ACE_wrappers/ace/Reactor_Notification_Strategy.cpp @@ -36,3 +36,4 @@ ACE_Reactor_Notification_Strategy::notify (ACE_Event_Handler *eh, } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Reactor_Notification_Strategy.h b/dep/ACE_wrappers/ace/Reactor_Notification_Strategy.h index 38e9f3bb4ca..fd73b36bb67 100644 --- a/dep/ACE_wrappers/ace/Reactor_Notification_Strategy.h +++ b/dep/ACE_wrappers/ace/Reactor_Notification_Strategy.h @@ -64,3 +64,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /*ACE_REACTOR_NOTIFICATION_STRATEGY_H */ + diff --git a/dep/ACE_wrappers/ace/Reactor_Timer_Interface.cpp b/dep/ACE_wrappers/ace/Reactor_Timer_Interface.cpp index e2c644bd7d3..91a4f48810a 100644 --- a/dep/ACE_wrappers/ace/Reactor_Timer_Interface.cpp +++ b/dep/ACE_wrappers/ace/Reactor_Timer_Interface.cpp @@ -14,3 +14,4 @@ ACE_Reactor_Timer_Interface::~ACE_Reactor_Timer_Interface() } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Reactor_Timer_Interface.h b/dep/ACE_wrappers/ace/Reactor_Timer_Interface.h index 02e4e628186..aaa2a663b0a 100644 --- a/dep/ACE_wrappers/ace/Reactor_Timer_Interface.h +++ b/dep/ACE_wrappers/ace/Reactor_Timer_Interface.h @@ -58,3 +58,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_REACTOR_TIMER_INTERFACE_H */ + diff --git a/dep/ACE_wrappers/ace/Reactor_Token_T.cpp b/dep/ACE_wrappers/ace/Reactor_Token_T.cpp index 5520c85c756..753c73b8a7f 100644 --- a/dep/ACE_wrappers/ace/Reactor_Token_T.cpp +++ b/dep/ACE_wrappers/ace/Reactor_Token_T.cpp @@ -68,3 +68,4 @@ ACE_Reactor_Token_T<ACE_TOKEN_TYPE>::sleep_hook (void) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Reactor_Token_T.h b/dep/ACE_wrappers/ace/Reactor_Token_T.h index 7442040b95e..4fcd2dae4f2 100644 --- a/dep/ACE_wrappers/ace/Reactor_Token_T.h +++ b/dep/ACE_wrappers/ace/Reactor_Token_T.h @@ -91,3 +91,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_REACTOR_TOKEN_T_H */ + diff --git a/dep/ACE_wrappers/ace/Read_Buffer.cpp b/dep/ACE_wrappers/ace/Read_Buffer.cpp index dc246a466b0..d87e2c55d3c 100644 --- a/dep/ACE_wrappers/ace/Read_Buffer.cpp +++ b/dep/ACE_wrappers/ace/Read_Buffer.cpp @@ -174,3 +174,4 @@ ACE_Read_Buffer::rec_read (int term, int search, int replace) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Read_Buffer.h b/dep/ACE_wrappers/ace/Read_Buffer.h index fafd42d6512..5dc1e9fa181 100644 --- a/dep/ACE_wrappers/ace/Read_Buffer.h +++ b/dep/ACE_wrappers/ace/Read_Buffer.h @@ -127,3 +127,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_READ_BUFFER_H */ + diff --git a/dep/ACE_wrappers/ace/Recursive_Thread_Mutex.cpp b/dep/ACE_wrappers/ace/Recursive_Thread_Mutex.cpp index c62302e2fc6..a654fdd82f3 100644 --- a/dep/ACE_wrappers/ace/Recursive_Thread_Mutex.cpp +++ b/dep/ACE_wrappers/ace/Recursive_Thread_Mutex.cpp @@ -123,3 +123,4 @@ ACE_Recursive_Thread_Mutex::dump (void) const ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_THREADS */ + diff --git a/dep/ACE_wrappers/ace/Recursive_Thread_Mutex.h b/dep/ACE_wrappers/ace/Recursive_Thread_Mutex.h index 2dce01607c9..0f61a75e300 100644 --- a/dep/ACE_wrappers/ace/Recursive_Thread_Mutex.h +++ b/dep/ACE_wrappers/ace/Recursive_Thread_Mutex.h @@ -192,3 +192,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_RECURSIVE_THREAD_MUTEX_H */ + diff --git a/dep/ACE_wrappers/ace/Recyclable.cpp b/dep/ACE_wrappers/ace/Recyclable.cpp index d68ffd4d7b5..1a31631fd9a 100644 --- a/dep/ACE_wrappers/ace/Recyclable.cpp +++ b/dep/ACE_wrappers/ace/Recyclable.cpp @@ -20,3 +20,4 @@ ACE_Recyclable::~ACE_Recyclable (void) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Recyclable.h b/dep/ACE_wrappers/ace/Recyclable.h index ab6844dd14b..6053963d6e0 100644 --- a/dep/ACE_wrappers/ace/Recyclable.h +++ b/dep/ACE_wrappers/ace/Recyclable.h @@ -77,3 +77,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /*ACE_RECYCLABLE_STATE_H*/ + diff --git a/dep/ACE_wrappers/ace/Refcountable.h b/dep/ACE_wrappers/ace/Refcountable.h index eba916cd661..19fc26601bc 100644 --- a/dep/ACE_wrappers/ace/Refcountable.h +++ b/dep/ACE_wrappers/ace/Refcountable.h @@ -30,3 +30,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /*ACE_REFCOUNTABLE_H*/ + diff --git a/dep/ACE_wrappers/ace/Refcountable_T.cpp b/dep/ACE_wrappers/ace/Refcountable_T.cpp index 80c28ea501b..d3b76a3bf08 100644 --- a/dep/ACE_wrappers/ace/Refcountable_T.cpp +++ b/dep/ACE_wrappers/ace/Refcountable_T.cpp @@ -23,3 +23,4 @@ ACE_Refcountable_T<ACE_LOCK>::~ACE_Refcountable_T (void) ACE_END_VERSIONED_NAMESPACE_DECL #endif /* !ACE_REFCOUNTABLE_T_CPP */ + diff --git a/dep/ACE_wrappers/ace/Refcountable_T.h b/dep/ACE_wrappers/ace/Refcountable_T.h index 36e4c508d6e..c18781f7954 100644 --- a/dep/ACE_wrappers/ace/Refcountable_T.h +++ b/dep/ACE_wrappers/ace/Refcountable_T.h @@ -65,3 +65,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /*ACE_REFCOUNTABLE_T_H*/ + diff --git a/dep/ACE_wrappers/ace/Refcounted_Auto_Ptr.cpp b/dep/ACE_wrappers/ace/Refcounted_Auto_Ptr.cpp index c43bcc7b933..483552b15d6 100644 --- a/dep/ACE_wrappers/ace/Refcounted_Auto_Ptr.cpp +++ b/dep/ACE_wrappers/ace/Refcounted_Auto_Ptr.cpp @@ -16,3 +16,4 @@ ACE_Refcounted_Auto_Ptr<X, ACE_LOCK>::~ACE_Refcounted_Auto_Ptr (void) ACE_END_VERSIONED_NAMESPACE_DECL #endif /* !ACE_REFCOUNTED_AUTO_PTR_CPP */ + diff --git a/dep/ACE_wrappers/ace/Refcounted_Auto_Ptr.h b/dep/ACE_wrappers/ace/Refcounted_Auto_Ptr.h index b766d73063e..43f639e8516 100644 --- a/dep/ACE_wrappers/ace/Refcounted_Auto_Ptr.h +++ b/dep/ACE_wrappers/ace/Refcounted_Auto_Ptr.h @@ -197,3 +197,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_REFCOUNTED_AUTO_PTR_H */ + diff --git a/dep/ACE_wrappers/ace/Registry.cpp b/dep/ACE_wrappers/ace/Registry.cpp index 9ae33451160..897df00a9af 100644 --- a/dep/ACE_wrappers/ace/Registry.cpp +++ b/dep/ACE_wrappers/ace/Registry.cpp @@ -1119,3 +1119,4 @@ ACE_Predefined_Naming_Contexts::is_local_host (const ACE_TCHAR *machine_name) ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_WIN32 && !ACE_LACKS_WIN32_REGISTRY */ + diff --git a/dep/ACE_wrappers/ace/Registry.h b/dep/ACE_wrappers/ace/Registry.h index b5d3b5449a5..2fc7a37d6d1 100644 --- a/dep/ACE_wrappers/ace/Registry.h +++ b/dep/ACE_wrappers/ace/Registry.h @@ -557,3 +557,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_WIN32 && !ACE_LACKS_WIN32_REGISTRY */ #include /**/ "ace/post.h" #endif /* ACE_REGISTRY_H */ + diff --git a/dep/ACE_wrappers/ace/Registry_Name_Space.cpp b/dep/ACE_wrappers/ace/Registry_Name_Space.cpp index 3a4234119ae..f59890e6c23 100644 --- a/dep/ACE_wrappers/ace/Registry_Name_Space.cpp +++ b/dep/ACE_wrappers/ace/Registry_Name_Space.cpp @@ -291,3 +291,4 @@ ACE_Registry_Name_Space::dump (void) const ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_WIN32 && ACE_USES_WCHAR */ + diff --git a/dep/ACE_wrappers/ace/Registry_Name_Space.h b/dep/ACE_wrappers/ace/Registry_Name_Space.h index 6e37419e8d1..842231777b6 100644 --- a/dep/ACE_wrappers/ace/Registry_Name_Space.h +++ b/dep/ACE_wrappers/ace/Registry_Name_Space.h @@ -138,3 +138,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_REGISTRY_NAME_SPACE_H */ + diff --git a/dep/ACE_wrappers/ace/Remote_Name_Space.cpp b/dep/ACE_wrappers/ace/Remote_Name_Space.cpp index afbfd360f21..5d609ec86ce 100644 --- a/dep/ACE_wrappers/ace/Remote_Name_Space.cpp +++ b/dep/ACE_wrappers/ace/Remote_Name_Space.cpp @@ -378,3 +378,4 @@ ACE_Remote_Name_Space::dump (void) const } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Remote_Name_Space.h b/dep/ACE_wrappers/ace/Remote_Name_Space.h index 683f36c7963..8b4ebdfc65e 100644 --- a/dep/ACE_wrappers/ace/Remote_Name_Space.h +++ b/dep/ACE_wrappers/ace/Remote_Name_Space.h @@ -145,3 +145,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_REMOTE_NAME_SPACE_H */ + diff --git a/dep/ACE_wrappers/ace/Remote_Tokens.cpp b/dep/ACE_wrappers/ace/Remote_Tokens.cpp index 30c7a556fa5..3df59910fa7 100644 --- a/dep/ACE_wrappers/ace/Remote_Tokens.cpp +++ b/dep/ACE_wrappers/ace/Remote_Tokens.cpp @@ -525,3 +525,4 @@ ACE_Remote_WLock::dump (void) const ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_TOKENS_LIBRARY */ + diff --git a/dep/ACE_wrappers/ace/Remote_Tokens.h b/dep/ACE_wrappers/ace/Remote_Tokens.h index 0014a3f5552..d9a47cf7aa8 100644 --- a/dep/ACE_wrappers/ace/Remote_Tokens.h +++ b/dep/ACE_wrappers/ace/Remote_Tokens.h @@ -320,3 +320,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_REMOTE_TOKEN_H */ + diff --git a/dep/ACE_wrappers/ace/Reverse_Lock_T.cpp b/dep/ACE_wrappers/ace/Reverse_Lock_T.cpp index b8f6255dbc0..6d2337727ee 100644 --- a/dep/ACE_wrappers/ace/Reverse_Lock_T.cpp +++ b/dep/ACE_wrappers/ace/Reverse_Lock_T.cpp @@ -91,3 +91,4 @@ ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::tryacquire_write_upgrade (void) ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_REVERSE_LOCK_T_CPP */ + diff --git a/dep/ACE_wrappers/ace/Reverse_Lock_T.h b/dep/ACE_wrappers/ace/Reverse_Lock_T.h index 12428d856de..979ee34ce63 100644 --- a/dep/ACE_wrappers/ace/Reverse_Lock_T.h +++ b/dep/ACE_wrappers/ace/Reverse_Lock_T.h @@ -137,3 +137,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_REVERSE_LOCK_T_H */ + diff --git a/dep/ACE_wrappers/ace/SOCK.cpp b/dep/ACE_wrappers/ace/SOCK.cpp index b5b38ced073..555e5876873 100644 --- a/dep/ACE_wrappers/ace/SOCK.cpp +++ b/dep/ACE_wrappers/ace/SOCK.cpp @@ -183,3 +183,4 @@ ACE_SOCK::ACE_SOCK (int type, } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/SOCK.h b/dep/ACE_wrappers/ace/SOCK.h index d2f3df97dc7..3d8b13cf24f 100644 --- a/dep/ACE_wrappers/ace/SOCK.h +++ b/dep/ACE_wrappers/ace/SOCK.h @@ -136,3 +136,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_SOCK_H */ + diff --git a/dep/ACE_wrappers/ace/SOCK_Acceptor.cpp b/dep/ACE_wrappers/ace/SOCK_Acceptor.cpp index f8ced09b78c..3dd98cbd335 100644 --- a/dep/ACE_wrappers/ace/SOCK_Acceptor.cpp +++ b/dep/ACE_wrappers/ace/SOCK_Acceptor.cpp @@ -404,3 +404,4 @@ ACE_SOCK_Acceptor::close (void) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/SOCK_Acceptor.h b/dep/ACE_wrappers/ace/SOCK_Acceptor.h index 3d63ba733df..e854ec07737 100644 --- a/dep/ACE_wrappers/ace/SOCK_Acceptor.h +++ b/dep/ACE_wrappers/ace/SOCK_Acceptor.h @@ -176,3 +176,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_SOCK_ACCEPTOR_H */ + diff --git a/dep/ACE_wrappers/ace/SOCK_CODgram.cpp b/dep/ACE_wrappers/ace/SOCK_CODgram.cpp index 7babdad8e9d..97fb7ec0391 100644 --- a/dep/ACE_wrappers/ace/SOCK_CODgram.cpp +++ b/dep/ACE_wrappers/ace/SOCK_CODgram.cpp @@ -149,3 +149,4 @@ ACE_SOCK_CODgram::open (const ACE_Addr &remote, const ACE_Addr &local, } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/SOCK_CODgram.h b/dep/ACE_wrappers/ace/SOCK_CODgram.h index 0788f871091..761a92d9d31 100644 --- a/dep/ACE_wrappers/ace/SOCK_CODgram.h +++ b/dep/ACE_wrappers/ace/SOCK_CODgram.h @@ -141,3 +141,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_SOCK_CODGRAM_H */ + diff --git a/dep/ACE_wrappers/ace/SOCK_Connector.cpp b/dep/ACE_wrappers/ace/SOCK_Connector.cpp index f45e36d6c79..df09a46b4d2 100644 --- a/dep/ACE_wrappers/ace/SOCK_Connector.cpp +++ b/dep/ACE_wrappers/ace/SOCK_Connector.cpp @@ -357,3 +357,4 @@ ACE_SOCK_Connector::ACE_SOCK_Connector (ACE_SOCK_Stream &new_stream, #endif // ACE_HAS_WINCE ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/SOCK_Connector.h b/dep/ACE_wrappers/ace/SOCK_Connector.h index e22ff2ceef9..9b77e7d61dd 100644 --- a/dep/ACE_wrappers/ace/SOCK_Connector.h +++ b/dep/ACE_wrappers/ace/SOCK_Connector.h @@ -319,3 +319,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_SOCK_CONNECTOR_H */ + diff --git a/dep/ACE_wrappers/ace/SOCK_Dgram.cpp b/dep/ACE_wrappers/ace/SOCK_Dgram.cpp index 12961a44f01..2a442e1c8b5 100644 --- a/dep/ACE_wrappers/ace/SOCK_Dgram.cpp +++ b/dep/ACE_wrappers/ace/SOCK_Dgram.cpp @@ -748,3 +748,4 @@ ACE_SOCK_Dgram::make_multicast_ifaddr6 (ipv6_mreq *ret_mreq, #endif /* __linux__ && ACE_HAS_IPV6 */ ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/SOCK_Dgram.h b/dep/ACE_wrappers/ace/SOCK_Dgram.h index c26c5ff2c35..42696a51fdd 100644 --- a/dep/ACE_wrappers/ace/SOCK_Dgram.h +++ b/dep/ACE_wrappers/ace/SOCK_Dgram.h @@ -237,3 +237,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_SOCK_DGRAM_H */ + diff --git a/dep/ACE_wrappers/ace/SOCK_Dgram_Bcast.cpp b/dep/ACE_wrappers/ace/SOCK_Dgram_Bcast.cpp index 7dbe796eed0..0a55c5149fa 100644 --- a/dep/ACE_wrappers/ace/SOCK_Dgram_Bcast.cpp +++ b/dep/ACE_wrappers/ace/SOCK_Dgram_Bcast.cpp @@ -378,3 +378,4 @@ ACE_SOCK_Dgram_Bcast::send (const iovec iov[], #endif /* ACE_HAS_MSG */ ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/SOCK_Dgram_Bcast.h b/dep/ACE_wrappers/ace/SOCK_Dgram_Bcast.h index 2156a669c89..a85ffc22052 100644 --- a/dep/ACE_wrappers/ace/SOCK_Dgram_Bcast.h +++ b/dep/ACE_wrappers/ace/SOCK_Dgram_Bcast.h @@ -138,3 +138,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_SOCK_DGRAM_BCAST_H */ + diff --git a/dep/ACE_wrappers/ace/SOCK_Dgram_Mcast.cpp b/dep/ACE_wrappers/ace/SOCK_Dgram_Mcast.cpp index 52961235bd7..81ea48352d1 100644 --- a/dep/ACE_wrappers/ace/SOCK_Dgram_Mcast.cpp +++ b/dep/ACE_wrappers/ace/SOCK_Dgram_Mcast.cpp @@ -930,3 +930,4 @@ ACE_SOCK_Dgram_Mcast::clear_subs_list (void) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/SOCK_Dgram_Mcast.h b/dep/ACE_wrappers/ace/SOCK_Dgram_Mcast.h index a84de430ff6..a14e1fc0994 100644 --- a/dep/ACE_wrappers/ace/SOCK_Dgram_Mcast.h +++ b/dep/ACE_wrappers/ace/SOCK_Dgram_Mcast.h @@ -382,3 +382,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_SOCK_DGRAM_MCAST_H */ + diff --git a/dep/ACE_wrappers/ace/SOCK_IO.cpp b/dep/ACE_wrappers/ace/SOCK_IO.cpp index b22016e463e..7d5befad8fd 100644 --- a/dep/ACE_wrappers/ace/SOCK_IO.cpp +++ b/dep/ACE_wrappers/ace/SOCK_IO.cpp @@ -179,3 +179,4 @@ ACE_SOCK_IO::recv (size_t n, ...) const } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/SOCK_IO.h b/dep/ACE_wrappers/ace/SOCK_IO.h index 1541f5ed0f3..ce14f87544b 100644 --- a/dep/ACE_wrappers/ace/SOCK_IO.h +++ b/dep/ACE_wrappers/ace/SOCK_IO.h @@ -134,3 +134,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_SOCK_IO_H */ + diff --git a/dep/ACE_wrappers/ace/SOCK_Netlink.cpp b/dep/ACE_wrappers/ace/SOCK_Netlink.cpp index aa1eca8b992..673b64b2958 100644 --- a/dep/ACE_wrappers/ace/SOCK_Netlink.cpp +++ b/dep/ACE_wrappers/ace/SOCK_Netlink.cpp @@ -111,3 +111,4 @@ ACE_SOCK_Netlink::recv (iovec iov[], ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_NETLINK */ + diff --git a/dep/ACE_wrappers/ace/SOCK_Netlink.h b/dep/ACE_wrappers/ace/SOCK_Netlink.h index c3be221552b..99d1198fa66 100644 --- a/dep/ACE_wrappers/ace/SOCK_Netlink.h +++ b/dep/ACE_wrappers/ace/SOCK_Netlink.h @@ -104,3 +104,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_SOCK_NETLINK_H */ + diff --git a/dep/ACE_wrappers/ace/SOCK_SEQPACK_Acceptor.cpp b/dep/ACE_wrappers/ace/SOCK_SEQPACK_Acceptor.cpp index ab0590564e0..2fe58ab938c 100644 --- a/dep/ACE_wrappers/ace/SOCK_SEQPACK_Acceptor.cpp +++ b/dep/ACE_wrappers/ace/SOCK_SEQPACK_Acceptor.cpp @@ -594,3 +594,4 @@ ACE_SOCK_SEQPACK_Acceptor::close (void) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/SOCK_SEQPACK_Acceptor.h b/dep/ACE_wrappers/ace/SOCK_SEQPACK_Acceptor.h index 117a61bddde..2a524652f5b 100644 --- a/dep/ACE_wrappers/ace/SOCK_SEQPACK_Acceptor.h +++ b/dep/ACE_wrappers/ace/SOCK_SEQPACK_Acceptor.h @@ -188,3 +188,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_SOCK_SEQ_ACCEPTOR_H */ + diff --git a/dep/ACE_wrappers/ace/SOCK_SEQPACK_Association.cpp b/dep/ACE_wrappers/ace/SOCK_SEQPACK_Association.cpp index 4e9afb4701a..13938988826 100644 --- a/dep/ACE_wrappers/ace/SOCK_SEQPACK_Association.cpp +++ b/dep/ACE_wrappers/ace/SOCK_SEQPACK_Association.cpp @@ -337,3 +337,4 @@ ACE_SOCK_SEQPACK_Association::get_remote_addrs (ACE_INET_Addr *addrs, size_t &si } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/SOCK_SEQPACK_Association.h b/dep/ACE_wrappers/ace/SOCK_SEQPACK_Association.h index 6189d1a9987..76cb3527a13 100644 --- a/dep/ACE_wrappers/ace/SOCK_SEQPACK_Association.h +++ b/dep/ACE_wrappers/ace/SOCK_SEQPACK_Association.h @@ -200,3 +200,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_SOCK_SEQPACK_ASSOCIATION_H */ + diff --git a/dep/ACE_wrappers/ace/SOCK_SEQPACK_Connector.cpp b/dep/ACE_wrappers/ace/SOCK_SEQPACK_Connector.cpp index f515f3aded6..3b6adfd7755 100644 --- a/dep/ACE_wrappers/ace/SOCK_SEQPACK_Connector.cpp +++ b/dep/ACE_wrappers/ace/SOCK_SEQPACK_Connector.cpp @@ -441,3 +441,4 @@ ACE_SOCK_SEQPACK_Connector::ACE_SOCK_SEQPACK_Connector (ACE_SOCK_SEQPACK_Associa } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/SOCK_SEQPACK_Connector.h b/dep/ACE_wrappers/ace/SOCK_SEQPACK_Connector.h index 2e0d57afff8..400161660e0 100644 --- a/dep/ACE_wrappers/ace/SOCK_SEQPACK_Connector.h +++ b/dep/ACE_wrappers/ace/SOCK_SEQPACK_Connector.h @@ -329,3 +329,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_SOCK_SEQPACK_CONNECTOR_H */ + diff --git a/dep/ACE_wrappers/ace/SOCK_Stream.cpp b/dep/ACE_wrappers/ace/SOCK_Stream.cpp index 36f0b8761c7..abff10c5811 100644 --- a/dep/ACE_wrappers/ace/SOCK_Stream.cpp +++ b/dep/ACE_wrappers/ace/SOCK_Stream.cpp @@ -38,3 +38,4 @@ ACE_SOCK_Stream::close (void) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/SOCK_Stream.h b/dep/ACE_wrappers/ace/SOCK_Stream.h index a96d7e664ef..d717d4f3eab 100644 --- a/dep/ACE_wrappers/ace/SOCK_Stream.h +++ b/dep/ACE_wrappers/ace/SOCK_Stream.h @@ -182,3 +182,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_SOCK_STREAM_H */ + diff --git a/dep/ACE_wrappers/ace/SPIPE.cpp b/dep/ACE_wrappers/ace/SPIPE.cpp index cddd44e9004..e26e027cbff 100644 --- a/dep/ACE_wrappers/ace/SPIPE.cpp +++ b/dep/ACE_wrappers/ace/SPIPE.cpp @@ -80,3 +80,4 @@ ACE_SPIPE::set_duplex_handle (ACE_HANDLE handle) #endif /* ACE_HAS_STREAM_PIPES */ ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/SPIPE.h b/dep/ACE_wrappers/ace/SPIPE.h index 6654b82a6f3..a65ade1db15 100644 --- a/dep/ACE_wrappers/ace/SPIPE.h +++ b/dep/ACE_wrappers/ace/SPIPE.h @@ -114,3 +114,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_SPIPE_H */ + diff --git a/dep/ACE_wrappers/ace/SPIPE_Acceptor.cpp b/dep/ACE_wrappers/ace/SPIPE_Acceptor.cpp index 3c653c4062f..cc12c0c4b89 100644 --- a/dep/ACE_wrappers/ace/SPIPE_Acceptor.cpp +++ b/dep/ACE_wrappers/ace/SPIPE_Acceptor.cpp @@ -335,3 +335,4 @@ ACE_SPIPE_Acceptor::accept (ACE_SPIPE_Stream &new_io, } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/SPIPE_Acceptor.h b/dep/ACE_wrappers/ace/SPIPE_Acceptor.h index acd7ebada02..bf3b3bba461 100644 --- a/dep/ACE_wrappers/ace/SPIPE_Acceptor.h +++ b/dep/ACE_wrappers/ace/SPIPE_Acceptor.h @@ -166,3 +166,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_SPIPE_ACCEPTOR_H */ + diff --git a/dep/ACE_wrappers/ace/SPIPE_Addr.cpp b/dep/ACE_wrappers/ace/SPIPE_Addr.cpp index e81da6d960d..3f84da76cc4 100644 --- a/dep/ACE_wrappers/ace/SPIPE_Addr.cpp +++ b/dep/ACE_wrappers/ace/SPIPE_Addr.cpp @@ -165,3 +165,4 @@ ACE_SPIPE_Addr::ACE_SPIPE_Addr (const ACE_TCHAR *addr, } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/SPIPE_Addr.h b/dep/ACE_wrappers/ace/SPIPE_Addr.h index 100d93b9658..46834b74727 100644 --- a/dep/ACE_wrappers/ace/SPIPE_Addr.h +++ b/dep/ACE_wrappers/ace/SPIPE_Addr.h @@ -120,3 +120,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_SPIPE_ADDR_H */ + diff --git a/dep/ACE_wrappers/ace/SPIPE_Connector.cpp b/dep/ACE_wrappers/ace/SPIPE_Connector.cpp index c11bb7d9b39..db49ca6c937 100644 --- a/dep/ACE_wrappers/ace/SPIPE_Connector.cpp +++ b/dep/ACE_wrappers/ace/SPIPE_Connector.cpp @@ -158,3 +158,4 @@ ACE_SPIPE_Connector::connect (ACE_SPIPE_Stream &new_io, } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/SPIPE_Connector.h b/dep/ACE_wrappers/ace/SPIPE_Connector.h index 419414adc2c..576cabaa073 100644 --- a/dep/ACE_wrappers/ace/SPIPE_Connector.h +++ b/dep/ACE_wrappers/ace/SPIPE_Connector.h @@ -116,3 +116,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_SPIPE_CONNECTOR_H */ + diff --git a/dep/ACE_wrappers/ace/SPIPE_Stream.cpp b/dep/ACE_wrappers/ace/SPIPE_Stream.cpp index 74a2ab350cb..008ce25ec3b 100644 --- a/dep/ACE_wrappers/ace/SPIPE_Stream.cpp +++ b/dep/ACE_wrappers/ace/SPIPE_Stream.cpp @@ -102,3 +102,4 @@ ACE_SPIPE_Stream::recv (size_t n, ...) const } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/SPIPE_Stream.h b/dep/ACE_wrappers/ace/SPIPE_Stream.h index 582ca07eb37..39a57a33126 100644 --- a/dep/ACE_wrappers/ace/SPIPE_Stream.h +++ b/dep/ACE_wrappers/ace/SPIPE_Stream.h @@ -169,3 +169,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_SPIPE_STREAM_H */ + diff --git a/dep/ACE_wrappers/ace/SString.cpp b/dep/ACE_wrappers/ace/SString.cpp index 6985c076f5e..9548a4e6f38 100644 --- a/dep/ACE_wrappers/ace/SString.cpp +++ b/dep/ACE_wrappers/ace/SString.cpp @@ -548,3 +548,4 @@ template ACE_WSTRING_TYPE ACE_String_Base<ACE_WSTRING_TYPE>::NULL_String_; #endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/SString.h b/dep/ACE_wrappers/ace/SString.h index fea86ba178b..b888521ba86 100644 --- a/dep/ACE_wrappers/ace/SString.h +++ b/dep/ACE_wrappers/ace/SString.h @@ -497,3 +497,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_SSTRING_H */ + diff --git a/dep/ACE_wrappers/ace/SStringfwd.h b/dep/ACE_wrappers/ace/SStringfwd.h index c8c868a433d..f73a39d023b 100644 --- a/dep/ACE_wrappers/ace/SStringfwd.h +++ b/dep/ACE_wrappers/ace/SStringfwd.h @@ -53,3 +53,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_SSTRINGFWD_H */ + diff --git a/dep/ACE_wrappers/ace/SUN_Proactor.cpp b/dep/ACE_wrappers/ace/SUN_Proactor.cpp index a7c125ad38a..56f2431c86e 100644 --- a/dep/ACE_wrappers/ace/SUN_Proactor.cpp +++ b/dep/ACE_wrappers/ace/SUN_Proactor.cpp @@ -322,3 +322,4 @@ ACE_SUN_Proactor::get_impl_type (void) ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_AIO_CALLS && sun */ + diff --git a/dep/ACE_wrappers/ace/SUN_Proactor.h b/dep/ACE_wrappers/ace/SUN_Proactor.h index 496616279f0..135b0f0e8ff 100644 --- a/dep/ACE_wrappers/ace/SUN_Proactor.h +++ b/dep/ACE_wrappers/ace/SUN_Proactor.h @@ -124,3 +124,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_AIO_CALLS && sun */ #endif /* ACE_SUN_PROACTOR_H*/ + diff --git a/dep/ACE_wrappers/ace/SV_Message.cpp b/dep/ACE_wrappers/ace/SV_Message.cpp index 5334cca6f77..b060172e5ef 100644 --- a/dep/ACE_wrappers/ace/SV_Message.cpp +++ b/dep/ACE_wrappers/ace/SV_Message.cpp @@ -22,3 +22,4 @@ ACE_SV_Message::dump (void) const } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/SV_Message.h b/dep/ACE_wrappers/ace/SV_Message.h index 395d35834a2..cb428f12a3d 100644 --- a/dep/ACE_wrappers/ace/SV_Message.h +++ b/dep/ACE_wrappers/ace/SV_Message.h @@ -65,3 +65,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_SV_MESSAGE_H */ + diff --git a/dep/ACE_wrappers/ace/SV_Message_Queue.cpp b/dep/ACE_wrappers/ace/SV_Message_Queue.cpp index a1c9d88791a..917b36829a0 100644 --- a/dep/ACE_wrappers/ace/SV_Message_Queue.cpp +++ b/dep/ACE_wrappers/ace/SV_Message_Queue.cpp @@ -42,3 +42,4 @@ ACE_SV_Message_Queue::ACE_SV_Message_Queue (key_t external_id, } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/SV_Message_Queue.h b/dep/ACE_wrappers/ace/SV_Message_Queue.h index 3698ca90da7..660fc9efb7a 100644 --- a/dep/ACE_wrappers/ace/SV_Message_Queue.h +++ b/dep/ACE_wrappers/ace/SV_Message_Queue.h @@ -103,3 +103,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_SV_MESSAGE_QUEUE_H */ + diff --git a/dep/ACE_wrappers/ace/SV_Semaphore_Complex.cpp b/dep/ACE_wrappers/ace/SV_Semaphore_Complex.cpp index c88c9dde46a..8ff99c052be 100644 --- a/dep/ACE_wrappers/ace/SV_Semaphore_Complex.cpp +++ b/dep/ACE_wrappers/ace/SV_Semaphore_Complex.cpp @@ -257,3 +257,4 @@ ACE_SV_Semaphore_Complex::ACE_SV_Semaphore_Complex (void) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/SV_Semaphore_Complex.h b/dep/ACE_wrappers/ace/SV_Semaphore_Complex.h index fc01ba46789..c4805a577e3 100644 --- a/dep/ACE_wrappers/ace/SV_Semaphore_Complex.h +++ b/dep/ACE_wrappers/ace/SV_Semaphore_Complex.h @@ -157,3 +157,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_SV_SEMAPHORE_COMPLEX_H */ + diff --git a/dep/ACE_wrappers/ace/SV_Semaphore_Simple.cpp b/dep/ACE_wrappers/ace/SV_Semaphore_Simple.cpp index 97395055b38..f7727fd163d 100644 --- a/dep/ACE_wrappers/ace/SV_Semaphore_Simple.cpp +++ b/dep/ACE_wrappers/ace/SV_Semaphore_Simple.cpp @@ -235,3 +235,4 @@ ACE_SV_Semaphore_Simple::remove (void) const } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/SV_Semaphore_Simple.h b/dep/ACE_wrappers/ace/SV_Semaphore_Simple.h index 5d3695615d6..d51034e59e4 100644 --- a/dep/ACE_wrappers/ace/SV_Semaphore_Simple.h +++ b/dep/ACE_wrappers/ace/SV_Semaphore_Simple.h @@ -195,3 +195,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* _SV_SEMAPHORE_SIMPLE_H */ + diff --git a/dep/ACE_wrappers/ace/SV_Shared_Memory.cpp b/dep/ACE_wrappers/ace/SV_Shared_Memory.cpp index 9db097ca2e8..122753989c2 100644 --- a/dep/ACE_wrappers/ace/SV_Shared_Memory.cpp +++ b/dep/ACE_wrappers/ace/SV_Shared_Memory.cpp @@ -86,3 +86,4 @@ ACE_SV_Shared_Memory::ACE_SV_Shared_Memory (ACE_HANDLE int_id, } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/SV_Shared_Memory.h b/dep/ACE_wrappers/ace/SV_Shared_Memory.h index fb34f286b79..f4bc944efa2 100644 --- a/dep/ACE_wrappers/ace/SV_Shared_Memory.h +++ b/dep/ACE_wrappers/ace/SV_Shared_Memory.h @@ -119,3 +119,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_SV_SHARED_MEMORY_H */ + diff --git a/dep/ACE_wrappers/ace/Sample_History.cpp b/dep/ACE_wrappers/ace/Sample_History.cpp index 913bbd5f88a..86a8f449fa2 100644 --- a/dep/ACE_wrappers/ace/Sample_History.cpp +++ b/dep/ACE_wrappers/ace/Sample_History.cpp @@ -71,3 +71,4 @@ ACE_Sample_History::collect_basic_stats (ACE_Basic_Stats &stats) const } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Sample_History.h b/dep/ACE_wrappers/ace/Sample_History.h index 730deea4fab..fe7dd0aa14e 100644 --- a/dep/ACE_wrappers/ace/Sample_History.h +++ b/dep/ACE_wrappers/ace/Sample_History.h @@ -89,3 +89,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_SAMPLE_HISTORY_H */ + diff --git a/dep/ACE_wrappers/ace/Sbrk_Memory_Pool.cpp b/dep/ACE_wrappers/ace/Sbrk_Memory_Pool.cpp index c8c5d3f5a3b..ec17dfcd291 100644 --- a/dep/ACE_wrappers/ace/Sbrk_Memory_Pool.cpp +++ b/dep/ACE_wrappers/ace/Sbrk_Memory_Pool.cpp @@ -122,3 +122,4 @@ ACE_Sbrk_Memory_Pool::round_up (size_t nbytes) ACE_END_VERSIONED_NAMESPACE_DECL #endif /* !ACE_LACKS_SBRK */ + diff --git a/dep/ACE_wrappers/ace/Sbrk_Memory_Pool.h b/dep/ACE_wrappers/ace/Sbrk_Memory_Pool.h index 501994860d9..05fdcdadb30 100644 --- a/dep/ACE_wrappers/ace/Sbrk_Memory_Pool.h +++ b/dep/ACE_wrappers/ace/Sbrk_Memory_Pool.h @@ -116,3 +116,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_SBRK_MEMORY_POOL_H */ + diff --git a/dep/ACE_wrappers/ace/Sched_Params.cpp b/dep/ACE_wrappers/ace/Sched_Params.cpp index 6584d88dbf2..34000a91cbc 100644 --- a/dep/ACE_wrappers/ace/Sched_Params.cpp +++ b/dep/ACE_wrappers/ace/Sched_Params.cpp @@ -330,3 +330,4 @@ ACE_Sched_Params::previous_priority (const Policy policy, } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Sched_Params.h b/dep/ACE_wrappers/ace/Sched_Params.h index 6bde2ddeb22..29983a36a92 100644 --- a/dep/ACE_wrappers/ace/Sched_Params.h +++ b/dep/ACE_wrappers/ace/Sched_Params.h @@ -230,3 +230,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_SCHED_PARAMS_H */ + diff --git a/dep/ACE_wrappers/ace/Select_Reactor.h b/dep/ACE_wrappers/ace/Select_Reactor.h index fdfd78eb6e5..f3595e0474f 100644 --- a/dep/ACE_wrappers/ace/Select_Reactor.h +++ b/dep/ACE_wrappers/ace/Select_Reactor.h @@ -67,3 +67,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_SELECT_REACTOR_H */ + diff --git a/dep/ACE_wrappers/ace/Select_Reactor_Base.cpp b/dep/ACE_wrappers/ace/Select_Reactor_Base.cpp index 380e9a64bb5..ecd5d4bd746 100644 --- a/dep/ACE_wrappers/ace/Select_Reactor_Base.cpp +++ b/dep/ACE_wrappers/ace/Select_Reactor_Base.cpp @@ -1114,3 +1114,4 @@ ACE_Select_Reactor_Impl::resumable_handler (void) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Select_Reactor_Base.h b/dep/ACE_wrappers/ace/Select_Reactor_Base.h index 085cdb13d3d..65b24cd5f23 100644 --- a/dep/ACE_wrappers/ace/Select_Reactor_Base.h +++ b/dep/ACE_wrappers/ace/Select_Reactor_Base.h @@ -609,3 +609,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_SELECT_REACTOR_BASE_H */ + diff --git a/dep/ACE_wrappers/ace/Select_Reactor_T.cpp b/dep/ACE_wrappers/ace/Select_Reactor_T.cpp index f447e3184ea..5250d6b4814 100644 --- a/dep/ACE_wrappers/ace/Select_Reactor_T.cpp +++ b/dep/ACE_wrappers/ace/Select_Reactor_T.cpp @@ -1596,3 +1596,4 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::dump (void) const ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_SELECT_REACTOR_T_CPP */ + diff --git a/dep/ACE_wrappers/ace/Select_Reactor_T.h b/dep/ACE_wrappers/ace/Select_Reactor_T.h index 7b13a15a349..e3d8fe299ce 100644 --- a/dep/ACE_wrappers/ace/Select_Reactor_T.h +++ b/dep/ACE_wrappers/ace/Select_Reactor_T.h @@ -716,3 +716,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_SELECT_REACTOR_T_H */ + diff --git a/dep/ACE_wrappers/ace/Semaphore.cpp b/dep/ACE_wrappers/ace/Semaphore.cpp index b3d6c6638ff..987a2014852 100644 --- a/dep/ACE_wrappers/ace/Semaphore.cpp +++ b/dep/ACE_wrappers/ace/Semaphore.cpp @@ -60,3 +60,4 @@ ACE_Semaphore::~ACE_Semaphore (void) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Semaphore.h b/dep/ACE_wrappers/ace/Semaphore.h index 7c4936abfd3..82709ab6beb 100644 --- a/dep/ACE_wrappers/ace/Semaphore.h +++ b/dep/ACE_wrappers/ace/Semaphore.h @@ -181,3 +181,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_SEMAPHORE_H */ + diff --git a/dep/ACE_wrappers/ace/Service_Config.cpp b/dep/ACE_wrappers/ace/Service_Config.cpp index f0f352cedcb..6a1cd533e98 100644 --- a/dep/ACE_wrappers/ace/Service_Config.cpp +++ b/dep/ACE_wrappers/ace/Service_Config.cpp @@ -617,3 +617,4 @@ ACE_Service_Config::reconfig_occurred (int config_occurred) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Service_Config.h b/dep/ACE_wrappers/ace/Service_Config.h index 61d9fd4d087..6b7241e46ae 100644 --- a/dep/ACE_wrappers/ace/Service_Config.h +++ b/dep/ACE_wrappers/ace/Service_Config.h @@ -682,3 +682,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_SERVICE_CONFIG_H */ + diff --git a/dep/ACE_wrappers/ace/Service_Gestalt.cpp b/dep/ACE_wrappers/ace/Service_Gestalt.cpp index 6ceeb15260f..cf177525ab4 100644 --- a/dep/ACE_wrappers/ace/Service_Gestalt.cpp +++ b/dep/ACE_wrappers/ace/Service_Gestalt.cpp @@ -1294,3 +1294,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL // Allocate a Service Manager. ACE_FACTORY_DEFINE (ACE, ACE_Service_Manager) + diff --git a/dep/ACE_wrappers/ace/Service_Gestalt.h b/dep/ACE_wrappers/ace/Service_Gestalt.h index 51d3b9b2730..2be4de5ba02 100644 --- a/dep/ACE_wrappers/ace/Service_Gestalt.h +++ b/dep/ACE_wrappers/ace/Service_Gestalt.h @@ -508,3 +508,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_SERVICE_GESTALT_H */ + diff --git a/dep/ACE_wrappers/ace/Service_Manager.cpp b/dep/ACE_wrappers/ace/Service_Manager.cpp index 39e26773e0a..b67b34d26be 100644 --- a/dep/ACE_wrappers/ace/Service_Manager.cpp +++ b/dep/ACE_wrappers/ace/Service_Manager.cpp @@ -435,3 +435,4 @@ ACE_Service_Manager::handle_input (ACE_HANDLE) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Service_Manager.h b/dep/ACE_wrappers/ace/Service_Manager.h index 13ce60405ff..8238da7ef78 100644 --- a/dep/ACE_wrappers/ace/Service_Manager.h +++ b/dep/ACE_wrappers/ace/Service_Manager.h @@ -118,3 +118,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* _SERVICE_MANAGER_H */ + diff --git a/dep/ACE_wrappers/ace/Service_Object.cpp b/dep/ACE_wrappers/ace/Service_Object.cpp index 33e27eb35c5..f737d6a3136 100644 --- a/dep/ACE_wrappers/ace/Service_Object.cpp +++ b/dep/ACE_wrappers/ace/Service_Object.cpp @@ -178,3 +178,4 @@ ACE_Dynamic_Svc_Registrar::ACE_Dynamic_Svc_Registrar (const ACE_TCHAR* alloc_nam #endif ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Service_Object.h b/dep/ACE_wrappers/ace/Service_Object.h index d64cebba6c4..fd69ba76f17 100644 --- a/dep/ACE_wrappers/ace/Service_Object.h +++ b/dep/ACE_wrappers/ace/Service_Object.h @@ -205,3 +205,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_SERVICE_OBJECT_H */ + diff --git a/dep/ACE_wrappers/ace/Service_Repository.cpp b/dep/ACE_wrappers/ace/Service_Repository.cpp index 18fafe05be7..d7d673ae756 100644 --- a/dep/ACE_wrappers/ace/Service_Repository.cpp +++ b/dep/ACE_wrappers/ace/Service_Repository.cpp @@ -635,3 +635,4 @@ ACE_Service_Repository_Iterator::valid (void) const } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Service_Repository.h b/dep/ACE_wrappers/ace/Service_Repository.h index 30c11ce6ce9..77b4955683c 100644 --- a/dep/ACE_wrappers/ace/Service_Repository.h +++ b/dep/ACE_wrappers/ace/Service_Repository.h @@ -278,3 +278,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* _SERVICE_REPOSITORY_H */ + diff --git a/dep/ACE_wrappers/ace/Service_Templates.h b/dep/ACE_wrappers/ace/Service_Templates.h index d05d0d611d2..34ab6a10eda 100644 --- a/dep/ACE_wrappers/ace/Service_Templates.h +++ b/dep/ACE_wrappers/ace/Service_Templates.h @@ -27,3 +27,4 @@ #include /**/ "ace/post.h" #endif /* ACE_SERVICE_TEMPLATES_H */ + diff --git a/dep/ACE_wrappers/ace/Service_Types.cpp b/dep/ACE_wrappers/ace/Service_Types.cpp index 46c671beb0a..5eb8765337e 100644 --- a/dep/ACE_wrappers/ace/Service_Types.cpp +++ b/dep/ACE_wrappers/ace/Service_Types.cpp @@ -451,3 +451,4 @@ ACE_Stream_Type::find (const ACE_TCHAR *mod_name) const // @@@ Eliminated ommented out explicit template instantiation code ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Service_Types.h b/dep/ACE_wrappers/ace/Service_Types.h index b9450d2c5a1..e7ab9874ac2 100644 --- a/dep/ACE_wrappers/ace/Service_Types.h +++ b/dep/ACE_wrappers/ace/Service_Types.h @@ -204,3 +204,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* _SERVICE_TYPE_H */ + diff --git a/dep/ACE_wrappers/ace/Shared_Memory.cpp b/dep/ACE_wrappers/ace/Shared_Memory.cpp index ccb1f26c401..6b3d4fa8792 100644 --- a/dep/ACE_wrappers/ace/Shared_Memory.cpp +++ b/dep/ACE_wrappers/ace/Shared_Memory.cpp @@ -11,3 +11,4 @@ ACE_Shared_Memory::~ACE_Shared_Memory (void) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Shared_Memory.h b/dep/ACE_wrappers/ace/Shared_Memory.h index 6dbd17ff492..cda765b4d4d 100644 --- a/dep/ACE_wrappers/ace/Shared_Memory.h +++ b/dep/ACE_wrappers/ace/Shared_Memory.h @@ -56,3 +56,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_SHARED_MEMORY_H */ + diff --git a/dep/ACE_wrappers/ace/Shared_Memory_MM.cpp b/dep/ACE_wrappers/ace/Shared_Memory_MM.cpp index d6d1ed90cce..25ece407bc5 100644 --- a/dep/ACE_wrappers/ace/Shared_Memory_MM.cpp +++ b/dep/ACE_wrappers/ace/Shared_Memory_MM.cpp @@ -109,3 +109,4 @@ ACE_Shared_Memory_MM::free (void *p) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Shared_Memory_MM.h b/dep/ACE_wrappers/ace/Shared_Memory_MM.h index e02b21249ac..27dda8eff57 100644 --- a/dep/ACE_wrappers/ace/Shared_Memory_MM.h +++ b/dep/ACE_wrappers/ace/Shared_Memory_MM.h @@ -118,3 +118,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_SHARED_MALLOC_MM_H */ + diff --git a/dep/ACE_wrappers/ace/Shared_Memory_Pool.cpp b/dep/ACE_wrappers/ace/Shared_Memory_Pool.cpp index b61febc3171..6a67c9235f8 100644 --- a/dep/ACE_wrappers/ace/Shared_Memory_Pool.cpp +++ b/dep/ACE_wrappers/ace/Shared_Memory_Pool.cpp @@ -459,3 +459,4 @@ ACE_Shared_Memory_Pool::round_up (size_t nbytes) ACE_END_VERSIONED_NAMESPACE_DECL #endif /* !ACE_LACKS_SYSV_SHMEM */ + diff --git a/dep/ACE_wrappers/ace/Shared_Memory_Pool.h b/dep/ACE_wrappers/ace/Shared_Memory_Pool.h index 79cb970e712..ea1a5e7d3c6 100644 --- a/dep/ACE_wrappers/ace/Shared_Memory_Pool.h +++ b/dep/ACE_wrappers/ace/Shared_Memory_Pool.h @@ -208,3 +208,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_SHARED_MEMORY_POOL_H */ + diff --git a/dep/ACE_wrappers/ace/Shared_Memory_SV.cpp b/dep/ACE_wrappers/ace/Shared_Memory_SV.cpp index fe26688b098..9cad5d247e2 100644 --- a/dep/ACE_wrappers/ace/Shared_Memory_SV.cpp +++ b/dep/ACE_wrappers/ace/Shared_Memory_SV.cpp @@ -86,3 +86,4 @@ ACE_Shared_Memory_SV::free (void *p) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Shared_Memory_SV.h b/dep/ACE_wrappers/ace/Shared_Memory_SV.h index 7ae62a3323f..ff0268cfda8 100644 --- a/dep/ACE_wrappers/ace/Shared_Memory_SV.h +++ b/dep/ACE_wrappers/ace/Shared_Memory_SV.h @@ -99,3 +99,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_SHARED_MALLOC_SV_H */ + diff --git a/dep/ACE_wrappers/ace/Shared_Object.cpp b/dep/ACE_wrappers/ace/Shared_Object.cpp index 76c27df1cb1..13b4ac72030 100644 --- a/dep/ACE_wrappers/ace/Shared_Object.cpp +++ b/dep/ACE_wrappers/ace/Shared_Object.cpp @@ -52,3 +52,4 @@ ACE_Shared_Object::~ACE_Shared_Object (void) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Shared_Object.h b/dep/ACE_wrappers/ace/Shared_Object.h index fedf051ba6f..17f6dca54dd 100644 --- a/dep/ACE_wrappers/ace/Shared_Object.h +++ b/dep/ACE_wrappers/ace/Shared_Object.h @@ -60,3 +60,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_SHARED_OBJECT_H */ + diff --git a/dep/ACE_wrappers/ace/Sig_Adapter.cpp b/dep/ACE_wrappers/ace/Sig_Adapter.cpp index d1af40f12d5..78683d1c911 100644 --- a/dep/ACE_wrappers/ace/Sig_Adapter.cpp +++ b/dep/ACE_wrappers/ace/Sig_Adapter.cpp @@ -78,3 +78,4 @@ ACE_Sig_Adapter::handle_signal (int signum, } return 0; } + diff --git a/dep/ACE_wrappers/ace/Sig_Adapter.h b/dep/ACE_wrappers/ace/Sig_Adapter.h index cbd6b399867..f0013ede558 100644 --- a/dep/ACE_wrappers/ace/Sig_Adapter.h +++ b/dep/ACE_wrappers/ace/Sig_Adapter.h @@ -79,3 +79,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_SIG_ADAPTER_H */ + diff --git a/dep/ACE_wrappers/ace/Sig_Handler.cpp b/dep/ACE_wrappers/ace/Sig_Handler.cpp index 33bbb638bb4..2829edcef94 100644 --- a/dep/ACE_wrappers/ace/Sig_Handler.cpp +++ b/dep/ACE_wrappers/ace/Sig_Handler.cpp @@ -612,3 +612,4 @@ ACE_Sig_Handlers::handler (int signum, ACE_Event_Handler *new_sh) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Sig_Handler.h b/dep/ACE_wrappers/ace/Sig_Handler.h index 53d30d4f058..ea58980154e 100644 --- a/dep/ACE_wrappers/ace/Sig_Handler.h +++ b/dep/ACE_wrappers/ace/Sig_Handler.h @@ -235,3 +235,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_SIG_HANDLER_H */ + diff --git a/dep/ACE_wrappers/ace/Signal.cpp b/dep/ACE_wrappers/ace/Signal.cpp index 5f17455502b..8c9647ca55f 100644 --- a/dep/ACE_wrappers/ace/Signal.cpp +++ b/dep/ACE_wrappers/ace/Signal.cpp @@ -219,3 +219,4 @@ ACE_Sig_Action::ACE_Sig_Action (const ACE_Sig_Set &signals, } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Signal.h b/dep/ACE_wrappers/ace/Signal.h index 736d62e5c08..7af918cc6e4 100644 --- a/dep/ACE_wrappers/ace/Signal.h +++ b/dep/ACE_wrappers/ace/Signal.h @@ -265,3 +265,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_SIGNAL_HANDLER_H */ + diff --git a/dep/ACE_wrappers/ace/Singleton.cpp b/dep/ACE_wrappers/ace/Singleton.cpp index 41c9cc194e0..518cb438d8f 100644 --- a/dep/ACE_wrappers/ace/Singleton.cpp +++ b/dep/ACE_wrappers/ace/Singleton.cpp @@ -532,3 +532,4 @@ ACE_DLL_Singleton_Adapter_T<TYPE>::dll_name (void) ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_SINGLETON_CPP */ + diff --git a/dep/ACE_wrappers/ace/Singleton.h b/dep/ACE_wrappers/ace/Singleton.h index e9c8498ff8a..2d9c8e937ef 100644 --- a/dep/ACE_wrappers/ace/Singleton.h +++ b/dep/ACE_wrappers/ace/Singleton.h @@ -325,3 +325,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_SINGLETON_H */ + diff --git a/dep/ACE_wrappers/ace/Sock_Connect.cpp b/dep/ACE_wrappers/ace/Sock_Connect.cpp index 99815ce797c..a6b2359c95c 100644 --- a/dep/ACE_wrappers/ace/Sock_Connect.cpp +++ b/dep/ACE_wrappers/ace/Sock_Connect.cpp @@ -1601,3 +1601,4 @@ ACE::ipv6_enabled (void) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Sock_Connect.h b/dep/ACE_wrappers/ace/Sock_Connect.h index d6a72c718b8..195dfcdf116 100644 --- a/dep/ACE_wrappers/ace/Sock_Connect.h +++ b/dep/ACE_wrappers/ace/Sock_Connect.h @@ -105,3 +105,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_SOCK_CONNECT_H */ + diff --git a/dep/ACE_wrappers/ace/Stack_Trace.cpp b/dep/ACE_wrappers/ace/Stack_Trace.cpp index edca5ef2652..1654e599336 100644 --- a/dep/ACE_wrappers/ace/Stack_Trace.cpp +++ b/dep/ACE_wrappers/ace/Stack_Trace.cpp @@ -694,3 +694,4 @@ ACE_Stack_Trace::generate_trace (ssize_t, size_t) } #endif + diff --git a/dep/ACE_wrappers/ace/Stack_Trace.h b/dep/ACE_wrappers/ace/Stack_Trace.h index 3769f7f14d1..b2fc0174ab6 100644 --- a/dep/ACE_wrappers/ace/Stack_Trace.h +++ b/dep/ACE_wrappers/ace/Stack_Trace.h @@ -105,3 +105,4 @@ private: #include /**/ "ace/post.h" #endif /* ACE_STACK_TRACE_H */ + diff --git a/dep/ACE_wrappers/ace/Static_Object_Lock.h b/dep/ACE_wrappers/ace/Static_Object_Lock.h index ad780258ee1..c1d533552cb 100644 --- a/dep/ACE_wrappers/ace/Static_Object_Lock.h +++ b/dep/ACE_wrappers/ace/Static_Object_Lock.h @@ -76,3 +76,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_STATIC_OBJECT_LOCK_H */ + diff --git a/dep/ACE_wrappers/ace/Stats.cpp b/dep/ACE_wrappers/ace/Stats.cpp index bb6dcf0a6a8..eac726e52df 100644 --- a/dep/ACE_wrappers/ace/Stats.cpp +++ b/dep/ACE_wrappers/ace/Stats.cpp @@ -424,3 +424,4 @@ ACE_Stats::square_root (const ACE_UINT64 n, } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Stats.h b/dep/ACE_wrappers/ace/Stats.h index 2590ec95c10..1e60ef34dc1 100644 --- a/dep/ACE_wrappers/ace/Stats.h +++ b/dep/ACE_wrappers/ace/Stats.h @@ -220,3 +220,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ! ACE_STATS_H */ + diff --git a/dep/ACE_wrappers/ace/Strategies.h b/dep/ACE_wrappers/ace/Strategies.h index 484ffa9a510..6ce48398f6e 100644 --- a/dep/ACE_wrappers/ace/Strategies.h +++ b/dep/ACE_wrappers/ace/Strategies.h @@ -31,3 +31,4 @@ #include /**/ "ace/post.h" #endif /*ACE_STRATEGIES_H*/ + diff --git a/dep/ACE_wrappers/ace/Strategies_T.cpp b/dep/ACE_wrappers/ace/Strategies_T.cpp index cd2935aadf3..cd500e16648 100644 --- a/dep/ACE_wrappers/ace/Strategies_T.cpp +++ b/dep/ACE_wrappers/ace/Strategies_T.cpp @@ -1500,3 +1500,4 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Thread_Strategy) ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_STRATEGIES_T_CPP */ + diff --git a/dep/ACE_wrappers/ace/Strategies_T.h b/dep/ACE_wrappers/ace/Strategies_T.h index bf73bb22c3d..7bd0d6bb1a3 100644 --- a/dep/ACE_wrappers/ace/Strategies_T.h +++ b/dep/ACE_wrappers/ace/Strategies_T.h @@ -1074,3 +1074,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_STRATEGIES_T_H */ + diff --git a/dep/ACE_wrappers/ace/Stream.cpp b/dep/ACE_wrappers/ace/Stream.cpp index 5259f72e992..442b86c924e 100644 --- a/dep/ACE_wrappers/ace/Stream.cpp +++ b/dep/ACE_wrappers/ace/Stream.cpp @@ -617,3 +617,4 @@ ACE_Stream_Iterator<ACE_SYNCH_USE>::ACE_Stream_Iterator (const ACE_Stream<ACE_SY ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_STREAM_CPP */ + diff --git a/dep/ACE_wrappers/ace/Stream.h b/dep/ACE_wrappers/ace/Stream.h index 7ad95060000..9dc426fcf0f 100644 --- a/dep/ACE_wrappers/ace/Stream.h +++ b/dep/ACE_wrappers/ace/Stream.h @@ -239,3 +239,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_STREAM_H */ + diff --git a/dep/ACE_wrappers/ace/Stream_Modules.cpp b/dep/ACE_wrappers/ace/Stream_Modules.cpp index 8d11e5da1da..fe562412cd5 100644 --- a/dep/ACE_wrappers/ace/Stream_Modules.cpp +++ b/dep/ACE_wrappers/ace/Stream_Modules.cpp @@ -378,3 +378,4 @@ ACE_Thru_Task<ACE_SYNCH_USE>::fini (void) ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_STREAM_MODULES_CPP */ + diff --git a/dep/ACE_wrappers/ace/Stream_Modules.h b/dep/ACE_wrappers/ace/Stream_Modules.h index 5bbc072ad4c..8b718b6013d 100644 --- a/dep/ACE_wrappers/ace/Stream_Modules.h +++ b/dep/ACE_wrappers/ace/Stream_Modules.h @@ -164,3 +164,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_STREAM_MODULES */ + diff --git a/dep/ACE_wrappers/ace/String_Base.cpp b/dep/ACE_wrappers/ace/String_Base.cpp index cc70598b6de..c3e95187625 100644 --- a/dep/ACE_wrappers/ace/String_Base.cpp +++ b/dep/ACE_wrappers/ace/String_Base.cpp @@ -561,3 +561,4 @@ ACE_String_Base<CHAR>::operator+= (const CHAR c) ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_STRING_BASE_CPP */ + diff --git a/dep/ACE_wrappers/ace/String_Base.h b/dep/ACE_wrappers/ace/String_Base.h index 8232380657c..c3ecbd8148b 100644 --- a/dep/ACE_wrappers/ace/String_Base.h +++ b/dep/ACE_wrappers/ace/String_Base.h @@ -610,3 +610,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_STRING_BASE_H */ + diff --git a/dep/ACE_wrappers/ace/String_Base_Const.cpp b/dep/ACE_wrappers/ace/String_Base_Const.cpp index e3f0f18f429..85ebef15086 100644 --- a/dep/ACE_wrappers/ace/String_Base_Const.cpp +++ b/dep/ACE_wrappers/ace/String_Base_Const.cpp @@ -18,3 +18,4 @@ ACE_String_Base_Const::size_type const ACE_String_Base_Const::npos = #endif /* AIX */ ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/String_Base_Const.h b/dep/ACE_wrappers/ace/String_Base_Const.h index cad0c0b6061..ac76e511289 100644 --- a/dep/ACE_wrappers/ace/String_Base_Const.h +++ b/dep/ACE_wrappers/ace/String_Base_Const.h @@ -50,3 +50,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_STRING_BASE_CONST_H */ + diff --git a/dep/ACE_wrappers/ace/Svc_Conf.h b/dep/ACE_wrappers/ace/Svc_Conf.h index 4a03e40aef4..db10481a1f0 100644 --- a/dep/ACE_wrappers/ace/Svc_Conf.h +++ b/dep/ACE_wrappers/ace/Svc_Conf.h @@ -108,3 +108,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_SVC_CONF_H */ + diff --git a/dep/ACE_wrappers/ace/Svc_Conf_Lexer.cpp b/dep/ACE_wrappers/ace/Svc_Conf_Lexer.cpp index d83f23ede7e..b55af3b4439 100644 --- a/dep/ACE_wrappers/ace/Svc_Conf_Lexer.cpp +++ b/dep/ACE_wrappers/ace/Svc_Conf_Lexer.cpp @@ -674,3 +674,4 @@ ACE_Svc_Conf_Lexer::locate_bom (char* source, ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_USES_CLASSIC_SVC_CONF = 1 */ + diff --git a/dep/ACE_wrappers/ace/Svc_Conf_Lexer.h b/dep/ACE_wrappers/ace/Svc_Conf_Lexer.h index fbd15e1a6da..c1759577e7e 100644 --- a/dep/ACE_wrappers/ace/Svc_Conf_Lexer.h +++ b/dep/ACE_wrappers/ace/Svc_Conf_Lexer.h @@ -68,3 +68,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* SVC_CONF_LEXER_H */ + diff --git a/dep/ACE_wrappers/ace/Svc_Conf_Param.h b/dep/ACE_wrappers/ace/Svc_Conf_Param.h index 764c615d608..a1c51844cec 100644 --- a/dep/ACE_wrappers/ace/Svc_Conf_Param.h +++ b/dep/ACE_wrappers/ace/Svc_Conf_Param.h @@ -140,3 +140,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_SVC_CONF_PARAM_H */ + diff --git a/dep/ACE_wrappers/ace/Svc_Conf_Token_Table.h b/dep/ACE_wrappers/ace/Svc_Conf_Token_Table.h index f139d027e12..0ce301a6e15 100644 --- a/dep/ACE_wrappers/ace/Svc_Conf_Token_Table.h +++ b/dep/ACE_wrappers/ace/Svc_Conf_Token_Table.h @@ -82,3 +82,4 @@ typedef int YYSTYPE; # define YYSTYPE_IS_DECLARED 1 # define YYSTYPE_IS_TRIVIAL 1 #endif + diff --git a/dep/ACE_wrappers/ace/Svc_Conf_Tokens.h b/dep/ACE_wrappers/ace/Svc_Conf_Tokens.h index 26a8ddad0bc..56a5820f46d 100644 --- a/dep/ACE_wrappers/ace/Svc_Conf_Tokens.h +++ b/dep/ACE_wrappers/ace/Svc_Conf_Tokens.h @@ -27,3 +27,4 @@ # undef YYSTYPE_IS_DECLARED #endif /* ifndef BISON_SVC_CONF_TAB_H */ + diff --git a/dep/ACE_wrappers/ace/Svc_Conf_y.cpp b/dep/ACE_wrappers/ace/Svc_Conf_y.cpp index bf2b562b5a1..52b2bcbb2aa 100644 --- a/dep/ACE_wrappers/ace/Svc_Conf_y.cpp +++ b/dep/ACE_wrappers/ace/Svc_Conf_y.cpp @@ -1996,3 +1996,4 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_USES_CLASSIC_SVC_CONF == 1 */ + diff --git a/dep/ACE_wrappers/ace/Svc_Handler.cpp b/dep/ACE_wrappers/ace/Svc_Handler.cpp index 2d0aead2360..166aec37f14 100644 --- a/dep/ACE_wrappers/ace/Svc_Handler.cpp +++ b/dep/ACE_wrappers/ace/Svc_Handler.cpp @@ -523,3 +523,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #undef PR_ST_1 #undef PR_ST_2 #endif /* ACE_SVC_HANDLER_CPP */ + diff --git a/dep/ACE_wrappers/ace/Svc_Handler.h b/dep/ACE_wrappers/ace/Svc_Handler.h index cf1d0eccecc..f42cf42c4c0 100644 --- a/dep/ACE_wrappers/ace/Svc_Handler.h +++ b/dep/ACE_wrappers/ace/Svc_Handler.h @@ -343,3 +343,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_SVC_HANDLER_H */ + diff --git a/dep/ACE_wrappers/ace/Synch.h b/dep/ACE_wrappers/ace/Synch.h index 4a1924a76df..756b969ea6d 100644 --- a/dep/ACE_wrappers/ace/Synch.h +++ b/dep/ACE_wrappers/ace/Synch.h @@ -63,3 +63,4 @@ #include /**/ "ace/post.h" #endif /* ACE_SYNCH_H */ + diff --git a/dep/ACE_wrappers/ace/Synch_Options.cpp b/dep/ACE_wrappers/ace/Synch_Options.cpp index dc857e289ec..c6e2997ab3d 100644 --- a/dep/ACE_wrappers/ace/Synch_Options.cpp +++ b/dep/ACE_wrappers/ace/Synch_Options.cpp @@ -108,3 +108,4 @@ ACE_Synch_Options::arg (const void *a) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Synch_Options.h b/dep/ACE_wrappers/ace/Synch_Options.h index 2466f0fc519..6c39dd55218 100644 --- a/dep/ACE_wrappers/ace/Synch_Options.h +++ b/dep/ACE_wrappers/ace/Synch_Options.h @@ -161,3 +161,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_SYNCH_OPTIONS_H */ + diff --git a/dep/ACE_wrappers/ace/Synch_T.cpp b/dep/ACE_wrappers/ace/Synch_T.cpp index c66e02768d6..13c3439c1f5 100644 --- a/dep/ACE_wrappers/ace/Synch_T.cpp +++ b/dep/ACE_wrappers/ace/Synch_T.cpp @@ -20,3 +20,4 @@ #include "ace/Condition_T.cpp" #endif /* ACE_SYNCH_T_CPP */ + diff --git a/dep/ACE_wrappers/ace/Synch_T.h b/dep/ACE_wrappers/ace/Synch_T.h index e5349e0bd98..acd6da6eb86 100644 --- a/dep/ACE_wrappers/ace/Synch_T.h +++ b/dep/ACE_wrappers/ace/Synch_T.h @@ -40,3 +40,4 @@ #include /**/ "ace/post.h" #endif /* ACE_SYNCH_T_H */ + diff --git a/dep/ACE_wrappers/ace/Synch_Traits.h b/dep/ACE_wrappers/ace/Synch_Traits.h index 80f23e948e9..c6649f9fdc8 100644 --- a/dep/ACE_wrappers/ace/Synch_Traits.h +++ b/dep/ACE_wrappers/ace/Synch_Traits.h @@ -150,3 +150,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_SYNCH_TRAITS_H */ + diff --git a/dep/ACE_wrappers/ace/System_Time.cpp b/dep/ACE_wrappers/ace/System_Time.cpp index 537f071dfa1..bda4db87afe 100644 --- a/dep/ACE_wrappers/ace/System_Time.cpp +++ b/dep/ACE_wrappers/ace/System_Time.cpp @@ -138,3 +138,4 @@ ACE_System_Time::sync_local_system_time (ACE_System_Time::Sync_Mode) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/System_Time.h b/dep/ACE_wrappers/ace/System_Time.h index bd5150d2333..2b1c329108e 100644 --- a/dep/ACE_wrappers/ace/System_Time.h +++ b/dep/ACE_wrappers/ace/System_Time.h @@ -97,3 +97,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_SYSTEM_TIME_H */ + diff --git a/dep/ACE_wrappers/ace/TLI.cpp b/dep/ACE_wrappers/ace/TLI.cpp index 16ab241747a..3f3431a3d9b 100644 --- a/dep/ACE_wrappers/ace/TLI.cpp +++ b/dep/ACE_wrappers/ace/TLI.cpp @@ -271,3 +271,4 @@ ACE_TLI::get_option (int level, int option, void *optval, int &optlen) ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_TLI */ + diff --git a/dep/ACE_wrappers/ace/TLI.h b/dep/ACE_wrappers/ace/TLI.h index 076f5964071..0beab16a1f8 100644 --- a/dep/ACE_wrappers/ace/TLI.h +++ b/dep/ACE_wrappers/ace/TLI.h @@ -114,3 +114,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_TLI */ #include /**/ "ace/post.h" #endif /* ACE_TLI_H */ + diff --git a/dep/ACE_wrappers/ace/TLI_Acceptor.cpp b/dep/ACE_wrappers/ace/TLI_Acceptor.cpp index a12b12d23ce..8c223f313c0 100644 --- a/dep/ACE_wrappers/ace/TLI_Acceptor.cpp +++ b/dep/ACE_wrappers/ace/TLI_Acceptor.cpp @@ -551,3 +551,4 @@ ACE_TLI_Acceptor::accept (ACE_TLI_Stream &new_tli_sap, ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_TLI */ + diff --git a/dep/ACE_wrappers/ace/TLI_Acceptor.h b/dep/ACE_wrappers/ace/TLI_Acceptor.h index a24b3224121..d6851aa0f01 100644 --- a/dep/ACE_wrappers/ace/TLI_Acceptor.h +++ b/dep/ACE_wrappers/ace/TLI_Acceptor.h @@ -121,3 +121,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_TLI */ #include /**/ "ace/post.h" #endif /* ACE_TLI_ACCEPTOR_H */ + diff --git a/dep/ACE_wrappers/ace/TLI_Connector.cpp b/dep/ACE_wrappers/ace/TLI_Connector.cpp index 7738c6b8f3f..a237305971f 100644 --- a/dep/ACE_wrappers/ace/TLI_Connector.cpp +++ b/dep/ACE_wrappers/ace/TLI_Connector.cpp @@ -254,3 +254,4 @@ ACE_TLI_Connector::complete (ACE_TLI_Stream &new_stream, ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_TLI */ + diff --git a/dep/ACE_wrappers/ace/TLI_Connector.h b/dep/ACE_wrappers/ace/TLI_Connector.h index e1b5907495d..538cba1c699 100644 --- a/dep/ACE_wrappers/ace/TLI_Connector.h +++ b/dep/ACE_wrappers/ace/TLI_Connector.h @@ -128,3 +128,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_TLI */ #include /**/ "ace/post.h" #endif /* ACE_TLI_CONNECTOR_H */ + diff --git a/dep/ACE_wrappers/ace/TLI_Stream.cpp b/dep/ACE_wrappers/ace/TLI_Stream.cpp index cb15738c407..b1097385058 100644 --- a/dep/ACE_wrappers/ace/TLI_Stream.cpp +++ b/dep/ACE_wrappers/ace/TLI_Stream.cpp @@ -227,3 +227,4 @@ ACE_TLI_Stream::recv_n (void *buf, ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_TLI */ + diff --git a/dep/ACE_wrappers/ace/TLI_Stream.h b/dep/ACE_wrappers/ace/TLI_Stream.h index 096c7af69ae..96f21de7e4c 100644 --- a/dep/ACE_wrappers/ace/TLI_Stream.h +++ b/dep/ACE_wrappers/ace/TLI_Stream.h @@ -139,3 +139,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_TLI */ #include /**/ "ace/post.h" #endif /* ACE_TLI_STREAM_H */ + diff --git a/dep/ACE_wrappers/ace/TP_Reactor.cpp b/dep/ACE_wrappers/ace/TP_Reactor.cpp index 34973de19bc..ffe47704953 100644 --- a/dep/ACE_wrappers/ace/TP_Reactor.cpp +++ b/dep/ACE_wrappers/ace/TP_Reactor.cpp @@ -684,3 +684,4 @@ ACE_TP_Reactor::get_notify_handle (void) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/TP_Reactor.h b/dep/ACE_wrappers/ace/TP_Reactor.h index a5994017e3d..1d8a3f05a1e 100644 --- a/dep/ACE_wrappers/ace/TP_Reactor.h +++ b/dep/ACE_wrappers/ace/TP_Reactor.h @@ -318,3 +318,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_TP_REACTOR_H */ + diff --git a/dep/ACE_wrappers/ace/TSS_Adapter.cpp b/dep/ACE_wrappers/ace/TSS_Adapter.cpp index da6218dddb8..287dcac8b59 100644 --- a/dep/ACE_wrappers/ace/TSS_Adapter.cpp +++ b/dep/ACE_wrappers/ace/TSS_Adapter.cpp @@ -43,3 +43,4 @@ ACE_TSS_C_cleanup (void *object) delete tss_adapter; } } + diff --git a/dep/ACE_wrappers/ace/TSS_Adapter.h b/dep/ACE_wrappers/ace/TSS_Adapter.h index b8ff85e3210..0729c1a7886 100644 --- a/dep/ACE_wrappers/ace/TSS_Adapter.h +++ b/dep/ACE_wrappers/ace/TSS_Adapter.h @@ -59,3 +59,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_TSS_ADAPTER_H */ + diff --git a/dep/ACE_wrappers/ace/TSS_T.cpp b/dep/ACE_wrappers/ace/TSS_T.cpp index 7ef74538aac..393bf4f6647 100644 --- a/dep/ACE_wrappers/ace/TSS_T.cpp +++ b/dep/ACE_wrappers/ace/TSS_T.cpp @@ -723,3 +723,4 @@ ACE_TSS_Read_Guard<ACE_LOCK>::dump (void) const ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_TSS_T_CPP */ + diff --git a/dep/ACE_wrappers/ace/TSS_T.h b/dep/ACE_wrappers/ace/TSS_T.h index f9ffaa92f35..e00c1a0445e 100644 --- a/dep/ACE_wrappers/ace/TSS_T.h +++ b/dep/ACE_wrappers/ace/TSS_T.h @@ -251,3 +251,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_TSS_T_H */ + diff --git a/dep/ACE_wrappers/ace/TTY_IO.cpp b/dep/ACE_wrappers/ace/TTY_IO.cpp index 9918ec0dceb..106c7379ab9 100644 --- a/dep/ACE_wrappers/ace/TTY_IO.cpp +++ b/dep/ACE_wrappers/ace/TTY_IO.cpp @@ -580,3 +580,4 @@ ACE_TTY_IO::operator ACE_DEV_IO &() #endif /* ACE_NEEDS_DEV_IO_CONVERSION */ ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/TTY_IO.h b/dep/ACE_wrappers/ace/TTY_IO.h index 1029966e56c..c7404e84af8 100644 --- a/dep/ACE_wrappers/ace/TTY_IO.h +++ b/dep/ACE_wrappers/ace/TTY_IO.h @@ -111,3 +111,4 @@ public: ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_TTY_IO_H */ + diff --git a/dep/ACE_wrappers/ace/Task.cpp b/dep/ACE_wrappers/ace/Task.cpp index b3d8aad7a86..3746b735811 100644 --- a/dep/ACE_wrappers/ace/Task.cpp +++ b/dep/ACE_wrappers/ace/Task.cpp @@ -297,3 +297,4 @@ ACE_Task_Base::svc_run (void *args) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Task.h b/dep/ACE_wrappers/ace/Task.h index f2ac03ca9e9..fb3c8604c2c 100644 --- a/dep/ACE_wrappers/ace/Task.h +++ b/dep/ACE_wrappers/ace/Task.h @@ -305,3 +305,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_TASK_H */ + diff --git a/dep/ACE_wrappers/ace/Task_Ex_T.cpp b/dep/ACE_wrappers/ace/Task_Ex_T.cpp index de97e5ba6b4..3ab3ee09135 100644 --- a/dep/ACE_wrappers/ace/Task_Ex_T.cpp +++ b/dep/ACE_wrappers/ace/Task_Ex_T.cpp @@ -112,3 +112,4 @@ ACE_Task_Ex<ACE_SYNCH_USE, ACE_MESSAGE_TYPE>::module (void) const ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_TASK_EX_T_CPP */ + diff --git a/dep/ACE_wrappers/ace/Task_Ex_T.h b/dep/ACE_wrappers/ace/Task_Ex_T.h index 00233d4e7d9..031b2a1f4f5 100644 --- a/dep/ACE_wrappers/ace/Task_Ex_T.h +++ b/dep/ACE_wrappers/ace/Task_Ex_T.h @@ -203,3 +203,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_TASK_EX_H */ + diff --git a/dep/ACE_wrappers/ace/Task_T.cpp b/dep/ACE_wrappers/ace/Task_T.cpp index 08b36f82f08..f0716820a5d 100644 --- a/dep/ACE_wrappers/ace/Task_T.cpp +++ b/dep/ACE_wrappers/ace/Task_T.cpp @@ -106,3 +106,4 @@ ACE_Task<ACE_SYNCH_USE>::module (void) const ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_TASK_T_CPP */ + diff --git a/dep/ACE_wrappers/ace/Task_T.h b/dep/ACE_wrappers/ace/Task_T.h index 35ebb064d6a..5cd703d29ac 100644 --- a/dep/ACE_wrappers/ace/Task_T.h +++ b/dep/ACE_wrappers/ace/Task_T.h @@ -196,3 +196,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_TASK_T_H */ + diff --git a/dep/ACE_wrappers/ace/Test_and_Set.cpp b/dep/ACE_wrappers/ace/Test_and_Set.cpp index 15fbfe084f5..65b179d2d8e 100644 --- a/dep/ACE_wrappers/ace/Test_and_Set.cpp +++ b/dep/ACE_wrappers/ace/Test_and_Set.cpp @@ -49,3 +49,4 @@ ACE_Test_and_Set<ACE_LOCK, TYPE>::handle_signal (int, siginfo_t *, ucontext_t *) ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_TEST_AND_SET_CPP */ + diff --git a/dep/ACE_wrappers/ace/Test_and_Set.h b/dep/ACE_wrappers/ace/Test_and_Set.h index 062de0bc804..e31d10f5460 100644 --- a/dep/ACE_wrappers/ace/Test_and_Set.h +++ b/dep/ACE_wrappers/ace/Test_and_Set.h @@ -73,3 +73,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_TEST_AND_SET_H */ + diff --git a/dep/ACE_wrappers/ace/Thread.cpp b/dep/ACE_wrappers/ace/Thread.cpp index 43d9a25baf8..1b4edd48825 100644 --- a/dep/ACE_wrappers/ace/Thread.cpp +++ b/dep/ACE_wrappers/ace/Thread.cpp @@ -97,3 +97,4 @@ ACE_Thread::spawn_n (ACE_thread_t thread_ids[], ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_THREADS */ + diff --git a/dep/ACE_wrappers/ace/Thread.h b/dep/ACE_wrappers/ace/Thread.h index 4d44858fa5b..6be139f9242 100644 --- a/dep/ACE_wrappers/ace/Thread.h +++ b/dep/ACE_wrappers/ace/Thread.h @@ -280,3 +280,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_THREAD_H */ + diff --git a/dep/ACE_wrappers/ace/Thread_Adapter.cpp b/dep/ACE_wrappers/ace/Thread_Adapter.cpp index 9dbad0580b8..e9defa34e88 100644 --- a/dep/ACE_wrappers/ace/Thread_Adapter.cpp +++ b/dep/ACE_wrappers/ace/Thread_Adapter.cpp @@ -226,3 +226,4 @@ ACE_Thread_Adapter::invoke_i (void) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Thread_Adapter.h b/dep/ACE_wrappers/ace/Thread_Adapter.h index 8f1f259eff3..015557b8e0d 100644 --- a/dep/ACE_wrappers/ace/Thread_Adapter.h +++ b/dep/ACE_wrappers/ace/Thread_Adapter.h @@ -98,3 +98,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_THREAD_ADAPTER_H */ + diff --git a/dep/ACE_wrappers/ace/Thread_Control.cpp b/dep/ACE_wrappers/ace/Thread_Control.cpp index 51d0f4c18eb..c97f4eef58b 100644 --- a/dep/ACE_wrappers/ace/Thread_Control.cpp +++ b/dep/ACE_wrappers/ace/Thread_Control.cpp @@ -94,3 +94,4 @@ ACE_Thread_Control::exit (ACE_THR_FUNC_RETURN exit_status, int do_thr_exit) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Thread_Control.h b/dep/ACE_wrappers/ace/Thread_Control.h index 3eb5185c84c..8322e73a968 100644 --- a/dep/ACE_wrappers/ace/Thread_Control.h +++ b/dep/ACE_wrappers/ace/Thread_Control.h @@ -100,3 +100,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_THREAD_CONTROL_H */ + diff --git a/dep/ACE_wrappers/ace/Thread_Exit.cpp b/dep/ACE_wrappers/ace/Thread_Exit.cpp index cc6a8620cbe..ac7f09fb66c 100644 --- a/dep/ACE_wrappers/ace/Thread_Exit.cpp +++ b/dep/ACE_wrappers/ace/Thread_Exit.cpp @@ -121,3 +121,4 @@ ACE_Thread_Exit_Maybe::instance (void) const } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Thread_Exit.h b/dep/ACE_wrappers/ace/Thread_Exit.h index 5b614e2e807..f56263c9db3 100644 --- a/dep/ACE_wrappers/ace/Thread_Exit.h +++ b/dep/ACE_wrappers/ace/Thread_Exit.h @@ -109,3 +109,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_THREAD_EXIT_H */ + diff --git a/dep/ACE_wrappers/ace/Thread_Hook.cpp b/dep/ACE_wrappers/ace/Thread_Hook.cpp index 79d937f9ff5..fcaecdd3301 100644 --- a/dep/ACE_wrappers/ace/Thread_Hook.cpp +++ b/dep/ACE_wrappers/ace/Thread_Hook.cpp @@ -31,3 +31,4 @@ ACE_Thread_Hook::thread_hook (void) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Thread_Hook.h b/dep/ACE_wrappers/ace/Thread_Hook.h index 7bc3bcce492..16a24cc7afc 100644 --- a/dep/ACE_wrappers/ace/Thread_Hook.h +++ b/dep/ACE_wrappers/ace/Thread_Hook.h @@ -63,3 +63,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_THREAD_HOOK_H */ + diff --git a/dep/ACE_wrappers/ace/Thread_Manager.cpp b/dep/ACE_wrappers/ace/Thread_Manager.cpp index 1cb7126b4d6..3e1b9d3a091 100644 --- a/dep/ACE_wrappers/ace/Thread_Manager.cpp +++ b/dep/ACE_wrappers/ace/Thread_Manager.cpp @@ -2219,3 +2219,4 @@ ACE_Thread_Manager::get_grp (ACE_Task_Base *task, int &grp_id) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Thread_Manager.h b/dep/ACE_wrappers/ace/Thread_Manager.h index 2703aae405a..1e891351167 100644 --- a/dep/ACE_wrappers/ace/Thread_Manager.h +++ b/dep/ACE_wrappers/ace/Thread_Manager.h @@ -1262,3 +1262,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_THREAD_MANAGER_H */ + diff --git a/dep/ACE_wrappers/ace/Thread_Mutex.cpp b/dep/ACE_wrappers/ace/Thread_Mutex.cpp index 4ebdc412e6f..1681aead6f9 100644 --- a/dep/ACE_wrappers/ace/Thread_Mutex.cpp +++ b/dep/ACE_wrappers/ace/Thread_Mutex.cpp @@ -60,3 +60,4 @@ ACE_Thread_Mutex::ACE_Thread_Mutex (const ACE_TCHAR *name, ACE_mutexattr_t *arg) ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_THREADS */ + diff --git a/dep/ACE_wrappers/ace/Thread_Mutex.h b/dep/ACE_wrappers/ace/Thread_Mutex.h index 471434eb49b..0a1b1cae2af 100644 --- a/dep/ACE_wrappers/ace/Thread_Mutex.h +++ b/dep/ACE_wrappers/ace/Thread_Mutex.h @@ -173,3 +173,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_THREAD_MUTEX_H */ + diff --git a/dep/ACE_wrappers/ace/Thread_Semaphore.cpp b/dep/ACE_wrappers/ace/Thread_Semaphore.cpp index 39b28931db5..13bab6ff340 100644 --- a/dep/ACE_wrappers/ace/Thread_Semaphore.cpp +++ b/dep/ACE_wrappers/ace/Thread_Semaphore.cpp @@ -60,3 +60,4 @@ ACE_Malloc_Lock_Adapter_T<ACE_Thread_Semaphore>::operator () (const ACE_TCHAR *n ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_THREADS */ + diff --git a/dep/ACE_wrappers/ace/Thread_Semaphore.h b/dep/ACE_wrappers/ace/Thread_Semaphore.h index b35ef334cb4..e6a9d008e68 100644 --- a/dep/ACE_wrappers/ace/Thread_Semaphore.h +++ b/dep/ACE_wrappers/ace/Thread_Semaphore.h @@ -87,3 +87,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_THREAD_SEMAPHORE_H */ + diff --git a/dep/ACE_wrappers/ace/Throughput_Stats.cpp b/dep/ACE_wrappers/ace/Throughput_Stats.cpp index 6e667299729..5e2288a39b7 100644 --- a/dep/ACE_wrappers/ace/Throughput_Stats.cpp +++ b/dep/ACE_wrappers/ace/Throughput_Stats.cpp @@ -200,3 +200,4 @@ ACE_Throughput_Stats::dump_throughput (const ACE_TCHAR *msg, } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Throughput_Stats.h b/dep/ACE_wrappers/ace/Throughput_Stats.h index c306c856c5e..66e57eee699 100644 --- a/dep/ACE_wrappers/ace/Throughput_Stats.h +++ b/dep/ACE_wrappers/ace/Throughput_Stats.h @@ -84,3 +84,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ! ACE_THROUGHPUT_STATS_H */ + diff --git a/dep/ACE_wrappers/ace/Time_Value.cpp b/dep/ACE_wrappers/ace/Time_Value.cpp index 8ecfbe7d3b4..86db481f042 100644 --- a/dep/ACE_wrappers/ace/Time_Value.cpp +++ b/dep/ACE_wrappers/ace/Time_Value.cpp @@ -262,3 +262,4 @@ ACE_Time_Value::operator *= (double d) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Time_Value.h b/dep/ACE_wrappers/ace/Time_Value.h index b00410e2b33..ae75cc1c9de 100644 --- a/dep/ACE_wrappers/ace/Time_Value.h +++ b/dep/ACE_wrappers/ace/Time_Value.h @@ -378,3 +378,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_TIME_VALUE_H */ + diff --git a/dep/ACE_wrappers/ace/Timeprobe.cpp b/dep/ACE_wrappers/ace/Timeprobe.cpp index 1fe8459ed8d..b92960415cf 100644 --- a/dep/ACE_wrappers/ace/Timeprobe.cpp +++ b/dep/ACE_wrappers/ace/Timeprobe.cpp @@ -13,3 +13,4 @@ ACE_RCSID(ace, Timeprobe, "$Id: Timeprobe.cpp 80826 2008-03-04 14:51:23Z wotte $ #endif /* __ACE_INLINE__ */ #endif /* ACE_COMPILE_TIMEPROBES */ + diff --git a/dep/ACE_wrappers/ace/Timeprobe.h b/dep/ACE_wrappers/ace/Timeprobe.h index ac2abe38d0e..4ec811e6317 100644 --- a/dep/ACE_wrappers/ace/Timeprobe.h +++ b/dep/ACE_wrappers/ace/Timeprobe.h @@ -199,3 +199,4 @@ static int ace_timeprobe_##descriptions##_return = \ #endif /* ACE_ENABLE_TIMEPROBES && ACE_COMPILE_TIMEPROBES */ #include /**/ "ace/post.h" #endif /* ACE_TIMEPROBE_H */ + diff --git a/dep/ACE_wrappers/ace/Timeprobe_T.cpp b/dep/ACE_wrappers/ace/Timeprobe_T.cpp index d23b7b8b869..2c0c8cf92f0 100644 --- a/dep/ACE_wrappers/ace/Timeprobe_T.cpp +++ b/dep/ACE_wrappers/ace/Timeprobe_T.cpp @@ -425,3 +425,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_COMPILE_TIMEPROBES */ #endif /* ACE_TIMEPROBE_T_CPP */ + diff --git a/dep/ACE_wrappers/ace/Timeprobe_T.h b/dep/ACE_wrappers/ace/Timeprobe_T.h index 54e5ff4c185..c180f7d7a72 100644 --- a/dep/ACE_wrappers/ace/Timeprobe_T.h +++ b/dep/ACE_wrappers/ace/Timeprobe_T.h @@ -218,3 +218,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_COMPILE_TIMEPROBES */ #include /**/ "ace/post.h" #endif /* ACE_TIMEPROBE_T_H */ + diff --git a/dep/ACE_wrappers/ace/Timer_Hash.h b/dep/ACE_wrappers/ace/Timer_Hash.h index b381419da44..c19291efaf7 100644 --- a/dep/ACE_wrappers/ace/Timer_Hash.h +++ b/dep/ACE_wrappers/ace/Timer_Hash.h @@ -73,3 +73,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_TIMER_HASH_H */ + diff --git a/dep/ACE_wrappers/ace/Timer_Hash_T.cpp b/dep/ACE_wrappers/ace/Timer_Hash_T.cpp index 057668063aa..5c8d3daa50d 100644 --- a/dep/ACE_wrappers/ace/Timer_Hash_T.cpp +++ b/dep/ACE_wrappers/ace/Timer_Hash_T.cpp @@ -871,3 +871,4 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::expire (const ACE_Time_Value ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_TIMER_HASH_T_CPP */ + diff --git a/dep/ACE_wrappers/ace/Timer_Hash_T.h b/dep/ACE_wrappers/ace/Timer_Hash_T.h index b04e7cfbcf3..882369cf5c9 100644 --- a/dep/ACE_wrappers/ace/Timer_Hash_T.h +++ b/dep/ACE_wrappers/ace/Timer_Hash_T.h @@ -340,3 +340,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_TIMER_HASH_T_H */ + diff --git a/dep/ACE_wrappers/ace/Timer_Heap.h b/dep/ACE_wrappers/ace/Timer_Heap.h index 7dec5ec22b4..61673974068 100644 --- a/dep/ACE_wrappers/ace/Timer_Heap.h +++ b/dep/ACE_wrappers/ace/Timer_Heap.h @@ -39,3 +39,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_TIMER_HEAP_H */ + diff --git a/dep/ACE_wrappers/ace/Timer_Heap_T.cpp b/dep/ACE_wrappers/ace/Timer_Heap_T.cpp index 03893dac9a3..f557473e449 100644 --- a/dep/ACE_wrappers/ace/Timer_Heap_T.cpp +++ b/dep/ACE_wrappers/ace/Timer_Heap_T.cpp @@ -887,3 +887,4 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::get_first (void) ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_TIMER_HEAP_T_CPP */ + diff --git a/dep/ACE_wrappers/ace/Timer_Heap_T.h b/dep/ACE_wrappers/ace/Timer_Heap_T.h index ac21a487f38..904e596e616 100644 --- a/dep/ACE_wrappers/ace/Timer_Heap_T.h +++ b/dep/ACE_wrappers/ace/Timer_Heap_T.h @@ -336,3 +336,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_TIMER_HEAP_T_H */ + diff --git a/dep/ACE_wrappers/ace/Timer_List.h b/dep/ACE_wrappers/ace/Timer_List.h index f2d9cc2a458..847eac1a1e9 100644 --- a/dep/ACE_wrappers/ace/Timer_List.h +++ b/dep/ACE_wrappers/ace/Timer_List.h @@ -40,3 +40,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_TIMER_LIST_H */ + diff --git a/dep/ACE_wrappers/ace/Timer_List_T.cpp b/dep/ACE_wrappers/ace/Timer_List_T.cpp index c3b837bb289..aaf5542ef7e 100644 --- a/dep/ACE_wrappers/ace/Timer_List_T.cpp +++ b/dep/ACE_wrappers/ace/Timer_List_T.cpp @@ -416,3 +416,4 @@ ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK>::remove_first (void) } #endif /* ACE_TIMER_LIST_T_C */ + diff --git a/dep/ACE_wrappers/ace/Timer_List_T.h b/dep/ACE_wrappers/ace/Timer_List_T.h index cabd47aeaf0..66d148f81eb 100644 --- a/dep/ACE_wrappers/ace/Timer_List_T.h +++ b/dep/ACE_wrappers/ace/Timer_List_T.h @@ -224,3 +224,4 @@ private: #include /**/ "ace/post.h" #endif /* ACE_TIMER_LIST_T_H */ + diff --git a/dep/ACE_wrappers/ace/Timer_Queue.h b/dep/ACE_wrappers/ace/Timer_Queue.h index 4644aa1b43d..0f5990ae546 100644 --- a/dep/ACE_wrappers/ace/Timer_Queue.h +++ b/dep/ACE_wrappers/ace/Timer_Queue.h @@ -50,3 +50,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_TIMER_QUEUE_H */ + diff --git a/dep/ACE_wrappers/ace/Timer_Queue_Adapters.cpp b/dep/ACE_wrappers/ace/Timer_Queue_Adapters.cpp index f6519ae9efc..bcfbcf05139 100644 --- a/dep/ACE_wrappers/ace/Timer_Queue_Adapters.cpp +++ b/dep/ACE_wrappers/ace/Timer_Queue_Adapters.cpp @@ -359,3 +359,4 @@ ACE_Thread_Timer_Queue_Adapter<TQ>::dispatch_commands (void) ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_TIMER_QUEUE_ADAPTERS_CPP */ + diff --git a/dep/ACE_wrappers/ace/Timer_Queue_Adapters.h b/dep/ACE_wrappers/ace/Timer_Queue_Adapters.h index e6ef944eab2..390aed19da0 100644 --- a/dep/ACE_wrappers/ace/Timer_Queue_Adapters.h +++ b/dep/ACE_wrappers/ace/Timer_Queue_Adapters.h @@ -259,3 +259,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_TIMER_QUEUE_ADAPTERS_H */ + diff --git a/dep/ACE_wrappers/ace/Timer_Queue_T.cpp b/dep/ACE_wrappers/ace/Timer_Queue_T.cpp index 58fbf9ad3dc..654b2f5aaf8 100644 --- a/dep/ACE_wrappers/ace/Timer_Queue_T.cpp +++ b/dep/ACE_wrappers/ace/Timer_Queue_T.cpp @@ -479,3 +479,4 @@ ACE_Event_Handler_Handle_Timeout_Upcall<ACE_LOCK>::deletion (TIMER_QUEUE &timer_ ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_TIMER_QUEUE_T_CPP */ + diff --git a/dep/ACE_wrappers/ace/Timer_Queue_T.h b/dep/ACE_wrappers/ace/Timer_Queue_T.h index 591109c177e..8e5478b3245 100644 --- a/dep/ACE_wrappers/ace/Timer_Queue_T.h +++ b/dep/ACE_wrappers/ace/Timer_Queue_T.h @@ -560,3 +560,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_TIMER_QUEUE_T_H */ + diff --git a/dep/ACE_wrappers/ace/Timer_Queuefwd.h b/dep/ACE_wrappers/ace/Timer_Queuefwd.h index 662f29c0411..5ee99ff1823 100644 --- a/dep/ACE_wrappers/ace/Timer_Queuefwd.h +++ b/dep/ACE_wrappers/ace/Timer_Queuefwd.h @@ -36,3 +36,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_TIMER_QUEUE_FWD_H */ + diff --git a/dep/ACE_wrappers/ace/Timer_Wheel.h b/dep/ACE_wrappers/ace/Timer_Wheel.h index 21ba8776102..888dc4a4470 100644 --- a/dep/ACE_wrappers/ace/Timer_Wheel.h +++ b/dep/ACE_wrappers/ace/Timer_Wheel.h @@ -40,3 +40,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_TIMER_WHEEL_H */ + diff --git a/dep/ACE_wrappers/ace/Timer_Wheel_T.cpp b/dep/ACE_wrappers/ace/Timer_Wheel_T.cpp index f62ca7523f2..75cfc750318 100644 --- a/dep/ACE_wrappers/ace/Timer_Wheel_T.cpp +++ b/dep/ACE_wrappers/ace/Timer_Wheel_T.cpp @@ -965,3 +965,4 @@ ACE_Timer_Wheel_Iterator_T<TYPE, FUNCTOR, ACE_LOCK>::item (void) ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_TIMER_WHEEL_T_CPP */ + diff --git a/dep/ACE_wrappers/ace/Timer_Wheel_T.h b/dep/ACE_wrappers/ace/Timer_Wheel_T.h index 44fffed13e6..7222837011b 100644 --- a/dep/ACE_wrappers/ace/Timer_Wheel_T.h +++ b/dep/ACE_wrappers/ace/Timer_Wheel_T.h @@ -224,3 +224,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_TIMER_WHEEL_T_H */ + diff --git a/dep/ACE_wrappers/ace/Token.cpp b/dep/ACE_wrappers/ace/Token.cpp index ca2aea12fe0..99686563f67 100644 --- a/dep/ACE_wrappers/ace/Token.cpp +++ b/dep/ACE_wrappers/ace/Token.cpp @@ -543,3 +543,4 @@ ACE_Token::wakeup_next_waiter (void) ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_THREADS */ + diff --git a/dep/ACE_wrappers/ace/Token.h b/dep/ACE_wrappers/ace/Token.h index f46726aa66c..e98e5f9a774 100644 --- a/dep/ACE_wrappers/ace/Token.h +++ b/dep/ACE_wrappers/ace/Token.h @@ -374,3 +374,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_TOKEN_H */ + diff --git a/dep/ACE_wrappers/ace/Token_Collection.cpp b/dep/ACE_wrappers/ace/Token_Collection.cpp index 23a5813c958..e9c4964f19e 100644 --- a/dep/ACE_wrappers/ace/Token_Collection.cpp +++ b/dep/ACE_wrappers/ace/Token_Collection.cpp @@ -292,3 +292,4 @@ ACE_Token_Collection::dump (void) const ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_TOKENS_LIBRARY */ + diff --git a/dep/ACE_wrappers/ace/Token_Collection.h b/dep/ACE_wrappers/ace/Token_Collection.h index 16a9bb412b0..6dad64ac6f0 100644 --- a/dep/ACE_wrappers/ace/Token_Collection.h +++ b/dep/ACE_wrappers/ace/Token_Collection.h @@ -241,3 +241,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_TOKEN_COLLECTION_H */ + diff --git a/dep/ACE_wrappers/ace/Token_Invariants.cpp b/dep/ACE_wrappers/ace/Token_Invariants.cpp index 6c5d1bd5298..e0ca87bdcc4 100644 --- a/dep/ACE_wrappers/ace/Token_Invariants.cpp +++ b/dep/ACE_wrappers/ace/Token_Invariants.cpp @@ -353,3 +353,4 @@ ACE_RWLock_Invariants::dump (void) const ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_TOKENS_LIBRARY */ + diff --git a/dep/ACE_wrappers/ace/Token_Invariants.h b/dep/ACE_wrappers/ace/Token_Invariants.h index 5cec394763d..1649e5937b3 100644 --- a/dep/ACE_wrappers/ace/Token_Invariants.h +++ b/dep/ACE_wrappers/ace/Token_Invariants.h @@ -243,3 +243,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_TOKEN_INVARIANTS_H */ + diff --git a/dep/ACE_wrappers/ace/Token_Manager.cpp b/dep/ACE_wrappers/ace/Token_Manager.cpp index 22b6e9f9e16..178a0e5c63b 100644 --- a/dep/ACE_wrappers/ace/Token_Manager.cpp +++ b/dep/ACE_wrappers/ace/Token_Manager.cpp @@ -271,3 +271,4 @@ ACE_Token_Manager::dump (void) const ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_TOKENS_LIBRARY */ + diff --git a/dep/ACE_wrappers/ace/Token_Manager.h b/dep/ACE_wrappers/ace/Token_Manager.h index 9882e28ef67..6a7c17d4167 100644 --- a/dep/ACE_wrappers/ace/Token_Manager.h +++ b/dep/ACE_wrappers/ace/Token_Manager.h @@ -148,3 +148,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_TOKEN_MANAGER_H */ + diff --git a/dep/ACE_wrappers/ace/Token_Request_Reply.cpp b/dep/ACE_wrappers/ace/Token_Request_Reply.cpp index 598afe01388..8950a47b2b0 100644 --- a/dep/ACE_wrappers/ace/Token_Request_Reply.cpp +++ b/dep/ACE_wrappers/ace/Token_Request_Reply.cpp @@ -184,3 +184,4 @@ ACE_Token_Reply::dump (void) const ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_TOKENS_LIBRARY */ + diff --git a/dep/ACE_wrappers/ace/Token_Request_Reply.h b/dep/ACE_wrappers/ace/Token_Request_Reply.h index 01a7cfd3e82..1c09f7af8f6 100644 --- a/dep/ACE_wrappers/ace/Token_Request_Reply.h +++ b/dep/ACE_wrappers/ace/Token_Request_Reply.h @@ -268,3 +268,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_TOKEN_REQUEST_REPLY_H */ + diff --git a/dep/ACE_wrappers/ace/Trace.cpp b/dep/ACE_wrappers/ace/Trace.cpp index 12ccf135ebd..5592b8169a3 100644 --- a/dep/ACE_wrappers/ace/Trace.cpp +++ b/dep/ACE_wrappers/ace/Trace.cpp @@ -135,3 +135,4 @@ ACE_Trace::~ACE_Trace (void) } ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/Trace.h b/dep/ACE_wrappers/ace/Trace.h index f11d634ee17..f1c6aa86037 100644 --- a/dep/ACE_wrappers/ace/Trace.h +++ b/dep/ACE_wrappers/ace/Trace.h @@ -94,3 +94,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_TRACE_H */ + diff --git a/dep/ACE_wrappers/ace/Truncate.h b/dep/ACE_wrappers/ace/Truncate.h index 5b9a0e1187a..aef1c4ea57e 100644 --- a/dep/ACE_wrappers/ace/Truncate.h +++ b/dep/ACE_wrappers/ace/Truncate.h @@ -1053,3 +1053,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_TRUNCATE_H*/ + diff --git a/dep/ACE_wrappers/ace/Typed_SV_Message.cpp b/dep/ACE_wrappers/ace/Typed_SV_Message.cpp index 6be3d4c682a..16c72d3cae8 100644 --- a/dep/ACE_wrappers/ace/Typed_SV_Message.cpp +++ b/dep/ACE_wrappers/ace/Typed_SV_Message.cpp @@ -28,3 +28,4 @@ ACE_Typed_SV_Message<T>::dump (void) const ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_TYPED_SV_MESSAGE_CPP */ + diff --git a/dep/ACE_wrappers/ace/Typed_SV_Message.h b/dep/ACE_wrappers/ace/Typed_SV_Message.h index b43258e01a3..69c87f73c2c 100644 --- a/dep/ACE_wrappers/ace/Typed_SV_Message.h +++ b/dep/ACE_wrappers/ace/Typed_SV_Message.h @@ -105,3 +105,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_TYPED_SV_MESSAGE_H */ + diff --git a/dep/ACE_wrappers/ace/Typed_SV_Message_Queue.cpp b/dep/ACE_wrappers/ace/Typed_SV_Message_Queue.cpp index 0adb589e62b..24459c79a4a 100644 --- a/dep/ACE_wrappers/ace/Typed_SV_Message_Queue.cpp +++ b/dep/ACE_wrappers/ace/Typed_SV_Message_Queue.cpp @@ -54,3 +54,4 @@ ACE_Typed_SV_Message_Queue<T>::~ACE_Typed_SV_Message_Queue (void) ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_TYPED_SV_MESSAGE_QUEUE_CPP */ + diff --git a/dep/ACE_wrappers/ace/Typed_SV_Message_Queue.h b/dep/ACE_wrappers/ace/Typed_SV_Message_Queue.h index 12c0e50921b..f5f336b010d 100644 --- a/dep/ACE_wrappers/ace/Typed_SV_Message_Queue.h +++ b/dep/ACE_wrappers/ace/Typed_SV_Message_Queue.h @@ -90,3 +90,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_TYPED_MESSAGE_QUEUE_H */ + diff --git a/dep/ACE_wrappers/ace/UNIX_Addr.cpp b/dep/ACE_wrappers/ace/UNIX_Addr.cpp index 013af8a33ec..0f2a14d9c42 100644 --- a/dep/ACE_wrappers/ace/UNIX_Addr.cpp +++ b/dep/ACE_wrappers/ace/UNIX_Addr.cpp @@ -149,3 +149,4 @@ ACE_UNIX_Addr::ACE_UNIX_Addr (const char rendezvous_point[]) ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */ + diff --git a/dep/ACE_wrappers/ace/UNIX_Addr.h b/dep/ACE_wrappers/ace/UNIX_Addr.h index 887529fe152..6dd4130f251 100644 --- a/dep/ACE_wrappers/ace/UNIX_Addr.h +++ b/dep/ACE_wrappers/ace/UNIX_Addr.h @@ -115,3 +115,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_UNIX_ADDR_H */ + diff --git a/dep/ACE_wrappers/ace/UPIPE_Acceptor.cpp b/dep/ACE_wrappers/ace/UPIPE_Acceptor.cpp index 0b8954d5d0c..97d90dfa570 100644 --- a/dep/ACE_wrappers/ace/UPIPE_Acceptor.cpp +++ b/dep/ACE_wrappers/ace/UPIPE_Acceptor.cpp @@ -127,3 +127,4 @@ ACE_UPIPE_Acceptor::accept (ACE_UPIPE_Stream &new_stream, ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_THREADS */ + diff --git a/dep/ACE_wrappers/ace/UPIPE_Acceptor.h b/dep/ACE_wrappers/ace/UPIPE_Acceptor.h index 0fd33226ed3..c23acd0fca0 100644 --- a/dep/ACE_wrappers/ace/UPIPE_Acceptor.h +++ b/dep/ACE_wrappers/ace/UPIPE_Acceptor.h @@ -97,3 +97,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_UPIPE_ACCEPTOR_H */ + diff --git a/dep/ACE_wrappers/ace/UPIPE_Addr.h b/dep/ACE_wrappers/ace/UPIPE_Addr.h index aaf33b683fa..755e10ebefe 100644 --- a/dep/ACE_wrappers/ace/UPIPE_Addr.h +++ b/dep/ACE_wrappers/ace/UPIPE_Addr.h @@ -31,3 +31,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_UPIPE_ADDR_H */ + diff --git a/dep/ACE_wrappers/ace/UPIPE_Connector.cpp b/dep/ACE_wrappers/ace/UPIPE_Connector.cpp index 9b9bfcd3878..863dde91fc1 100644 --- a/dep/ACE_wrappers/ace/UPIPE_Connector.cpp +++ b/dep/ACE_wrappers/ace/UPIPE_Connector.cpp @@ -99,3 +99,4 @@ ACE_UPIPE_Connector::connect (ACE_UPIPE_Stream &new_stream, ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_THREADS */ + diff --git a/dep/ACE_wrappers/ace/UPIPE_Connector.h b/dep/ACE_wrappers/ace/UPIPE_Connector.h index ea4fc2ec762..328587f36a0 100644 --- a/dep/ACE_wrappers/ace/UPIPE_Connector.h +++ b/dep/ACE_wrappers/ace/UPIPE_Connector.h @@ -113,3 +113,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_UPIPE_CONNECTOR_H */ + diff --git a/dep/ACE_wrappers/ace/UPIPE_Stream.cpp b/dep/ACE_wrappers/ace/UPIPE_Stream.cpp index 443dc5fa1c2..66c537f9d5d 100644 --- a/dep/ACE_wrappers/ace/UPIPE_Stream.cpp +++ b/dep/ACE_wrappers/ace/UPIPE_Stream.cpp @@ -232,3 +232,4 @@ ACE_UPIPE_Stream::recv_n (char *buf, ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_THREADS */ + diff --git a/dep/ACE_wrappers/ace/UPIPE_Stream.h b/dep/ACE_wrappers/ace/UPIPE_Stream.h index b10aef11591..2cf53b1e274 100644 --- a/dep/ACE_wrappers/ace/UPIPE_Stream.h +++ b/dep/ACE_wrappers/ace/UPIPE_Stream.h @@ -138,3 +138,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /*ACE_UPIPE_STREAM_H */ + diff --git a/dep/ACE_wrappers/ace/UTF16_Encoding_Converter.cpp b/dep/ACE_wrappers/ace/UTF16_Encoding_Converter.cpp index 0a51cf9fbb5..6c660a37c4b 100644 --- a/dep/ACE_wrappers/ace/UTF16_Encoding_Converter.cpp +++ b/dep/ACE_wrappers/ace/UTF16_Encoding_Converter.cpp @@ -362,3 +362,4 @@ ACE_UTF16_Encoding_Converter::get_offsets_from_utf8 (void) ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_USES_WCHAR */ + diff --git a/dep/ACE_wrappers/ace/UTF16_Encoding_Converter.h b/dep/ACE_wrappers/ace/UTF16_Encoding_Converter.h index 9bdcb21a07f..231ce158dfa 100644 --- a/dep/ACE_wrappers/ace/UTF16_Encoding_Converter.h +++ b/dep/ACE_wrappers/ace/UTF16_Encoding_Converter.h @@ -84,3 +84,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_UTF16_ENCODING_CONVERTER_H */ + diff --git a/dep/ACE_wrappers/ace/UTF32_Encoding_Converter.cpp b/dep/ACE_wrappers/ace/UTF32_Encoding_Converter.cpp index 459bf2530b0..325eded7428 100644 --- a/dep/ACE_wrappers/ace/UTF32_Encoding_Converter.cpp +++ b/dep/ACE_wrappers/ace/UTF32_Encoding_Converter.cpp @@ -252,3 +252,4 @@ ACE_UTF32_Encoding_Converter::encoded (const ACE_Byte* source, ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_USES_WCHAR */ + diff --git a/dep/ACE_wrappers/ace/UTF32_Encoding_Converter.h b/dep/ACE_wrappers/ace/UTF32_Encoding_Converter.h index 214edeeeed8..dc811d7251d 100644 --- a/dep/ACE_wrappers/ace/UTF32_Encoding_Converter.h +++ b/dep/ACE_wrappers/ace/UTF32_Encoding_Converter.h @@ -65,3 +65,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_UTF32_ENCODING_CONVERTER_H */ + diff --git a/dep/ACE_wrappers/ace/UTF8_Encoding_Converter.cpp b/dep/ACE_wrappers/ace/UTF8_Encoding_Converter.cpp index cd6c409d0f8..42e452150a4 100644 --- a/dep/ACE_wrappers/ace/UTF8_Encoding_Converter.cpp +++ b/dep/ACE_wrappers/ace/UTF8_Encoding_Converter.cpp @@ -90,3 +90,4 @@ ACE_UTF8_Encoding_Converter::encoded (const ACE_Byte* source, ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_USES_WCHAR */ + diff --git a/dep/ACE_wrappers/ace/UTF8_Encoding_Converter.h b/dep/ACE_wrappers/ace/UTF8_Encoding_Converter.h index 2cb6ed4e452..989adca194a 100644 --- a/dep/ACE_wrappers/ace/UTF8_Encoding_Converter.h +++ b/dep/ACE_wrappers/ace/UTF8_Encoding_Converter.h @@ -70,3 +70,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_UTF8_ENCODING_CONVERTER_H */ + diff --git a/dep/ACE_wrappers/ace/UUID.cpp b/dep/ACE_wrappers/ace/UUID.cpp index 17785384957..d27c8f8a33b 100644 --- a/dep/ACE_wrappers/ace/UUID.cpp +++ b/dep/ACE_wrappers/ace/UUID.cpp @@ -552,3 +552,4 @@ template ACE_Singleton<ACE_Utils::UUID_Generator, ACE_SYNCH_MUTEX> * #endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/UUID.h b/dep/ACE_wrappers/ace/UUID.h index b499697ceea..f2dceff3e51 100644 --- a/dep/ACE_wrappers/ace/UUID.h +++ b/dep/ACE_wrappers/ace/UUID.h @@ -237,3 +237,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif // ACE_UUID_H + diff --git a/dep/ACE_wrappers/ace/Unbounded_Queue.cpp b/dep/ACE_wrappers/ace/Unbounded_Queue.cpp index aaaddc6a98d..11efca41c0d 100644 --- a/dep/ACE_wrappers/ace/Unbounded_Queue.cpp +++ b/dep/ACE_wrappers/ace/Unbounded_Queue.cpp @@ -432,3 +432,4 @@ ACE_Unbounded_Queue_Iterator<T>::next (T *&item) ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_UNBOUNDED_QUEUE_CPP */ + diff --git a/dep/ACE_wrappers/ace/Unbounded_Queue.h b/dep/ACE_wrappers/ace/Unbounded_Queue.h index b6e1c4eea76..0c16ac23388 100644 --- a/dep/ACE_wrappers/ace/Unbounded_Queue.h +++ b/dep/ACE_wrappers/ace/Unbounded_Queue.h @@ -295,3 +295,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_UNBOUNDED_QUEUE_H */ + diff --git a/dep/ACE_wrappers/ace/Unbounded_Set.cpp b/dep/ACE_wrappers/ace/Unbounded_Set.cpp index c54e3fcfa2f..a81561b3ab2 100644 --- a/dep/ACE_wrappers/ace/Unbounded_Set.cpp +++ b/dep/ACE_wrappers/ace/Unbounded_Set.cpp @@ -16,3 +16,4 @@ #endif /* __ACE_INLINE__ */ #endif /* ACE_UNBOUNDED_SET_CPP */ + diff --git a/dep/ACE_wrappers/ace/Unbounded_Set.h b/dep/ACE_wrappers/ace/Unbounded_Set.h index aa629b15d4e..44fb84068ee 100644 --- a/dep/ACE_wrappers/ace/Unbounded_Set.h +++ b/dep/ACE_wrappers/ace/Unbounded_Set.h @@ -101,3 +101,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_UNBOUNDED_SET_H */ + diff --git a/dep/ACE_wrappers/ace/Unbounded_Set_Ex.cpp b/dep/ACE_wrappers/ace/Unbounded_Set_Ex.cpp index c5cd9e27b21..03edae5da0c 100644 --- a/dep/ACE_wrappers/ace/Unbounded_Set_Ex.cpp +++ b/dep/ACE_wrappers/ace/Unbounded_Set_Ex.cpp @@ -497,3 +497,4 @@ ACE_Unbounded_Set_Ex_Const_Iterator<T, C>::operator!= (const ACE_Unbounded_Set_E ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_UNBOUNDED_SET_EX_CPP */ + diff --git a/dep/ACE_wrappers/ace/Unbounded_Set_Ex.h b/dep/ACE_wrappers/ace/Unbounded_Set_Ex.h index 92f8fe0065e..ab16a54be86 100644 --- a/dep/ACE_wrappers/ace/Unbounded_Set_Ex.h +++ b/dep/ACE_wrappers/ace/Unbounded_Set_Ex.h @@ -345,3 +345,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_UNBOUNDED_SET_H */ + diff --git a/dep/ACE_wrappers/ace/Value_Ptr.h b/dep/ACE_wrappers/ace/Value_Ptr.h index c9272a90cff..f42beba0c99 100644 --- a/dep/ACE_wrappers/ace/Value_Ptr.h +++ b/dep/ACE_wrappers/ace/Value_Ptr.h @@ -165,3 +165,4 @@ namespace ACE ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_VALUE_PTR_H */ + diff --git a/dep/ACE_wrappers/ace/Vector_T.cpp b/dep/ACE_wrappers/ace/Vector_T.cpp index e50fe5f71ba..e70ba09add5 100644 --- a/dep/ACE_wrappers/ace/Vector_T.cpp +++ b/dep/ACE_wrappers/ace/Vector_T.cpp @@ -152,3 +152,4 @@ ACE_Vector_Iterator<T, DEFAULT_SIZE>::next (T *&item) ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_VECTOR_T_CPP */ + diff --git a/dep/ACE_wrappers/ace/Vector_T.h b/dep/ACE_wrappers/ace/Vector_T.h index 2df3aa61d00..7be43bfd631 100644 --- a/dep/ACE_wrappers/ace/Vector_T.h +++ b/dep/ACE_wrappers/ace/Vector_T.h @@ -314,3 +314,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_VECTOR_T_H */ + diff --git a/dep/ACE_wrappers/ace/Version.h b/dep/ACE_wrappers/ace/Version.h index 0c8c9d7dbb0..ff3f3e64074 100644 --- a/dep/ACE_wrappers/ace/Version.h +++ b/dep/ACE_wrappers/ace/Version.h @@ -7,3 +7,4 @@ #define ACE_MINOR_VERSION 6 #define ACE_BETA_VERSION 6 #define ACE_VERSION "5.6.6" + diff --git a/dep/ACE_wrappers/ace/Versioned_Namespace.h b/dep/ACE_wrappers/ace/Versioned_Namespace.h index 542254876ff..9b71d0111fc 100644 --- a/dep/ACE_wrappers/ace/Versioned_Namespace.h +++ b/dep/ACE_wrappers/ace/Versioned_Namespace.h @@ -49,3 +49,4 @@ #endif /* ACE_HAS_VERSIONED_NAMESPACE */ #endif /* !ACE_VERSIONED_NAMESPACE_H */ + diff --git a/dep/ACE_wrappers/ace/WFMO_Reactor.cpp b/dep/ACE_wrappers/ace/WFMO_Reactor.cpp index 7195749adcc..7355a025bbd 100644 --- a/dep/ACE_wrappers/ace/WFMO_Reactor.cpp +++ b/dep/ACE_wrappers/ace/WFMO_Reactor.cpp @@ -2746,3 +2746,4 @@ WSAEnumNetworkEvents (SOCKET /* s */, ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_WIN32 */ + diff --git a/dep/ACE_wrappers/ace/WFMO_Reactor.h b/dep/ACE_wrappers/ace/WFMO_Reactor.h index 1bbf207eca1..8a6a8af8ad1 100644 --- a/dep/ACE_wrappers/ace/WFMO_Reactor.h +++ b/dep/ACE_wrappers/ace/WFMO_Reactor.h @@ -1366,3 +1366,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_WIN32 */ #include /**/ "ace/post.h" #endif /* ACE_WFMO_REACTOR_H */ + diff --git a/dep/ACE_wrappers/ace/WIN32_Asynch_IO.cpp b/dep/ACE_wrappers/ace/WIN32_Asynch_IO.cpp index 6f201acccbd..43cb20c4343 100644 --- a/dep/ACE_wrappers/ace/WIN32_Asynch_IO.cpp +++ b/dep/ACE_wrappers/ace/WIN32_Asynch_IO.cpp @@ -3776,3 +3776,4 @@ ACE_WIN32_Asynch_Write_Dgram::ACE_WIN32_Asynch_Write_Dgram (ACE_WIN32_Proactor * ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_WIN32_OVERLAPPED_IO && ACE_HAS_WINSOCK2 */ + diff --git a/dep/ACE_wrappers/ace/WIN32_Asynch_IO.h b/dep/ACE_wrappers/ace/WIN32_Asynch_IO.h index 34af77dabb2..a1cf22ae0a0 100644 --- a/dep/ACE_wrappers/ace/WIN32_Asynch_IO.h +++ b/dep/ACE_wrappers/ace/WIN32_Asynch_IO.h @@ -1935,3 +1935,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_WIN32_OVERLAPPED_IO && ACE_HAS_WINSOCK2 */ #include /**/ "ace/post.h" #endif /* ACE_WIN32_ASYNCH_IO_H */ + diff --git a/dep/ACE_wrappers/ace/WIN32_Proactor.cpp b/dep/ACE_wrappers/ace/WIN32_Proactor.cpp index a559838976f..dceb8336277 100644 --- a/dep/ACE_wrappers/ace/WIN32_Proactor.cpp +++ b/dep/ACE_wrappers/ace/WIN32_Proactor.cpp @@ -802,3 +802,4 @@ ACE_WIN32_Wakeup_Completion::complete (size_t /* bytes_transferred */, ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_WIN32 */ + diff --git a/dep/ACE_wrappers/ace/WIN32_Proactor.h b/dep/ACE_wrappers/ace/WIN32_Proactor.h index 4fb686d7a7e..1035021fb6d 100644 --- a/dep/ACE_wrappers/ace/WIN32_Proactor.h +++ b/dep/ACE_wrappers/ace/WIN32_Proactor.h @@ -323,3 +323,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_WIN32 */ #include /**/ "ace/post.h" #endif /* ACE_PROACTOR_H */ + diff --git a/dep/ACE_wrappers/ace/XML_Svc_Conf.cpp b/dep/ACE_wrappers/ace/XML_Svc_Conf.cpp index 23dddad8469..59d5649e508 100644 --- a/dep/ACE_wrappers/ace/XML_Svc_Conf.cpp +++ b/dep/ACE_wrappers/ace/XML_Svc_Conf.cpp @@ -13,3 +13,4 @@ ACE_XML_Svc_Conf::~ACE_XML_Svc_Conf (void) ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_USES_CLASSIC_SVC_CONF == 0 */ + diff --git a/dep/ACE_wrappers/ace/XML_Svc_Conf.h b/dep/ACE_wrappers/ace/XML_Svc_Conf.h index 883151e05d2..5455657ece2 100644 --- a/dep/ACE_wrappers/ace/XML_Svc_Conf.h +++ b/dep/ACE_wrappers/ace/XML_Svc_Conf.h @@ -63,3 +63,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_XML_SVC_CONF_H */ + diff --git a/dep/ACE_wrappers/ace/XTI_ATM_Mcast.cpp b/dep/ACE_wrappers/ace/XTI_ATM_Mcast.cpp index 503e3fea0e2..ac3443ee8b5 100644 --- a/dep/ACE_wrappers/ace/XTI_ATM_Mcast.cpp +++ b/dep/ACE_wrappers/ace/XTI_ATM_Mcast.cpp @@ -68,3 +68,4 @@ ACE_XTI_ATM_Mcast::add_leaf (ACE_TLI_Stream ¤t_stream, ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_XTI_ATM */ + diff --git a/dep/ACE_wrappers/ace/XTI_ATM_Mcast.h b/dep/ACE_wrappers/ace/XTI_ATM_Mcast.h index bfdfa92c957..9cd01f8ac0b 100644 --- a/dep/ACE_wrappers/ace/XTI_ATM_Mcast.h +++ b/dep/ACE_wrappers/ace/XTI_ATM_Mcast.h @@ -135,3 +135,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_XTI_ATM_MCAST_H */ + diff --git a/dep/ACE_wrappers/ace/ace_wchar.cpp b/dep/ACE_wrappers/ace/ace_wchar.cpp index bec8255447d..4f7ca485585 100644 --- a/dep/ACE_wrappers/ace/ace_wchar.cpp +++ b/dep/ACE_wrappers/ace/ace_wchar.cpp @@ -15,3 +15,4 @@ iconv_t ACE_Ascii_To_Wide::ACE_Ascii_To_Wide_iconv_env = 0; #endif ACE_END_VERSIONED_NAMESPACE_DECL + diff --git a/dep/ACE_wrappers/ace/ace_wchar.h b/dep/ACE_wrappers/ace/ace_wchar.h index f556e0f9cf8..75afa83968b 100644 --- a/dep/ACE_wrappers/ace/ace_wchar.h +++ b/dep/ACE_wrappers/ace/ace_wchar.h @@ -383,3 +383,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/ace_wchar.inl" #endif /* ACE_WCHAR_H */ + diff --git a/dep/ACE_wrappers/ace/checked_iterator.h b/dep/ACE_wrappers/ace/checked_iterator.h index 7792fbb9ec6..fa15cb8f338 100644 --- a/dep/ACE_wrappers/ace/checked_iterator.h +++ b/dep/ACE_wrappers/ace/checked_iterator.h @@ -56,3 +56,4 @@ ACE_make_checked_array_iterator (PTR buf, size_t /* len */) # endif /* _MSC_VER >= 1400 */ #endif /* ACE_CHECKED_ITERATOR_H */ + diff --git a/dep/ACE_wrappers/ace/config-WinCE.h b/dep/ACE_wrappers/ace/config-WinCE.h index f3b65a44c10..83db197b8e4 100644 --- a/dep/ACE_wrappers/ace/config-WinCE.h +++ b/dep/ACE_wrappers/ace/config-WinCE.h @@ -238,3 +238,4 @@ typedef long off_t; #include /**/ "ace/post.h" #endif // ACE_CONFIG_WINCE_H + diff --git a/dep/ACE_wrappers/ace/config-aix-5.x.h b/dep/ACE_wrappers/ace/config-aix-5.x.h index 30507a05fea..5c1972b5675 100644 --- a/dep/ACE_wrappers/ace/config-aix-5.x.h +++ b/dep/ACE_wrappers/ace/config-aix-5.x.h @@ -331,3 +331,4 @@ #define ACE_HAS_TIMEZONE /* Call tzset() to set timezone */ #endif /* ACE_CONFIG_AIX_5_X_H */ + diff --git a/dep/ACE_wrappers/ace/config-all.h b/dep/ACE_wrappers/ace/config-all.h index 2a57a7ee3f3..927bd14919b 100644 --- a/dep/ACE_wrappers/ace/config-all.h +++ b/dep/ACE_wrappers/ace/config-all.h @@ -87,3 +87,4 @@ #include /**/ "ace/post.h" #endif /* ACE_CONFIG_ALL_H */ + diff --git a/dep/ACE_wrappers/ace/config-borland-common.h b/dep/ACE_wrappers/ace/config-borland-common.h index c57ddb07f36..5c80c872ad7 100644 --- a/dep/ACE_wrappers/ace/config-borland-common.h +++ b/dep/ACE_wrappers/ace/config-borland-common.h @@ -64,3 +64,4 @@ #include /**/ "ace/post.h" #endif /* ACE_CONFIG_BORLAND_COMMON_H */ + diff --git a/dep/ACE_wrappers/ace/config-cray.h b/dep/ACE_wrappers/ace/config-cray.h index 28038b15b88..87fe263503d 100644 --- a/dep/ACE_wrappers/ace/config-cray.h +++ b/dep/ACE_wrappers/ace/config-cray.h @@ -211,3 +211,4 @@ #include /**/ "ace/post.h" #endif /* ACE_CONFIG_CRAY_H */ + diff --git a/dep/ACE_wrappers/ace/config-cxx-common.h b/dep/ACE_wrappers/ace/config-cxx-common.h index 024c25fd27e..6d467d64964 100644 --- a/dep/ACE_wrappers/ace/config-cxx-common.h +++ b/dep/ACE_wrappers/ace/config-cxx-common.h @@ -84,3 +84,4 @@ #include /**/ "ace/post.h" #endif /* ACE_CXX_COMMON_H */ + diff --git a/dep/ACE_wrappers/ace/config-cygwin32.h b/dep/ACE_wrappers/ace/config-cygwin32.h index 3dde027988e..e6683e29795 100644 --- a/dep/ACE_wrappers/ace/config-cygwin32.h +++ b/dep/ACE_wrappers/ace/config-cygwin32.h @@ -204,3 +204,4 @@ #include /**/ "ace/post.h" #endif /* ACE_CONFIG_CYGWIN32_H */ + diff --git a/dep/ACE_wrappers/ace/config-doxygen.h b/dep/ACE_wrappers/ace/config-doxygen.h index 2bc89c982fa..d4e8a068e43 100644 --- a/dep/ACE_wrappers/ace/config-doxygen.h +++ b/dep/ACE_wrappers/ace/config-doxygen.h @@ -118,3 +118,4 @@ #define ACE_HAS_IP_MULTICAST #endif /* ACE_CONFIG_DOXYGEN_H */ + diff --git a/dep/ACE_wrappers/ace/config-freebsd.h b/dep/ACE_wrappers/ace/config-freebsd.h index 3461bec8d81..d5ead871030 100644 --- a/dep/ACE_wrappers/ace/config-freebsd.h +++ b/dep/ACE_wrappers/ace/config-freebsd.h @@ -282,3 +282,4 @@ extern "C" { char * cuserid (char *s); } #include /**/ "ace/post.h" #endif /* ACE_CONFIG_H */ + diff --git a/dep/ACE_wrappers/ace/config-g++-common.h b/dep/ACE_wrappers/ace/config-g++-common.h index 8ac8eb9748f..ff365a5890d 100644 --- a/dep/ACE_wrappers/ace/config-g++-common.h +++ b/dep/ACE_wrappers/ace/config-g++-common.h @@ -134,3 +134,4 @@ #include /**/ "ace/post.h" #endif /* ACE_GNUG_COMMON_H */ + diff --git a/dep/ACE_wrappers/ace/config-ghs-common.h b/dep/ACE_wrappers/ace/config-ghs-common.h index ffa554c047e..bb169ba06ba 100644 --- a/dep/ACE_wrappers/ace/config-ghs-common.h +++ b/dep/ACE_wrappers/ace/config-ghs-common.h @@ -41,3 +41,4 @@ #include /**/ "ace/post.h" #endif /* ACE_GHS_COMMON_H */ + diff --git a/dep/ACE_wrappers/ace/config-hpux-11.00.h b/dep/ACE_wrappers/ace/config-hpux-11.00.h index 3af693e3eb3..17de9afa38c 100644 --- a/dep/ACE_wrappers/ace/config-hpux-11.00.h +++ b/dep/ACE_wrappers/ace/config-hpux-11.00.h @@ -447,3 +447,4 @@ #include /**/ "ace/post.h" #endif /* ACE_CONFIG_H */ + diff --git a/dep/ACE_wrappers/ace/config-icc-common.h b/dep/ACE_wrappers/ace/config-icc-common.h index 1ebd0c52ed7..290d2b60fc6 100644 --- a/dep/ACE_wrappers/ace/config-icc-common.h +++ b/dep/ACE_wrappers/ace/config-icc-common.h @@ -111,3 +111,4 @@ #include /**/ "ace/post.h" #endif /* ACE_LINUX_ICC_COMMON_H */ + diff --git a/dep/ACE_wrappers/ace/config-integritySCA.h b/dep/ACE_wrappers/ace/config-integritySCA.h index 62a5d5963a6..195027f94ec 100644 --- a/dep/ACE_wrappers/ace/config-integritySCA.h +++ b/dep/ACE_wrappers/ace/config-integritySCA.h @@ -231,3 +231,4 @@ int unlink(const char *); #include <unistd.h> #endif /* ACE_CONFIG_H */ + diff --git a/dep/ACE_wrappers/ace/config-irix6.5.x-sgic++.h b/dep/ACE_wrappers/ace/config-irix6.5.x-sgic++.h index 2d501010b68..a47126ff5f2 100644 --- a/dep/ACE_wrappers/ace/config-irix6.5.x-sgic++.h +++ b/dep/ACE_wrappers/ace/config-irix6.5.x-sgic++.h @@ -16,3 +16,4 @@ #include /**/ "ace/post.h" #endif /* ACE_CONFIG_IRIX65X_H */ + diff --git a/dep/ACE_wrappers/ace/config-irix6.x-common.h b/dep/ACE_wrappers/ace/config-irix6.x-common.h index d968fa422e0..ab5413412c1 100644 --- a/dep/ACE_wrappers/ace/config-irix6.x-common.h +++ b/dep/ACE_wrappers/ace/config-irix6.x-common.h @@ -255,3 +255,4 @@ #endif /* ACE_CONFIG_IRIX6X_COMMON_H */ + diff --git a/dep/ACE_wrappers/ace/config-irix6.x-g++.h b/dep/ACE_wrappers/ace/config-irix6.x-g++.h index 2211e0e7ce3..91276bdbaad 100644 --- a/dep/ACE_wrappers/ace/config-irix6.x-g++.h +++ b/dep/ACE_wrappers/ace/config-irix6.x-g++.h @@ -21,3 +21,4 @@ #include /**/ "ace/post.h" #endif /* ACE_CONFIG_H */ + diff --git a/dep/ACE_wrappers/ace/config-irix6.x-sgic++.h b/dep/ACE_wrappers/ace/config-irix6.x-sgic++.h index 8bba07ac671..d832995ea8c 100644 --- a/dep/ACE_wrappers/ace/config-irix6.x-sgic++.h +++ b/dep/ACE_wrappers/ace/config-irix6.x-sgic++.h @@ -34,3 +34,4 @@ #include /**/ "ace/post.h" #endif /* ACE_CONFIG_H */ + diff --git a/dep/ACE_wrappers/ace/config-linux-common.h b/dep/ACE_wrappers/ace/config-linux-common.h index bbb10b175da..6743c53adfc 100644 --- a/dep/ACE_wrappers/ace/config-linux-common.h +++ b/dep/ACE_wrappers/ace/config-linux-common.h @@ -446,3 +446,4 @@ #include /**/ "ace/post.h" #endif /* ACE_LINUX_COMMON_H */ + diff --git a/dep/ACE_wrappers/ace/config-linux.h b/dep/ACE_wrappers/ace/config-linux.h index 8b79c13a415..4c5dc3c4bdb 100644 --- a/dep/ACE_wrappers/ace/config-linux.h +++ b/dep/ACE_wrappers/ace/config-linux.h @@ -73,3 +73,4 @@ #include /**/ "ace/post.h" #endif /* ACE_CONFIG_LINUX_H */ + diff --git a/dep/ACE_wrappers/ace/config-lite.h b/dep/ACE_wrappers/ace/config-lite.h index 0992925a601..5af65ccc557 100644 --- a/dep/ACE_wrappers/ace/config-lite.h +++ b/dep/ACE_wrappers/ace/config-lite.h @@ -162,3 +162,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ACE_CONFIG_LITE_H */ + diff --git a/dep/ACE_wrappers/ace/config-lynxos.h b/dep/ACE_wrappers/ace/config-lynxos.h index c65e9b0f72a..baeafa88bb8 100644 --- a/dep/ACE_wrappers/ace/config-lynxos.h +++ b/dep/ACE_wrappers/ace/config-lynxos.h @@ -160,3 +160,4 @@ #include /**/ "ace/post.h" #endif /* ACE_CONFIG_H */ + diff --git a/dep/ACE_wrappers/ace/config-macosx-leopard.h b/dep/ACE_wrappers/ace/config-macosx-leopard.h index bc82d8a7f37..ef9ffc59a08 100644 --- a/dep/ACE_wrappers/ace/config-macosx-leopard.h +++ b/dep/ACE_wrappers/ace/config-macosx-leopard.h @@ -225,3 +225,4 @@ #endif /* __APPLE_CC__ */ #endif /* ACE_CONFIG_MACOSX_TIGER_H */ + diff --git a/dep/ACE_wrappers/ace/config-macosx-panther.h b/dep/ACE_wrappers/ace/config-macosx-panther.h index 8b4010e796a..e2b3361752f 100644 --- a/dep/ACE_wrappers/ace/config-macosx-panther.h +++ b/dep/ACE_wrappers/ace/config-macosx-panther.h @@ -189,3 +189,4 @@ #endif /* __APPLE_CC__ */ #endif /* ACE_CONFIG_MACOSX_H */ + diff --git a/dep/ACE_wrappers/ace/config-macosx-tiger.h b/dep/ACE_wrappers/ace/config-macosx-tiger.h index f920690edb0..282e8800c3c 100644 --- a/dep/ACE_wrappers/ace/config-macosx-tiger.h +++ b/dep/ACE_wrappers/ace/config-macosx-tiger.h @@ -217,3 +217,4 @@ #endif /* __APPLE_CC__ */ #endif /* ACE_CONFIG_MACOSX_TIGER_H */ + diff --git a/dep/ACE_wrappers/ace/config-macosx.h b/dep/ACE_wrappers/ace/config-macosx.h index 904eae5ac00..e8ec1af6e96 100644 --- a/dep/ACE_wrappers/ace/config-macosx.h +++ b/dep/ACE_wrappers/ace/config-macosx.h @@ -189,3 +189,4 @@ #endif /* __APPLE_CC__ */ #endif /* ACE_CONFIG_MACOSX_H */ + diff --git a/dep/ACE_wrappers/ace/config-macros.h b/dep/ACE_wrappers/ace/config-macros.h index ca7f49c31b4..5d1067e6c13 100644 --- a/dep/ACE_wrappers/ace/config-macros.h +++ b/dep/ACE_wrappers/ace/config-macros.h @@ -634,3 +634,4 @@ extern "C" u_long CLS##_Export _get_dll_unload_policy (void) \ // ------------------------------------------------------------------- #endif /* ACE_CONFIG_MACROS_H */ + diff --git a/dep/ACE_wrappers/ace/config-minimal.h b/dep/ACE_wrappers/ace/config-minimal.h index 4cf2e8a487b..5766987f07d 100644 --- a/dep/ACE_wrappers/ace/config-minimal.h +++ b/dep/ACE_wrappers/ace/config-minimal.h @@ -37,3 +37,4 @@ #include /**/ "ace/post.h" #endif /* ACE_CONFIG_MINIMAL_H */ + diff --git a/dep/ACE_wrappers/ace/config-mvs.h b/dep/ACE_wrappers/ace/config-mvs.h index c37bac25892..22ddffee139 100644 --- a/dep/ACE_wrappers/ace/config-mvs.h +++ b/dep/ACE_wrappers/ace/config-mvs.h @@ -129,3 +129,4 @@ #define IN_MULTICAST(a) IN_CLASSD(a) #include /**/ "ace/post.h" #endif /* ACE_CONFIG_H */ + diff --git a/dep/ACE_wrappers/ace/config-netbsd.h b/dep/ACE_wrappers/ace/config-netbsd.h index 551718015f9..b05b26e3963 100644 --- a/dep/ACE_wrappers/ace/config-netbsd.h +++ b/dep/ACE_wrappers/ace/config-netbsd.h @@ -165,3 +165,4 @@ typedef signed long long ACE_INT64; // Local Variables: // mode:C++ // End: + diff --git a/dep/ACE_wrappers/ace/config-openbsd.h b/dep/ACE_wrappers/ace/config-openbsd.h index a730c810da3..e81e36bc613 100644 --- a/dep/ACE_wrappers/ace/config-openbsd.h +++ b/dep/ACE_wrappers/ace/config-openbsd.h @@ -233,3 +233,4 @@ #include /**/ "ace/post.h" #endif /* ACE_CONFIG_H */ + diff --git a/dep/ACE_wrappers/ace/config-openvms.h b/dep/ACE_wrappers/ace/config-openvms.h index 0b3d3c15f8e..90541513f35 100644 --- a/dep/ACE_wrappers/ace/config-openvms.h +++ b/dep/ACE_wrappers/ace/config-openvms.h @@ -193,3 +193,4 @@ #define ACE_LACKS_ALPHASORT 1 #endif + diff --git a/dep/ACE_wrappers/ace/config-pharlap.h b/dep/ACE_wrappers/ace/config-pharlap.h index 8a0d2792a44..e0751c32f1c 100644 --- a/dep/ACE_wrappers/ace/config-pharlap.h +++ b/dep/ACE_wrappers/ace/config-pharlap.h @@ -88,3 +88,4 @@ #include /**/ "ace/post.h" #endif /* ACE_CONFIG_PHARLAP_H */ + diff --git a/dep/ACE_wrappers/ace/config-posix-nonetworking.h b/dep/ACE_wrappers/ace/config-posix-nonetworking.h index 7edc31d0dab..492692179d8 100644 --- a/dep/ACE_wrappers/ace/config-posix-nonetworking.h +++ b/dep/ACE_wrappers/ace/config-posix-nonetworking.h @@ -84,3 +84,4 @@ # define ACE_DISABLE_NOTIFY_PIPE_DEFAULT 1 #endif /* ACE_CONFIG_POSIX_NONETWORKING_H */ + diff --git a/dep/ACE_wrappers/ace/config-posix.h b/dep/ACE_wrappers/ace/config-posix.h index 09b4e0671f3..a9cb744435b 100644 --- a/dep/ACE_wrappers/ace/config-posix.h +++ b/dep/ACE_wrappers/ace/config-posix.h @@ -71,3 +71,4 @@ #endif /* _POSIX_MESSAGE_PASSING */ #endif /* ACE_CONFIG_POSIX_H */ + diff --git a/dep/ACE_wrappers/ace/config-qnx-neutrino.h b/dep/ACE_wrappers/ace/config-qnx-neutrino.h index 745b864916b..ef37758352a 100644 --- a/dep/ACE_wrappers/ace/config-qnx-neutrino.h +++ b/dep/ACE_wrappers/ace/config-qnx-neutrino.h @@ -135,3 +135,4 @@ #include /**/ "ace/post.h" #endif /* ACE_CONFIG_H */ + diff --git a/dep/ACE_wrappers/ace/config-qnx-rtp-62x.h b/dep/ACE_wrappers/ace/config-qnx-rtp-62x.h index 3574153baf6..5ad3326b412 100644 --- a/dep/ACE_wrappers/ace/config-qnx-rtp-62x.h +++ b/dep/ACE_wrappers/ace/config-qnx-rtp-62x.h @@ -127,3 +127,4 @@ #define FD_SETSIZE 1000 #include /**/ "ace/post.h" #endif /* ACE_CONFIG_QNX_RTP_62x_H*/ + diff --git a/dep/ACE_wrappers/ace/config-qnx-rtp-common.h b/dep/ACE_wrappers/ace/config-qnx-rtp-common.h index 410d94e4ee5..ee832adf604 100644 --- a/dep/ACE_wrappers/ace/config-qnx-rtp-common.h +++ b/dep/ACE_wrappers/ace/config-qnx-rtp-common.h @@ -44,3 +44,4 @@ #include /**/ "ace/post.h" #endif /* ACE_CONFIG_QNX_RTP_COMMON_H */ + diff --git a/dep/ACE_wrappers/ace/config-qnx-rtp-pre62x.h b/dep/ACE_wrappers/ace/config-qnx-rtp-pre62x.h index 92adf76b162..af55eeb6cae 100644 --- a/dep/ACE_wrappers/ace/config-qnx-rtp-pre62x.h +++ b/dep/ACE_wrappers/ace/config-qnx-rtp-pre62x.h @@ -149,3 +149,4 @@ #include /**/ "ace/post.h" #endif /* ACE_CONFIG_RTP_PRE62x_H */ + diff --git a/dep/ACE_wrappers/ace/config-qnx-rtp.h b/dep/ACE_wrappers/ace/config-qnx-rtp.h index 54047262540..a176efd8f3e 100644 --- a/dep/ACE_wrappers/ace/config-qnx-rtp.h +++ b/dep/ACE_wrappers/ace/config-qnx-rtp.h @@ -23,3 +23,4 @@ #include /**/ "ace/post.h" #endif /* ACE_CONFIG_QNX_RTP_H */ + diff --git a/dep/ACE_wrappers/ace/config-rtems.h b/dep/ACE_wrappers/ace/config-rtems.h index e2b45861559..558a6e1007c 100644 --- a/dep/ACE_wrappers/ace/config-rtems.h +++ b/dep/ACE_wrappers/ace/config-rtems.h @@ -163,3 +163,4 @@ #endif #endif /* ACE_CONFIG_H */ + diff --git a/dep/ACE_wrappers/ace/config-sco-5.0.0-nothread.h b/dep/ACE_wrappers/ace/config-sco-5.0.0-nothread.h index b8368063967..7d5c4f4ebef 100644 --- a/dep/ACE_wrappers/ace/config-sco-5.0.0-nothread.h +++ b/dep/ACE_wrappers/ace/config-sco-5.0.0-nothread.h @@ -12,3 +12,4 @@ #include /**/ "ace/post.h" #endif /* ACE_CONFIG_H */ + diff --git a/dep/ACE_wrappers/ace/config-sco-5.0.0.h b/dep/ACE_wrappers/ace/config-sco-5.0.0.h index 22849e50518..35c33a43fad 100644 --- a/dep/ACE_wrappers/ace/config-sco-5.0.0.h +++ b/dep/ACE_wrappers/ace/config-sco-5.0.0.h @@ -95,3 +95,4 @@ #include /**/ "ace/post.h" #endif /* ACE_CONFIG_SCO_5_0_0_H */ + diff --git a/dep/ACE_wrappers/ace/config-suncc-common.h b/dep/ACE_wrappers/ace/config-suncc-common.h index 3f0bae8a295..31d424d76b5 100644 --- a/dep/ACE_wrappers/ace/config-suncc-common.h +++ b/dep/ACE_wrappers/ace/config-suncc-common.h @@ -65,3 +65,4 @@ #include /**/ "ace/post.h" #endif /* ACE_SUNCC_COMMON_H */ + diff --git a/dep/ACE_wrappers/ace/config-sunos5.10.h b/dep/ACE_wrappers/ace/config-sunos5.10.h index 79ec20a637c..7ba78c2b3bd 100644 --- a/dep/ACE_wrappers/ace/config-sunos5.10.h +++ b/dep/ACE_wrappers/ace/config-sunos5.10.h @@ -49,3 +49,4 @@ #endif /* ACE_LACKS_WCSTOULL */ #endif /* ACE_CONFIG_H */ + diff --git a/dep/ACE_wrappers/ace/config-sunos5.11.h b/dep/ACE_wrappers/ace/config-sunos5.11.h index bbfd91c82fe..3f78c9f94e6 100644 --- a/dep/ACE_wrappers/ace/config-sunos5.11.h +++ b/dep/ACE_wrappers/ace/config-sunos5.11.h @@ -13,3 +13,4 @@ #include "ace/config-sunos5.10.h" #endif /* ACE_CONFIG_H */ + diff --git a/dep/ACE_wrappers/ace/config-sunos5.4-g++.h b/dep/ACE_wrappers/ace/config-sunos5.4-g++.h index f911da8d361..9622a068232 100644 --- a/dep/ACE_wrappers/ace/config-sunos5.4-g++.h +++ b/dep/ACE_wrappers/ace/config-sunos5.4-g++.h @@ -179,3 +179,4 @@ #include /**/ "ace/post.h" #endif /* ACE_CONFIG_H */ + diff --git a/dep/ACE_wrappers/ace/config-sunos5.4-sunc++-4.x.h b/dep/ACE_wrappers/ace/config-sunos5.4-sunc++-4.x.h index 36a155cdbab..8714b8d72fc 100644 --- a/dep/ACE_wrappers/ace/config-sunos5.4-sunc++-4.x.h +++ b/dep/ACE_wrappers/ace/config-sunos5.4-sunc++-4.x.h @@ -188,3 +188,4 @@ #include /**/ "ace/post.h" #endif /* ACE_CONFIG_H */ + diff --git a/dep/ACE_wrappers/ace/config-sunos5.5.h b/dep/ACE_wrappers/ace/config-sunos5.5.h index 3608a28abe2..83d4d164951 100644 --- a/dep/ACE_wrappers/ace/config-sunos5.5.h +++ b/dep/ACE_wrappers/ace/config-sunos5.5.h @@ -415,3 +415,4 @@ #include /**/ "ace/post.h" #endif /* ACE_CONFIG_H */ + diff --git a/dep/ACE_wrappers/ace/config-sunos5.6.h b/dep/ACE_wrappers/ace/config-sunos5.6.h index d100627a212..2ebf5a274a0 100644 --- a/dep/ACE_wrappers/ace/config-sunos5.6.h +++ b/dep/ACE_wrappers/ace/config-sunos5.6.h @@ -124,3 +124,4 @@ #endif /* _XPG4_2 */ #endif /* ACE_CONFIG_H */ + diff --git a/dep/ACE_wrappers/ace/config-sunos5.7.h b/dep/ACE_wrappers/ace/config-sunos5.7.h index 60e1d993a13..b2b62b7e7bb 100644 --- a/dep/ACE_wrappers/ace/config-sunos5.7.h +++ b/dep/ACE_wrappers/ace/config-sunos5.7.h @@ -76,3 +76,4 @@ #define ACE_HAS_DEV_POLL #endif /* ACE_CONFIG_H */ + diff --git a/dep/ACE_wrappers/ace/config-sunos5.8.h b/dep/ACE_wrappers/ace/config-sunos5.8.h index eb83e91490b..36ce6d4a81a 100644 --- a/dep/ACE_wrappers/ace/config-sunos5.8.h +++ b/dep/ACE_wrappers/ace/config-sunos5.8.h @@ -37,3 +37,4 @@ #define ACE_HAS_BROKEN_GETHOSTBYADDR_V4MAPPED #endif /* ACE_CONFIG_H */ + diff --git a/dep/ACE_wrappers/ace/config-sunos5.9.h b/dep/ACE_wrappers/ace/config-sunos5.9.h index 0e6aa8d5b9c..39b5721b527 100644 --- a/dep/ACE_wrappers/ace/config-sunos5.9.h +++ b/dep/ACE_wrappers/ace/config-sunos5.9.h @@ -16,3 +16,4 @@ #define ACE_LACKS_THR_CONCURRENCY_FUNCS #endif /* ACE_CONFIG_H */ + diff --git a/dep/ACE_wrappers/ace/config-tandem-nsk-mips-v2.h b/dep/ACE_wrappers/ace/config-tandem-nsk-mips-v2.h index 20d555321a8..18e2cb23f79 100644 --- a/dep/ACE_wrappers/ace/config-tandem-nsk-mips-v2.h +++ b/dep/ACE_wrappers/ace/config-tandem-nsk-mips-v2.h @@ -399,3 +399,4 @@ typedef enum CMA_T_SCHED_POLICY { #include /**/ "ace/post.h" #endif /* ACE_CONFIG_NSK_H */ + diff --git a/dep/ACE_wrappers/ace/config-tandem-nsk-mips-v3.h b/dep/ACE_wrappers/ace/config-tandem-nsk-mips-v3.h index 0e6fd291c29..c002835a857 100644 --- a/dep/ACE_wrappers/ace/config-tandem-nsk-mips-v3.h +++ b/dep/ACE_wrappers/ace/config-tandem-nsk-mips-v3.h @@ -469,3 +469,4 @@ typedef enum CMA_T_SCHED_POLICY { #include /**/ "ace/post.h" #endif /* ACE_CONFIG_NSK_H */ + diff --git a/dep/ACE_wrappers/ace/config-tandem.h b/dep/ACE_wrappers/ace/config-tandem.h index 981fdfb2d99..1577e1e6866 100644 --- a/dep/ACE_wrappers/ace/config-tandem.h +++ b/dep/ACE_wrappers/ace/config-tandem.h @@ -191,3 +191,4 @@ #include /**/ "ace/post.h" #endif /* ACE_CONFIG_H */ + diff --git a/dep/ACE_wrappers/ace/config-tru64.h b/dep/ACE_wrappers/ace/config-tru64.h index f2825b996a9..db16845b529 100644 --- a/dep/ACE_wrappers/ace/config-tru64.h +++ b/dep/ACE_wrappers/ace/config-tru64.h @@ -152,3 +152,4 @@ #include /**/ "ace/post.h" #endif /* ACE_CONFIG_TRU64_H */ + diff --git a/dep/ACE_wrappers/ace/config-unixware-7.1.0.h b/dep/ACE_wrappers/ace/config-unixware-7.1.0.h index b75fac4dcd8..03725638a70 100644 --- a/dep/ACE_wrappers/ace/config-unixware-7.1.0.h +++ b/dep/ACE_wrappers/ace/config-unixware-7.1.0.h @@ -410,3 +410,4 @@ #define __IOCTL_VERSIONED__ // By Carlo! #endif /* ACE_CONFIG_H */ + diff --git a/dep/ACE_wrappers/ace/config-unixware-7.1.0.udk.h b/dep/ACE_wrappers/ace/config-unixware-7.1.0.udk.h index 477130d3d2d..988c451effb 100644 --- a/dep/ACE_wrappers/ace/config-unixware-7.1.0.udk.h +++ b/dep/ACE_wrappers/ace/config-unixware-7.1.0.udk.h @@ -458,3 +458,4 @@ #define __IOCTL_VERSIONED__ // By Carlo! #endif /* ACE_UNIXWARE_UDK_H */ + diff --git a/dep/ACE_wrappers/ace/config-visualage.h b/dep/ACE_wrappers/ace/config-visualage.h index 4cef8108bc5..6d967b52217 100644 --- a/dep/ACE_wrappers/ace/config-visualage.h +++ b/dep/ACE_wrappers/ace/config-visualage.h @@ -18,3 +18,4 @@ #include /**/ "ace/post.h" #endif //CONFIG_VISUALAGE_H + diff --git a/dep/ACE_wrappers/ace/config-vxworks.h b/dep/ACE_wrappers/ace/config-vxworks.h index bb6ed5796d5..52c2958654d 100644 --- a/dep/ACE_wrappers/ace/config-vxworks.h +++ b/dep/ACE_wrappers/ace/config-vxworks.h @@ -53,3 +53,4 @@ #include /**/ "ace/post.h" #endif /* ACE_CONFIG_VXWORKS_H */ + diff --git a/dep/ACE_wrappers/ace/config-vxworks5.x.h b/dep/ACE_wrappers/ace/config-vxworks5.x.h index a13ce4720d1..eeb22490090 100644 --- a/dep/ACE_wrappers/ace/config-vxworks5.x.h +++ b/dep/ACE_wrappers/ace/config-vxworks5.x.h @@ -343,3 +343,4 @@ #include /**/ "ace/post.h" #endif /* ACE_CONFIG_H */ + diff --git a/dep/ACE_wrappers/ace/config-vxworks6.2.h b/dep/ACE_wrappers/ace/config-vxworks6.2.h index 0d03b44cd50..f7978b0036e 100644 --- a/dep/ACE_wrappers/ace/config-vxworks6.2.h +++ b/dep/ACE_wrappers/ace/config-vxworks6.2.h @@ -326,3 +326,4 @@ #include /**/ "ace/post.h" #endif /* ACE_CONFIG_VXWORKS_6_2_H */ + diff --git a/dep/ACE_wrappers/ace/config-vxworks6.3.h b/dep/ACE_wrappers/ace/config-vxworks6.3.h index 1b7cd4100c3..fe90626e3dc 100644 --- a/dep/ACE_wrappers/ace/config-vxworks6.3.h +++ b/dep/ACE_wrappers/ace/config-vxworks6.3.h @@ -315,3 +315,4 @@ #include /**/ "ace/post.h" #endif /* ACE_CONFIG_VXWORKS_6_3_H */ + diff --git a/dep/ACE_wrappers/ace/config-vxworks6.4.h b/dep/ACE_wrappers/ace/config-vxworks6.4.h index 2d8db5294fd..80c28ab624c 100644 --- a/dep/ACE_wrappers/ace/config-vxworks6.4.h +++ b/dep/ACE_wrappers/ace/config-vxworks6.4.h @@ -338,3 +338,4 @@ #include /**/ "ace/post.h" #endif /* ACE_CONFIG_VXWORKS_6_4_H */ + diff --git a/dep/ACE_wrappers/ace/config-vxworks6.5.h b/dep/ACE_wrappers/ace/config-vxworks6.5.h index 19273e6cad4..d40f695774c 100644 --- a/dep/ACE_wrappers/ace/config-vxworks6.5.h +++ b/dep/ACE_wrappers/ace/config-vxworks6.5.h @@ -23,3 +23,4 @@ #include /**/ "ace/post.h" #endif /* ACE_CONFIG_VXWORKS_6_5_H */ + diff --git a/dep/ACE_wrappers/ace/config-vxworks6.6.h b/dep/ACE_wrappers/ace/config-vxworks6.6.h index 98787f39e00..a2058aa51c3 100644 --- a/dep/ACE_wrappers/ace/config-vxworks6.6.h +++ b/dep/ACE_wrappers/ace/config-vxworks6.6.h @@ -27,3 +27,4 @@ #include /**/ "ace/post.h" #endif /* ACE_CONFIG_VXWORKS_6_6_H */ + diff --git a/dep/ACE_wrappers/ace/config-win32-borland.h b/dep/ACE_wrappers/ace/config-win32-borland.h index 2c05bc074a2..371919cfdc4 100644 --- a/dep/ACE_wrappers/ace/config-win32-borland.h +++ b/dep/ACE_wrappers/ace/config-win32-borland.h @@ -123,3 +123,4 @@ #include /**/ "ace/post.h" #endif /* ACE_CONFIG_WIN32_BORLAND_H */ + diff --git a/dep/ACE_wrappers/ace/config-win32-common.h b/dep/ACE_wrappers/ace/config-win32-common.h index 837f9ce4d21..1abeccd4c54 100644 --- a/dep/ACE_wrappers/ace/config-win32-common.h +++ b/dep/ACE_wrappers/ace/config-win32-common.h @@ -664,3 +664,4 @@ #include /**/ "ace/post.h" #endif /* ACE_CONFIG_WIN32_COMMON_H */ + diff --git a/dep/ACE_wrappers/ace/config-win32-dmc.h b/dep/ACE_wrappers/ace/config-win32-dmc.h index 91adf86b8b9..ca855f5bc97 100644 --- a/dep/ACE_wrappers/ace/config-win32-dmc.h +++ b/dep/ACE_wrappers/ace/config-win32-dmc.h @@ -108,3 +108,4 @@ typedef long o_gid_t; #include /**/ "ace/post.h" #endif /* ACE_CONFIG_WIN32_DMC_H */ + diff --git a/dep/ACE_wrappers/ace/config-win32-ghs.h b/dep/ACE_wrappers/ace/config-win32-ghs.h index 77cff1d803d..775488f3f7f 100644 --- a/dep/ACE_wrappers/ace/config-win32-ghs.h +++ b/dep/ACE_wrappers/ace/config-win32-ghs.h @@ -94,3 +94,4 @@ #include /**/ "ace/post.h" #endif /* ACE_CONFIG_WIN32_GHS_H */ + diff --git a/dep/ACE_wrappers/ace/config-win32-interix.h b/dep/ACE_wrappers/ace/config-win32-interix.h index d613444fadb..71f521af45a 100644 --- a/dep/ACE_wrappers/ace/config-win32-interix.h +++ b/dep/ACE_wrappers/ace/config-win32-interix.h @@ -98,3 +98,4 @@ IOStream_Test.log ACE_IOSTREAM not supported on this platform */ + diff --git a/dep/ACE_wrappers/ace/config-win32-mingw.h b/dep/ACE_wrappers/ace/config-win32-mingw.h index f4439865de2..259e5d927fd 100644 --- a/dep/ACE_wrappers/ace/config-win32-mingw.h +++ b/dep/ACE_wrappers/ace/config-win32-mingw.h @@ -98,3 +98,4 @@ #include /**/ "ace/post.h" #endif /* ACE_CONFIG_WIN32_MINGW_H */ + diff --git a/dep/ACE_wrappers/ace/config-win32-msvc-7.h b/dep/ACE_wrappers/ace/config-win32-msvc-7.h index 535643a8fbf..b2b45c6894b 100644 --- a/dep/ACE_wrappers/ace/config-win32-msvc-7.h +++ b/dep/ACE_wrappers/ace/config-win32-msvc-7.h @@ -123,3 +123,4 @@ #include /**/ "ace/post.h" #endif /* ACE_CONFIG_WIN32_MSVC_7_H */ + diff --git a/dep/ACE_wrappers/ace/config-win32-msvc-8.h b/dep/ACE_wrappers/ace/config-win32-msvc-8.h index 73c29e1d482..f35ba9f4f94 100644 --- a/dep/ACE_wrappers/ace/config-win32-msvc-8.h +++ b/dep/ACE_wrappers/ace/config-win32-msvc-8.h @@ -146,3 +146,4 @@ #include /**/ "ace/post.h" #endif /* ACE_CONFIG_WIN32_MSVC_8_H */ + diff --git a/dep/ACE_wrappers/ace/config-win32-msvc-9.h b/dep/ACE_wrappers/ace/config-win32-msvc-9.h index 8f148b4c00e..ee8feef52e1 100644 --- a/dep/ACE_wrappers/ace/config-win32-msvc-9.h +++ b/dep/ACE_wrappers/ace/config-win32-msvc-9.h @@ -138,3 +138,4 @@ #include /**/ "ace/post.h" #endif /* ACE_CONFIG_WIN32_MSVC_9_H */ + diff --git a/dep/ACE_wrappers/ace/config-win32-msvc.h b/dep/ACE_wrappers/ace/config-win32-msvc.h index a7f8898fce7..7abad321c7d 100644 --- a/dep/ACE_wrappers/ace/config-win32-msvc.h +++ b/dep/ACE_wrappers/ace/config-win32-msvc.h @@ -167,3 +167,4 @@ #include /**/ "ace/post.h" #endif /* ACE_CONFIG_WIN32_MSVC_H */ + diff --git a/dep/ACE_wrappers/ace/config-win32.h b/dep/ACE_wrappers/ace/config-win32.h index 76f258eb3ee..96c351bd567 100644 --- a/dep/ACE_wrappers/ace/config-win32.h +++ b/dep/ACE_wrappers/ace/config-win32.h @@ -91,3 +91,4 @@ #include /**/ "ace/post.h" #endif /* ACE_CONFIG_WIN32_H */ + diff --git a/dep/ACE_wrappers/ace/gethrtime.cpp b/dep/ACE_wrappers/ace/gethrtime.cpp index 69de03153a1..163645cd68b 100644 --- a/dep/ACE_wrappers/ace/gethrtime.cpp +++ b/dep/ACE_wrappers/ace/gethrtime.cpp @@ -58,3 +58,4 @@ ACE_GETHRTIME_NAME (void) #endif /* ! ACE_HAS_PENTIUM */ } #endif /* ghs */ + diff --git a/dep/ACE_wrappers/ace/iosfwd.h b/dep/ACE_wrappers/ace/iosfwd.h index b07a9f11b05..561e15e8ad8 100644 --- a/dep/ACE_wrappers/ace/iosfwd.h +++ b/dep/ACE_wrappers/ace/iosfwd.h @@ -97,3 +97,4 @@ #endif /* ACE_LACKS_IOSTREAM_TOTALLY */ #endif /* ACE_IOSFWD_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/arpa/os_inet.h b/dep/ACE_wrappers/ace/os_include/arpa/os_inet.h index 090484d2850..37538c0824d 100644 --- a/dep/ACE_wrappers/ace/os_include/arpa/os_inet.h +++ b/dep/ACE_wrappers/ace/os_include/arpa/os_inet.h @@ -72,3 +72,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_ARPA_OS_INET_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/net/os_if.h b/dep/ACE_wrappers/ace/os_include/net/os_if.h index 1f59a177292..da099f89dc2 100644 --- a/dep/ACE_wrappers/ace/os_include/net/os_if.h +++ b/dep/ACE_wrappers/ace/os_include/net/os_if.h @@ -117,3 +117,4 @@ struct ifconf { #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_NET_OS_IF_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/netinet/os_in.h b/dep/ACE_wrappers/ace/os_include/netinet/os_in.h index 4a4346ed4d6..c90fb8fa8d4 100644 --- a/dep/ACE_wrappers/ace/os_include/netinet/os_in.h +++ b/dep/ACE_wrappers/ace/os_include/netinet/os_in.h @@ -183,3 +183,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_NETINET_OS_IN_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/netinet/os_tcp.h b/dep/ACE_wrappers/ace/os_include/netinet/os_tcp.h index 6e6c6675708..9f60cd91af8 100644 --- a/dep/ACE_wrappers/ace/os_include/netinet/os_tcp.h +++ b/dep/ACE_wrappers/ace/os_include/netinet/os_tcp.h @@ -44,3 +44,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_NETINET_OS_TCP_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/os_aio.h b/dep/ACE_wrappers/ace/os_include/os_aio.h index 4ec9fe9d127..2011403ff3c 100644 --- a/dep/ACE_wrappers/ace/os_include/os_aio.h +++ b/dep/ACE_wrappers/ace/os_include/os_aio.h @@ -45,3 +45,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_AIO_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/os_assert.h b/dep/ACE_wrappers/ace/os_include/os_assert.h index fdca573fe8e..1c1ed53d852 100644 --- a/dep/ACE_wrappers/ace/os_include/os_assert.h +++ b/dep/ACE_wrappers/ace/os_include/os_assert.h @@ -44,3 +44,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_ASSERT_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/os_byteswap.h b/dep/ACE_wrappers/ace/os_include/os_byteswap.h index b55754ee810..fd1ff253fce 100644 --- a/dep/ACE_wrappers/ace/os_include/os_byteswap.h +++ b/dep/ACE_wrappers/ace/os_include/os_byteswap.h @@ -39,3 +39,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_BYTESWAP_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/os_complex.h b/dep/ACE_wrappers/ace/os_include/os_complex.h index 5e6546f82df..27ce474b6dc 100644 --- a/dep/ACE_wrappers/ace/os_include/os_complex.h +++ b/dep/ACE_wrappers/ace/os_include/os_complex.h @@ -40,3 +40,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_COMPLEX_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/os_cpio.h b/dep/ACE_wrappers/ace/os_include/os_cpio.h index 2c06e8eb2f5..09e536d521a 100644 --- a/dep/ACE_wrappers/ace/os_include/os_cpio.h +++ b/dep/ACE_wrappers/ace/os_include/os_cpio.h @@ -40,3 +40,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_CPIO_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/os_ctype.h b/dep/ACE_wrappers/ace/os_include/os_ctype.h index faa04af65ba..61a3df06375 100644 --- a/dep/ACE_wrappers/ace/os_include/os_ctype.h +++ b/dep/ACE_wrappers/ace/os_include/os_ctype.h @@ -43,3 +43,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_CTYPE_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/os_dirent.h b/dep/ACE_wrappers/ace/os_include/os_dirent.h index 2db95c65a52..4e81e94d1bf 100644 --- a/dep/ACE_wrappers/ace/os_include/os_dirent.h +++ b/dep/ACE_wrappers/ace/os_include/os_dirent.h @@ -106,3 +106,4 @@ int alphasort (const void *, const void *); #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_DIRENT_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/os_dlfcn.h b/dep/ACE_wrappers/ace/os_include/os_dlfcn.h index 0f74437fb80..f7691ad8a58 100644 --- a/dep/ACE_wrappers/ace/os_include/os_dlfcn.h +++ b/dep/ACE_wrappers/ace/os_include/os_dlfcn.h @@ -99,3 +99,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_DLFCN_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/os_errno.h b/dep/ACE_wrappers/ace/os_include/os_errno.h index 1e297e36495..6534aa8c7c8 100644 --- a/dep/ACE_wrappers/ace/os_include/os_errno.h +++ b/dep/ACE_wrappers/ace/os_include/os_errno.h @@ -151,3 +151,4 @@ extern int t_errno; #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_ERRNO_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/os_fcntl.h b/dep/ACE_wrappers/ace/os_include/os_fcntl.h index 048ff62ae6e..ad5beeb9511 100644 --- a/dep/ACE_wrappers/ace/os_include/os_fcntl.h +++ b/dep/ACE_wrappers/ace/os_include/os_fcntl.h @@ -104,3 +104,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_FCNTL_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/os_fenv.h b/dep/ACE_wrappers/ace/os_include/os_fenv.h index cbf5ab41100..a178c04c91b 100644 --- a/dep/ACE_wrappers/ace/os_include/os_fenv.h +++ b/dep/ACE_wrappers/ace/os_include/os_fenv.h @@ -40,3 +40,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_FENV_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/os_float.h b/dep/ACE_wrappers/ace/os_include/os_float.h index ac4b2f8f961..6b114a5dc3e 100644 --- a/dep/ACE_wrappers/ace/os_include/os_float.h +++ b/dep/ACE_wrappers/ace/os_include/os_float.h @@ -40,3 +40,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_FLOAT_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/os_fmtmsg.h b/dep/ACE_wrappers/ace/os_include/os_fmtmsg.h index 74251a950d6..391e8606e27 100644 --- a/dep/ACE_wrappers/ace/os_include/os_fmtmsg.h +++ b/dep/ACE_wrappers/ace/os_include/os_fmtmsg.h @@ -40,3 +40,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_FMTMSG_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/os_fnmatch.h b/dep/ACE_wrappers/ace/os_include/os_fnmatch.h index 36726e293ae..2f592ef46e1 100644 --- a/dep/ACE_wrappers/ace/os_include/os_fnmatch.h +++ b/dep/ACE_wrappers/ace/os_include/os_fnmatch.h @@ -40,3 +40,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_FNMATCH_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/os_ftw.h b/dep/ACE_wrappers/ace/os_include/os_ftw.h index 225d3251339..ab4655f241b 100644 --- a/dep/ACE_wrappers/ace/os_include/os_ftw.h +++ b/dep/ACE_wrappers/ace/os_include/os_ftw.h @@ -42,3 +42,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_FTW_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/os_glob.h b/dep/ACE_wrappers/ace/os_include/os_glob.h index 0ced3a36234..2ffdbab53e6 100644 --- a/dep/ACE_wrappers/ace/os_include/os_glob.h +++ b/dep/ACE_wrappers/ace/os_include/os_glob.h @@ -40,3 +40,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_GLOB_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/os_grp.h b/dep/ACE_wrappers/ace/os_include/os_grp.h index 74bb6e64737..bc0741e9de2 100644 --- a/dep/ACE_wrappers/ace/os_include/os_grp.h +++ b/dep/ACE_wrappers/ace/os_include/os_grp.h @@ -42,3 +42,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_GRP_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/os_iconv.h b/dep/ACE_wrappers/ace/os_include/os_iconv.h index 33b061cd789..14a69870112 100644 --- a/dep/ACE_wrappers/ace/os_include/os_iconv.h +++ b/dep/ACE_wrappers/ace/os_include/os_iconv.h @@ -42,3 +42,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_ICONV_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/os_intrin.h b/dep/ACE_wrappers/ace/os_include/os_intrin.h index 37b669500e2..d56951b6b57 100644 --- a/dep/ACE_wrappers/ace/os_include/os_intrin.h +++ b/dep/ACE_wrappers/ace/os_include/os_intrin.h @@ -55,3 +55,4 @@ LONG __cdecl _InterlockedExchangeAdd (LONG volatile *Addend, LONG Value); #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_INTRIN_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/os_inttypes.h b/dep/ACE_wrappers/ace/os_include/os_inttypes.h index 2f0c188699e..86105a723a6 100644 --- a/dep/ACE_wrappers/ace/os_include/os_inttypes.h +++ b/dep/ACE_wrappers/ace/os_include/os_inttypes.h @@ -44,3 +44,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_INTTYPES_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/os_iso646.h b/dep/ACE_wrappers/ace/os_include/os_iso646.h index 0c5ab2ae4aa..bccc85f17ad 100644 --- a/dep/ACE_wrappers/ace/os_include/os_iso646.h +++ b/dep/ACE_wrappers/ace/os_include/os_iso646.h @@ -40,3 +40,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_ISO646_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/os_kstat.h b/dep/ACE_wrappers/ace/os_include/os_kstat.h index 31836cd27d0..5ca91673d8e 100644 --- a/dep/ACE_wrappers/ace/os_include/os_kstat.h +++ b/dep/ACE_wrappers/ace/os_include/os_kstat.h @@ -41,3 +41,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_KSTAT_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/os_langinfo.h b/dep/ACE_wrappers/ace/os_include/os_langinfo.h index bfcd67cc2dc..29648b459d8 100644 --- a/dep/ACE_wrappers/ace/os_include/os_langinfo.h +++ b/dep/ACE_wrappers/ace/os_include/os_langinfo.h @@ -42,3 +42,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_LANGINFO_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/os_libgen.h b/dep/ACE_wrappers/ace/os_include/os_libgen.h index ca24a4d7f9b..5692f5effe1 100644 --- a/dep/ACE_wrappers/ace/os_include/os_libgen.h +++ b/dep/ACE_wrappers/ace/os_include/os_libgen.h @@ -40,3 +40,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_LIBGEN_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/os_limits.h b/dep/ACE_wrappers/ace/os_include/os_limits.h index 1b1267721ae..87eb978d541 100644 --- a/dep/ACE_wrappers/ace/os_include/os_limits.h +++ b/dep/ACE_wrappers/ace/os_include/os_limits.h @@ -141,3 +141,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_LIMITS_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/os_local.h b/dep/ACE_wrappers/ace/os_include/os_local.h index b5752f9ab95..64ff0d4d06f 100644 --- a/dep/ACE_wrappers/ace/os_include/os_local.h +++ b/dep/ACE_wrappers/ace/os_include/os_local.h @@ -42,3 +42,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_LOCAL_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/os_math.h b/dep/ACE_wrappers/ace/os_include/os_math.h index 6fb53cb1576..8a1fcd84790 100644 --- a/dep/ACE_wrappers/ace/os_include/os_math.h +++ b/dep/ACE_wrappers/ace/os_include/os_math.h @@ -42,3 +42,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_MATH_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/os_monetary.h b/dep/ACE_wrappers/ace/os_include/os_monetary.h index 6e956885ad6..731dbc11210 100644 --- a/dep/ACE_wrappers/ace/os_include/os_monetary.h +++ b/dep/ACE_wrappers/ace/os_include/os_monetary.h @@ -42,3 +42,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_MONETARY_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/os_mqueue.h b/dep/ACE_wrappers/ace/os_include/os_mqueue.h index 7b3cbb9209a..186d10697e8 100644 --- a/dep/ACE_wrappers/ace/os_include/os_mqueue.h +++ b/dep/ACE_wrappers/ace/os_include/os_mqueue.h @@ -42,3 +42,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_MQUEUE_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/os_ndbm.h b/dep/ACE_wrappers/ace/os_include/os_ndbm.h index 042dcebf2ff..f3decb0064f 100644 --- a/dep/ACE_wrappers/ace/os_include/os_ndbm.h +++ b/dep/ACE_wrappers/ace/os_include/os_ndbm.h @@ -42,3 +42,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_NDBM_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/os_netdb.h b/dep/ACE_wrappers/ace/os_include/os_netdb.h index 286cb275481..7c08f6df081 100644 --- a/dep/ACE_wrappers/ace/os_include/os_netdb.h +++ b/dep/ACE_wrappers/ace/os_include/os_netdb.h @@ -106,3 +106,4 @@ struct servent { #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_NETDB_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/os_nl_types.h b/dep/ACE_wrappers/ace/os_include/os_nl_types.h index e043f6ae6d3..2b14f55c7ec 100644 --- a/dep/ACE_wrappers/ace/os_include/os_nl_types.h +++ b/dep/ACE_wrappers/ace/os_include/os_nl_types.h @@ -40,3 +40,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_NL_TYPES_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/os_pdh.h b/dep/ACE_wrappers/ace/os_include/os_pdh.h index 5c60c60d10e..4dd5b582f31 100644 --- a/dep/ACE_wrappers/ace/os_include/os_pdh.h +++ b/dep/ACE_wrappers/ace/os_include/os_pdh.h @@ -43,3 +43,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_PDH_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/os_pdhmsg.h b/dep/ACE_wrappers/ace/os_include/os_pdhmsg.h index 2156236e07c..4bd09ba9d54 100644 --- a/dep/ACE_wrappers/ace/os_include/os_pdhmsg.h +++ b/dep/ACE_wrappers/ace/os_include/os_pdhmsg.h @@ -39,3 +39,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_PDHMSG_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/os_poll.h b/dep/ACE_wrappers/ace/os_include/os_poll.h index 646c1bb853c..e9597e5d50e 100644 --- a/dep/ACE_wrappers/ace/os_include/os_poll.h +++ b/dep/ACE_wrappers/ace/os_include/os_poll.h @@ -40,3 +40,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_POLL_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/os_pthread.h b/dep/ACE_wrappers/ace/os_include/os_pthread.h index 368f4254a34..6556a64576d 100644 --- a/dep/ACE_wrappers/ace/os_include/os_pthread.h +++ b/dep/ACE_wrappers/ace/os_include/os_pthread.h @@ -422,3 +422,4 @@ public: #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_PTHREAD_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/os_pwd.h b/dep/ACE_wrappers/ace/os_include/os_pwd.h index b1bc94af381..f3cba066af9 100644 --- a/dep/ACE_wrappers/ace/os_include/os_pwd.h +++ b/dep/ACE_wrappers/ace/os_include/os_pwd.h @@ -56,3 +56,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_PWD_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/os_regex.h b/dep/ACE_wrappers/ace/os_include/os_regex.h index 1c856da26f0..94606e45e58 100644 --- a/dep/ACE_wrappers/ace/os_include/os_regex.h +++ b/dep/ACE_wrappers/ace/os_include/os_regex.h @@ -46,3 +46,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_REGEX_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/os_sched.h b/dep/ACE_wrappers/ace/os_include/os_sched.h index a80b454df0a..15279dbeef3 100644 --- a/dep/ACE_wrappers/ace/os_include/os_sched.h +++ b/dep/ACE_wrappers/ace/os_include/os_sched.h @@ -50,3 +50,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_SCHED_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/os_search.h b/dep/ACE_wrappers/ace/os_include/os_search.h index 605fd365c09..b67d902e9af 100644 --- a/dep/ACE_wrappers/ace/os_include/os_search.h +++ b/dep/ACE_wrappers/ace/os_include/os_search.h @@ -42,3 +42,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_SEARCH_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/os_semaphore.h b/dep/ACE_wrappers/ace/os_include/os_semaphore.h index 7fad7dafb4e..e6ae6b19b40 100644 --- a/dep/ACE_wrappers/ace/os_include/os_semaphore.h +++ b/dep/ACE_wrappers/ace/os_include/os_semaphore.h @@ -75,3 +75,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_SEMAPHORE_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/os_setjmp.h b/dep/ACE_wrappers/ace/os_include/os_setjmp.h index 2ab4a18a9f9..e5261965cd8 100644 --- a/dep/ACE_wrappers/ace/os_include/os_setjmp.h +++ b/dep/ACE_wrappers/ace/os_include/os_setjmp.h @@ -40,3 +40,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_SETJMP_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/os_signal.h b/dep/ACE_wrappers/ace/os_include/os_signal.h index fdfd21e99ba..029e5553921 100644 --- a/dep/ACE_wrappers/ace/os_include/os_signal.h +++ b/dep/ACE_wrappers/ace/os_include/os_signal.h @@ -251,3 +251,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_SIGNAL_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/os_spawn.h b/dep/ACE_wrappers/ace/os_include/os_spawn.h index 0f825640ff9..ffa80163f50 100644 --- a/dep/ACE_wrappers/ace/os_include/os_spawn.h +++ b/dep/ACE_wrappers/ace/os_include/os_spawn.h @@ -44,3 +44,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_SPAWN_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/os_stdarg.h b/dep/ACE_wrappers/ace/os_include/os_stdarg.h index 0e9d234b55e..7a9fcf5a928 100644 --- a/dep/ACE_wrappers/ace/os_include/os_stdarg.h +++ b/dep/ACE_wrappers/ace/os_include/os_stdarg.h @@ -48,3 +48,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_STDARG_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/os_stdbool.h b/dep/ACE_wrappers/ace/os_include/os_stdbool.h index ddb3f8e0ddb..e739fddf26d 100644 --- a/dep/ACE_wrappers/ace/os_include/os_stdbool.h +++ b/dep/ACE_wrappers/ace/os_include/os_stdbool.h @@ -40,3 +40,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_STDBOOL_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/os_stddef.h b/dep/ACE_wrappers/ace/os_include/os_stddef.h index b842ffe80ab..34e6001925f 100644 --- a/dep/ACE_wrappers/ace/os_include/os_stddef.h +++ b/dep/ACE_wrappers/ace/os_include/os_stddef.h @@ -95,3 +95,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_STDDEF_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/os_stdint.h b/dep/ACE_wrappers/ace/os_include/os_stdint.h index ac6fec664c5..5786e2a2b71 100644 --- a/dep/ACE_wrappers/ace/os_include/os_stdint.h +++ b/dep/ACE_wrappers/ace/os_include/os_stdint.h @@ -139,3 +139,4 @@ _POSIX_V6_LPBIG_OFFBIG programming environment. #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_STDINT_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/os_stdio.h b/dep/ACE_wrappers/ace/os_include/os_stdio.h index e9f452024ff..23cec4d8eba 100644 --- a/dep/ACE_wrappers/ace/os_include/os_stdio.h +++ b/dep/ACE_wrappers/ace/os_include/os_stdio.h @@ -85,3 +85,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_STDIO_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/os_stdlib.h b/dep/ACE_wrappers/ace/os_include/os_stdlib.h index f30c77d0fd6..4813f4e2bcc 100644 --- a/dep/ACE_wrappers/ace/os_include/os_stdlib.h +++ b/dep/ACE_wrappers/ace/os_include/os_stdlib.h @@ -75,3 +75,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_STDLIB_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/os_string.h b/dep/ACE_wrappers/ace/os_include/os_string.h index 0bd82f75df7..cfbc4fd2fcf 100644 --- a/dep/ACE_wrappers/ace/os_include/os_string.h +++ b/dep/ACE_wrappers/ace/os_include/os_string.h @@ -74,3 +74,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_STRING_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/os_strings.h b/dep/ACE_wrappers/ace/os_include/os_strings.h index ba258b08cb9..8bfc768962f 100644 --- a/dep/ACE_wrappers/ace/os_include/os_strings.h +++ b/dep/ACE_wrappers/ace/os_include/os_strings.h @@ -50,3 +50,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_STRINGS_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/os_stropts.h b/dep/ACE_wrappers/ace/os_include/os_stropts.h index 1e69b9a03d9..961bd37feaa 100644 --- a/dep/ACE_wrappers/ace/os_include/os_stropts.h +++ b/dep/ACE_wrappers/ace/os_include/os_stropts.h @@ -118,3 +118,4 @@ struct strbuf #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_STROPTS_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/os_syslog.h b/dep/ACE_wrappers/ace/os_include/os_syslog.h index d448b7491e5..f1713b47780 100644 --- a/dep/ACE_wrappers/ace/os_include/os_syslog.h +++ b/dep/ACE_wrappers/ace/os_include/os_syslog.h @@ -40,3 +40,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_SYSLOG_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/os_tar.h b/dep/ACE_wrappers/ace/os_include/os_tar.h index 007925022e8..a0dc6ce2a76 100644 --- a/dep/ACE_wrappers/ace/os_include/os_tar.h +++ b/dep/ACE_wrappers/ace/os_include/os_tar.h @@ -40,3 +40,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_TAR_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/os_termios.h b/dep/ACE_wrappers/ace/os_include/os_termios.h index 9dfd3862276..d67aa4a1aa9 100644 --- a/dep/ACE_wrappers/ace/os_include/os_termios.h +++ b/dep/ACE_wrappers/ace/os_include/os_termios.h @@ -44,3 +44,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_TERMIOS_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/os_tgmath.h b/dep/ACE_wrappers/ace/os_include/os_tgmath.h index 6d9f2c2db23..2b112a12875 100644 --- a/dep/ACE_wrappers/ace/os_include/os_tgmath.h +++ b/dep/ACE_wrappers/ace/os_include/os_tgmath.h @@ -43,3 +43,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_TGMATH_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/os_time.h b/dep/ACE_wrappers/ace/os_include/os_time.h index 150f6a71296..3670f3b492d 100644 --- a/dep/ACE_wrappers/ace/os_include/os_time.h +++ b/dep/ACE_wrappers/ace/os_include/os_time.h @@ -121,3 +121,4 @@ typedef const struct timespec * ACE_TIMESPEC_PTR; #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_TIME_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/os_trace.h b/dep/ACE_wrappers/ace/os_include/os_trace.h index fd89d54b23b..0eacf9dc4bb 100644 --- a/dep/ACE_wrappers/ace/os_include/os_trace.h +++ b/dep/ACE_wrappers/ace/os_include/os_trace.h @@ -42,3 +42,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_TRACE_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/os_ucontext.h b/dep/ACE_wrappers/ace/os_include/os_ucontext.h index f62be80e5fc..556bbdbbe45 100644 --- a/dep/ACE_wrappers/ace/os_include/os_ucontext.h +++ b/dep/ACE_wrappers/ace/os_include/os_ucontext.h @@ -46,3 +46,4 @@ typedef int ucontext_t; #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_UCONTEXT_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/os_ulimit.h b/dep/ACE_wrappers/ace/os_include/os_ulimit.h index 8593c0d95a5..ad18c8a18d2 100644 --- a/dep/ACE_wrappers/ace/os_include/os_ulimit.h +++ b/dep/ACE_wrappers/ace/os_include/os_ulimit.h @@ -40,3 +40,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_ULIMIT_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/os_unistd.h b/dep/ACE_wrappers/ace/os_include/os_unistd.h index a699a22ec06..6e2d4a5c537 100644 --- a/dep/ACE_wrappers/ace/os_include/os_unistd.h +++ b/dep/ACE_wrappers/ace/os_include/os_unistd.h @@ -201,3 +201,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_UNISTD_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/os_utime.h b/dep/ACE_wrappers/ace/os_include/os_utime.h index 703da8b1424..4cf719e34f9 100644 --- a/dep/ACE_wrappers/ace/os_include/os_utime.h +++ b/dep/ACE_wrappers/ace/os_include/os_utime.h @@ -42,3 +42,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_UTIME_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/os_utmpx.h b/dep/ACE_wrappers/ace/os_include/os_utmpx.h index 74ef305d4c1..234351366fb 100644 --- a/dep/ACE_wrappers/ace/os_include/os_utmpx.h +++ b/dep/ACE_wrappers/ace/os_include/os_utmpx.h @@ -42,3 +42,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_UTMPX_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/os_wchar.h b/dep/ACE_wrappers/ace/os_include/os_wchar.h index 1a542b7b50c..a020715876f 100644 --- a/dep/ACE_wrappers/ace/os_include/os_wchar.h +++ b/dep/ACE_wrappers/ace/os_include/os_wchar.h @@ -47,3 +47,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_WCHAR_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/os_wctype.h b/dep/ACE_wrappers/ace/os_include/os_wctype.h index 15aa295a677..5f385e0fc63 100644 --- a/dep/ACE_wrappers/ace/os_include/os_wctype.h +++ b/dep/ACE_wrappers/ace/os_include/os_wctype.h @@ -43,3 +43,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_WCTYPE_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/os_wordexp.h b/dep/ACE_wrappers/ace/os_include/os_wordexp.h index 76960076df6..885893861a2 100644 --- a/dep/ACE_wrappers/ace/os_include/os_wordexp.h +++ b/dep/ACE_wrappers/ace/os_include/os_wordexp.h @@ -42,3 +42,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_WORDEXP_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/sys/os_ipc.h b/dep/ACE_wrappers/ace/os_include/sys/os_ipc.h index bea65e5e7d9..99401b724cb 100644 --- a/dep/ACE_wrappers/ace/os_include/sys/os_ipc.h +++ b/dep/ACE_wrappers/ace/os_include/sys/os_ipc.h @@ -72,3 +72,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_SYS_OS_IPC_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/sys/os_loadavg.h b/dep/ACE_wrappers/ace/os_include/sys/os_loadavg.h index 6eeeb69be0a..151f400e2c2 100644 --- a/dep/ACE_wrappers/ace/os_include/sys/os_loadavg.h +++ b/dep/ACE_wrappers/ace/os_include/sys/os_loadavg.h @@ -39,3 +39,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_SYS_OS_LOADAVG_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/sys/os_mman.h b/dep/ACE_wrappers/ace/os_include/sys/os_mman.h index b39fc48cbc4..c100d52fafe 100644 --- a/dep/ACE_wrappers/ace/os_include/sys/os_mman.h +++ b/dep/ACE_wrappers/ace/os_include/sys/os_mman.h @@ -120,3 +120,4 @@ PAGE_NOCACHE */ #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_SYS_OS_MMAN_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/sys/os_msg.h b/dep/ACE_wrappers/ace/os_include/sys/os_msg.h index fa7edad1eb1..57341dba97d 100644 --- a/dep/ACE_wrappers/ace/os_include/sys/os_msg.h +++ b/dep/ACE_wrappers/ace/os_include/sys/os_msg.h @@ -53,3 +53,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_SYS_OS_MSG_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/sys/os_pstat.h b/dep/ACE_wrappers/ace/os_include/sys/os_pstat.h index dcb3467b623..253b8127979 100644 --- a/dep/ACE_wrappers/ace/os_include/sys/os_pstat.h +++ b/dep/ACE_wrappers/ace/os_include/sys/os_pstat.h @@ -40,3 +40,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_SYS_OS_PSTAT_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/sys/os_resource.h b/dep/ACE_wrappers/ace/os_include/sys/os_resource.h index 23486b616e2..a724ed2e0eb 100644 --- a/dep/ACE_wrappers/ace/os_include/sys/os_resource.h +++ b/dep/ACE_wrappers/ace/os_include/sys/os_resource.h @@ -102,3 +102,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_SYS_OS_RESOURCE_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/sys/os_select.h b/dep/ACE_wrappers/ace/os_include/sys/os_select.h index 26a3fabd776..f3e999831fd 100644 --- a/dep/ACE_wrappers/ace/os_include/sys/os_select.h +++ b/dep/ACE_wrappers/ace/os_include/sys/os_select.h @@ -57,3 +57,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_SYS_OS_SELECT_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/sys/os_sem.h b/dep/ACE_wrappers/ace/os_include/sys/os_sem.h index 926092b7d06..92153e2fcea 100644 --- a/dep/ACE_wrappers/ace/os_include/sys/os_sem.h +++ b/dep/ACE_wrappers/ace/os_include/sys/os_sem.h @@ -88,3 +88,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_SYS_OS_SEM_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/sys/os_shm.h b/dep/ACE_wrappers/ace/os_include/sys/os_shm.h index 79d502fec0d..83e32486cb6 100644 --- a/dep/ACE_wrappers/ace/os_include/sys/os_shm.h +++ b/dep/ACE_wrappers/ace/os_include/sys/os_shm.h @@ -46,3 +46,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_SYS_OS_SHM_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/sys/os_socket.h b/dep/ACE_wrappers/ace/os_include/sys/os_socket.h index f70fee9dfd6..cefc28c2134 100644 --- a/dep/ACE_wrappers/ace/os_include/sys/os_socket.h +++ b/dep/ACE_wrappers/ace/os_include/sys/os_socket.h @@ -305,3 +305,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_SYS_OS_SOCKET_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/sys/os_stat.h b/dep/ACE_wrappers/ace/os_include/sys/os_stat.h index a6ad4eeafd6..edd43d3932a 100644 --- a/dep/ACE_wrappers/ace/os_include/sys/os_stat.h +++ b/dep/ACE_wrappers/ace/os_include/sys/os_stat.h @@ -125,3 +125,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_SYS_OS_STAT_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/sys/os_statvfs.h b/dep/ACE_wrappers/ace/os_include/sys/os_statvfs.h index 7988c4f5060..6661aa437d9 100644 --- a/dep/ACE_wrappers/ace/os_include/sys/os_statvfs.h +++ b/dep/ACE_wrappers/ace/os_include/sys/os_statvfs.h @@ -40,3 +40,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_SYS_OS_STATVFS_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/sys/os_sysctl.h b/dep/ACE_wrappers/ace/os_include/sys/os_sysctl.h index ee51cd7db65..630c9de345b 100644 --- a/dep/ACE_wrappers/ace/os_include/sys/os_sysctl.h +++ b/dep/ACE_wrappers/ace/os_include/sys/os_sysctl.h @@ -39,3 +39,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_SYS_OS_SYSCTL_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/sys/os_sysinfo.h b/dep/ACE_wrappers/ace/os_include/sys/os_sysinfo.h index 7aca1f44d1f..19d57e984f9 100644 --- a/dep/ACE_wrappers/ace/os_include/sys/os_sysinfo.h +++ b/dep/ACE_wrappers/ace/os_include/sys/os_sysinfo.h @@ -37,3 +37,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_SYS_OS_SYSINFO_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/sys/os_time.h b/dep/ACE_wrappers/ace/os_include/sys/os_time.h index 4c6fdce763b..130a8265ac2 100644 --- a/dep/ACE_wrappers/ace/os_include/sys/os_time.h +++ b/dep/ACE_wrappers/ace/os_include/sys/os_time.h @@ -58,3 +58,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_SYS_OS_TIME_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/sys/os_timeb.h b/dep/ACE_wrappers/ace/os_include/sys/os_timeb.h index e276ba8bbd9..c8c0d74043c 100644 --- a/dep/ACE_wrappers/ace/os_include/sys/os_timeb.h +++ b/dep/ACE_wrappers/ace/os_include/sys/os_timeb.h @@ -47,3 +47,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_SYS_OS_TIMEB_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/sys/os_times.h b/dep/ACE_wrappers/ace/os_include/sys/os_times.h index 617b416ec56..d6769f7eb8d 100644 --- a/dep/ACE_wrappers/ace/os_include/sys/os_times.h +++ b/dep/ACE_wrappers/ace/os_include/sys/os_times.h @@ -42,3 +42,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_SYS_OS_TIMES_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/sys/os_types.h b/dep/ACE_wrappers/ace/os_include/sys/os_types.h index 794faf86d01..0377e024b69 100644 --- a/dep/ACE_wrappers/ace/os_include/sys/os_types.h +++ b/dep/ACE_wrappers/ace/os_include/sys/os_types.h @@ -156,3 +156,4 @@ typedef double ACE_timer_t; #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_SYS_OS_TYPES_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/sys/os_uio.h b/dep/ACE_wrappers/ace/os_include/sys/os_uio.h index 7baaec57e75..ccc5bbeb12e 100644 --- a/dep/ACE_wrappers/ace/os_include/sys/os_uio.h +++ b/dep/ACE_wrappers/ace/os_include/sys/os_uio.h @@ -75,3 +75,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_SYS_OS_UIO_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/sys/os_un.h b/dep/ACE_wrappers/ace/os_include/sys/os_un.h index 6fe6ec6e1ef..00b07315249 100644 --- a/dep/ACE_wrappers/ace/os_include/sys/os_un.h +++ b/dep/ACE_wrappers/ace/os_include/sys/os_un.h @@ -50,3 +50,4 @@ struct sockaddr_un { #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_SYS_OS_UN_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/sys/os_utsname.h b/dep/ACE_wrappers/ace/os_include/sys/os_utsname.h index d78d1e3463a..23748bb7160 100644 --- a/dep/ACE_wrappers/ace/os_include/sys/os_utsname.h +++ b/dep/ACE_wrappers/ace/os_include/sys/os_utsname.h @@ -40,3 +40,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_SYS_OS_UTSNAME_H */ + diff --git a/dep/ACE_wrappers/ace/os_include/sys/os_wait.h b/dep/ACE_wrappers/ace/os_include/sys/os_wait.h index b7a219ac82e..fd42e2cdf90 100644 --- a/dep/ACE_wrappers/ace/os_include/sys/os_wait.h +++ b/dep/ACE_wrappers/ace/os_include/sys/os_wait.h @@ -95,3 +95,4 @@ extern "C" #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_SYS_OS_WAIT_H */ + diff --git a/dep/ACE_wrappers/ace/post.h b/dep/ACE_wrappers/ace/post.h index c393dfe50aa..7c77af216ad 100644 --- a/dep/ACE_wrappers/ace/post.h +++ b/dep/ACE_wrappers/ace/post.h @@ -20,3 +20,4 @@ # pragma nopushoptwarn # pragma nopackwarning #endif + diff --git a/dep/ACE_wrappers/ace/pre.h b/dep/ACE_wrappers/ace/pre.h index 7cc32d8ff30..b610c95aeb9 100644 --- a/dep/ACE_wrappers/ace/pre.h +++ b/dep/ACE_wrappers/ace/pre.h @@ -22,3 +22,4 @@ # pragma nopushoptwarn # pragma nopackwarning #endif + diff --git a/dep/ACE_wrappers/ace/streams.h b/dep/ACE_wrappers/ace/streams.h index 396a67c712e..2b3ae4390fa 100644 --- a/dep/ACE_wrappers/ace/streams.h +++ b/dep/ACE_wrappers/ace/streams.h @@ -136,3 +136,4 @@ #include /**/ "ace/post.h" #endif /* ACE_STREAMS_H */ + diff --git a/dep/ACE_wrappers/ace/svc_export.h b/dep/ACE_wrappers/ace/svc_export.h index e84907b6e38..33fa67cd80b 100644 --- a/dep/ACE_wrappers/ace/svc_export.h +++ b/dep/ACE_wrappers/ace/svc_export.h @@ -42,3 +42,4 @@ #endif /* ACE_SVC_EXPORT_H */ // End of auto generated file. + diff --git a/dep/include/g3dlite/G3D/AABox.h b/dep/include/g3dlite/G3D/AABox.h index 34262b82c0d..699a3d94674 100644 --- a/dep/include/g3dlite/G3D/AABox.h +++ b/dep/include/g3dlite/G3D/AABox.h @@ -253,3 +253,4 @@ inline unsigned int hashCode(const G3D::AABox& b) { #endif + diff --git a/dep/include/g3dlite/G3D/Array.h b/dep/include/g3dlite/G3D/Array.h index d0ac66ee4b1..f58ee5eeedb 100644 --- a/dep/include/g3dlite/G3D/Array.h +++ b/dep/include/g3dlite/G3D/Array.h @@ -1154,3 +1154,4 @@ template<class T> bool contains(const T* array, int len, const T& e) { #ifdef G3D_WIN32 # pragma warning (push) #endif + diff --git a/dep/include/g3dlite/G3D/Box.h b/dep/include/g3dlite/G3D/Box.h index 124727a0ca9..8ec7ea3408d 100644 --- a/dep/include/g3dlite/G3D/Box.h +++ b/dep/include/g3dlite/G3D/Box.h @@ -226,3 +226,4 @@ public: } #endif + diff --git a/dep/include/g3dlite/G3D/CollisionDetection.h b/dep/include/g3dlite/G3D/CollisionDetection.h index 0105f1349ca..4add967ed8b 100644 --- a/dep/include/g3dlite/G3D/CollisionDetection.h +++ b/dep/include/g3dlite/G3D/CollisionDetection.h @@ -1155,3 +1155,4 @@ public: } // namespace #endif // G3D_COLLISIONDETECTION_H + diff --git a/dep/include/g3dlite/G3D/CoordinateFrame.h b/dep/include/g3dlite/G3D/CoordinateFrame.h index d93bfb43f40..62cbbd47639 100644 --- a/dep/include/g3dlite/G3D/CoordinateFrame.h +++ b/dep/include/g3dlite/G3D/CoordinateFrame.h @@ -316,3 +316,4 @@ public: } // namespace #endif + diff --git a/dep/include/g3dlite/G3D/Crypto.h b/dep/include/g3dlite/G3D/Crypto.h index 63ee1bbecb6..2805e8590c2 100644 --- a/dep/include/g3dlite/G3D/Crypto.h +++ b/dep/include/g3dlite/G3D/Crypto.h @@ -44,3 +44,4 @@ public: } #endif + diff --git a/dep/include/g3dlite/G3D/GCamera.h b/dep/include/g3dlite/G3D/GCamera.h index c4fd27a1ff5..50d5ca2244e 100644 --- a/dep/include/g3dlite/G3D/GCamera.h +++ b/dep/include/g3dlite/G3D/GCamera.h @@ -249,3 +249,4 @@ public: } // namespace G3D #endif + diff --git a/dep/include/g3dlite/G3D/Line.h b/dep/include/g3dlite/G3D/Line.h index 59adafd0459..724d5ef88cb 100644 --- a/dep/include/g3dlite/G3D/Line.h +++ b/dep/include/g3dlite/G3D/Line.h @@ -83,3 +83,4 @@ public: #endif + diff --git a/dep/include/g3dlite/G3D/Matrix3.h b/dep/include/g3dlite/G3D/Matrix3.h index 3d8da9204b8..0fd85b306c9 100644 --- a/dep/include/g3dlite/G3D/Matrix3.h +++ b/dep/include/g3dlite/G3D/Matrix3.h @@ -309,3 +309,4 @@ inline Vector3 operator* (const Vector3& rkPoint, const Matrix3& rkMatrix) { #endif + diff --git a/dep/include/g3dlite/G3D/Plane.h b/dep/include/g3dlite/G3D/Plane.h index 0e53cc14666..c7043e23c42 100644 --- a/dep/include/g3dlite/G3D/Plane.h +++ b/dep/include/g3dlite/G3D/Plane.h @@ -154,3 +154,4 @@ public: } // namespace #endif + diff --git a/dep/include/g3dlite/G3D/Quat.h b/dep/include/g3dlite/G3D/Quat.h index 34549032262..f53d70be909 100644 --- a/dep/include/g3dlite/G3D/Quat.h +++ b/dep/include/g3dlite/G3D/Quat.h @@ -700,3 +700,4 @@ inline G3D::Quat pow(const G3D::Quat& q, double x) { #include "Quat.inl" #endif + diff --git a/dep/include/g3dlite/G3D/Ray.h b/dep/include/g3dlite/G3D/Ray.h index b9848792733..3929cf1e6ac 100644 --- a/dep/include/g3dlite/G3D/Ray.h +++ b/dep/include/g3dlite/G3D/Ray.h @@ -325,3 +325,4 @@ inline float Ray::intersectionTime( }// namespace #endif + diff --git a/dep/include/g3dlite/G3D/RegistryUtil.h b/dep/include/g3dlite/G3D/RegistryUtil.h index 34e4ef8f144..85b5d0ab1be 100644 --- a/dep/include/g3dlite/G3D/RegistryUtil.h +++ b/dep/include/g3dlite/G3D/RegistryUtil.h @@ -83,4 +83,5 @@ public: #endif // G3D_WIN32 -#endif // G3D_REGISTRYTUIL_H
\ No newline at end of file +#endif // G3D_REGISTRYTUIL_H + diff --git a/dep/include/g3dlite/G3D/Sphere.h b/dep/include/g3dlite/G3D/Sphere.h index 97425649fbd..122e4d41f65 100644 --- a/dep/include/g3dlite/G3D/Sphere.h +++ b/dep/include/g3dlite/G3D/Sphere.h @@ -126,3 +126,4 @@ inline unsigned int hashCode(const G3D::Sphere& sphere) { } #endif + diff --git a/dep/include/g3dlite/G3D/System.h b/dep/include/g3dlite/G3D/System.h index 178302d5953..ab5a8d60a76 100644 --- a/dep/include/g3dlite/G3D/System.h +++ b/dep/include/g3dlite/G3D/System.h @@ -120,3 +120,4 @@ public: } // namespace #endif + diff --git a/dep/include/g3dlite/G3D/Table.h b/dep/include/g3dlite/G3D/Table.h index 692b91ab059..bf4dff38207 100644 --- a/dep/include/g3dlite/G3D/Table.h +++ b/dep/include/g3dlite/G3D/Table.h @@ -693,3 +693,4 @@ public: #endif #endif + diff --git a/dep/include/g3dlite/G3D/Triangle.h b/dep/include/g3dlite/G3D/Triangle.h index 50552a356fa..6852dac9492 100644 --- a/dep/include/g3dlite/G3D/Triangle.h +++ b/dep/include/g3dlite/G3D/Triangle.h @@ -114,3 +114,4 @@ inline unsigned int hashCode(const G3D::Triangle& t) { } #endif + diff --git a/dep/include/g3dlite/G3D/Vector2.h b/dep/include/g3dlite/G3D/Vector2.h index 02098037f34..3d66e654f93 100644 --- a/dep/include/g3dlite/G3D/Vector2.h +++ b/dep/include/g3dlite/G3D/Vector2.h @@ -436,3 +436,4 @@ inline unsigned int hashCode(const G3D::Vector2& v); #endif + diff --git a/dep/include/g3dlite/G3D/Vector2int16.h b/dep/include/g3dlite/G3D/Vector2int16.h index 0d495e383c9..40f39bae43d 100644 --- a/dep/include/g3dlite/G3D/Vector2int16.h +++ b/dep/include/g3dlite/G3D/Vector2int16.h @@ -73,3 +73,4 @@ public: } #endif + diff --git a/dep/include/g3dlite/G3D/Vector3.h b/dep/include/g3dlite/G3D/Vector3.h index 56e88aa085a..9f46bf87233 100644 --- a/dep/include/g3dlite/G3D/Vector3.h +++ b/dep/include/g3dlite/G3D/Vector3.h @@ -502,3 +502,4 @@ unsigned int hashCode(const G3D::Vector3& v); #include "Vector3.inl" #endif + diff --git a/dep/include/g3dlite/G3D/Vector3int16.h b/dep/include/g3dlite/G3D/Vector3int16.h index 744446a147c..e0631125960 100644 --- a/dep/include/g3dlite/G3D/Vector3int16.h +++ b/dep/include/g3dlite/G3D/Vector3int16.h @@ -53,3 +53,4 @@ public: } #endif + diff --git a/dep/include/g3dlite/G3D/Vector4.h b/dep/include/g3dlite/G3D/Vector4.h index ecaec2bec57..1bf243e5ed7 100644 --- a/dep/include/g3dlite/G3D/Vector4.h +++ b/dep/include/g3dlite/G3D/Vector4.h @@ -522,3 +522,4 @@ unsigned int hashCode(const G3D::Vector4& v); #include "Vector4.inl" #endif + diff --git a/dep/include/g3dlite/G3D/debug.h b/dep/include/g3dlite/G3D/debug.h index 0216d1daf11..408dd3ea146 100644 --- a/dep/include/g3dlite/G3D/debug.h +++ b/dep/include/g3dlite/G3D/debug.h @@ -9,3 +9,4 @@ #endif + diff --git a/dep/include/g3dlite/G3D/format.h b/dep/include/g3dlite/G3D/format.h index 877afba1926..fd129381791 100644 --- a/dep/include/g3dlite/G3D/format.h +++ b/dep/include/g3dlite/G3D/format.h @@ -55,3 +55,4 @@ std::string vformat( }; // namespace #endif + diff --git a/dep/include/g3dlite/G3D/g3dmath.h b/dep/include/g3dlite/G3D/g3dmath.h index 5dbd008409f..38ee23fc3c1 100644 --- a/dep/include/g3dlite/G3D/g3dmath.h +++ b/dep/include/g3dlite/G3D/g3dmath.h @@ -523,3 +523,4 @@ inline double wrap(double t, double hi) { #endif + diff --git a/dep/include/g3dlite/G3D/platform.h b/dep/include/g3dlite/G3D/platform.h index 1b2518fcd77..16f9b208d18 100644 --- a/dep/include/g3dlite/G3D/platform.h +++ b/dep/include/g3dlite/G3D/platform.h @@ -267,3 +267,4 @@ // Header guard #endif + diff --git a/dep/include/g3dlite/G3D/stringutils.h b/dep/include/g3dlite/G3D/stringutils.h index c24a2653a78..59449313bf5 100644 --- a/dep/include/g3dlite/G3D/stringutils.h +++ b/dep/include/g3dlite/G3D/stringutils.h @@ -128,3 +128,4 @@ inline bool isQuote(const char c) { #endif + diff --git a/dep/include/mersennetwister/MersenneTwister.h b/dep/include/mersennetwister/MersenneTwister.h index 9c7d3f0250a..708b675eed4 100644 --- a/dep/include/mersennetwister/MersenneTwister.h +++ b/dep/include/mersennetwister/MersenneTwister.h @@ -412,3 +412,4 @@ inline std::istream& operator>>( std::istream& is, MTRand& mtrand ) // - Fixed out-of-range number generation on 64-bit machines // - Improved portability by substituting literal constants for long enum's // - Changed license from GNU LGPL to BSD + diff --git a/dep/include/mysql/config-netware.h b/dep/include/mysql/config-netware.h index 0f74ebe7933..0cc47802591 100644 --- a/dep/include/mysql/config-netware.h +++ b/dep/include/mysql/config-netware.h @@ -139,3 +139,4 @@ extern "C" { #endif #endif /* _config_netware_h */ + diff --git a/dep/include/mysql/config-os2.h b/dep/include/mysql/config-os2.h index b2932c38b5a..440d75af65a 100644 --- a/dep/include/mysql/config-os2.h +++ b/dep/include/mysql/config-os2.h @@ -833,3 +833,4 @@ typedef unsigned long long os_off_t; /* #undef _LARGE_FILES */ #endif /* __CONFIG_OS2_H__ */ + diff --git a/dep/include/mysql/config-win.h b/dep/include/mysql/config-win.h index f23a92385fe..5a4cf162a11 100644 --- a/dep/include/mysql/config-win.h +++ b/dep/include/mysql/config-win.h @@ -458,3 +458,4 @@ inline double ulonglong2double(ulonglong value) #define HAVE_CHARSET_utf8 1 #define HAVE_UCA_COLLATIONS 1 + diff --git a/dep/include/mysql/errmsg.h b/dep/include/mysql/errmsg.h index 627ac7b00cc..720ff7a25ae 100644 --- a/dep/include/mysql/errmsg.h +++ b/dep/include/mysql/errmsg.h @@ -100,3 +100,4 @@ extern const char *client_errors[]; /* Error messages */ #define CR_ERROR_LAST /*Copy last error nr:*/ 2055 /* Add error numbers before CR_ERROR_LAST and change it accordingly. */ + diff --git a/dep/include/mysql/m_ctype.h b/dep/include/mysql/m_ctype.h index 218ec2daadb..ac067636b0a 100644 --- a/dep/include/mysql/m_ctype.h +++ b/dep/include/mysql/m_ctype.h @@ -519,3 +519,4 @@ my_bool my_charset_is_8bit_pure_ascii(CHARSET_INFO *cs); #endif #endif /* _m_ctype_h */ + diff --git a/dep/include/mysql/m_string.h b/dep/include/mysql/m_string.h index c26d0fb9260..445ba18bf41 100644 --- a/dep/include/mysql/m_string.h +++ b/dep/include/mysql/m_string.h @@ -264,3 +264,4 @@ extern int my_snprintf(char *to, size_t n, const char *fmt, ...) } #endif #endif + diff --git a/dep/include/mysql/my_alloc.h b/dep/include/mysql/my_alloc.h index 657394a363b..ac56c97456c 100644 --- a/dep/include/mysql/my_alloc.h +++ b/dep/include/mysql/my_alloc.h @@ -49,3 +49,4 @@ typedef struct st_mem_root void (*error_handler)(void); } MEM_ROOT; #endif + diff --git a/dep/include/mysql/my_dbug.h b/dep/include/mysql/my_dbug.h index 31fd507ec73..68088e1cc8d 100644 --- a/dep/include/mysql/my_dbug.h +++ b/dep/include/mysql/my_dbug.h @@ -105,3 +105,4 @@ extern void _db_unlock_file(void); } #endif #endif + diff --git a/dep/include/mysql/my_getopt.h b/dep/include/mysql/my_getopt.h index f5688a37231..d5b6ae9e3fe 100644 --- a/dep/include/mysql/my_getopt.h +++ b/dep/include/mysql/my_getopt.h @@ -75,3 +75,4 @@ C_MODE_END #endif /* _my_getopt_h */ + diff --git a/dep/include/mysql/my_global.h b/dep/include/mysql/my_global.h index 08877300d8a..02bbd30e34a 100644 --- a/dep/include/mysql/my_global.h +++ b/dep/include/mysql/my_global.h @@ -1352,3 +1352,4 @@ do { doubleget_union _tmp; \ #define MY_INT64_NUM_DECIMAL_DIGITS 21 #endif /* my_global_h */ + diff --git a/dep/include/mysql/my_list.h b/dep/include/mysql/my_list.h index 4a1737d4c53..bdb0a89c4f5 100644 --- a/dep/include/mysql/my_list.h +++ b/dep/include/mysql/my_list.h @@ -43,3 +43,4 @@ extern int list_walk(LIST *,list_walk_action action,gptr argument); } #endif #endif + diff --git a/dep/include/mysql/my_pthread.h b/dep/include/mysql/my_pthread.h index 13b7cf93d6f..2c734952ccd 100644 --- a/dep/include/mysql/my_pthread.h +++ b/dep/include/mysql/my_pthread.h @@ -797,3 +797,4 @@ extern uint thd_lib_detected; } #endif #endif /* _my_ptread_h */ + diff --git a/dep/include/mysql/my_sys.h b/dep/include/mysql/my_sys.h index d656326e968..cafdf571968 100644 --- a/dep/include/mysql/my_sys.h +++ b/dep/include/mysql/my_sys.h @@ -934,3 +934,4 @@ void netware_reg_user(const char *ip, const char *user, C_MODE_END #include "raid.h" #endif /* _my_sys_h */ + diff --git a/dep/include/mysql/mysql.h b/dep/include/mysql/mysql.h index 1f106429f0d..4d4a3eb67c9 100644 --- a/dep/include/mysql/mysql.h +++ b/dep/include/mysql/mysql.h @@ -869,3 +869,4 @@ int STDCALL mysql_drop_db(MYSQL *mysql, const char *DB); #endif #endif /* _mysql_h */ + diff --git a/dep/include/mysql/mysql_com.h b/dep/include/mysql/mysql_com.h index 94b34c1c3f0..0669a7e0d02 100644 --- a/dep/include/mysql/mysql_com.h +++ b/dep/include/mysql/mysql_com.h @@ -465,3 +465,4 @@ char *net_store_length(char *pkg, ulonglong length); #define MYSQL_LONG_DATA_HEADER 6 #endif + diff --git a/dep/include/mysql/mysql_embed.h b/dep/include/mysql/mysql_embed.h index 7416283d83d..2e44c99a192 100644 --- a/dep/include/mysql/mysql_embed.h +++ b/dep/include/mysql/mysql_embed.h @@ -29,3 +29,4 @@ #define DONT_USE_RAID #endif /* EMBEDDED_LIBRARY */ + diff --git a/dep/include/mysql/mysql_time.h b/dep/include/mysql/mysql_time.h index 0a3f17a81fb..6dce2fd02c7 100644 --- a/dep/include/mysql/mysql_time.h +++ b/dep/include/mysql/mysql_time.h @@ -53,3 +53,4 @@ typedef struct st_mysql_time } MYSQL_TIME; #endif /* _mysql_time_h_ */ + diff --git a/dep/include/mysql/mysql_version.h b/dep/include/mysql/mysql_version.h index 3ec91e40930..0628c9fb331 100644 --- a/dep/include/mysql/mysql_version.h +++ b/dep/include/mysql/mysql_version.h @@ -28,3 +28,4 @@ #endif /* LICENSE */ #endif /* _mysql_version_h */ + diff --git a/dep/include/mysql/mysqld_error.h b/dep/include/mysql/mysqld_error.h index 591ff78c5e1..b200fdc84d6 100644 --- a/dep/include/mysql/mysqld_error.h +++ b/dep/include/mysql/mysqld_error.h @@ -478,3 +478,4 @@ #define ER_NAME_BECOMES_EMPTY 1474 #define ER_AMBIGUOUS_FIELD_TERM 1475 #define ER_ERROR_LAST 1475 + diff --git a/dep/include/mysql/raid.h b/dep/include/mysql/raid.h index c3b256042f5..77e668c35b2 100644 --- a/dep/include/mysql/raid.h +++ b/dep/include/mysql/raid.h @@ -156,3 +156,4 @@ class RaidFd { #endif /* __cplusplus */ #endif /* USE_RAID */ + diff --git a/dep/include/mysql/typelib.h b/dep/include/mysql/typelib.h index 2a62f344cd0..40d69b89e34 100644 --- a/dep/include/mysql/typelib.h +++ b/dep/include/mysql/typelib.h @@ -34,3 +34,4 @@ extern TYPELIB *copy_typelib(MEM_ROOT *root, TYPELIB *from); extern TYPELIB sql_protocol_typelib; #endif /* _typelib_h */ + diff --git a/dep/include/openssl/aes.h b/dep/include/openssl/aes.h index 865c81618d4..c9198db7dd3 100644 --- a/dep/include/openssl/aes.h +++ b/dep/include/openssl/aes.h @@ -136,3 +136,4 @@ void AES_bi_ige_encrypt(const unsigned char *in, unsigned char *out, #endif #endif /* !HEADER_AES_H */ + diff --git a/dep/include/openssl/asn1.h b/dep/include/openssl/asn1.h index 8bb4cec4c9e..759b8a590e0 100644 --- a/dep/include/openssl/asn1.h +++ b/dep/include/openssl/asn1.h @@ -1231,3 +1231,4 @@ void ERR_load_ASN1_strings(void); } #endif #endif + diff --git a/dep/include/openssl/asn1_mac.h b/dep/include/openssl/asn1_mac.h index d826460a065..c7b79ec56d8 100644 --- a/dep/include/openssl/asn1_mac.h +++ b/dep/include/openssl/asn1_mac.h @@ -569,3 +569,4 @@ void asn1_add_error(const unsigned char *address,int offset); #endif #endif + diff --git a/dep/include/openssl/asn1t.h b/dep/include/openssl/asn1t.h index 1efb83cd256..bf4ea43fb8e 100644 --- a/dep/include/openssl/asn1t.h +++ b/dep/include/openssl/asn1t.h @@ -884,3 +884,4 @@ int asn1_enc_save(ASN1_VALUE **pval, const unsigned char *in, int inlen, const A } #endif #endif + diff --git a/dep/include/openssl/bio.h b/dep/include/openssl/bio.h index 22b8316e24d..960b77ba101 100644 --- a/dep/include/openssl/bio.h +++ b/dep/include/openssl/bio.h @@ -773,3 +773,4 @@ void ERR_load_BIO_strings(void); } #endif #endif + diff --git a/dep/include/openssl/blowfish.h b/dep/include/openssl/blowfish.h index 2acc081b810..f57474eb60b 100644 --- a/dep/include/openssl/blowfish.h +++ b/dep/include/openssl/blowfish.h @@ -125,3 +125,4 @@ const char *BF_options(void); #endif #endif + diff --git a/dep/include/openssl/bn.h b/dep/include/openssl/bn.h index 0eceb59303f..08962f7df00 100644 --- a/dep/include/openssl/bn.h +++ b/dep/include/openssl/bn.h @@ -825,3 +825,4 @@ void ERR_load_BN_strings(void); } #endif #endif + diff --git a/dep/include/openssl/buffer.h b/dep/include/openssl/buffer.h index 82e07a96953..669bc5eb364 100644 --- a/dep/include/openssl/buffer.h +++ b/dep/include/openssl/buffer.h @@ -116,3 +116,4 @@ void ERR_load_BUF_strings(void); } #endif #endif + diff --git a/dep/include/openssl/cast.h b/dep/include/openssl/cast.h index 812bb485319..ba2bc25047c 100644 --- a/dep/include/openssl/cast.h +++ b/dep/include/openssl/cast.h @@ -103,3 +103,4 @@ void CAST_ofb64_encrypt(const unsigned char *in, unsigned char *out, #endif #endif + diff --git a/dep/include/openssl/comp.h b/dep/include/openssl/comp.h index c94262fc051..e99c87b238b 100644 --- a/dep/include/openssl/comp.h +++ b/dep/include/openssl/comp.h @@ -64,3 +64,4 @@ void ERR_load_COMP_strings(void); } #endif #endif + diff --git a/dep/include/openssl/conf.h b/dep/include/openssl/conf.h index 30272a5ceca..ac59b96f93d 100644 --- a/dep/include/openssl/conf.h +++ b/dep/include/openssl/conf.h @@ -251,3 +251,4 @@ void ERR_load_CONF_strings(void); } #endif #endif + diff --git a/dep/include/openssl/conf_api.h b/dep/include/openssl/conf_api.h index b102271dc13..ffe5ccd80aa 100644 --- a/dep/include/openssl/conf_api.h +++ b/dep/include/openssl/conf_api.h @@ -87,3 +87,4 @@ void _CONF_free_data(CONF *conf); #endif #endif + diff --git a/dep/include/openssl/crypto.h b/dep/include/openssl/crypto.h index c29ae5b62af..af624679b93 100644 --- a/dep/include/openssl/crypto.h +++ b/dep/include/openssl/crypto.h @@ -548,3 +548,4 @@ void ERR_load_CRYPTO_strings(void); } #endif #endif + diff --git a/dep/include/openssl/des.h b/dep/include/openssl/des.h index c8306de0f88..31ec76509ee 100644 --- a/dep/include/openssl/des.h +++ b/dep/include/openssl/des.h @@ -242,3 +242,4 @@ int DES_read_2passwords(DES_cblock *key1, DES_cblock *key2, const char *prompt, #endif #endif + diff --git a/dep/include/openssl/des_old.h b/dep/include/openssl/des_old.h index 11edf40471c..5961dae089d 100644 --- a/dep/include/openssl/des_old.h +++ b/dep/include/openssl/des_old.h @@ -443,3 +443,4 @@ void _ossl_096_des_random_seed(des_cblock *key); #include <openssl/ui_compat.h> #endif + diff --git a/dep/include/openssl/dh.h b/dep/include/openssl/dh.h index a5232c70f05..9913b4d41c1 100644 --- a/dep/include/openssl/dh.h +++ b/dep/include/openssl/dh.h @@ -232,3 +232,4 @@ void ERR_load_DH_strings(void); } #endif #endif + diff --git a/dep/include/openssl/dsa.h b/dep/include/openssl/dsa.h index d9472400b59..6341a71cd0e 100644 --- a/dep/include/openssl/dsa.h +++ b/dep/include/openssl/dsa.h @@ -283,3 +283,4 @@ void ERR_load_DSA_strings(void); } #endif #endif + diff --git a/dep/include/openssl/dso.h b/dep/include/openssl/dso.h index 9038b509bd6..08730cef2f1 100644 --- a/dep/include/openssl/dso.h +++ b/dep/include/openssl/dso.h @@ -366,3 +366,4 @@ void ERR_load_DSO_strings(void); } #endif #endif + diff --git a/dep/include/openssl/dtls1.h b/dep/include/openssl/dtls1.h index dad6c563ff7..dbeceab9453 100644 --- a/dep/include/openssl/dtls1.h +++ b/dep/include/openssl/dtls1.h @@ -210,3 +210,4 @@ typedef struct dtls1_record_data_st #endif #endif + diff --git a/dep/include/openssl/e_os2.h b/dep/include/openssl/e_os2.h index b9d3486e645..100265e2379 100644 --- a/dep/include/openssl/e_os2.h +++ b/dep/include/openssl/e_os2.h @@ -277,3 +277,4 @@ extern "C" { } #endif #endif + diff --git a/dep/include/openssl/ebcdic.h b/dep/include/openssl/ebcdic.h index 6d65afcf9e7..e970f129364 100644 --- a/dep/include/openssl/ebcdic.h +++ b/dep/include/openssl/ebcdic.h @@ -17,3 +17,4 @@ void *ebcdic2ascii(void *dest, const void *srce, size_t count); void *ascii2ebcdic(void *dest, const void *srce, size_t count); #endif + diff --git a/dep/include/openssl/ec.h b/dep/include/openssl/ec.h index d068a42cb8b..6952d9739a1 100644 --- a/dep/include/openssl/ec.h +++ b/dep/include/openssl/ec.h @@ -523,3 +523,4 @@ void ERR_load_EC_strings(void); } #endif #endif + diff --git a/dep/include/openssl/ecdh.h b/dep/include/openssl/ecdh.h index 1aecaeafb7b..ee07aa05036 100644 --- a/dep/include/openssl/ecdh.h +++ b/dep/include/openssl/ecdh.h @@ -121,3 +121,4 @@ void ERR_load_ECDH_strings(void); } #endif #endif + diff --git a/dep/include/openssl/ecdsa.h b/dep/include/openssl/ecdsa.h index f2dbc0dfe74..1f85df7fa2a 100644 --- a/dep/include/openssl/ecdsa.h +++ b/dep/include/openssl/ecdsa.h @@ -269,3 +269,4 @@ void ERR_load_ECDSA_strings(void); } #endif #endif + diff --git a/dep/include/openssl/engine.h b/dep/include/openssl/engine.h index dc931f44c49..a0dc2d08fd4 100644 --- a/dep/include/openssl/engine.h +++ b/dep/include/openssl/engine.h @@ -783,3 +783,4 @@ void ERR_load_ENGINE_strings(void); } #endif #endif + diff --git a/dep/include/openssl/err.h b/dep/include/openssl/err.h index b52d92cf7a1..b0329919484 100644 --- a/dep/include/openssl/err.h +++ b/dep/include/openssl/err.h @@ -316,3 +316,4 @@ int ERR_set_implementation(const ERR_FNS *fns); #endif #endif + diff --git a/dep/include/openssl/evp.h b/dep/include/openssl/evp.h index a0f3a0e2f86..66838b36323 100644 --- a/dep/include/openssl/evp.h +++ b/dep/include/openssl/evp.h @@ -968,3 +968,4 @@ void ERR_load_EVP_strings(void); } #endif #endif + diff --git a/dep/include/openssl/hmac.h b/dep/include/openssl/hmac.h index ca1557b5bf8..2387f704cee 100644 --- a/dep/include/openssl/hmac.h +++ b/dep/include/openssl/hmac.h @@ -106,3 +106,4 @@ unsigned char *HMAC(const EVP_MD *evp_md, const void *key, int key_len, #endif #endif + diff --git a/dep/include/openssl/idea.h b/dep/include/openssl/idea.h index a58bc3180d7..6b7cabb1c48 100644 --- a/dep/include/openssl/idea.h +++ b/dep/include/openssl/idea.h @@ -98,3 +98,4 @@ void idea_encrypt(unsigned long *in, IDEA_KEY_SCHEDULE *ks); #endif #endif + diff --git a/dep/include/openssl/krb5_asn.h b/dep/include/openssl/krb5_asn.h index 33c94fd7f85..66c0629bcdb 100644 --- a/dep/include/openssl/krb5_asn.h +++ b/dep/include/openssl/krb5_asn.h @@ -254,3 +254,4 @@ DECLARE_ASN1_FUNCTIONS(KRB5_AUTHENT) #endif #endif + diff --git a/dep/include/openssl/kssl.h b/dep/include/openssl/kssl.h index de1f8f04d01..e920e1ceea7 100644 --- a/dep/include/openssl/kssl.h +++ b/dep/include/openssl/kssl.h @@ -177,3 +177,4 @@ unsigned char *kssl_skip_confound(krb5_enctype enctype, unsigned char *authn); #endif #endif /* OPENSSL_NO_KRB5 */ #endif /* KSSL_H */ + diff --git a/dep/include/openssl/lhash.h b/dep/include/openssl/lhash.h index 4d8fe1952dd..9ae674e6c3e 100644 --- a/dep/include/openssl/lhash.h +++ b/dep/include/openssl/lhash.h @@ -198,3 +198,4 @@ void lh_node_usage_stats_bio(const LHASH *lh, BIO *out); #endif + diff --git a/dep/include/openssl/md2.h b/dep/include/openssl/md2.h index 670a0be8bc6..cd58a8cca55 100644 --- a/dep/include/openssl/md2.h +++ b/dep/include/openssl/md2.h @@ -90,3 +90,4 @@ unsigned char *MD2(const unsigned char *d, size_t n,unsigned char *md); #endif #endif + diff --git a/dep/include/openssl/md4.h b/dep/include/openssl/md4.h index 22f11ad0f31..89209898b67 100644 --- a/dep/include/openssl/md4.h +++ b/dep/include/openssl/md4.h @@ -115,3 +115,4 @@ void MD4_Transform(MD4_CTX *c, const unsigned char *b); #endif #endif + diff --git a/dep/include/openssl/md5.h b/dep/include/openssl/md5.h index 502be116801..29989eb1c4b 100644 --- a/dep/include/openssl/md5.h +++ b/dep/include/openssl/md5.h @@ -115,3 +115,4 @@ void MD5_Transform(MD5_CTX *c, const unsigned char *b); #endif #endif + diff --git a/dep/include/openssl/mdc2.h b/dep/include/openssl/mdc2.h index 1bab9a6abab..b6203882a93 100644 --- a/dep/include/openssl/mdc2.h +++ b/dep/include/openssl/mdc2.h @@ -94,3 +94,4 @@ unsigned char *MDC2(const unsigned char *d, unsigned long n, #endif + diff --git a/dep/include/openssl/obj_mac.h b/dep/include/openssl/obj_mac.h index 0394cff616d..52aa57b25c3 100644 --- a/dep/include/openssl/obj_mac.h +++ b/dep/include/openssl/obj_mac.h @@ -3406,3 +3406,4 @@ #define LN_camellia_256_cfb8 "camellia-256-cfb8" #define NID_camellia_256_cfb8 765 + diff --git a/dep/include/openssl/objects.h b/dep/include/openssl/objects.h index b7e127296b8..b44abc3e683 100644 --- a/dep/include/openssl/objects.h +++ b/dep/include/openssl/objects.h @@ -1047,3 +1047,4 @@ void ERR_load_OBJ_strings(void); } #endif #endif + diff --git a/dep/include/openssl/ocsp.h b/dep/include/openssl/ocsp.h index 85e148be9cb..1cbaa64b274 100644 --- a/dep/include/openssl/ocsp.h +++ b/dep/include/openssl/ocsp.h @@ -612,3 +612,4 @@ void ERR_load_OCSP_strings(void); } #endif #endif + diff --git a/dep/include/openssl/opensslconf.h b/dep/include/openssl/opensslconf.h index 8073c136922..4b8bfffefc3 100644 --- a/dep/include/openssl/opensslconf.h +++ b/dep/include/openssl/opensslconf.h @@ -212,3 +212,4 @@ YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!! #endif /* DES_DEFAULT_OPTIONS */ #endif /* HEADER_DES_LOCL_H */ + diff --git a/dep/include/openssl/opensslv.h b/dep/include/openssl/opensslv.h index fb9072ec8b1..1e32c6809dd 100644 --- a/dep/include/openssl/opensslv.h +++ b/dep/include/openssl/opensslv.h @@ -87,3 +87,4 @@ #endif /* HEADER_OPENSSLV_H */ + diff --git a/dep/include/openssl/ossl_typ.h b/dep/include/openssl/ossl_typ.h index 5150bee0e36..ca61b2fc864 100644 --- a/dep/include/openssl/ossl_typ.h +++ b/dep/include/openssl/ossl_typ.h @@ -172,3 +172,4 @@ typedef int CRYPTO_EX_dup(CRYPTO_EX_DATA *to, CRYPTO_EX_DATA *from, void *from_d int idx, long argl, void *argp); #endif /* def HEADER_OPENSSL_TYPES_H */ + diff --git a/dep/include/openssl/pem.h b/dep/include/openssl/pem.h index 9fb9a7f7af8..7924e75da3f 100644 --- a/dep/include/openssl/pem.h +++ b/dep/include/openssl/pem.h @@ -735,3 +735,4 @@ void ERR_load_PEM_strings(void); } #endif #endif + diff --git a/dep/include/openssl/pem2.h b/dep/include/openssl/pem2.h index 84897d5ec35..893030edcdc 100644 --- a/dep/include/openssl/pem2.h +++ b/dep/include/openssl/pem2.h @@ -68,3 +68,4 @@ void ERR_load_PEM_strings(void); #ifdef __cplusplus } #endif + diff --git a/dep/include/openssl/pkcs12.h b/dep/include/openssl/pkcs12.h index 6ad18e6fd2e..c20eff06baf 100644 --- a/dep/include/openssl/pkcs12.h +++ b/dep/include/openssl/pkcs12.h @@ -331,3 +331,4 @@ void ERR_load_PKCS12_strings(void); } #endif #endif + diff --git a/dep/include/openssl/pkcs7.h b/dep/include/openssl/pkcs7.h index 16769d49116..457cfdd70ac 100644 --- a/dep/include/openssl/pkcs7.h +++ b/dep/include/openssl/pkcs7.h @@ -462,3 +462,4 @@ void ERR_load_PKCS7_strings(void); } #endif #endif + diff --git a/dep/include/openssl/pq_compat.h b/dep/include/openssl/pq_compat.h index fd2b5bbf1a0..bd8928dc0e9 100644 --- a/dep/include/openssl/pq_compat.h +++ b/dep/include/openssl/pq_compat.h @@ -145,3 +145,4 @@ *(x) |= mask; \ } while(0) #endif /* OPENSSL_SYS_VMS */ + diff --git a/dep/include/openssl/pqueue.h b/dep/include/openssl/pqueue.h index 6920a409282..cc6b0018201 100644 --- a/dep/include/openssl/pqueue.h +++ b/dep/include/openssl/pqueue.h @@ -93,3 +93,4 @@ pitem *pqueue_next(piterator *iter); void pqueue_print(pqueue pq); #endif /* ! HEADER_PQUEUE_H */ + diff --git a/dep/include/openssl/rand.h b/dep/include/openssl/rand.h index fd1cb148faf..ca1361dcf0b 100644 --- a/dep/include/openssl/rand.h +++ b/dep/include/openssl/rand.h @@ -138,3 +138,4 @@ void ERR_load_RAND_strings(void); } #endif #endif + diff --git a/dep/include/openssl/rc2.h b/dep/include/openssl/rc2.h index e74f96c4d02..194948e62fa 100644 --- a/dep/include/openssl/rc2.h +++ b/dep/include/openssl/rc2.h @@ -99,3 +99,4 @@ void RC2_ofb64_encrypt(const unsigned char *in, unsigned char *out, #endif #endif + diff --git a/dep/include/openssl/rc4.h b/dep/include/openssl/rc4.h index 19391222ac0..7a08e80b07a 100644 --- a/dep/include/openssl/rc4.h +++ b/dep/include/openssl/rc4.h @@ -85,3 +85,4 @@ void RC4(RC4_KEY *key, unsigned long len, const unsigned char *indata, #endif #endif + diff --git a/dep/include/openssl/rc5.h b/dep/include/openssl/rc5.h index a0fd12289e1..e242657121f 100644 --- a/dep/include/openssl/rc5.h +++ b/dep/include/openssl/rc5.h @@ -115,3 +115,4 @@ void RC5_32_ofb64_encrypt(const unsigned char *in, unsigned char *out, #endif + diff --git a/dep/include/openssl/ripemd.h b/dep/include/openssl/ripemd.h index 57a50715bed..74a715a5db5 100644 --- a/dep/include/openssl/ripemd.h +++ b/dep/include/openssl/ripemd.h @@ -102,3 +102,4 @@ void RIPEMD160_Transform(RIPEMD160_CTX *c, const unsigned char *b); #endif #endif + diff --git a/dep/include/openssl/rsa.h b/dep/include/openssl/rsa.h index 4b69c824145..91b21260732 100644 --- a/dep/include/openssl/rsa.h +++ b/dep/include/openssl/rsa.h @@ -439,3 +439,4 @@ void ERR_load_RSA_strings(void); } #endif #endif + diff --git a/dep/include/openssl/safestack.h b/dep/include/openssl/safestack.h index 69813945332..7cd19b229e9 100644 --- a/dep/include/openssl/safestack.h +++ b/dep/include/openssl/safestack.h @@ -1848,3 +1848,4 @@ STACK_OF(type) \ /* End of util/mkstack.pl block, you may now edit :-) */ #endif /* !defined HEADER_SAFESTACK_H */ + diff --git a/dep/include/openssl/sha.h b/dep/include/openssl/sha.h index 83fca212ab8..299de706761 100644 --- a/dep/include/openssl/sha.h +++ b/dep/include/openssl/sha.h @@ -198,3 +198,4 @@ void SHA512_Transform(SHA512_CTX *c, const unsigned char *data); #endif #endif + diff --git a/dep/include/openssl/ssl.h b/dep/include/openssl/ssl.h index 9e08588f132..b461dcdb8ae 100644 --- a/dep/include/openssl/ssl.h +++ b/dep/include/openssl/ssl.h @@ -1958,3 +1958,4 @@ void ERR_load_SSL_strings(void); } #endif #endif + diff --git a/dep/include/openssl/ssl2.h b/dep/include/openssl/ssl2.h index 347a2d44b7e..52c166e8c5b 100644 --- a/dep/include/openssl/ssl2.h +++ b/dep/include/openssl/ssl2.h @@ -266,3 +266,4 @@ typedef struct ssl2_state_st #endif #endif + diff --git a/dep/include/openssl/ssl23.h b/dep/include/openssl/ssl23.h index 1374fe81b00..67bd8e9e952 100644 --- a/dep/include/openssl/ssl23.h +++ b/dep/include/openssl/ssl23.h @@ -81,3 +81,4 @@ extern "C" { #endif #endif + diff --git a/dep/include/openssl/ssl3.h b/dep/include/openssl/ssl3.h index 745db869e8f..d7687ec8266 100644 --- a/dep/include/openssl/ssl3.h +++ b/dep/include/openssl/ssl3.h @@ -553,3 +553,4 @@ typedef struct ssl3_state_st #endif #endif + diff --git a/dep/include/openssl/stack.h b/dep/include/openssl/stack.h index d790c979ea2..51d14d5bf77 100644 --- a/dep/include/openssl/stack.h +++ b/dep/include/openssl/stack.h @@ -107,3 +107,4 @@ int sk_is_sorted(const STACK *st); #endif #endif + diff --git a/dep/include/openssl/store.h b/dep/include/openssl/store.h index 2368faa83ab..25f360892a3 100644 --- a/dep/include/openssl/store.h +++ b/dep/include/openssl/store.h @@ -552,3 +552,4 @@ void ERR_load_STORE_strings(void); } #endif #endif + diff --git a/dep/include/openssl/symhacks.h b/dep/include/openssl/symhacks.h index b4f1f8399ea..5ef15139deb 100644 --- a/dep/include/openssl/symhacks.h +++ b/dep/include/openssl/symhacks.h @@ -381,3 +381,4 @@ #endif /* ! defined HEADER_VMS_IDHACKS_H */ + diff --git a/dep/include/openssl/tls1.h b/dep/include/openssl/tls1.h index f7364ed5940..c3b53bfd4a1 100644 --- a/dep/include/openssl/tls1.h +++ b/dep/include/openssl/tls1.h @@ -303,3 +303,4 @@ extern "C" { + diff --git a/dep/include/openssl/tmdiff.h b/dep/include/openssl/tmdiff.h index 1ddb28b5d49..0409edbaacd 100644 --- a/dep/include/openssl/tmdiff.h +++ b/dep/include/openssl/tmdiff.h @@ -91,3 +91,4 @@ int ms_time_cmp(const MS_TM *ap, const MS_TM *bp); #endif + diff --git a/dep/include/openssl/txt_db.h b/dep/include/openssl/txt_db.h index 3d57458114c..e78ba87fa9f 100644 --- a/dep/include/openssl/txt_db.h +++ b/dep/include/openssl/txt_db.h @@ -107,3 +107,4 @@ int TXT_DB_insert(TXT_DB *db,char **value); #endif #endif + diff --git a/dep/include/openssl/ui.h b/dep/include/openssl/ui.h index b8e083cbec8..3a2f29e67ee 100644 --- a/dep/include/openssl/ui.h +++ b/dep/include/openssl/ui.h @@ -379,3 +379,4 @@ void ERR_load_UI_strings(void); } #endif #endif + diff --git a/dep/include/openssl/ui_compat.h b/dep/include/openssl/ui_compat.h index 1b9e80b5fda..4687853772a 100644 --- a/dep/include/openssl/ui_compat.h +++ b/dep/include/openssl/ui_compat.h @@ -81,3 +81,4 @@ int _ossl_old_des_read_pw(char *buf,char *buff,int size,const char *prompt,int v } #endif #endif + diff --git a/dep/include/openssl/x509.h b/dep/include/openssl/x509.h index ebc99d76643..3dec0b822c4 100644 --- a/dep/include/openssl/x509.h +++ b/dep/include/openssl/x509.h @@ -1342,3 +1342,4 @@ void ERR_load_X509_strings(void); } #endif #endif + diff --git a/dep/include/openssl/x509_vfy.h b/dep/include/openssl/x509_vfy.h index 78b6227a4ee..053920a458c 100644 --- a/dep/include/openssl/x509_vfy.h +++ b/dep/include/openssl/x509_vfy.h @@ -529,3 +529,4 @@ const X509_POLICY_NODE * #endif #endif + diff --git a/dep/include/openssl/x509v3.h b/dep/include/openssl/x509v3.h index 255d1a7711a..6b3a2ff64de 100644 --- a/dep/include/openssl/x509v3.h +++ b/dep/include/openssl/x509v3.h @@ -917,3 +917,4 @@ void ERR_load_X509V3_strings(void); } #endif #endif + diff --git a/dep/include/postgre/libpq-fe.h b/dep/include/postgre/libpq-fe.h index 5da750a79aa..e38d47f2bd7 100644 --- a/dep/include/postgre/libpq-fe.h +++ b/dep/include/postgre/libpq-fe.h @@ -523,3 +523,4 @@ extern int pg_valid_server_encoding_id(int encoding); #endif #endif /* LIBPQ_FE_H */ + diff --git a/dep/include/postgre/pg_type.h b/dep/include/postgre/pg_type.h index deac579a54f..ce6331908ba 100644 --- a/dep/include/postgre/pg_type.h +++ b/dep/include/postgre/pg_type.h @@ -71,3 +71,4 @@ #define NUMERICOID 1700 #endif /* PG_TYPE_H */ + diff --git a/dep/include/postgre/postgres_ext.h b/dep/include/postgre/postgres_ext.h index 48a191de98c..56914a7adcd 100644 --- a/dep/include/postgre/postgres_ext.h +++ b/dep/include/postgre/postgres_ext.h @@ -57,3 +57,4 @@ typedef unsigned int Oid; #define PG_DIAG_SOURCE_FUNCTION 'R' #endif + diff --git a/dep/include/sockets/Base64.h b/dep/include/sockets/Base64.h index 0620cee6a30..b1fd5364fc2 100644 --- a/dep/include/sockets/Base64.h +++ b/dep/include/sockets/Base64.h @@ -75,3 +75,4 @@ static const char rstr[128]; #endif // _SOCKETS_Base64_H + diff --git a/dep/include/sockets/Exception.h b/dep/include/sockets/Exception.h index 8bfa9904d8b..ae48ab765ba 100644 --- a/dep/include/sockets/Exception.h +++ b/dep/include/sockets/Exception.h @@ -56,3 +56,4 @@ private: #endif // _Sockets_Exception_H + diff --git a/dep/include/sockets/File.h b/dep/include/sockets/File.h index 803930fc790..e1d00ec38c7 100644 --- a/dep/include/sockets/File.h +++ b/dep/include/sockets/File.h @@ -82,3 +82,4 @@ private: #endif // _SOCKETS_File_H + diff --git a/dep/include/sockets/IFile.h b/dep/include/sockets/IFile.h index f086d9ef1f1..e1e39727b52 100644 --- a/dep/include/sockets/IFile.h +++ b/dep/include/sockets/IFile.h @@ -69,3 +69,4 @@ public: #endif // _SOCKETS_IFile_H + diff --git a/dep/include/sockets/ISocketHandler.h b/dep/include/sockets/ISocketHandler.h index 5c9d539b3a9..bb1aa42bafc 100644 --- a/dep/include/sockets/ISocketHandler.h +++ b/dep/include/sockets/ISocketHandler.h @@ -230,3 +230,4 @@ public: #endif // _SOCKETS_ISocketHandler_H + diff --git a/dep/include/sockets/Ipv4Address.h b/dep/include/sockets/Ipv4Address.h index 2c43881a68a..ba2292425a0 100644 --- a/dep/include/sockets/Ipv4Address.h +++ b/dep/include/sockets/Ipv4Address.h @@ -96,3 +96,4 @@ private: #endif #endif // _SOCKETS_Ipv4Address_H + diff --git a/dep/include/sockets/Ipv6Address.h b/dep/include/sockets/Ipv6Address.h index a3b24b0b092..9bd651786bc 100644 --- a/dep/include/sockets/Ipv6Address.h +++ b/dep/include/sockets/Ipv6Address.h @@ -105,3 +105,4 @@ private: #endif // ENABLE_IPV6 #endif // _SOCKETS_Ipv6Address_H + diff --git a/dep/include/sockets/ListenSocket.h b/dep/include/sockets/ListenSocket.h index 7dcee47d9ba..80aa48f20b4 100644 --- a/dep/include/sockets/ListenSocket.h +++ b/dep/include/sockets/ListenSocket.h @@ -418,3 +418,4 @@ private: #endif // _SOCKETS_ListenSocket_H + diff --git a/dep/include/sockets/Lock.h b/dep/include/sockets/Lock.h index 7d67716a26a..e819537ef26 100644 --- a/dep/include/sockets/Lock.h +++ b/dep/include/sockets/Lock.h @@ -57,3 +57,4 @@ private: #endif #endif // _SOCKETS_Lock_H + diff --git a/dep/include/sockets/Mutex.h b/dep/include/sockets/Mutex.h index 35b753ca028..8fce2ce08ba 100644 --- a/dep/include/sockets/Mutex.h +++ b/dep/include/sockets/Mutex.h @@ -66,3 +66,4 @@ private: #endif #endif // _SOCKETS_Mutex_H + diff --git a/dep/include/sockets/Parse.h b/dep/include/sockets/Parse.h index b5d15f00f5c..4b42ea768b2 100644 --- a/dep/include/sockets/Parse.h +++ b/dep/include/sockets/Parse.h @@ -99,3 +99,4 @@ private: #endif // _SOCKETS_Parse_H + diff --git a/dep/include/sockets/ResolvServer.h b/dep/include/sockets/ResolvServer.h index 05dcfd58adf..b713a8ad382 100644 --- a/dep/include/sockets/ResolvServer.h +++ b/dep/include/sockets/ResolvServer.h @@ -71,3 +71,4 @@ private: #endif // ENABLE_RESOLVER #endif // _SOCKETS_ResolvServer_H + diff --git a/dep/include/sockets/ResolvSocket.h b/dep/include/sockets/ResolvSocket.h index 2396af894de..38ff3335c28 100644 --- a/dep/include/sockets/ResolvSocket.h +++ b/dep/include/sockets/ResolvSocket.h @@ -104,3 +104,4 @@ private: #endif // ENABLE_RESOLVER #endif // _SOCKETS_ResolvSocket_H + diff --git a/dep/include/sockets/SctpSocket.h b/dep/include/sockets/SctpSocket.h index 49a360b16da..50757fc4b13 100644 --- a/dep/include/sockets/SctpSocket.h +++ b/dep/include/sockets/SctpSocket.h @@ -107,3 +107,4 @@ private: #endif // USE_SCTP #endif // _SOCKETS_SctpSocket_H + diff --git a/dep/include/sockets/Socket.h b/dep/include/sockets/Socket.h index 0545ad7f849..8a7fdc9d2fd 100644 --- a/dep/include/sockets/Socket.h +++ b/dep/include/sockets/Socket.h @@ -737,3 +737,4 @@ static WSAInitializer m_winsock_init; ///< Winsock initialization singleton cla #endif // _SOCKETS_Socket_H + diff --git a/dep/include/sockets/SocketAddress.h b/dep/include/sockets/SocketAddress.h index c44ff450643..496600b112c 100644 --- a/dep/include/sockets/SocketAddress.h +++ b/dep/include/sockets/SocketAddress.h @@ -93,3 +93,4 @@ public: #endif #endif // _SOCKETS_SocketAddress_H + diff --git a/dep/include/sockets/SocketHandler.h b/dep/include/sockets/SocketHandler.h index a28d2b5311a..1812c9c386f 100644 --- a/dep/include/sockets/SocketHandler.h +++ b/dep/include/sockets/SocketHandler.h @@ -264,3 +264,4 @@ private: #endif // _SOCKETS_SocketHandler_H + diff --git a/dep/include/sockets/StdLog.h b/dep/include/sockets/StdLog.h index 2d2a6705ce0..8266479f21c 100644 --- a/dep/include/sockets/StdLog.h +++ b/dep/include/sockets/StdLog.h @@ -72,3 +72,4 @@ public: #endif // _SOCKETS_StdLog_H + diff --git a/dep/include/sockets/StdoutLog.h b/dep/include/sockets/StdoutLog.h index 3222892e4bf..aee865be6af 100644 --- a/dep/include/sockets/StdoutLog.h +++ b/dep/include/sockets/StdoutLog.h @@ -55,3 +55,4 @@ public: #endif // _SOCKETS_StdoutLog_H + diff --git a/dep/include/sockets/StreamSocket.h b/dep/include/sockets/StreamSocket.h index a22e2332bcb..e839040e2b0 100644 --- a/dep/include/sockets/StreamSocket.h +++ b/dep/include/sockets/StreamSocket.h @@ -125,3 +125,4 @@ private: #endif // _StreamSocket_H + diff --git a/dep/include/sockets/TcpSocket.h b/dep/include/sockets/TcpSocket.h index 4a157db4df6..4caeb548aaa 100644 --- a/dep/include/sockets/TcpSocket.h +++ b/dep/include/sockets/TcpSocket.h @@ -356,3 +356,4 @@ static SSLInitializer m_ssl_init; #endif // _SOCKETS_TcpSocket_H + diff --git a/dep/include/sockets/Thread.h b/dep/include/sockets/Thread.h index 4e99664d579..e065a257a85 100644 --- a/dep/include/sockets/Thread.h +++ b/dep/include/sockets/Thread.h @@ -98,3 +98,4 @@ private: #endif // _SOCKETS_Thread_H + diff --git a/dep/include/sockets/UdpSocket.h b/dep/include/sockets/UdpSocket.h index 86f72e9ca16..fd9965e96e8 100644 --- a/dep/include/sockets/UdpSocket.h +++ b/dep/include/sockets/UdpSocket.h @@ -213,3 +213,4 @@ private: #endif // _SOCKETS_UdpSocket_H + diff --git a/dep/include/sockets/Utility.h b/dep/include/sockets/Utility.h index f940221e5ca..be0f6a05498 100644 --- a/dep/include/sockets/Utility.h +++ b/dep/include/sockets/Utility.h @@ -184,3 +184,4 @@ private: #endif // _SOCKETS_Utility_H + diff --git a/dep/include/sockets/socket_include.h b/dep/include/sockets/socket_include.h index 1edac03be3a..31960ccee05 100644 --- a/dep/include/sockets/socket_include.h +++ b/dep/include/sockets/socket_include.h @@ -297,3 +297,4 @@ namespace SOCKETS_NAMESPACE { #endif // _SOCKETS_socket_include_H + diff --git a/dep/include/sockets/sockets-config.h b/dep/include/sockets/sockets-config.h index 5b1ba2cbcb4..464ed34cabb 100644 --- a/dep/include/sockets/sockets-config.h +++ b/dep/include/sockets/sockets-config.h @@ -99,3 +99,4 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #endif // _SOCKETS_CONFIG_H + diff --git a/dep/include/sqlite/sqlite.h b/dep/include/sqlite/sqlite.h index f5a9328886b..f50671a1095 100644 --- a/dep/include/sqlite/sqlite.h +++ b/dep/include/sqlite/sqlite.h @@ -832,3 +832,4 @@ int sqlite_rekey( #endif #endif /* _SQLITE_H_ */ + diff --git a/dep/include/utf8cpp/utf8.h b/dep/include/utf8cpp/utf8.h index 82b13f59f98..cc463cb82d5 100644 --- a/dep/include/utf8cpp/utf8.h +++ b/dep/include/utf8cpp/utf8.h @@ -32,3 +32,4 @@ DEALINGS IN THE SOFTWARE. #include "utf8/unchecked.h" #endif // header guard + diff --git a/dep/include/utf8cpp/utf8/checked.h b/dep/include/utf8cpp/utf8/checked.h index 2807aac0559..c88844023cb 100644 --- a/dep/include/utf8cpp/utf8/checked.h +++ b/dep/include/utf8cpp/utf8/checked.h @@ -316,3 +316,4 @@ namespace utf8 #endif //header guard + diff --git a/dep/include/utf8cpp/utf8/core.h b/dep/include/utf8cpp/utf8/core.h index 6180155d4b8..389dd3e8ca5 100644 --- a/dep/include/utf8cpp/utf8/core.h +++ b/dep/include/utf8cpp/utf8/core.h @@ -266,3 +266,4 @@ namespace internal #endif // header guard + diff --git a/dep/include/utf8cpp/utf8/unchecked.h b/dep/include/utf8cpp/utf8/unchecked.h index 3aa1a5dbd8d..fc7267d1b98 100644 --- a/dep/include/utf8cpp/utf8/unchecked.h +++ b/dep/include/utf8cpp/utf8/unchecked.h @@ -226,3 +226,4 @@ namespace utf8 #endif // header guard + diff --git a/dep/include/vld/vld.h b/dep/include/vld/vld.h index ffe675d7d79..72bebd8c4f6 100644 --- a/dep/include/vld/vld.h +++ b/dep/include/vld/vld.h @@ -102,3 +102,4 @@ __declspec(dllimport) void VLDEnable (); #endif // _DEBUG #endif // _VLD_H_ + diff --git a/dep/include/zlib/zconf.h b/dep/include/zlib/zconf.h index 03a9431c8be..719855a60d4 100644 --- a/dep/include/zlib/zconf.h +++ b/dep/include/zlib/zconf.h @@ -330,3 +330,4 @@ typedef uLong FAR uLongf; #endif #endif /* ZCONF_H */ + diff --git a/dep/include/zlib/zlib.h b/dep/include/zlib/zlib.h index 022817927ce..2ad74617098 100644 --- a/dep/include/zlib/zlib.h +++ b/dep/include/zlib/zlib.h @@ -1355,3 +1355,4 @@ ZEXTERN const uLongf * ZEXPORT get_crc_table OF((void)); #endif #endif /* ZLIB_H */ + diff --git a/dep/include/zthread/AtomicCount.h b/dep/include/zthread/AtomicCount.h index 38e67dc0d0b..8314b345b4f 100644 --- a/dep/include/zthread/AtomicCount.h +++ b/dep/include/zthread/AtomicCount.h @@ -72,3 +72,4 @@ namespace ZThread { } // namespace ZThread #endif // __ZTATOMICCOUNT_H__ + diff --git a/dep/include/zthread/Barrier.h b/dep/include/zthread/Barrier.h index ec0d9fc8bb8..74381150a03 100644 --- a/dep/include/zthread/Barrier.h +++ b/dep/include/zthread/Barrier.h @@ -326,3 +326,4 @@ namespace ZThread { } // namespace ZThread #endif // __ZTBARRIER_H__ + diff --git a/dep/include/zthread/BiasedReadWriteLock.h b/dep/include/zthread/BiasedReadWriteLock.h index 1fcff74e032..f1877bb116b 100644 --- a/dep/include/zthread/BiasedReadWriteLock.h +++ b/dep/include/zthread/BiasedReadWriteLock.h @@ -317,3 +317,4 @@ namespace ZThread { }; // __ZTBIASEDREADWRITELOCK_H__ #endif + diff --git a/dep/include/zthread/BlockingQueue.h b/dep/include/zthread/BlockingQueue.h index da0b701a825..cf57c12cba9 100644 --- a/dep/include/zthread/BlockingQueue.h +++ b/dep/include/zthread/BlockingQueue.h @@ -243,3 +243,4 @@ namespace ZThread { } // namespace ZThread #endif // __ZTBLOCKINGQUEUE_H__ + diff --git a/dep/include/zthread/BoundedQueue.h b/dep/include/zthread/BoundedQueue.h index 528e6d869d0..95b0ceaaf64 100644 --- a/dep/include/zthread/BoundedQueue.h +++ b/dep/include/zthread/BoundedQueue.h @@ -385,3 +385,4 @@ namespace ZThread { } // namespace ZThread #endif // __ZTBOUNDEDQUEUE_H__ + diff --git a/dep/include/zthread/Cancelable.h b/dep/include/zthread/Cancelable.h index 8d1cae526c3..bf2874b3387 100644 --- a/dep/include/zthread/Cancelable.h +++ b/dep/include/zthread/Cancelable.h @@ -84,3 +84,4 @@ namespace ZThread { } // namespace ZThread #endif // __ZTCANCELABLE_H__ + diff --git a/dep/include/zthread/ClassLockable.h b/dep/include/zthread/ClassLockable.h index 7c1eb0b5059..6554b70b487 100644 --- a/dep/include/zthread/ClassLockable.h +++ b/dep/include/zthread/ClassLockable.h @@ -72,3 +72,4 @@ namespace ZThread { } // namespace ZThread #endif // __ZTCLASSLOCKABLE_H__ + diff --git a/dep/include/zthread/ConcurrentExecutor.h b/dep/include/zthread/ConcurrentExecutor.h index ccfd4a7ab67..df8c18589b5 100644 --- a/dep/include/zthread/ConcurrentExecutor.h +++ b/dep/include/zthread/ConcurrentExecutor.h @@ -122,3 +122,4 @@ namespace ZThread { } // namespace ZThread #endif // __ZTCONCURRENTEXECUTOR_H__ + diff --git a/dep/include/zthread/Condition.h b/dep/include/zthread/Condition.h index 60f4b544ea9..919f60c4893 100644 --- a/dep/include/zthread/Condition.h +++ b/dep/include/zthread/Condition.h @@ -152,3 +152,4 @@ namespace ZThread { } // namespace ZThread #endif // __ZTCONDITION_H__ + diff --git a/dep/include/zthread/Config.h b/dep/include/zthread/Config.h index ee03c831dc4..4d30c2711e6 100644 --- a/dep/include/zthread/Config.h +++ b/dep/include/zthread/Config.h @@ -216,3 +216,4 @@ #endif // __ZTCONFIG_H__ + diff --git a/dep/include/zthread/CountedPtr.h b/dep/include/zthread/CountedPtr.h index 095b61c7ab5..c94392398e2 100644 --- a/dep/include/zthread/CountedPtr.h +++ b/dep/include/zthread/CountedPtr.h @@ -287,3 +287,4 @@ namespace ZThread { #endif // __ZTCOUNTEDPTR_H__ + diff --git a/dep/include/zthread/CountingSemaphore.h b/dep/include/zthread/CountingSemaphore.h index ea23300c2a7..cdaf98a75ff 100644 --- a/dep/include/zthread/CountingSemaphore.h +++ b/dep/include/zthread/CountingSemaphore.h @@ -136,3 +136,4 @@ namespace ZThread { } // namespace ZThread #endif // __ZTCOUNTINGSEMAPHORE_H__ + diff --git a/dep/include/zthread/Exceptions.h b/dep/include/zthread/Exceptions.h index 7a387feb5a4..458c556c0ff 100644 --- a/dep/include/zthread/Exceptions.h +++ b/dep/include/zthread/Exceptions.h @@ -242,3 +242,4 @@ class Future_Exception : public Synchronization_Exception { }; #endif // __ZTEXCEPTIONS_H__ + diff --git a/dep/include/zthread/Executor.h b/dep/include/zthread/Executor.h index 1c6a81a72eb..a500c0a6a00 100644 --- a/dep/include/zthread/Executor.h +++ b/dep/include/zthread/Executor.h @@ -92,3 +92,4 @@ namespace ZThread { } // namespace ZThread #endif // __ZTEXECUTOR_H__ + diff --git a/dep/include/zthread/FairReadWriteLock.h b/dep/include/zthread/FairReadWriteLock.h index 908f663a508..6ee120d3386 100644 --- a/dep/include/zthread/FairReadWriteLock.h +++ b/dep/include/zthread/FairReadWriteLock.h @@ -181,3 +181,4 @@ namespace ZThread { }; // __ZTFAIRREADWRITELOCK_H__ #endif + diff --git a/dep/include/zthread/FastMutex.h b/dep/include/zthread/FastMutex.h index 819108b377a..e41f34d98e1 100644 --- a/dep/include/zthread/FastMutex.h +++ b/dep/include/zthread/FastMutex.h @@ -109,3 +109,4 @@ namespace ZThread { }; #endif // __ZTFASTMUTEX_H__ + diff --git a/dep/include/zthread/FastRecursiveMutex.h b/dep/include/zthread/FastRecursiveMutex.h index 5a3322e3c65..d94c9ee14da 100644 --- a/dep/include/zthread/FastRecursiveMutex.h +++ b/dep/include/zthread/FastRecursiveMutex.h @@ -104,3 +104,4 @@ namespace ZThread { } // namespace ZThread #endif // __ZTFASTRECURSIVEMUTEX_H__ + diff --git a/dep/include/zthread/Guard.h b/dep/include/zthread/Guard.h index d1befccd85a..eac332535b9 100644 --- a/dep/include/zthread/Guard.h +++ b/dep/include/zthread/Guard.h @@ -509,3 +509,4 @@ Guard<LockType, LockingPolicy>::~Guard() throw() { + diff --git a/dep/include/zthread/GuardedClass.h b/dep/include/zthread/GuardedClass.h index 1a8ac1904df..f5665fd7a52 100644 --- a/dep/include/zthread/GuardedClass.h +++ b/dep/include/zthread/GuardedClass.h @@ -101,3 +101,4 @@ namespace ZThread { } // namespace ZThread #endif // __ZTGUARDEDCLASS_H__ + diff --git a/dep/include/zthread/Lockable.h b/dep/include/zthread/Lockable.h index a663498bc2c..a8546a36213 100644 --- a/dep/include/zthread/Lockable.h +++ b/dep/include/zthread/Lockable.h @@ -94,3 +94,4 @@ namespace ZThread { } // namespace ZThread #endif // __ZTLOCKABLE_H__ + diff --git a/dep/include/zthread/LockedQueue.h b/dep/include/zthread/LockedQueue.h index 5aae3278406..62d5f792b8a 100644 --- a/dep/include/zthread/LockedQueue.h +++ b/dep/include/zthread/LockedQueue.h @@ -195,3 +195,4 @@ namespace ZThread { } // namespace ZThread #endif // __ZTLOCKEDQUEUE_H__ + diff --git a/dep/include/zthread/MonitoredQueue.h b/dep/include/zthread/MonitoredQueue.h index 2122b7f7a28..07d7fa6ae28 100644 --- a/dep/include/zthread/MonitoredQueue.h +++ b/dep/include/zthread/MonitoredQueue.h @@ -343,3 +343,4 @@ namespace ZThread { #endif // __ZTMONITOREDQUEUE_H__ + diff --git a/dep/include/zthread/Mutex.h b/dep/include/zthread/Mutex.h index 6c2c6bd2d3e..a40ac9b4d67 100644 --- a/dep/include/zthread/Mutex.h +++ b/dep/include/zthread/Mutex.h @@ -133,3 +133,4 @@ namespace ZThread { } // namespace ZThread #endif // __ZTMUTEX_H__ + diff --git a/dep/include/zthread/NonCopyable.h b/dep/include/zthread/NonCopyable.h index 5c33f345f46..f003be50366 100644 --- a/dep/include/zthread/NonCopyable.h +++ b/dep/include/zthread/NonCopyable.h @@ -58,3 +58,4 @@ namespace ZThread { } // namespace ZThread #endif // __ZTNONCOPYABLE_H__ + diff --git a/dep/include/zthread/PoolExecutor.h b/dep/include/zthread/PoolExecutor.h index 03df37d9f77..6776381def4 100644 --- a/dep/include/zthread/PoolExecutor.h +++ b/dep/include/zthread/PoolExecutor.h @@ -176,3 +176,4 @@ namespace ZThread { + diff --git a/dep/include/zthread/Priority.h b/dep/include/zthread/Priority.h index 907d1f153a8..b34eb1ca3ff 100644 --- a/dep/include/zthread/Priority.h +++ b/dep/include/zthread/Priority.h @@ -37,3 +37,4 @@ namespace ZThread { } #endif // __ZTPRIORITY_H__ + diff --git a/dep/include/zthread/PriorityCondition.h b/dep/include/zthread/PriorityCondition.h index a85a000e941..caf77e488a0 100644 --- a/dep/include/zthread/PriorityCondition.h +++ b/dep/include/zthread/PriorityCondition.h @@ -87,3 +87,4 @@ namespace ZThread { } // namespace ZThread #endif // __ZTPRIORITYCONDITION_H__ + diff --git a/dep/include/zthread/PriorityInheritanceMutex.h b/dep/include/zthread/PriorityInheritanceMutex.h index 81c6109b318..d69b26be0e5 100644 --- a/dep/include/zthread/PriorityInheritanceMutex.h +++ b/dep/include/zthread/PriorityInheritanceMutex.h @@ -91,3 +91,4 @@ namespace ZThread { } // namespace ZThread #endif // __ZTPRIORITYINHERITANCEMUTEX_H__ + diff --git a/dep/include/zthread/PriorityMutex.h b/dep/include/zthread/PriorityMutex.h index b1279764eea..50165ba4663 100644 --- a/dep/include/zthread/PriorityMutex.h +++ b/dep/include/zthread/PriorityMutex.h @@ -84,3 +84,4 @@ namespace ZThread { } // namespace ZThread #endif // __ZTPRIORITYMUTEX_H__ + diff --git a/dep/include/zthread/PrioritySemaphore.h b/dep/include/zthread/PrioritySemaphore.h index 887691f72df..ab5f4ac2903 100644 --- a/dep/include/zthread/PrioritySemaphore.h +++ b/dep/include/zthread/PrioritySemaphore.h @@ -109,3 +109,4 @@ namespace ZThread { } // namespace ZThread #endif // __ZTPRIORITYSEMAPHORE_H__ + diff --git a/dep/include/zthread/Queue.h b/dep/include/zthread/Queue.h index 11a84330b23..9c392ce8bfc 100644 --- a/dep/include/zthread/Queue.h +++ b/dep/include/zthread/Queue.h @@ -187,3 +187,4 @@ namespace ZThread { } // namespace ZThread #endif // __ZTQUEUE_H__ + diff --git a/dep/include/zthread/ReadWriteLock.h b/dep/include/zthread/ReadWriteLock.h index 38b429b699b..86cfac63baa 100644 --- a/dep/include/zthread/ReadWriteLock.h +++ b/dep/include/zthread/ReadWriteLock.h @@ -78,3 +78,4 @@ namespace ZThread { }; // __ZTREADWRITELOCK_H__ #endif + diff --git a/dep/include/zthread/RecursiveMutex.h b/dep/include/zthread/RecursiveMutex.h index 25df4484b6b..8c8a7920345 100644 --- a/dep/include/zthread/RecursiveMutex.h +++ b/dep/include/zthread/RecursiveMutex.h @@ -121,3 +121,4 @@ namespace ZThread { } // namespace ZThread #endif // __ZTRECURSIVEMUTEX_H__ + diff --git a/dep/include/zthread/Runnable.h b/dep/include/zthread/Runnable.h index bfe8d03a58f..35d2c218ee0 100644 --- a/dep/include/zthread/Runnable.h +++ b/dep/include/zthread/Runnable.h @@ -56,3 +56,4 @@ namespace ZThread { } #endif // __ZTRUNNABLE_H__ + diff --git a/dep/include/zthread/Semaphore.h b/dep/include/zthread/Semaphore.h index b01c77804ba..3ea1dba4e16 100644 --- a/dep/include/zthread/Semaphore.h +++ b/dep/include/zthread/Semaphore.h @@ -148,3 +148,4 @@ namespace ZThread { } // namespace ZThread #endif // __ZTSEMAPHORE_H__ + diff --git a/dep/include/zthread/Singleton.h b/dep/include/zthread/Singleton.h index b8f0d1ea842..c9711751013 100644 --- a/dep/include/zthread/Singleton.h +++ b/dep/include/zthread/Singleton.h @@ -247,3 +247,4 @@ T* Singleton<T, InstantiationPolicy, LockType>::instance() { #endif + diff --git a/dep/include/zthread/SynchronousExecutor.h b/dep/include/zthread/SynchronousExecutor.h index bc9de273c4c..e506e83b376 100644 --- a/dep/include/zthread/SynchronousExecutor.h +++ b/dep/include/zthread/SynchronousExecutor.h @@ -124,3 +124,4 @@ namespace ZThread { } // namespace ZThread #endif // __ZTSYNCHRONOUSEXECUTOR_H__ + diff --git a/dep/include/zthread/Task.h b/dep/include/zthread/Task.h index 850ab98c043..ed7f630f4be 100644 --- a/dep/include/zthread/Task.h +++ b/dep/include/zthread/Task.h @@ -76,3 +76,4 @@ namespace ZThread { + diff --git a/dep/include/zthread/Thread.h b/dep/include/zthread/Thread.h index 23ecd1af4bf..90a318ecfff 100644 --- a/dep/include/zthread/Thread.h +++ b/dep/include/zthread/Thread.h @@ -379,3 +379,4 @@ namespace ZThread { + diff --git a/dep/include/zthread/ThreadLocal.h b/dep/include/zthread/ThreadLocal.h index 7cccab4ca69..703f6bce6bf 100644 --- a/dep/include/zthread/ThreadLocal.h +++ b/dep/include/zthread/ThreadLocal.h @@ -380,3 +380,4 @@ namespace ZThread { } // namespace ZThread #endif // __ZTTHREADLOCAL_H__ + diff --git a/dep/include/zthread/ThreadLocalImpl.h b/dep/include/zthread/ThreadLocalImpl.h index be000dfa695..a53c5d1dde4 100644 --- a/dep/include/zthread/ThreadLocalImpl.h +++ b/dep/include/zthread/ThreadLocalImpl.h @@ -106,3 +106,4 @@ namespace ZThread { #endif + diff --git a/dep/include/zthread/ThreadedExecutor.h b/dep/include/zthread/ThreadedExecutor.h index 469a112f6bc..9a52368532c 100644 --- a/dep/include/zthread/ThreadedExecutor.h +++ b/dep/include/zthread/ThreadedExecutor.h @@ -134,3 +134,4 @@ namespace ZThread { } // namespace ZThread #endif // __ZTTHREADEDEXECUTOR_H__ + diff --git a/dep/include/zthread/Time.h b/dep/include/zthread/Time.h index 374c4fd6bf0..0f6db2153ff 100644 --- a/dep/include/zthread/Time.h +++ b/dep/include/zthread/Time.h @@ -223,3 +223,4 @@ const Time& operator-=(const Time& t) { } // namespace ZThread #endif // __ZTTIME_H__ + diff --git a/dep/include/zthread/Waitable.h b/dep/include/zthread/Waitable.h index 17260370316..c5cae314b46 100644 --- a/dep/include/zthread/Waitable.h +++ b/dep/include/zthread/Waitable.h @@ -92,3 +92,4 @@ namespace ZThread { } // namespace ZThread #endif // __ZTWAITABLE_H__ + diff --git a/dep/include/zthread/ZThread.h b/dep/include/zthread/ZThread.h index 1df5bb67a7c..61a7027eeb2 100644 --- a/dep/include/zthread/ZThread.h +++ b/dep/include/zthread/ZThread.h @@ -65,3 +65,4 @@ #include "zthread/Waitable.h" #endif + diff --git a/dep/src/g3dlite/AABox.cpp b/dep/src/g3dlite/AABox.cpp index 0baa1a07419..f2f2b70535c 100644 --- a/dep/src/g3dlite/AABox.cpp +++ b/dep/src/g3dlite/AABox.cpp @@ -297,3 +297,4 @@ bool AABox::intersects(const class Sphere& sphere) const { } // namespace + diff --git a/dep/src/g3dlite/Box.cpp b/dep/src/g3dlite/Box.cpp index b99104ff28b..c30211fd5b9 100644 --- a/dep/src/g3dlite/Box.cpp +++ b/dep/src/g3dlite/Box.cpp @@ -346,3 +346,4 @@ void Box::getBounds(class AABox& aabb) const { } // namespace + diff --git a/dep/src/g3dlite/Crypto.cpp b/dep/src/g3dlite/Crypto.cpp index 763c2fefd4b..bff3a5a966c 100644 --- a/dep/src/g3dlite/Crypto.cpp +++ b/dep/src/g3dlite/Crypto.cpp @@ -144,3 +144,4 @@ uint32 Crypto::crc32(const void* byte, size_t numBytes) { } } // G3D + diff --git a/dep/src/g3dlite/Matrix3.cpp b/dep/src/g3dlite/Matrix3.cpp index c6fc9729b34..630c1883c0b 100644 --- a/dep/src/g3dlite/Matrix3.cpp +++ b/dep/src/g3dlite/Matrix3.cpp @@ -1684,3 +1684,4 @@ std::string Matrix3::toString() const { } // namespace + diff --git a/dep/src/g3dlite/Plane.cpp b/dep/src/g3dlite/Plane.cpp index 5265ef8f670..10ee7ff0f0c 100644 --- a/dep/src/g3dlite/Plane.cpp +++ b/dep/src/g3dlite/Plane.cpp @@ -129,3 +129,4 @@ std::string Plane::toString() const { } } + diff --git a/dep/src/g3dlite/System.cpp b/dep/src/g3dlite/System.cpp index f28c9d62a9a..cb7169a4c4d 100644 --- a/dep/src/g3dlite/System.cpp +++ b/dep/src/g3dlite/System.cpp @@ -664,3 +664,4 @@ void System::alignedFree(void* _ptr) { } // namespace + diff --git a/dep/src/g3dlite/Triangle.cpp b/dep/src/g3dlite/Triangle.cpp index d3fa835c7c8..bb5b8f94635 100644 --- a/dep/src/g3dlite/Triangle.cpp +++ b/dep/src/g3dlite/Triangle.cpp @@ -110,3 +110,4 @@ void Triangle::getBounds(AABox& out) const { } } // G3D + diff --git a/dep/src/g3dlite/Vector3.cpp b/dep/src/g3dlite/Vector3.cpp index 274769a1e0b..09c3003888b 100644 --- a/dep/src/g3dlite/Vector3.cpp +++ b/dep/src/g3dlite/Vector3.cpp @@ -441,3 +441,4 @@ Vector4 Vector3::zzzz() const { return Vector4 (z, z, z, z); } } // namespace + diff --git a/dep/src/g3dlite/Vector4.cpp b/dep/src/g3dlite/Vector4.cpp index 2a597df65ed..91f916d1040 100644 --- a/dep/src/g3dlite/Vector4.cpp +++ b/dep/src/g3dlite/Vector4.cpp @@ -436,3 +436,4 @@ Vector4 Vector4::wwww() const { return Vector4 (w, w, w, w); } }; // namespace + diff --git a/dep/src/g3dlite/format.cpp b/dep/src/g3dlite/format.cpp index 8737128a0f8..13f01e26e6b 100644 --- a/dep/src/g3dlite/format.cpp +++ b/dep/src/g3dlite/format.cpp @@ -169,3 +169,4 @@ std::string vformat(const char* fmt, va_list argPtr) { #endif #undef NEWLINE + diff --git a/dep/src/sockets/Base64.cpp b/dep/src/sockets/Base64.cpp index 95b91555beb..cb66b93af6f 100644 --- a/dep/src/sockets/Base64.cpp +++ b/dep/src/sockets/Base64.cpp @@ -270,3 +270,4 @@ size_t Base64::decode_length(const std::string& str64) #endif + diff --git a/dep/src/sockets/Exception.cpp b/dep/src/sockets/Exception.cpp index b3844982c0f..33a7b4a133c 100644 --- a/dep/src/sockets/Exception.cpp +++ b/dep/src/sockets/Exception.cpp @@ -46,3 +46,4 @@ const std::string Exception::ToString() const } // namespace SOCKETS_NAMESPACE { #endif + diff --git a/dep/src/sockets/Ipv4Address.cpp b/dep/src/sockets/Ipv4Address.cpp index 88a7d33fb63..b89cc2a449b 100644 --- a/dep/src/sockets/Ipv4Address.cpp +++ b/dep/src/sockets/Ipv4Address.cpp @@ -212,3 +212,4 @@ std::string Ipv4Address::Reverse() } // namespace SOCKETS_NAMESPACE { #endif + diff --git a/dep/src/sockets/Ipv6Address.cpp b/dep/src/sockets/Ipv6Address.cpp index c6f1443af2e..6c92de24871 100644 --- a/dep/src/sockets/Ipv6Address.cpp +++ b/dep/src/sockets/Ipv6Address.cpp @@ -268,3 +268,4 @@ std::string Ipv6Address::Reverse() #endif // IPPROTO_IPV6 #endif // ENABLE_IPV6 + diff --git a/dep/src/sockets/Lock.cpp b/dep/src/sockets/Lock.cpp index 3f7ad87b2ba..597ca30afc6 100644 --- a/dep/src/sockets/Lock.cpp +++ b/dep/src/sockets/Lock.cpp @@ -53,3 +53,4 @@ Lock::~Lock() } #endif + diff --git a/dep/src/sockets/Mutex.cpp b/dep/src/sockets/Mutex.cpp index 8284fefacd8..3bfe64d04c7 100644 --- a/dep/src/sockets/Mutex.cpp +++ b/dep/src/sockets/Mutex.cpp @@ -79,3 +79,4 @@ void Mutex::Unlock() } #endif + diff --git a/dep/src/sockets/Parse.cpp b/dep/src/sockets/Parse.cpp index 4d4dd99cd98..ccbd553b0e6 100644 --- a/dep/src/sockets/Parse.cpp +++ b/dep/src/sockets/Parse.cpp @@ -319,3 +319,4 @@ void Parse::getline(std::string&s) #endif + diff --git a/dep/src/sockets/ResolvServer.cpp b/dep/src/sockets/ResolvServer.cpp index 3923df33079..492d6705080 100644 --- a/dep/src/sockets/ResolvServer.cpp +++ b/dep/src/sockets/ResolvServer.cpp @@ -95,3 +95,4 @@ bool ResolvServer::Ready() #endif // ENABLE_RESOLVER + diff --git a/dep/src/sockets/ResolvSocket.cpp b/dep/src/sockets/ResolvSocket.cpp index 6096dc89e37..236e93f9704 100644 --- a/dep/src/sockets/ResolvSocket.cpp +++ b/dep/src/sockets/ResolvSocket.cpp @@ -434,3 +434,4 @@ DEB(fprintf(stderr, " *** Update cache for [%s][%s] = '%s'\n", m_query.c_str(), #endif // ENABLE_RESOLVER + diff --git a/dep/src/sockets/Socket.cpp b/dep/src/sockets/Socket.cpp index 5e739ec0c71..bf1a73abf6e 100644 --- a/dep/src/sockets/Socket.cpp +++ b/dep/src/sockets/Socket.cpp @@ -1896,3 +1896,4 @@ std::string Socket::GetSockAddress6() } #endif + diff --git a/dep/src/sockets/SocketHandler.cpp b/dep/src/sockets/SocketHandler.cpp index 8a7307f4192..7ade1e99eb6 100644 --- a/dep/src/sockets/SocketHandler.cpp +++ b/dep/src/sockets/SocketHandler.cpp @@ -1420,3 +1420,4 @@ void SocketHandler::Trigger(int id, Socket::TriggerData& data, bool erase) } #endif + diff --git a/dep/src/sockets/StdoutLog.cpp b/dep/src/sockets/StdoutLog.cpp index 93ae535e6d3..054b8489bb3 100644 --- a/dep/src/sockets/StdoutLog.cpp +++ b/dep/src/sockets/StdoutLog.cpp @@ -94,3 +94,4 @@ void StdoutLog::error(ISocketHandler *,Socket *sock,const std::string& call,int #endif + diff --git a/dep/src/sockets/StreamSocket.cpp b/dep/src/sockets/StreamSocket.cpp index 4412d498536..c8a3c32e496 100644 --- a/dep/src/sockets/StreamSocket.cpp +++ b/dep/src/sockets/StreamSocket.cpp @@ -167,3 +167,4 @@ int StreamSocket::GetShutdown() } // namespace SOCKETS_NAMESPACE { #endif + diff --git a/dep/src/sockets/TcpSocket.cpp b/dep/src/sockets/TcpSocket.cpp index 1dc54dd3fac..9dab541eebe 100644 --- a/dep/src/sockets/TcpSocket.cpp +++ b/dep/src/sockets/TcpSocket.cpp @@ -1743,3 +1743,4 @@ void TcpSocket::OnTransferLimit() } #endif + diff --git a/dep/src/sockets/Thread.cpp b/dep/src/sockets/Thread.cpp index e1834ab4a87..a387a7e3824 100644 --- a/dep/src/sockets/Thread.cpp +++ b/dep/src/sockets/Thread.cpp @@ -164,3 +164,4 @@ bool Thread::IsDestructor() #endif + diff --git a/dep/src/sockets/UdpSocket.cpp b/dep/src/sockets/UdpSocket.cpp index 229a26414e5..f4c3d2f9657 100644 --- a/dep/src/sockets/UdpSocket.cpp +++ b/dep/src/sockets/UdpSocket.cpp @@ -850,3 +850,4 @@ void UdpSocket::SetTimestamp(bool x) #endif + diff --git a/dep/src/sockets/Utility.cpp b/dep/src/sockets/Utility.cpp index e552da3b6e7..6473f0a2564 100644 --- a/dep/src/sockets/Utility.cpp +++ b/dep/src/sockets/Utility.cpp @@ -997,3 +997,4 @@ unsigned long Utility::Rng::Get() } #endif + diff --git a/dep/src/sockets/socket_include.cpp b/dep/src/sockets/socket_include.cpp index 6f08e8e16ab..133ff745d91 100644 --- a/dep/src/sockets/socket_include.cpp +++ b/dep/src/sockets/socket_include.cpp @@ -88,3 +88,4 @@ static char tmp[100]; + diff --git a/dep/src/zlib/crc32.h b/dep/src/zlib/crc32.h index 8053b6117c0..dfd1deaa522 100644 --- a/dep/src/zlib/crc32.h +++ b/dep/src/zlib/crc32.h @@ -439,3 +439,4 @@ local const unsigned long FAR crc_table[TBLS][256] = #endif } }; + diff --git a/dep/src/zlib/deflate.h b/dep/src/zlib/deflate.h index 05a5ab3a2c1..d56e97db4cb 100644 --- a/dep/src/zlib/deflate.h +++ b/dep/src/zlib/deflate.h @@ -329,3 +329,4 @@ void _tr_stored_block OF((deflate_state *s, charf *buf, ulg stored_len, #endif #endif /* DEFLATE_H */ + diff --git a/dep/src/zlib/inffast.h b/dep/src/zlib/inffast.h index 1e88d2d97b5..c66fae6da2c 100644 --- a/dep/src/zlib/inffast.h +++ b/dep/src/zlib/inffast.h @@ -9,3 +9,4 @@ */ void inflate_fast OF((z_streamp strm, unsigned start)); + diff --git a/dep/src/zlib/inffixed.h b/dep/src/zlib/inffixed.h index 75ed4b5978d..3757019557f 100644 --- a/dep/src/zlib/inffixed.h +++ b/dep/src/zlib/inffixed.h @@ -92,3 +92,4 @@ {16,5,4},{24,5,769},{20,5,49},{28,5,12289},{18,5,13},{26,5,3073}, {22,5,193},{64,5,0} }; + diff --git a/dep/src/zlib/inflate.h b/dep/src/zlib/inflate.h index 07bd3e78a7c..7c05e08fcba 100644 --- a/dep/src/zlib/inflate.h +++ b/dep/src/zlib/inflate.h @@ -113,3 +113,4 @@ struct inflate_state { unsigned short work[288]; /* work area for code table building */ code codes[ENOUGH]; /* space for code tables */ }; + diff --git a/dep/src/zlib/inftrees.h b/dep/src/zlib/inftrees.h index b1104c87e76..977ee2f78f5 100644 --- a/dep/src/zlib/inftrees.h +++ b/dep/src/zlib/inftrees.h @@ -53,3 +53,4 @@ typedef enum { extern int inflate_table OF((codetype type, unsigned short FAR *lens, unsigned codes, code FAR * FAR *table, unsigned FAR *bits, unsigned short FAR *work)); + diff --git a/dep/src/zlib/trees.h b/dep/src/zlib/trees.h index 72facf900f7..ba8cd78357b 100644 --- a/dep/src/zlib/trees.h +++ b/dep/src/zlib/trees.h @@ -126,3 +126,4 @@ local const int base_dist[D_CODES] = { 1024, 1536, 2048, 3072, 4096, 6144, 8192, 12288, 16384, 24576 }; + diff --git a/dep/src/zlib/zconf.h b/dep/src/zlib/zconf.h index 03a9431c8be..719855a60d4 100644 --- a/dep/src/zlib/zconf.h +++ b/dep/src/zlib/zconf.h @@ -330,3 +330,4 @@ typedef uLong FAR uLongf; #endif #endif /* ZCONF_H */ + diff --git a/dep/src/zlib/zlib.h b/dep/src/zlib/zlib.h index 022817927ce..2ad74617098 100644 --- a/dep/src/zlib/zlib.h +++ b/dep/src/zlib/zlib.h @@ -1355,3 +1355,4 @@ ZEXTERN const uLongf * ZEXPORT get_crc_table OF((void)); #endif #endif /* ZLIB_H */ + diff --git a/dep/src/zlib/zutil.h b/dep/src/zlib/zutil.h index b7d5eff81b6..b8a722d904d 100644 --- a/dep/src/zlib/zutil.h +++ b/dep/src/zlib/zutil.h @@ -267,3 +267,4 @@ void zcfree OF((voidpf opaque, voidpf ptr)); #define TRY_FREE(s, p) {if (p) ZFREE(s, p);} #endif /* ZUTIL_H */ + diff --git a/dep/src/zthread/ConcurrentExecutor.cxx b/dep/src/zthread/ConcurrentExecutor.cxx index a65e9c5e909..c5076d135ce 100644 --- a/dep/src/zthread/ConcurrentExecutor.cxx +++ b/dep/src/zthread/ConcurrentExecutor.cxx @@ -24,7 +24,7 @@ namespace ZThread { - ConcurrentExecutor::ConcurrentExecutor() + ConcurrentExecutor::ConcurrentExecutor() : _executor(1) {} void ConcurrentExecutor::interrupt() { @@ -34,21 +34,21 @@ namespace ZThread { void ConcurrentExecutor::execute(const Task& task) { _executor.execute(task); } - + void ConcurrentExecutor::cancel() { _executor.cancel(); } - + bool ConcurrentExecutor::isCanceled() { - return _executor.isCanceled(); + return _executor.isCanceled(); } - + void ConcurrentExecutor::wait() { _executor.wait(); } - + bool ConcurrentExecutor::wait(unsigned long timeout) { - return _executor.wait(timeout); + return _executor.wait(timeout); } } diff --git a/dep/src/zthread/Condition.cxx b/dep/src/zthread/Condition.cxx index 39485fb5ca4..f1ea13f35e8 100644 --- a/dep/src/zthread/Condition.cxx +++ b/dep/src/zthread/Condition.cxx @@ -32,14 +32,14 @@ namespace ZThread { }; Condition::Condition(Lockable& lock) { - + _impl = new FifoConditionImpl(lock); } Condition::~Condition() { - + if(_impl != 0) delete _impl; @@ -64,7 +64,7 @@ namespace ZThread { void Condition::signal() { - + _impl->signal(); } diff --git a/dep/src/zthread/ConditionImpl.h b/dep/src/zthread/ConditionImpl.h index ad1503ef197..923bf2bc39d 100644 --- a/dep/src/zthread/ConditionImpl.h +++ b/dep/src/zthread/ConditionImpl.h @@ -375,3 +375,4 @@ bool ConditionImpl<List>::wait(unsigned long timeout) { } // namespace ZThread #endif // __ZTCONDITIONIMPL_H__ + diff --git a/dep/src/zthread/CountingSemaphore.cxx b/dep/src/zthread/CountingSemaphore.cxx index 43e8b8cfba7..1aa0ff79c77 100644 --- a/dep/src/zthread/CountingSemaphore.cxx +++ b/dep/src/zthread/CountingSemaphore.cxx @@ -29,9 +29,9 @@ namespace ZThread { CountingSemaphore::CountingSemaphore(int initialCount) { - + _impl = new FifoSemaphoreImpl(initialCount, 0 , false); - + } diff --git a/dep/src/zthread/Debug.h b/dep/src/zthread/Debug.h index 1762de22fe3..10cc741834f 100644 --- a/dep/src/zthread/Debug.h +++ b/dep/src/zthread/Debug.h @@ -30,3 +30,4 @@ #endif #endif + diff --git a/dep/src/zthread/DeferredInterruptionScope.h b/dep/src/zthread/DeferredInterruptionScope.h index 5205c80ca58..58050da6d8c 100644 --- a/dep/src/zthread/DeferredInterruptionScope.h +++ b/dep/src/zthread/DeferredInterruptionScope.h @@ -61,3 +61,4 @@ class DeferredInterruptionScope { } #endif // __ZTDEFERREDINTERRUPTIONSCOPE_H__ + diff --git a/dep/src/zthread/FastLock.h b/dep/src/zthread/FastLock.h index 4d7f34a086d..8a955bf7b7d 100644 --- a/dep/src/zthread/FastLock.h +++ b/dep/src/zthread/FastLock.h @@ -69,3 +69,4 @@ #endif #endif // __ZTFASTLOCKSELECT_H__ + diff --git a/dep/src/zthread/FastMutex.cxx b/dep/src/zthread/FastMutex.cxx index 464dd83e5e0..fce54a127a2 100644 --- a/dep/src/zthread/FastMutex.cxx +++ b/dep/src/zthread/FastMutex.cxx @@ -28,7 +28,7 @@ namespace ZThread { FastMutex::FastMutex() : _lock(new FastLock) { } FastMutex::~FastMutex() { - delete _lock; + delete _lock; } @@ -39,7 +39,7 @@ namespace ZThread { } bool FastMutex::tryAcquire(unsigned long timeout) { - + return _lock->tryAcquire(timeout); } diff --git a/dep/src/zthread/FastRecursiveLock.h b/dep/src/zthread/FastRecursiveLock.h index 96b66ebe675..b26f5f231d5 100644 --- a/dep/src/zthread/FastRecursiveLock.h +++ b/dep/src/zthread/FastRecursiveLock.h @@ -72,3 +72,4 @@ #endif #endif // __ZTFASTRECURSIVELOCKSELECT_H__ + diff --git a/dep/src/zthread/FastRecursiveMutex.cxx b/dep/src/zthread/FastRecursiveMutex.cxx index 5ca677a654d..f84e207192f 100644 --- a/dep/src/zthread/FastRecursiveMutex.cxx +++ b/dep/src/zthread/FastRecursiveMutex.cxx @@ -25,10 +25,10 @@ namespace ZThread { - FastRecursiveMutex::FastRecursiveMutex() + FastRecursiveMutex::FastRecursiveMutex() : _lock(new FastRecursiveLock) { } - FastRecursiveMutex::~FastRecursiveMutex() + FastRecursiveMutex::~FastRecursiveMutex() { delete _lock; } @@ -39,7 +39,7 @@ namespace ZThread { } bool FastRecursiveMutex::tryAcquire(unsigned long timeout) { - + return _lock->tryAcquire(timeout); } diff --git a/dep/src/zthread/IntrusivePtr.h b/dep/src/zthread/IntrusivePtr.h index 189ebaf8ad7..818f41ea698 100644 --- a/dep/src/zthread/IntrusivePtr.h +++ b/dep/src/zthread/IntrusivePtr.h @@ -97,3 +97,4 @@ public: }; #endif + diff --git a/dep/src/zthread/Monitor.cxx b/dep/src/zthread/Monitor.cxx index 9a578e796ed..2afb6162a22 100644 --- a/dep/src/zthread/Monitor.cxx +++ b/dep/src/zthread/Monitor.cxx @@ -26,10 +26,10 @@ #include "Monitor.h" // This file will select an implementation for a Monitor based on -// what Monitor.h selects. This method is for selecting the +// what Monitor.h selects. This method is for selecting the // source files, to improve portability. Currently, the project is // based on the autoconf tool-set, which doesn't support conditional -// compilation well. Additionally, this should make the library +// compilation well. Additionally, this should make the library // easier to port since its working around conditional compilation // by using C++ features and people won't have to fiddle around with // their make tool as much to compile the source diff --git a/dep/src/zthread/Monitor.h b/dep/src/zthread/Monitor.h index 1170982292e..d6d4aafc7d0 100644 --- a/dep/src/zthread/Monitor.h +++ b/dep/src/zthread/Monitor.h @@ -58,3 +58,4 @@ #endif #endif // __ZTMONITORSELECT_H__ + diff --git a/dep/src/zthread/Mutex.cxx b/dep/src/zthread/Mutex.cxx index eca38ba89c6..a98897d090d 100644 --- a/dep/src/zthread/Mutex.cxx +++ b/dep/src/zthread/Mutex.cxx @@ -64,5 +64,5 @@ namespace ZThread { -} // namespace ZThread +} // namespace ZThread diff --git a/dep/src/zthread/MutexImpl.h b/dep/src/zthread/MutexImpl.h index 21338ba289c..83b32d47a98 100644 --- a/dep/src/zthread/MutexImpl.h +++ b/dep/src/zthread/MutexImpl.h @@ -375,3 +375,4 @@ void MutexImpl<List, Behavior>::release() { + diff --git a/dep/src/zthread/PoolExecutor.cxx b/dep/src/zthread/PoolExecutor.cxx index cf84e145453..82ace996035 100644 --- a/dep/src/zthread/PoolExecutor.cxx +++ b/dep/src/zthread/PoolExecutor.cxx @@ -42,7 +42,7 @@ namespace ZThread { class WaiterQueue { typedef std::deque<ThreadImpl*> ThreadList; - + typedef struct group_t { size_t id; size_t count; @@ -68,14 +68,14 @@ namespace ZThread { void operator()(const Group& grp) { count += grp.count; } operator size_t() { return count; } }; - + FastMutex _lock; GroupList _list; size_t _id; size_t _generation; public: - + WaiterQueue() : _id(0), _generation(0) { // At least one empty-group exists _list.push_back( Group(_id++) ); @@ -89,7 +89,7 @@ namespace ZThread { */ bool wait(unsigned long timeout) { - ThreadImpl* current = ThreadImpl::current(); + ThreadImpl* current = ThreadImpl::current(); Monitor& m = current->getMonitor(); Monitor::STATE state; @@ -103,15 +103,15 @@ namespace ZThread { if((size_t)std::for_each(_list.begin(), _list.end(), counter()) < 1) return true; - // Update the waiter list for the active group + // Update the waiter list for the active group _list.back().waiters.push_back(current); size_t n = _list.back().id; m.acquire(); - + { - Guard<FastMutex, UnlockedScope> g2(g1); + Guard<FastMutex, UnlockedScope> g2(g1); state = timeout == 0 ? m.wait() : m.wait(timeout); } @@ -142,22 +142,22 @@ namespace ZThread { throw Interrupted_Exception(); default: throw Synchronization_Exception(); - } - + } + return true; } - + /** * Increment the active group count * * @pre at least 1 empty group exists - * @post at least 1 non-empty group exists + * @post at least 1 non-empty group exists */ std::pair<size_t, size_t> increment() { - + Guard<FastMutex> g(_lock); - + // At least one empty-group exists assert(!_list.empty()); @@ -176,7 +176,7 @@ namespace ZThread { // When the active group is being incremented, insert a new active group // to replace it if there were waiting threads - if(i == --_list.end() && !i->waiters.empty()) + if(i == --_list.end() && !i->waiters.empty()) _list.push_back(Group(_id++)); // At least 1 non-empty group exists @@ -185,27 +185,27 @@ namespace ZThread { return std::make_pair(n, _generation); } - + /** * Decrease the count for the group with the given id. * * @param n group id - * + * * @pre At least 1 non-empty group exists * @post At least 1 empty group exists */ void decrement(size_t n) { - + Guard<FastMutex> g1(_lock); - + // At least 1 non-empty group exists assert((size_t)std::for_each(_list.begin(), _list.end(), counter()) > 0); // Find the requested group GroupList::iterator i = std::find_if(_list.begin(), _list.end(), by_id(n)); if(i == _list.end()) { - + // A group should never have been removed until // the final task in that group completed assert(0); @@ -214,11 +214,11 @@ namespace ZThread { // Decrease the count for tasks in this group, if(--i->count == 0 && i == _list.begin()) { - - do { + + do { // When the first group completes, wake all waiters for every - // group, starting from the first until a group that is not + // group, starting from the first until a group that is not // complete is reached /* @@ -226,29 +226,29 @@ namespace ZThread { if(i == --_list.end() && i->waiters.empty()) break; */ - + if( awaken(*i) ) { - - // If all waiters were awakened, remove the group + + // If all waiters were awakened, remove the group i = _list.erase(i); - + } else { - + { // Otherwise, unlock and yield allowing the waiter // lists to be updated if other threads are busy Guard<FastLock, UnlockedScope> g2(g1); ThreadImpl::yield(); - + } i = _list.begin(); } - - } while(i != _list.end() && i->count == 0); - + + } while(i != _list.end() && i->count == 0); + // Ensure that an active group exists if(_list.empty()) _list.push_back( Group(++_id) ); @@ -257,7 +257,7 @@ namespace ZThread { // At least one group exists assert(!_list.empty()); - + } /** @@ -268,40 +268,40 @@ namespace ZThread { return next ? _generation++ : _generation; } - + private: - + /** * Awaken all the waiters remaining in the given group - * + * * @return * - true if all the waiting threads were successfully awakened. * - false if there were one or more threads that could not be awakened. */ bool awaken(Group& grp) { - // Go through the waiter list in the given group; + // Go through the waiter list in the given group; for(ThreadList::iterator i = grp.waiters.begin(); i != grp.waiters.end();) { - + ThreadImpl* impl = *i; Monitor& m = impl->getMonitor(); - + // Try the monitor lock, if it cant be locked skip to the next waiter if(m.tryAcquire()) { - + // Notify the monitor & remove from the waiter list so time isn't // wasted checking it again. i = grp.waiters.erase(i); - + // Try to wake the waiter, it doesn't matter if this is successful - // or not (only fails when the monitor is already going to stop waiting). + // or not (only fails when the monitor is already going to stop waiting). m.notify(); m.release(); - + } else ++i; - + } - + return grp.waiters.empty(); } @@ -310,13 +310,13 @@ namespace ZThread { /** * @class GroupedRunnable - * - * Wrap a task with group and generation information. + * + * Wrap a task with group and generation information. * * - 'group' allows tasks to be grouped together so that lists of waiting * threads can be managed. * - * - 'generation' allows tasks to be interrupted + * - 'generation' allows tasks to be interrupted */ class GroupedRunnable : public Runnable { @@ -329,10 +329,10 @@ namespace ZThread { public: GroupedRunnable(const Task& task, WaiterQueue& queue) - : _task(task), _queue(queue) { - + : _task(task), _queue(queue) { + std::pair<size_t, size_t> pr( _queue.increment() ); - + _group = pr.first; _generation = pr.second; @@ -368,10 +368,10 @@ namespace ZThread { * */ class ExecutorImpl { - + typedef MonitoredQueue<ExecutorTask, FastMutex> TaskQueue; typedef std::deque<ThreadImpl*> ThreadList; - + TaskQueue _taskQueue; WaiterQueue _waitingQueue; @@ -380,19 +380,19 @@ namespace ZThread { public: - + ExecutorImpl() : _size(0) {} void registerThread() { - + Guard<TaskQueue> g(_taskQueue); ThreadImpl* impl = ThreadImpl::current(); _threads.push_back(impl); // current cancel if too many threads are being created - if(_threads.size() > _size) + if(_threads.size() > _size) impl->cancel(); } @@ -408,14 +408,14 @@ namespace ZThread { // Wrap the task with a grouped task GroupedRunnable* runnable = new GroupedRunnable(task, _waitingQueue); - + try { - + _taskQueue.add( ExecutorTask(runnable) ); } catch(...) { - // Incase the queue is canceled between the time the WaiterQueue is + // Incase the queue is canceled between the time the WaiterQueue is // updated and the task is added to the TaskQueue _waitingQueue.decrement( runnable->group() ); throw; @@ -430,41 +430,41 @@ namespace ZThread { _waitingQueue.generation(true); Guard<TaskQueue> g(_taskQueue); - + // Interrupt all threads currently running, thier tasks would be // from an older generation for(ThreadList::iterator i = _threads.begin(); i != _threads.end(); ++i) (*i)->interrupt(); - + } //! Adjust the number of desired workers and return the number of Threads needed size_t workers(size_t n) { - + Guard<TaskQueue> g(_taskQueue); size_t m = (_size < n) ? (n - _size) : 0; _size = n; - + return m; } - + size_t workers() { - + Guard<TaskQueue> g(_taskQueue); return _size; - + } - + ExecutorTask next() { - + ExecutorTask task; - + // Draw the task from the queue for(;;) { - try { + try { task = _taskQueue.next(); break; @@ -473,13 +473,13 @@ namespace ZThread { // Ignore interruption here, it can only come from // another thread interrupt()ing the executor. The - // thread was interrupted in the hopes it was busy + // thread was interrupted in the hopes it was busy // with a task } } - + // Interrupt the thread running the tasks when the generation // does not match the current generation if( task->generation() != _waitingQueue.generation() ) @@ -512,31 +512,31 @@ namespace ZThread { class Worker : public Runnable { CountedPtr< ExecutorImpl > _impl; - + public: - + //! Create a Worker that draws upon the given Queue - Worker(const CountedPtr< ExecutorImpl >& impl) + Worker(const CountedPtr< ExecutorImpl >& impl) : _impl(impl) { } - + //! Run until Thread or Queue are canceled - void run() { - + void run() { + _impl->registerThread(); - + // Run until the Queue is canceled while(!Thread::canceled()) { - + // Draw tasks from the queue ExecutorTask task( _impl->next() ); task->run(); - - } - + + } + _impl->unregisterThread(); - + } - + }; /* Worker */ @@ -547,10 +547,10 @@ namespace ZThread { public: - Shutdown(const CountedPtr< ExecutorImpl >& impl) + Shutdown(const CountedPtr< ExecutorImpl >& impl) : _impl(impl) { } - - void run() { + + void run() { _impl->cancel(); } @@ -560,35 +560,35 @@ namespace ZThread { PoolExecutor::PoolExecutor(size_t n) : _impl( new ExecutorImpl() ), _shutdown( new Shutdown(_impl) ) { - + size(n); - + // Request cancelation when main() exits ThreadQueue::instance()->insertShutdownTask(_shutdown); } - PoolExecutor::~PoolExecutor() { + PoolExecutor::~PoolExecutor() { try { - + /** * If the shutdown task for this executor has not already been * selected to run, then run it locally */ - if(ThreadQueue::instance()->removeShutdownTask(_shutdown)) + if(ThreadQueue::instance()->removeShutdownTask(_shutdown)) _shutdown->run(); - + } catch(...) { } - } + } void PoolExecutor::interrupt() { _impl->interrupt(); } void PoolExecutor::size(size_t n) { - + if(n < 1) throw InvalidOp_Exception(); @@ -604,26 +604,26 @@ namespace ZThread { void PoolExecutor::execute(const Task& task) { - // Enqueue the task, the Queue will reject it with a + // Enqueue the task, the Queue will reject it with a // Cancelation_Exception if the Executor has been canceled - _impl->execute(task); + _impl->execute(task); } void PoolExecutor::cancel() { - _impl->cancel(); + _impl->cancel(); } bool PoolExecutor::isCanceled() { - return _impl->isCanceled(); + return _impl->isCanceled(); } - - void PoolExecutor::wait() { + + void PoolExecutor::wait() { _impl->wait(0); } bool PoolExecutor::wait(unsigned long timeout) { - return _impl->wait(timeout == 0 ? 1 : timeout); + return _impl->wait(timeout == 0 ? 1 : timeout); } } diff --git a/dep/src/zthread/PriorityCondition.cxx b/dep/src/zthread/PriorityCondition.cxx index c43953ff73b..70258563ee4 100644 --- a/dep/src/zthread/PriorityCondition.cxx +++ b/dep/src/zthread/PriorityCondition.cxx @@ -32,14 +32,14 @@ namespace ZThread { }; PriorityCondition::PriorityCondition(Lockable& lock) { - + _impl = new PriorityConditionImpl(lock); } PriorityCondition::~PriorityCondition() { - + if(_impl != 0) delete _impl; diff --git a/dep/src/zthread/PriorityInheritanceMutex.cxx b/dep/src/zthread/PriorityInheritanceMutex.cxx index 108e4a74370..6735d15d422 100644 --- a/dep/src/zthread/PriorityInheritanceMutex.cxx +++ b/dep/src/zthread/PriorityInheritanceMutex.cxx @@ -28,28 +28,28 @@ namespace ZThread { class InheritPriorityBehavior : public NullBehavior { - + ThreadImpl* owner; Priority p; protected: - // Temporarily raise the effective priority of the owner - inline void waiterArrived(ThreadImpl* impl) { - + // Temporarily raise the effective priority of the owner + inline void waiterArrived(ThreadImpl* impl) { + Priority q = impl->getPriority(); if((int)q > (int)p) { ThreadOps::setPriority(impl, p); p = q; - + } } // Note the owners priority - inline void ownerAcquired(ThreadImpl* impl) { + inline void ownerAcquired(ThreadImpl* impl) { p = impl->getPriority(); owner = impl; @@ -57,7 +57,7 @@ namespace ZThread { } // Restore its original priority - inline void ownerReleased(ThreadImpl* impl) { + inline void ownerReleased(ThreadImpl* impl) { if(p > owner->getPriority()) ThreadOps::setPriority(impl, impl->getPriority()); @@ -66,18 +66,18 @@ namespace ZThread { }; - class PriorityInheritanceMutexImpl : + class PriorityInheritanceMutexImpl : public MutexImpl<priority_list, InheritPriorityBehavior> { }; PriorityInheritanceMutex::PriorityInheritanceMutex() { - + _impl = new PriorityInheritanceMutexImpl(); - + } PriorityInheritanceMutex::~PriorityInheritanceMutex() { - if(_impl != 0) + if(_impl != 0) delete _impl; } @@ -85,7 +85,7 @@ namespace ZThread { // P void PriorityInheritanceMutex::acquire() { - _impl->acquire(); + _impl->acquire(); } @@ -93,14 +93,14 @@ namespace ZThread { // P bool PriorityInheritanceMutex::tryAcquire(unsigned long ms) { - return _impl->tryAcquire(ms); + return _impl->tryAcquire(ms); } // V void PriorityInheritanceMutex::release() { - _impl->release(); + _impl->release(); } diff --git a/dep/src/zthread/PriorityMutex.cxx b/dep/src/zthread/PriorityMutex.cxx index c25eaebc46c..1823c82f40d 100644 --- a/dep/src/zthread/PriorityMutex.cxx +++ b/dep/src/zthread/PriorityMutex.cxx @@ -29,15 +29,15 @@ namespace ZThread { class PriorityMutexImpl : public MutexImpl<priority_list, NullBehavior> { }; - PriorityMutex::PriorityMutex() { - + PriorityMutex::PriorityMutex() { + _impl = new PriorityMutexImpl(); - + } PriorityMutex::~PriorityMutex() { - if(_impl != 0) + if(_impl != 0) delete _impl; } @@ -45,7 +45,7 @@ namespace ZThread { // P void PriorityMutex::acquire() { - _impl->acquire(); + _impl->acquire(); } @@ -53,14 +53,14 @@ namespace ZThread { // P bool PriorityMutex::tryAcquire(unsigned long ms) { - return _impl->tryAcquire(ms); + return _impl->tryAcquire(ms); } // V void PriorityMutex::release() { - _impl->release(); + _impl->release(); } diff --git a/dep/src/zthread/PrioritySemaphore.cxx b/dep/src/zthread/PrioritySemaphore.cxx index 15138b5f426..cdefe3a4aed 100644 --- a/dep/src/zthread/PrioritySemaphore.cxx +++ b/dep/src/zthread/PrioritySemaphore.cxx @@ -26,10 +26,10 @@ namespace ZThread { - class PrioritySemaphoreImpl : public SemaphoreImpl<priority_list> { + class PrioritySemaphoreImpl : public SemaphoreImpl<priority_list> { public: - PrioritySemaphoreImpl(int count, unsigned int maxCount) + PrioritySemaphoreImpl(int count, unsigned int maxCount) : SemaphoreImpl<priority_list>(count, maxCount, true) { } }; @@ -41,9 +41,9 @@ namespace ZThread { * @param maxCount maximum size of the semaphore count */ PrioritySemaphore::PrioritySemaphore(int count, unsigned int maxCount) { - + _impl = new PrioritySemaphoreImpl(count, maxCount); - + } PrioritySemaphore::~PrioritySemaphore() { diff --git a/dep/src/zthread/RecursiveMutex.cxx b/dep/src/zthread/RecursiveMutex.cxx index 57994f55b81..ad029488725 100644 --- a/dep/src/zthread/RecursiveMutex.cxx +++ b/dep/src/zthread/RecursiveMutex.cxx @@ -26,14 +26,14 @@ namespace ZThread { RecursiveMutex::RecursiveMutex() { - + _impl = new RecursiveMutexImpl(); - + } RecursiveMutex::~RecursiveMutex() { - if(_impl != (RecursiveMutexImpl*)0 ) + if(_impl != (RecursiveMutexImpl*)0 ) delete _impl; } @@ -41,20 +41,20 @@ namespace ZThread { void RecursiveMutex::acquire() { - _impl->acquire(); + _impl->acquire(); } bool RecursiveMutex::tryAcquire(unsigned long ms) { - return _impl->tryAcquire(ms); + return _impl->tryAcquire(ms); } void RecursiveMutex::release() { - _impl->release(); + _impl->release(); } diff --git a/dep/src/zthread/RecursiveMutexImpl.cxx b/dep/src/zthread/RecursiveMutexImpl.cxx index 41ca03547f8..adee8004278 100644 --- a/dep/src/zthread/RecursiveMutexImpl.cxx +++ b/dep/src/zthread/RecursiveMutexImpl.cxx @@ -39,9 +39,9 @@ namespace ZThread { * @exception Initialization_Exception thrown if resources could not be * properly allocated */ - RecursiveMutexImpl::RecursiveMutexImpl() + RecursiveMutexImpl::RecursiveMutexImpl() : _owner(0), _count(0) { - + } /** @@ -52,14 +52,14 @@ namespace ZThread { #ifndef NDEBUG // It is an error to destroy a mutex that has not been released - if(_owner != 0) { + if(_owner != 0) { ZTDEBUG("** You are destroying a mutex which was never released. **\n"); assert(0); // Destroyed mutex while in use } - if(!_waiters.empty()) { + if(!_waiters.empty()) { ZTDEBUG("** You are destroying a mutex which is blocking %d threads. **\n", _waiters.size()); assert(0); // Destroyed mutex while in use @@ -78,10 +78,10 @@ namespace ZThread { Monitor::STATE state; Guard<FastLock> g1(_lock); - - // If there is an entry count and the current thread is + + // If there is an entry count and the current thread is // the owner, increment the count and continue. - if(_owner == &m) + if(_owner == &m) _count++; else { @@ -91,11 +91,11 @@ namespace ZThread { assert(_count == 0); - _owner = &m; + _owner = &m; _count++; } else { // Otherwise, wait() - + _waiters.push_back(&m); m.acquire(); @@ -108,7 +108,7 @@ namespace ZThread { } m.release(); - + // Remove from waiter list, regarless of weather release() is called or // not. The monitor is sticky, so its possible a state 'stuck' from a // previous operation and will leave the wait() w/o release() having @@ -117,39 +117,39 @@ namespace ZThread { if(i != _waiters.end()) _waiters.erase(i); - // If awoke due to a notify(), take ownership. + // If awoke due to a notify(), take ownership. switch(state) { case Monitor::SIGNALED: - + assert(_owner == 0); assert(_count == 0); _owner = &m; _count++; - + break; case Monitor::INTERRUPTED: throw Interrupted_Exception(); - + default: throw Synchronization_Exception(); - } - + } + } - + } } bool RecursiveMutexImpl::tryAcquire(unsigned long timeout) { - + // Get the monitor for the current thread Monitor& m = ThreadImpl::current()->getMonitor(); Guard<FastLock> g1(_lock); - - // If there is an entry count and the current thread is + + // If there is an entry count and the current thread is // the owner, increment the count and continue. if(_owner == &m) _count++; @@ -176,14 +176,14 @@ namespace ZThread { m.acquire(); { - + Guard<FastLock, UnlockedScope> g2(g1); state = m.wait(timeout); - + } m.release(); - + } // Remove from waiter list, regarless of weather release() is called or @@ -194,7 +194,7 @@ namespace ZThread { if(i != _waiters.end()) _waiters.erase(i); - // If awoke due to a notify(), take ownership. + // If awoke due to a notify(), take ownership. switch(state) { case Monitor::SIGNALED: @@ -203,21 +203,21 @@ namespace ZThread { _owner = &m; _count++; - + break; case Monitor::INTERRUPTED: throw Interrupted_Exception(); - + case Monitor::TIMEDOUT: return false; default: throw Synchronization_Exception(); - } - + } + } - + } return true; @@ -237,7 +237,7 @@ namespace ZThread { // Update the count, if it has reached 0, wake another waiter. if(--_count == 0) { - + _owner = 0; // Try to find a waiter with a backoff & retry scheme @@ -245,24 +245,24 @@ namespace ZThread { // Go through the list, attempt to notify() a waiter. for(List::iterator i = _waiters.begin(); i != _waiters.end();) { - + // Try the monitor lock, if it cant be locked skip to the next waiter Monitor* n = *i; if(n->tryAcquire()) { - - // If notify() is not sucessful, it is because the wait() has already + + // If notify() is not sucessful, it is because the wait() has already // been ended (killed/interrupted/notify'd) bool woke = n->notify(); n->release(); - + // Once notify() succeeds, return if(woke) return; - + } else ++i; - + } - + if(_waiters.empty()) return; @@ -276,7 +276,7 @@ namespace ZThread { } } - + } } // namespace ZThread diff --git a/dep/src/zthread/RecursiveMutexImpl.h b/dep/src/zthread/RecursiveMutexImpl.h index 1e477136f52..0c0e20020cc 100644 --- a/dep/src/zthread/RecursiveMutexImpl.h +++ b/dep/src/zthread/RecursiveMutexImpl.h @@ -76,3 +76,4 @@ namespace ZThread { }; #endif + diff --git a/dep/src/zthread/Scheduling.h b/dep/src/zthread/Scheduling.h index 00061341d62..c9df80cbe39 100644 --- a/dep/src/zthread/Scheduling.h +++ b/dep/src/zthread/Scheduling.h @@ -94,3 +94,4 @@ namespace ZThread { } // namespace ZThread #endif // __ZTSCHEDULING_H__ + diff --git a/dep/src/zthread/Semaphore.cxx b/dep/src/zthread/Semaphore.cxx index b9fb8d0f613..f15254eb7ee 100644 --- a/dep/src/zthread/Semaphore.cxx +++ b/dep/src/zthread/Semaphore.cxx @@ -32,9 +32,9 @@ namespace ZThread { * @param maxCount maximum size of the semaphore count */ Semaphore::Semaphore(int count, unsigned int maxCount) { - + _impl = new FifoSemaphoreImpl(count, maxCount, true); - + } Semaphore::~Semaphore() { diff --git a/dep/src/zthread/SemaphoreImpl.h b/dep/src/zthread/SemaphoreImpl.h index 7f1b866c387..d5a8df30872 100644 --- a/dep/src/zthread/SemaphoreImpl.h +++ b/dep/src/zthread/SemaphoreImpl.h @@ -346,3 +346,4 @@ namespace ZThread { } // namespace ZThread #endif // __ZTSEMAPHOREIMPL_H__ + diff --git a/dep/src/zthread/State.h b/dep/src/zthread/State.h index 96697c9d4bd..6250f31599c 100644 --- a/dep/src/zthread/State.h +++ b/dep/src/zthread/State.h @@ -149,3 +149,4 @@ class State { }; #endif + diff --git a/dep/src/zthread/Status.h b/dep/src/zthread/Status.h index a56d505a8f4..cdc050430c0 100644 --- a/dep/src/zthread/Status.h +++ b/dep/src/zthread/Status.h @@ -177,3 +177,4 @@ namespace ZThread { }; // namespace ZThread #endif + diff --git a/dep/src/zthread/SynchronousExecutor.cxx b/dep/src/zthread/SynchronousExecutor.cxx index 0dc75b5f676..da49797ee94 100644 --- a/dep/src/zthread/SynchronousExecutor.cxx +++ b/dep/src/zthread/SynchronousExecutor.cxx @@ -24,12 +24,12 @@ namespace ZThread { - SynchronousExecutor::SynchronousExecutor() + SynchronousExecutor::SynchronousExecutor() : _canceled(false) {} SynchronousExecutor::~SynchronousExecutor() { } - + void SynchronousExecutor::cancel() { Guard<Mutex> g(_lock); @@ -38,41 +38,41 @@ namespace ZThread { } bool SynchronousExecutor::isCanceled() { - + Guard<Mutex> g(_lock); return _canceled; - + } void SynchronousExecutor::interrupt() { } void SynchronousExecutor::execute(const Task& task) { - - // Canceled Executors will not accept new tasks, quick + + // Canceled Executors will not accept new tasks, quick // check to avoid excessive locking in the canceled state - if(_canceled) + if(_canceled) throw Cancellation_Exception(); - + Guard<Mutex> g(_lock); - + if(_canceled) // Double check throw Cancellation_Exception(); - + // Run the task. Task(task)->run(); - - } + + } void SynchronousExecutor::wait() { - + if(Thread::interrupted()) throw Interrupted_Exception(); - + Guard<Mutex> g(_lock); - + } - + /** * @see Executor::wait(unsigned long) */ @@ -80,11 +80,11 @@ namespace ZThread { if(Thread::interrupted()) throw Interrupted_Exception(); - + Guard<Mutex> g(_lock); return true; - + } - - + + } diff --git a/dep/src/zthread/TSS.h b/dep/src/zthread/TSS.h index ed29230ec57..a81d5b5e128 100644 --- a/dep/src/zthread/TSS.h +++ b/dep/src/zthread/TSS.h @@ -50,3 +50,4 @@ #endif #endif // __ZTTSSSELECT_H__ + diff --git a/dep/src/zthread/Thread.cxx b/dep/src/zthread/Thread.cxx index 25cde79969c..5ed7fc3e998 100644 --- a/dep/src/zthread/Thread.cxx +++ b/dep/src/zthread/Thread.cxx @@ -27,20 +27,20 @@ namespace ZThread { - Thread::Thread() - : _impl( ThreadImpl::current() ) { + Thread::Thread() + : _impl( ThreadImpl::current() ) { - // ThreadImpl's start out life with a reference count + // ThreadImpl's start out life with a reference count // of one, and the they are added to the ThreadQueue. _impl->addReference(); - + } Thread::Thread(const Task& task, bool autoCancel) - : _impl( new ThreadImpl(task, autoCancel) ) { - + : _impl( new ThreadImpl(task, autoCancel) ) { + _impl->addReference(); - + } bool Thread::operator==(const Thread& t) const { @@ -94,7 +94,7 @@ namespace ZThread { return _impl->interrupt(); } - + void Thread::cancel() { if(ThreadImpl::current() == _impl) @@ -102,7 +102,7 @@ namespace ZThread { _impl->cancel(); - } + } bool Thread::isCanceled() { @@ -124,4 +124,4 @@ namespace ZThread { } -} // namespace ZThread +} // namespace ZThread diff --git a/dep/src/zthread/ThreadImpl.cxx b/dep/src/zthread/ThreadImpl.cxx index c7c22883b5e..fa2fd9e36c5 100644 --- a/dep/src/zthread/ThreadImpl.cxx +++ b/dep/src/zthread/ThreadImpl.cxx @@ -34,88 +34,88 @@ namespace ZThread { TSS<ThreadImpl*> ThreadImpl::_threadMap; namespace { - + class Launcher : public Runnable { - + ThreadImpl* x; ThreadImpl* y; Task z; - + public: - + Launcher(ThreadImpl* a, ThreadImpl* b, const Task& c) : x(a), y(b), z(c) {} - - void run() { - y->dispatch(x,y,z); + + void run() { + y->dispatch(x,y,z); } - + }; - + } - ThreadImpl::ThreadImpl() + ThreadImpl::ThreadImpl() : _state(State::REFERENCE), _priority(Medium), _autoCancel(false) { - + ZTDEBUG("Reference thread created.\n"); - + } - ThreadImpl::ThreadImpl(const Task& task, bool autoCancel) + ThreadImpl::ThreadImpl(const Task& task, bool autoCancel) : _state(State::IDLE), _priority(Medium), _autoCancel(autoCancel) { - + ZTDEBUG("User thread created.\n"); start(task); } - - + + ThreadImpl::~ThreadImpl() { - + _tls.clear(); if(isActive()) { - + ZTDEBUG("You are destroying an executing thread!\n"); abort(); - + } - + ZTDEBUG("Thread destroyed.\n"); - + } - + Monitor& ThreadImpl::getMonitor() { return _monitor; } - + void ThreadImpl::cancel(bool autoCancel) { - if(!autoCancel || _autoCancel) - _monitor.cancel(); + if(!autoCancel || _autoCancel) + _monitor.cancel(); } - - bool ThreadImpl::interrupt() { - return _monitor.interrupt(); + + bool ThreadImpl::interrupt() { + return _monitor.interrupt(); } - + bool ThreadImpl::isInterrupted() { return _monitor.isInterrupted(); } - + bool ThreadImpl::isCanceled() { return _monitor.isCanceled(); } Priority ThreadImpl::getPriority() const { - return _priority; + return _priority; } - - + + bool ThreadImpl::isReference() { return _state.isReference(); } - + /** * Join the thread, blocking the caller until it is interrupted or until * the thread represented by this object exits. @@ -124,27 +124,27 @@ namespace ZThread { * joined. */ bool ThreadImpl::join(unsigned long timeout) { - + // Serial access to this ThreadImpl's state Guard<Monitor> g1(_monitor); - + // Make sure a thread is not trying to join() itself. if(ThreadOps::isCurrent(this)) throw Deadlock_Exception("Cannot join self."); - - // Reference threads can't be joined. + + // Reference threads can't be joined. if(_state.isReference()) throw InvalidOp_Exception("Can not join this thread."); - - /* - - TODO: Insert cyclic join check. - + + /* + + TODO: Insert cyclic join check. + */ - + // If the task has not completed yet, wait for completion if(!_state.isJoined()) { - + // Add the current thread to the joiner list ThreadImpl* impl = current(); _joiners.push_back(impl); @@ -153,49 +153,49 @@ namespace ZThread { { // Release this ThreadImpl's lock while the joiner sleeps - _monitor.release(); + _monitor.release(); Guard<Monitor> g3(impl->getMonitor()); - + result = impl->_monitor.wait(timeout); - + _monitor.acquire(); - + } - + // Update the joiner list List::iterator i = std::find(_joiners.begin(), _joiners.end(), impl); if(i != _joiners.end()) _joiners.erase(i); - - + + switch(result) { - + case Monitor::TIMEDOUT: return false; - + case Monitor::INTERRUPTED: throw Interrupted_Exception(); - + default: break; - + } - + } return true; - + } - + /** * Translate the priority into a pthread value, and update the thread priority. * - * This is not available on all platforms, and probably works differently - * the platforms that do support it. Pthreads does not have very portable + * This is not available on all platforms, and probably works differently + * the platforms that do support it. Pthreads does not have very portable * priority support as far I am aware. * - * If SCHED_OTHER is not supported priority values are still set but + * If SCHED_OTHER is not supported priority values are still set but * dont not actually in affect anything. * * @param prio PRIORITY value @@ -204,18 +204,18 @@ namespace ZThread { * @exception InvalidOp_Exception thrown by IDLE, JOINING or JOINED threads. */ void ThreadImpl::setPriority(Priority p) { - + Guard<Monitor> g(_monitor); - + // Only set the native priority when the thread is running if(_state.isRunning()) ThreadOps::setPriority(this, p); - + _priority = p; - + } - - + + /** * Test the state Monitor of this thread to determine if the thread * is an active thread created by zthreads. @@ -223,13 +223,13 @@ namespace ZThread { * @return bool indicating the activity of the thread. */ bool ThreadImpl::isActive() { - + Guard<Monitor> g(_monitor); return _state.isRunning(); - + } - - + + /** * Get a reference to an implmenetation that maps to the current thread. * Accomplished by checking the TLS map. This will always return a valid @@ -237,98 +237,98 @@ namespace ZThread { * * @return ThreadImpl* current implementation that maps to the * executing thread. - */ + */ ThreadImpl* ThreadImpl::current() { - + // Get the ThreadImpl previously mapped onto the executing thread. ThreadImpl* impl = _threadMap.get(); - + // Create a reference thread for any threads that have been 'discovered' // because they are not created by ZThreads. - if(impl == 0) { - - // Create a ThreadImpl to represent this thread. + if(impl == 0) { + + // Create a ThreadImpl to represent this thread. impl = new ThreadImpl(); impl->_state.setReference(); - + ThreadOps::activate(impl); - + // Map a reference thread and insert it into the queue _threadMap.set(impl); - + ThreadQueue::instance()->insertReferenceThread(impl); - + } - + assert(impl != 0); return impl; - + } - + /** * Make current thread sleep for the given number of milliseconds. * This sleep can be interrupt()ed. - * + * * @param ms timeout for the sleep. * * @post the calling thread is blocked by waiting on the internal condition * variable. This can be signaled in the monitor of an interrupt */ void ThreadImpl::sleep(unsigned long ms) { - + // Make sleep()ing for 0 milliseconds equivalent to a yield. if(ms == 0) { - + yield(); return; - + } - + // Get the monitor for the current thread Monitor& monitor = current()->getMonitor(); - + // Acquire that threads Monitor with a Guard Guard<Monitor> g(monitor); - + for(;;) { - + switch(monitor.wait(ms)) { - + case Monitor::INTERRUPTED: throw Interrupted_Exception(); - + default: return; - + } - + } - + } - - + + /** - * Yield the current timeslice to another thread. - * If sched_yield() is available it is used. + * Yield the current timeslice to another thread. + * If sched_yield() is available it is used. * Otherwise, the state Monitor for this thread is used to simiulate a - * yield by blocking for 1 millisecond, which should give the + * yield by blocking for 1 millisecond, which should give the * scheduler a chance to schedule another thread. */ void ThreadImpl::yield() { - - // Try to yield with the native operation. If it fails, then + + // Try to yield with the native operation. If it fails, then // simulate with a short wait() on the monitor. if(!ThreadOps::yield()) { - + // Get the monitor for the current thread Monitor& monitor = current()->getMonitor(); - + // Attempt a wait(). - Guard<Monitor> g(monitor); + Guard<Monitor> g(monitor); monitor.wait(1); - + } - + } void ThreadImpl::start(const Task& task) { @@ -338,9 +338,9 @@ namespace ZThread { // A Thread must be idle in order to be eligable to run a task. if(!_state.isIdle()) throw InvalidOp_Exception("Thread is not idle."); - + _state.setRunning(); - + // Spawn a new thread, blocking the parent (current) thread until // the child starts. @@ -353,14 +353,14 @@ namespace ZThread { if(!spawn(&launch)) { // Return to the idle state & report the error if it doesn't work out. - _state.setIdle(); - throw Synchronization_Exception(); + _state.setIdle(); + throw Synchronization_Exception(); } // Wait, uninterruptably, for the child's signal. The parent thread - // still can be interrupted and killed; it just won't take effect + // still can be interrupted and killed; it just won't take effect // until the child has started. Guard<Monitor, DeferredInterruptionScope> g3(parent->_monitor); @@ -368,7 +368,7 @@ namespace ZThread { if(parent->_monitor.wait() != Monitor::SIGNALED) { assert(0); } - + } @@ -378,23 +378,23 @@ namespace ZThread { // Map the implementation object onto the running thread. _threadMap.set(impl); - // Update the reference count on a ThreadImpl before the 'Thread' + // Update the reference count on a ThreadImpl before the 'Thread' // that owns it can go out of scope (by signaling the parent) impl->addReference(); // Update the priority of the thread - if(parent->_state.isReference()) - ThreadOps::setPriority(impl, + if(parent->_state.isReference()) + ThreadOps::setPriority(impl, parent->_state.isReference() ? impl->_priority : parent->_priority); // Inherit ThreadLocal values from the parent typedef ThreadLocalMap::const_iterator It; - for(It i = parent->getThreadLocalMap().begin(); i != parent->getThreadLocalMap().end(); ++i) + for(It i = parent->getThreadLocalMap().begin(); i != parent->getThreadLocalMap().end(); ++i) if( (i->second)->isInheritable() ) impl->getThreadLocalMap()[ i->first ] = (i->second)->clone(); - - // Insert a user-thread mapping + + // Insert a user-thread mapping ThreadQueue::instance()->insertUserThread(impl); // Wake the parent once the thread is setup parent->_monitor.notify(); @@ -403,65 +403,65 @@ namespace ZThread { // not catch exceptions, let program terminate //try { - + task->run(); //} catch(...) { // Result of running a task that threw an exception. // ZTDEBUG("The task has thrown an unhandled exception\n"); - //assert(0); // UQ1: Go to debugger... - + //assert(0); // UQ1: Go to debugger... + //} - ZTDEBUG("Thread joining...\n"); - + ZTDEBUG("Thread joining...\n"); + { // Update the state of the thread - + Guard<Monitor> g(impl->_monitor); impl->_state.setJoined(); - + // Wake the joiners that will be easy to join first for(List::iterator i = impl->_joiners.begin(); i != impl->_joiners.end();) { - + ThreadImpl* joiner = *i; Monitor& m = joiner->getMonitor(); if(m.tryAcquire()) { - + m.notify(); - m.release(); - + m.release(); + i = impl->_joiners.erase(i); } else ++i; - } + } // Wake the joiners that might take a while next for(List::iterator i = impl->_joiners.begin(); i != impl->_joiners.end(); ++i) { - + ThreadImpl* joiner = *i; Monitor& m = joiner->getMonitor(); m.acquire(); m.notify(); - m.release(); - + m.release(); + } - + } - ZTDEBUG("Thread exiting...\n"); + ZTDEBUG("Thread exiting...\n"); - // Insert a pending-thread mapping, allowing the resources to be reclaimed + // Insert a pending-thread mapping, allowing the resources to be reclaimed ThreadQueue::instance()->insertPendingThread(impl); // Cleanup ThreadLocal values impl->getThreadLocalMap().clear(); - // Update the reference count allowing it to be destroyed + // Update the reference count allowing it to be destroyed impl->delReference(); } diff --git a/dep/src/zthread/ThreadImpl.h b/dep/src/zthread/ThreadImpl.h index f464242918c..78b414b63e7 100644 --- a/dep/src/zthread/ThreadImpl.h +++ b/dep/src/zthread/ThreadImpl.h @@ -120,3 +120,4 @@ class ThreadImpl : public IntrusivePtr<ThreadImpl, FastLock>, public ThreadOps { } // namespace ZThread #endif // __ZTTHREADIMPL_H__ + diff --git a/dep/src/zthread/ThreadLocalImpl.cxx b/dep/src/zthread/ThreadLocalImpl.cxx index 25682e66325..502a70734dc 100644 --- a/dep/src/zthread/ThreadLocalImpl.cxx +++ b/dep/src/zthread/ThreadLocalImpl.cxx @@ -27,13 +27,13 @@ namespace ZThread { ThreadLocalImpl::ThreadLocalImpl() {} - ThreadLocalImpl::~ThreadLocalImpl() {} - + ThreadLocalImpl::~ThreadLocalImpl() {} + void ThreadLocalImpl::clearAll() { typedef ThreadImpl::ThreadLocalMap Map; Map& m = ThreadImpl::current()->getThreadLocalMap(); - + m.clear(); } @@ -42,25 +42,25 @@ namespace ZThread { typedef ThreadImpl::ThreadLocalMap Map; Map& m = ThreadImpl::current()->getThreadLocalMap(); - + Map::iterator i = m.find(this); - if(i != m.end()) + if(i != m.end()) m.erase(i); - } + } ThreadLocalImpl::ValuePtr ThreadLocalImpl::value( ValuePtr(*pfn)() ) const { - + typedef ThreadImpl::ThreadLocalMap Map; Map& m = ThreadImpl::current()->getThreadLocalMap(); - + Map::iterator i = m.find(this); - if(i != m.end()) + if(i != m.end()) return i->second; - + m[ this ] = ValuePtr( pfn() ); return m[ this ]; } -} // namespace ZThread +} // namespace ZThread diff --git a/dep/src/zthread/ThreadOps.cxx b/dep/src/zthread/ThreadOps.cxx index 53a3e4457bc..5917891028b 100644 --- a/dep/src/zthread/ThreadOps.cxx +++ b/dep/src/zthread/ThreadOps.cxx @@ -26,10 +26,10 @@ #include "ThreadOps.h" // This file will select an implementation for a ThreadOps based on -// what ThreadOps.h selects. This method is for selecting the +// what ThreadOps.h selects. This method is for selecting the // source files, to improve portability. Currently, the project is // based on the autoconf tool-set, which doesn't support conditional -// compilation well. Additionally, this should make the library +// compilation well. Additionally, this should make the library // easier to port since its working around conditional compilation // by using C++ features and people won't have to fiddle around with // their make tool as much to compile the source diff --git a/dep/src/zthread/ThreadOps.h b/dep/src/zthread/ThreadOps.h index d8737158e3e..86b7e1301ca 100644 --- a/dep/src/zthread/ThreadOps.h +++ b/dep/src/zthread/ThreadOps.h @@ -65,3 +65,4 @@ #endif #endif // __ZTTHREADOPSSELECT_H__ + diff --git a/dep/src/zthread/ThreadQueue.cxx b/dep/src/zthread/ThreadQueue.cxx index 02349504641..d0493a5eabf 100644 --- a/dep/src/zthread/ThreadQueue.cxx +++ b/dep/src/zthread/ThreadQueue.cxx @@ -29,9 +29,9 @@ #include <deque> namespace ZThread { - - ThreadQueue::ThreadQueue() - : _waiter(0) { + + ThreadQueue::ThreadQueue() + : _waiter(0) { ZTDEBUG("ThreadQueue created\n"); @@ -52,36 +52,36 @@ namespace ZThread { TaskList shutdownTasks; { // Check the queue to for pending user threads - + Guard<FastLock> g(_lock); - + waitRequired = (_waiter != (ThreadImpl*)1); _waiter = impl; - + threadsWaiting = !_userThreads.empty() || !_pendingThreads.empty(); - + //ZTDEBUG("Wait required: %d\n", waitRequired); //ZTDEBUG("Threads waiting: %d\n", threadsWaiting); - + // Auto-cancel any active threads at the time main() goes out of scope - // "force" a gentle exit from the executing tasks; eventually the user- + // "force" a gentle exit from the executing tasks; eventually the user- // threads will transition into pending-threads pollUserThreads(); - + // Remove all the tasks about to be run from the task list so an indication // can be given to threads calling removeShutdownTask() too late. - std::remove_copy(_shutdownTasks.begin(), - _shutdownTasks.end(), - std::back_inserter(shutdownTasks), - Task((Runnable*)0)); - + std::remove_copy(_shutdownTasks.begin(), + _shutdownTasks.end(), + std::back_inserter(shutdownTasks), + Task((Runnable*)0)); + //ZTDEBUG("Threads waiting: %d\n", threadsWaiting); - + } // Execute the shutdown tasks for(TaskList::iterator i = shutdownTasks.begin(); i != shutdownTasks.end(); ++i) { - try { + try { (*i)->run(); } catch(...) { } } @@ -93,20 +93,20 @@ namespace ZThread { Monitor& m = _waiter->getMonitor(); - + // Defer interruption while this thread waits for a signal from // the last pending user thread Guard<Monitor, CompoundScope<DeferredInterruptionScope, LockedScope> > g(m); //ZTDEBUG("Threads waiting: %d %d\n", _userThreads.size(), _pendingThreads.size()); // Avoid race-condition where the last threads are done with thier tasks, but - // only begin the final part of the clean up phase after this destructor begins + // only begin the final part of the clean up phase after this destructor begins // to run. Takes advantage of the fact that if all remaining threads have transitioned // into a pending state by the time execution reaches this point, then there is no // need to wait. waitRequired = waitRequired && !(_userThreads.empty() && !_pendingThreads.empty()); - // Reference threads can't be interrupted or otherwise + // Reference threads can't be interrupted or otherwise // manipulated. The only signal this monitor will receive // at this point will be from the last pending thread. if(waitRequired && m.wait() != Monitor::SIGNALED) { @@ -115,16 +115,16 @@ namespace ZThread { // Join those pending threads pollPendingThreads(); - + } - + // Clean up the reference threads - pollReferenceThreads(); - + pollReferenceThreads(); + ZTDEBUG("ThreadQueue destroyed\n"); } - + void ThreadQueue::insertPendingThread(ThreadImpl* impl) { ZTDEBUG("insertPendingThread()\n"); @@ -136,7 +136,7 @@ namespace ZThread { _userThreads.erase(i); _pendingThreads.push_back(impl); - + // Wake the main thread,if its waiting, when the last pending-thread becomes available; // Otherwise, take note that no wait for pending threads to finish is needed if(_userThreads.empty()) @@ -171,7 +171,7 @@ namespace ZThread { impl->cancel(true); ZTDEBUG("1 user-thread added.\n"); - + } @@ -183,9 +183,9 @@ namespace ZThread { ThreadImpl* impl = (ThreadImpl*)*i; ThreadOps::join(impl); - + impl->delReference(); - + i = _pendingThreads.erase(i); ZTDEBUG("1 pending-thread reclaimed.\n"); @@ -199,14 +199,14 @@ namespace ZThread { ZTDEBUG("pollReferenceThreads()\n"); for(ThreadList::iterator i = _referenceThreads.begin(); i != _referenceThreads.end(); ++i) { - + ThreadImpl* impl = (ThreadImpl*)*i; impl->delReference(); - + ZTDEBUG("1 reference-thread reclaimed.\n"); } - + } void ThreadQueue::pollUserThreads() { @@ -219,11 +219,11 @@ namespace ZThread { impl->cancel(true); ZTDEBUG("1 user-thread reclaimed.\n"); - + } } - + void ThreadQueue::insertShutdownTask(Task& task) { bool hasWaiter = false; @@ -231,34 +231,34 @@ namespace ZThread { { Guard<FastLock> g(_lock); - - // Execute later when the ThreadQueue is destroyed + + // Execute later when the ThreadQueue is destroyed if( !(hasWaiter = (_waiter != 0)) ) { _shutdownTasks.push_back(task); //ZTDEBUG("1 shutdown task added. %d\n", _shutdownTasks.size()); - + } } - + // Execute immediately if things are shutting down if(hasWaiter) task->run(); - + } - + bool ThreadQueue::removeShutdownTask(const Task& task) { - + Guard<FastLock> g(_lock); - + TaskList::iterator i = std::find(_shutdownTasks.begin(), _shutdownTasks.end(), task); bool removed = (i != _shutdownTasks.end()); if(removed) _shutdownTasks.erase(i); //ZTDEBUG("1 shutdown task removed (%d)-%d\n", removed, _shutdownTasks.size()); - + return removed; } diff --git a/dep/src/zthread/ThreadQueue.h b/dep/src/zthread/ThreadQueue.h index 72049fda3b2..52761a408c6 100644 --- a/dep/src/zthread/ThreadQueue.h +++ b/dep/src/zthread/ThreadQueue.h @@ -132,3 +132,4 @@ namespace ZThread { #endif // __ZTTHREADQUEUE_H__ + diff --git a/dep/src/zthread/ThreadedExecutor.cxx b/dep/src/zthread/ThreadedExecutor.cxx index 44a213e8daa..e33dda4ab5e 100644 --- a/dep/src/zthread/ThreadedExecutor.cxx +++ b/dep/src/zthread/ThreadedExecutor.cxx @@ -31,11 +31,11 @@ namespace ZThread { namespace { - //! + //! class WaiterQueue { typedef std::deque<ThreadImpl*> ThreadList; - + typedef struct group_t { size_t id; size_t count; @@ -61,14 +61,14 @@ namespace ZThread { void operator()(const Group& grp) { count += grp.count; } operator size_t() { return count; } }; - + FastMutex _lock; GroupList _list; size_t _id; size_t _generation; public: - + WaiterQueue() : _id(0), _generation(0) { // At least one empty-group exists _list.push_back( Group(_id++) ); @@ -96,15 +96,15 @@ namespace ZThread { if((size_t)std::for_each(_list.begin(), _list.end(), counter()) < 1) return true; - // Update the waiter list for the active group + // Update the waiter list for the active group _list.back().waiters.push_back(self); size_t n = _list.back().id; m.acquire(); - + { - - Guard<Lockable, UnlockedScope> g2(g1); + + Guard<Lockable, UnlockedScope> g2(g1); state = timeout == 0 ? m.wait() : m.wait(timeout); } @@ -135,22 +135,22 @@ namespace ZThread { throw Interrupted_Exception(); default: throw Synchronization_Exception(); - } - + } + return true; } - + /** * Increment the active group count * * @pre at least 1 empty group exists - * @post at least 1 non-empty group exists + * @post at least 1 non-empty group exists */ std::pair<size_t, size_t> increment() { - + Guard<FastMutex> g(_lock); - + // At least one empty-group exists assert(!_list.empty()); @@ -169,7 +169,7 @@ namespace ZThread { // When the active group is being incremented, insert a new active group // to replace it if there were waiting threads - if(i == --_list.end() && !i->waiters.empty()) + if(i == --_list.end() && !i->waiters.empty()) _list.push_back(Group(_id++)); // At least 1 non-empty group exists @@ -178,13 +178,13 @@ namespace ZThread { return std::make_pair(n, _generation); } - + /** * Decrease the count for the group with the given id. * * @param n group id - * + * * @pre At least 1 non-empty group exists * @post At least 1 empty group exists */ @@ -198,7 +198,7 @@ namespace ZThread { // Find the requested group GroupList::iterator i = std::find_if(_list.begin(), _list.end(), by_id(n)); if(i == _list.end()) { - + // A group should never have been removed until // the final task in that group completed assert(0); @@ -207,11 +207,11 @@ namespace ZThread { // Decrease the count for tasks in this group, if(--i->count == 0 && i == _list.begin()) { - - do { + + do { // When the first group completes, wake all waiters for every - // group, starting from the first until a group that is not + // group, starting from the first until a group that is not // complete is reached /* @@ -219,29 +219,29 @@ namespace ZThread { if(i == --_list.end() && i->waiters.empty()) break; */ - + if( awaken(*i) ) { - - // If all waiters were awakened, remove the group + + // If all waiters were awakened, remove the group i = _list.erase(i); - + } else { - + { // Otherwise, unlock and yield allowing the waiter // lists to be updated if other threads are busy Guard<FastLock, UnlockedScope> g2(g1); ThreadImpl::yield(); - + } i = _list.begin(); } - - } while(i != _list.end() && i->count == 0); - + + } while(i != _list.end() && i->count == 0); + // Ensure that an active group exists if(_list.empty()) _list.push_back( Group(++_id) ); @@ -250,7 +250,7 @@ namespace ZThread { // At least one group exists assert(!_list.empty()); - + } /** @@ -261,74 +261,74 @@ namespace ZThread { return next ? _generation++ : _generation; } - + private: - + /** * Awaken all the waiters remaining in the given group - * + * * @return * - true if all the waiting threads were successfully awakened. * - false if there were one or more threads that could not be awakened. */ bool awaken(Group& grp) { - // Go through the waiter list in the given group; + // Go through the waiter list in the given group; for(ThreadList::iterator i = grp.waiters.begin(); i != grp.waiters.end();) { - + ThreadImpl* impl = *i; Monitor& m = impl->getMonitor(); - + // Try the monitor lock, if it cant be locked skip to the next waiter if(m.tryAcquire()) { - + // Notify the monitor & remove from the waiter list so time isn't // wasted checking it again. i = grp.waiters.erase(i); - + // Try to wake the waiter, it doesn't matter if this is successful - // or not (only fails when the monitor is already going to stop waiting). + // or not (only fails when the monitor is already going to stop waiting). m.notify(); m.release(); - + } else ++i; - + } - + return grp.waiters.empty(); } }; - //! Synchronization point for the Executor + //! Synchronization point for the Executor class ExecutorImpl { typedef std::deque<ThreadImpl*> ThreadList; bool _canceled; - FastMutex _lock; + FastMutex _lock; //! Worker threads ThreadList _threads; - + WaiterQueue _queue; public: ExecutorImpl() : _canceled(false) {} - WaiterQueue& getWaiterQueue() { + WaiterQueue& getWaiterQueue() { return _queue; } void registerThread(size_t generation) { - + // Interrupt slow starting threads if(getWaiterQueue().generation() != generation) ThreadImpl::current()->interrupt(); - // Enqueue for possible future interrupt() + // Enqueue for possible future interrupt() else { Guard<FastMutex> g(_lock); @@ -339,7 +339,7 @@ namespace ZThread { } void unregisterThread() { - + Guard<FastMutex> g(_lock); std::remove(_threads.begin(), _threads.end(), ThreadImpl::current() ); @@ -369,11 +369,11 @@ namespace ZThread { // Interrupt all the registered threads for(ThreadList::iterator i = _threads.begin(); i != _threads.end(); ++i) (*i)->interrupt(); - + // Bump the generation up, ensuring slow starting threads get this interrupt getWaiterQueue().generation( true ); - } + } }; /* ExecutorImpl */ @@ -392,7 +392,7 @@ namespace ZThread { : _impl(impl), _task(task) { std::pair<size_t, size_t> pr( _impl->getWaiterQueue().increment() ); - + _group = pr.first; _generation = pr.second; @@ -405,20 +405,20 @@ namespace ZThread { size_t generation() const { return _generation; } - + void run() { - + // Register this thread once its begun; the generation is used to ensure // threads that are slow starting are properly interrupted _impl->registerThread( generation() ); - + try { - _task->run(); + _task->run(); } catch(...) { /* consume the exceptions the work propogates */ } - + _impl->getWaiterQueue().decrement( group() ); // Unregister this thread @@ -434,30 +434,30 @@ namespace ZThread { ThreadedExecutor::ThreadedExecutor() : _impl(new ExecutorImpl) {} ThreadedExecutor::~ThreadedExecutor() {} - + void ThreadedExecutor::execute(const Task& task) { - + Thread t( new Worker(_impl, task) ); - } + } void ThreadedExecutor::interrupt() { _impl->interrupt(); } void ThreadedExecutor::cancel() { - _impl->cancel(); + _impl->cancel(); } - + bool ThreadedExecutor::isCanceled() { return _impl->isCanceled(); } - + void ThreadedExecutor::wait() { _impl->getWaiterQueue().wait(0); } - bool ThreadedExecutor::wait(unsigned long timeout) { + bool ThreadedExecutor::wait(unsigned long timeout) { return _impl->getWaiterQueue().wait(timeout == 0 ? 1 : timeout); } diff --git a/dep/src/zthread/Time.cxx b/dep/src/zthread/Time.cxx index 2409d93cb79..ee2b84a4e8a 100644 --- a/dep/src/zthread/Time.cxx +++ b/dep/src/zthread/Time.cxx @@ -27,7 +27,7 @@ using namespace ZThread; Time::Time() { - + // System startup time static TimeStrategy firstHelper; TimeStrategy helper; @@ -37,7 +37,7 @@ Time::Time() { now -= then; - _seconds = now.seconds(); + _seconds = now.seconds(); _milliseconds = now.milliseconds(); } diff --git a/dep/src/zthread/TimeStrategy.h b/dep/src/zthread/TimeStrategy.h index 249d8ab5a64..b82c06f05e2 100644 --- a/dep/src/zthread/TimeStrategy.h +++ b/dep/src/zthread/TimeStrategy.h @@ -84,3 +84,4 @@ #endif #endif // __ZTTIMESELECT_H__ + diff --git a/dep/src/zthread/config.h b/dep/src/zthread/config.h index 4ef2ca213d1..41deb93c0f6 100644 --- a/dep/src/zthread/config.h +++ b/dep/src/zthread/config.h @@ -93,3 +93,4 @@ /* No OS priority support */ /* #undef ZTHREAD_DISABLE_PRIORITY */ + diff --git a/dep/src/zthread/linux/AtomicCount.cxx b/dep/src/zthread/linux/AtomicCount.cxx index 28c2381c3b4..18b31e3a8ce 100644 --- a/dep/src/zthread/linux/AtomicCount.cxx +++ b/dep/src/zthread/linux/AtomicCount.cxx @@ -47,7 +47,7 @@ typedef struct atomic_count_t { AtomicCount::AtomicCount() { _value = reinterpret_cast<void*>(new ATOMIC_COUNT); - + } AtomicCount::~AtomicCount() { @@ -55,19 +55,19 @@ AtomicCount::~AtomicCount() { delete reinterpret_cast<ATOMIC_COUNT*>(_value); } - + void AtomicCount::increment() { atomic_inc(&reinterpret_cast<ATOMIC_COUNT*>(_value)->count); - + } - + bool AtomicCount::decrement() { return atomic_dec_and_test(&reinterpret_cast<ATOMIC_COUNT*>(_value)->count); - + } - + }; #endif // __ZTATOMICCOUNTIMPL_H__ diff --git a/dep/src/zthread/linux/AtomicFastLock.h b/dep/src/zthread/linux/AtomicFastLock.h index a416fef67cb..e5851c96d17 100644 --- a/dep/src/zthread/linux/AtomicFastLock.h +++ b/dep/src/zthread/linux/AtomicFastLock.h @@ -115,3 +115,4 @@ public: } // namespace ZThread #endif + diff --git a/dep/src/zthread/linux/FastRecursiveLock.h b/dep/src/zthread/linux/FastRecursiveLock.h index a9a74d21521..6ba392145ec 100644 --- a/dep/src/zthread/linux/FastRecursiveLock.h +++ b/dep/src/zthread/linux/FastRecursiveLock.h @@ -81,3 +81,4 @@ public: } // namespace ZThread #endif + diff --git a/dep/src/zthread/macos/FastLock.h b/dep/src/zthread/macos/FastLock.h index 0bd40e1f2fd..012843f2e3e 100644 --- a/dep/src/zthread/macos/FastLock.h +++ b/dep/src/zthread/macos/FastLock.h @@ -137,3 +137,4 @@ class FastLock : private NonCopyable { + diff --git a/dep/src/zthread/macos/Monitor.cxx b/dep/src/zthread/macos/Monitor.cxx index ab7806b13df..a6a2f58cb37 100644 --- a/dep/src/zthread/macos/Monitor.cxx +++ b/dep/src/zthread/macos/Monitor.cxx @@ -29,20 +29,20 @@ using namespace ZThread; Monitor::Monitor() : _owner(0), _waiting(false), _pending(false) { - + if(MPCreateSemaphore(1, 0, &_sema) != noErr) { assert(0); throw Initialization_Exception(); } } - + Monitor::~Monitor() throw() { assert(!_waiting); OSStatus status = MPDeleteSemaphore(_sema); - if(status != noErr) + if(status != noErr) assert(false); } @@ -53,9 +53,9 @@ Monitor::STATE Monitor::wait(unsigned long timeout) { // http://developer.apple.com/techpubs/macosx/Carbon/oss/MultiPServices/Multiprocessing_Services/index.html?http://developer.apple.com/techpubs/macosx/Carbon/oss/MultiPServices/Multiprocessing_Services/Functions/Creating_and_ssage_Queues.html AbsoluteTime tTarget; - Duration waitDuration = - (timeout == 0) ? kDurationForever : (kDurationMillisecond * timeout); - + Duration waitDuration = + (timeout == 0) ? kDurationForever : (kDurationMillisecond * timeout); + if(waitDuration != kDurationForever) tTarget = AddDurationToAbsolute(waitDuration, UpTime()); @@ -66,13 +66,13 @@ Monitor::STATE Monitor::wait(unsigned long timeout) { _owner = MPCurrentTaskID(); STATE state(INVALID); - + // Serialize access to the state of the Monitor // and test the state to determine if a wait is needed. _waitLock.acquire(); if(pending(ANYTHING)) { - + // Return without waiting when possible state = next(); @@ -80,57 +80,57 @@ Monitor::STATE Monitor::wait(unsigned long timeout) { return state; } - // Unlock the external lock if a wait() is probably needed. + // Unlock the external lock if a wait() is probably needed. // Access to the state is still serial. _lock.release(); // Wait for a transition in the state that is of interest, this - // allows waits to exclude certain flags (e.g. INTERRUPTED) + // allows waits to exclude certain flags (e.g. INTERRUPTED) // for a single wait() w/o actually discarding those flags - // they will remain set until a wait interested in those flags // occurs. // Wait, ignoring signals _waiting = true; - + _waitLock.release(); // Update the wait time - if(waitDuration != kDurationForever) + if(waitDuration != kDurationForever) waitDuration = AbsoluteDeltaToDuration(tTarget, UpTime()); - // Sleep until a signal arrives or a timeout occurs + // Sleep until a signal arrives or a timeout occurs OSStatus status = MPWaitOnSemaphore(_sema, waitDuration); // Reacquire serialized access to the state _waitLock.acquire(); - + // Awaken only when the event is set or the timeout expired assert(status == kMPTimeoutErr || status == noErr); - + if(status == kMPTimeoutErr) push(TIMEDOUT); // Get the next available STATE - state = next(); + state = next(); - _waiting = false; + _waiting = false; - // Its possible that a timeout will wake the thread before a signal is + // Its possible that a timeout will wake the thread before a signal is // delivered. Absorb that leftover so the next wait isn't aborted right away if(status == kMPTimeoutErr && _pending) { - + status = MPWaitOnSemaphore(_sema, kDurationForever); assert(status == noErr); } _pending = false; - + // Acquire the internal lock & release the external lock _waitLock.release(); - // Reaquire the external lock, keep from deadlocking threads calling + // Reaquire the external lock, keep from deadlocking threads calling // notify(), interrupt(), etc. _lock.acquire(); @@ -143,7 +143,7 @@ bool Monitor::interrupt() { // Serialize access to the state _waitLock.acquire(); - + bool wasInterruptable = !pending(INTERRUPTED); bool hasWaiter = false; @@ -151,7 +151,7 @@ bool Monitor::interrupt() { if(wasInterruptable) { push(INTERRUPTED); - + wasInterruptable = false; if(_waiting && !_pending) { @@ -159,7 +159,7 @@ bool Monitor::interrupt() { _pending = true; hasWaiter = true; - } else + } else wasInterruptable = !(_owner == MPCurrentTaskID()); } @@ -180,7 +180,7 @@ bool Monitor::isInterrupted() { bool wasInterrupted = pending(INTERRUPTED); clear(INTERRUPTED); - + _waitLock.release(); return wasInterrupted; @@ -227,12 +227,12 @@ bool Monitor::cancel() { bool wasInterrupted = !pending(INTERRUPTED); bool hasWaiter = false; - + push(CANCELED); // Update the state if theres a waiter if(wasInterrupted) { - + push(INTERRUPTED); if(_waiting && !_pending) { @@ -243,9 +243,9 @@ bool Monitor::cancel() { } } - + _waitLock.release(); - + if(hasWaiter && !masked(Monitor::INTERRUPTED)) MPSignalSemaphore(_sema); @@ -254,12 +254,12 @@ bool Monitor::cancel() { } bool Monitor::isCanceled() { - + // Serialize access to the state _waitLock.acquire(); - + bool wasCanceled = Status::examine(CANCELED); - + if(_owner == MPCurrentTaskID()) clear(INTERRUPTED); diff --git a/dep/src/zthread/macos/Monitor.h b/dep/src/zthread/macos/Monitor.h index 9fa3c9a5aa2..fa5b2ec7760 100644 --- a/dep/src/zthread/macos/Monitor.h +++ b/dep/src/zthread/macos/Monitor.h @@ -154,3 +154,4 @@ class Monitor : public Status, private NonCopyable { }; #endif + diff --git a/dep/src/zthread/macos/TSS.h b/dep/src/zthread/macos/TSS.h index 1be90c5f278..e73050c4612 100644 --- a/dep/src/zthread/macos/TSS.h +++ b/dep/src/zthread/macos/TSS.h @@ -118,3 +118,4 @@ namespace ZThread { #endif + diff --git a/dep/src/zthread/macos/ThreadOps.cxx b/dep/src/zthread/macos/ThreadOps.cxx index 6a1a4106877..ddb380992b0 100644 --- a/dep/src/zthread/macos/ThreadOps.cxx +++ b/dep/src/zthread/macos/ThreadOps.cxx @@ -27,25 +27,25 @@ namespace ZThread { -const ThreadOps ThreadOps::INVALID(0); +const ThreadOps ThreadOps::INVALID(0); + +ThreadOps::ThreadOps() : _queue(0), _tid(0) { -ThreadOps::ThreadOps() : _queue(0), _tid(0) { - if(MPCreateQueue(&_queue) != noErr) throw Initialization_Exception(); } ThreadOps::~ThreadOps() throw() { - + if(_queue != 0) { OSStatus status = MPDeleteQueue(_queue); - if(status != noErr) + if(status != noErr) assert(0); } - + } bool ThreadOps::join(ThreadOps* ops) { @@ -56,7 +56,7 @@ bool ThreadOps::join(ThreadOps* ops) { OSStatus status = MPWaitOnQueue(ops->_queue, NULL, NULL, NULL, kDurationForever); return status == noErr; - + } bool ThreadOps::yield() { @@ -91,13 +91,13 @@ OSStatus ThreadOps::_dispatch(void *arg) { // Run the task from the correct context task->run(); - + // Exit the thread MPExit(noErr); return noErr; } - + } // namespace ZThread diff --git a/dep/src/zthread/macos/ThreadOps.h b/dep/src/zthread/macos/ThreadOps.h index 5c4eb044e73..c0417f0bb2f 100644 --- a/dep/src/zthread/macos/ThreadOps.h +++ b/dep/src/zthread/macos/ThreadOps.h @@ -165,3 +165,4 @@ protected: #endif // __ZTTHREADOPS_H__ + diff --git a/dep/src/zthread/macos/UpTimeStrategy.h b/dep/src/zthread/macos/UpTimeStrategy.h index 0f7962d7eca..4d94a48f3cd 100644 --- a/dep/src/zthread/macos/UpTimeStrategy.h +++ b/dep/src/zthread/macos/UpTimeStrategy.h @@ -84,3 +84,4 @@ class TimeStrategy { }; #endif // __ZTTIMESTRATEGY_H__ + diff --git a/dep/src/zthread/posix/ConditionRecursiveLock.h b/dep/src/zthread/posix/ConditionRecursiveLock.h index 2be55c13797..bbf77da833b 100644 --- a/dep/src/zthread/posix/ConditionRecursiveLock.h +++ b/dep/src/zthread/posix/ConditionRecursiveLock.h @@ -144,3 +144,4 @@ public: } // namespace ZThread #endif + diff --git a/dep/src/zthread/posix/FastLock.h b/dep/src/zthread/posix/FastLock.h index 261fd7c893a..eee3c6545db 100644 --- a/dep/src/zthread/posix/FastLock.h +++ b/dep/src/zthread/posix/FastLock.h @@ -119,3 +119,4 @@ class FastLock : private NonCopyable { }; #endif + diff --git a/dep/src/zthread/posix/FtimeStrategy.h b/dep/src/zthread/posix/FtimeStrategy.h index 5e8d33b6c9b..a1adc61068c 100644 --- a/dep/src/zthread/posix/FtimeStrategy.h +++ b/dep/src/zthread/posix/FtimeStrategy.h @@ -82,3 +82,4 @@ public: }; #endif // __ZTTIMESTRATEGY_H__ + diff --git a/dep/src/zthread/posix/GetTimeOfDayStrategy.h b/dep/src/zthread/posix/GetTimeOfDayStrategy.h index 8588807f4f7..781162adeaa 100644 --- a/dep/src/zthread/posix/GetTimeOfDayStrategy.h +++ b/dep/src/zthread/posix/GetTimeOfDayStrategy.h @@ -73,3 +73,4 @@ public: }; #endif // __ZTTIMESTRATEGY_H__ + diff --git a/dep/src/zthread/posix/Monitor.cxx b/dep/src/zthread/posix/Monitor.cxx index bb157dae0dc..5e4b34c54cf 100644 --- a/dep/src/zthread/posix/Monitor.cxx +++ b/dep/src/zthread/posix/Monitor.cxx @@ -31,19 +31,19 @@ namespace ZThread { Monitor::Monitor() : _owner(0), _waiting(false) { - + pthread_cond_init(&_waitCond, 0); pthread_mutex_init(&_waitLock, 0); } - + Monitor::~Monitor() { - + assert(!_waiting); pthread_cond_destroy(&_waitCond); pthread_mutex_destroy(&_waitLock); - + } Monitor::STATE Monitor::wait(unsigned long ms) { @@ -55,14 +55,14 @@ Monitor::STATE Monitor::wait(unsigned long ms) { _owner = pthread_self(); STATE state(INVALID); - + // Serialize access to the state of the Monitor // and test the state to determine if a wait is needed. - + pthread_mutex_lock(&_waitLock); - + if(pending(ANYTHING)) { - + // Return without waiting when possible state = next(); @@ -70,13 +70,13 @@ Monitor::STATE Monitor::wait(unsigned long ms) { return state; } - - // Unlock the external lock if a wait() is probably needed. + + // Unlock the external lock if a wait() is probably needed. // Access to the state is still serial. _lock.release(); - + // Wait for a transition in the state that is of interest, this - // allows waits to exclude certain flags (e.g. INTERRUPTED) + // allows waits to exclude certain flags (e.g. INTERRUPTED) // for a single wait() w/o actually discarding those flags - // they will remain set until a wait interested in those flags // occurs. @@ -85,20 +85,20 @@ Monitor::STATE Monitor::wait(unsigned long ms) { // Wait, ignoring signals _waiting = true; int status = 0; - - if(ms == 0) { // Wait forever - - do { // ignore signals unless the state is interesting + + if(ms == 0) { // Wait forever + + do { // ignore signals unless the state is interesting status = pthread_cond_wait(&_waitCond, &_waitLock); } while(status == EINTR && !pending(ANYTHING)); - + // Akwaken only when a state is pending assert(status == 0); - + } else { - + // Find the target time - TimeStrategy t; + TimeStrategy t; ms += t.milliseconds(); @@ -106,34 +106,34 @@ Monitor::STATE Monitor::wait(unsigned long ms) { ms %= 1000; // Convert to a timespec - struct ::timespec timeout; - - timeout.tv_sec = s; + struct ::timespec timeout; + + timeout.tv_sec = s; timeout.tv_nsec = ms*1000000; - - // Wait ignoring signals until the state is interesting - do { - + + // Wait ignoring signals until the state is interesting + do { + // When a timeout occurs, update the state to reflect that. status = pthread_cond_timedwait(&_waitCond, &_waitLock, &timeout); - + } while(status == EINTR && !pending(ANYTHING)); - + // Akwaken only when a state is pending or when the timeout expired assert(status == 0 || status == ETIMEDOUT); - + if(status == ETIMEDOUT) push(TIMEDOUT); } - + // Get the next available STATE - state = next(); - _waiting = false; - + state = next(); + _waiting = false; + pthread_mutex_unlock(&_waitLock); - - // Reaquire the external lock, keep from deadlocking threads calling + + // Reaquire the external lock, keep from deadlocking threads calling // notify(), interrupt(), etc. _lock.acquire(); @@ -147,17 +147,17 @@ bool Monitor::interrupt() { // Serialize access to the state pthread_mutex_lock(&_waitLock); - + bool wasInterruptable = !pending(INTERRUPTED); bool hadWaiter = _waiting; - + if(wasInterruptable) { - + // Update the state & wake the waiter if there is one push(INTERRUPTED); wasInterruptable = false; - + if(hadWaiter && !masked(Monitor::INTERRUPTED)) pthread_cond_signal(&_waitCond); else @@ -180,7 +180,7 @@ bool Monitor::isInterrupted() { bool wasInterrupted = pending(INTERRUPTED); clear(INTERRUPTED); - + pthread_mutex_unlock(&_waitLock); return wasInterrupted; @@ -193,7 +193,7 @@ bool Monitor::isCanceled() { pthread_mutex_lock(&_waitLock); bool wasCanceled = examine(CANCELED); - + if(pthread_equal(_owner, pthread_self())) clear(INTERRUPTED); @@ -210,17 +210,17 @@ bool Monitor::cancel() { bool wasInterrupted = !pending(INTERRUPTED); bool hadWaiter = _waiting; - + push(CANCELED); if(wasInterrupted) { - + // Update the state & wake the waiter if there is one push(INTERRUPTED); - + if(hadWaiter && !masked(Monitor::INTERRUPTED)) pthread_cond_signal(&_waitCond); - + } pthread_mutex_unlock(&_waitLock); @@ -235,16 +235,16 @@ bool Monitor::notify() { pthread_mutex_lock(&_waitLock); bool wasNotifyable = !pending(INTERRUPTED); - + if(wasNotifyable) { - + // Set the flag and wake the waiter if there // is one push(SIGNALED); - - if(_waiting) + + if(_waiting) pthread_cond_signal(&_waitCond); - + } pthread_mutex_unlock(&_waitLock); diff --git a/dep/src/zthread/posix/Monitor.h b/dep/src/zthread/posix/Monitor.h index fe6c8b559e3..380a420b571 100644 --- a/dep/src/zthread/posix/Monitor.h +++ b/dep/src/zthread/posix/Monitor.h @@ -151,3 +151,4 @@ class Monitor : public Status, private NonCopyable { }; #endif + diff --git a/dep/src/zthread/posix/PriorityOps.h b/dep/src/zthread/posix/PriorityOps.h index 3a7f822711d..df6bfced282 100644 --- a/dep/src/zthread/posix/PriorityOps.h +++ b/dep/src/zthread/posix/PriorityOps.h @@ -49,3 +49,4 @@ public: } // namespace ZThread #endif // __ZTPRIORITYOPS_H__ + diff --git a/dep/src/zthread/posix/TSS.h b/dep/src/zthread/posix/TSS.h index c9c9c0e352a..13f564d1558 100644 --- a/dep/src/zthread/posix/TSS.h +++ b/dep/src/zthread/posix/TSS.h @@ -102,3 +102,4 @@ namespace ZThread { #endif + diff --git a/dep/src/zthread/posix/ThreadOps.cxx b/dep/src/zthread/posix/ThreadOps.cxx index e72ef78ada3..994b5903b28 100644 --- a/dep/src/zthread/posix/ThreadOps.cxx +++ b/dep/src/zthread/posix/ThreadOps.cxx @@ -31,7 +31,7 @@ namespace ZThread { -const ThreadOps ThreadOps::INVALID(0); +const ThreadOps ThreadOps::INVALID(0); bool ThreadOps::join(ThreadOps* ops) { @@ -57,7 +57,7 @@ bool ThreadOps::yield() { #if defined(HAVE_SCHED_YIELD) result = sched_yield() == 0; #endif - + return result; } @@ -67,11 +67,11 @@ bool ThreadOps::setPriority(ThreadOps* impl, Priority p) { assert(impl); bool result = true; - + #if !defined(ZTHREAD_DISABLE_PRIORITY) - + struct sched_param param; - + switch(p) { case Low: param.sched_priority = 0; @@ -83,7 +83,7 @@ bool ThreadOps::setPriority(ThreadOps* impl, Priority p) { default: param.sched_priority = 5; } - + result = pthread_setschedparam(impl->_tid, SCHED_OTHER, ¶m) == 0; #endif @@ -97,14 +97,14 @@ bool ThreadOps::getPriority(ThreadOps* impl, Priority& p) { assert(impl); bool result = true; - + #if !defined(ZTHREAD_DISABLE_PRIORITY) struct sched_param param; int policy = SCHED_OTHER; - + if(result = (pthread_getschedparam(impl->_tid, &policy, ¶m) == 0)) { - + // Convert to one of the PRIORITY values if(param.sched_priority < 10) p = Low; @@ -112,9 +112,9 @@ bool ThreadOps::getPriority(ThreadOps* impl, Priority& p) { p = Medium; else p = High; - + } - + #endif return result; @@ -132,16 +132,16 @@ extern "C" void *_dispatch(void *arg) { Runnable* task = reinterpret_cast<Runnable*>(arg); assert(task); - + // Run the task from the correct context task->run(); - + // Exit the thread pthread_exit((void**)0); return (void*)0; - + } - + } // namespace ZThread diff --git a/dep/src/zthread/posix/ThreadOps.h b/dep/src/zthread/posix/ThreadOps.h index 8fef43bb3fd..7176da5b1c9 100644 --- a/dep/src/zthread/posix/ThreadOps.h +++ b/dep/src/zthread/posix/ThreadOps.h @@ -152,3 +152,4 @@ protected: } #endif // __ZTTHREADOPS_H__ + diff --git a/dep/src/zthread/solaris/FastRecursiveLock.h b/dep/src/zthread/solaris/FastRecursiveLock.h index 2de0f8cd022..d743f9a9b55 100644 --- a/dep/src/zthread/solaris/FastRecursiveLock.h +++ b/dep/src/zthread/solaris/FastRecursiveLock.h @@ -120,3 +120,4 @@ public: } // namespace ZThread #endif + diff --git a/dep/src/zthread/vanilla/DualMutexRecursiveLock.h b/dep/src/zthread/vanilla/DualMutexRecursiveLock.h index 63214133c02..22f10b9bc04 100644 --- a/dep/src/zthread/vanilla/DualMutexRecursiveLock.h +++ b/dep/src/zthread/vanilla/DualMutexRecursiveLock.h @@ -171,3 +171,4 @@ class FastRecursiveLock : private NonCopyable { } // namespace ZThread #endif + diff --git a/dep/src/zthread/vanilla/SimpleAtomicCount.cxx b/dep/src/zthread/vanilla/SimpleAtomicCount.cxx index fc63d141d6a..67f50d546dc 100644 --- a/dep/src/zthread/vanilla/SimpleAtomicCount.cxx +++ b/dep/src/zthread/vanilla/SimpleAtomicCount.cxx @@ -34,7 +34,7 @@ typedef struct atomic_count_t { FastLock lock; unsigned long count; - + atomic_count_t() : count(0) {} } ATOMIC_COUNT; @@ -43,7 +43,7 @@ AtomicCount::AtomicCount() { ATOMIC_COUNT* c = new ATOMIC_COUNT; _value = reinterpret_cast<void*>(c); - + } AtomicCount::~AtomicCount() { @@ -54,22 +54,22 @@ AtomicCount::~AtomicCount() { delete c; } - + //! Postfix decrement and return the current value size_t AtomicCount::operator--(int) { ATOMIC_COUNT* c = reinterpret_cast<ATOMIC_COUNT*>(_value); - + Guard<FastLock> g(c->lock); return c->count--; } - + //! Postfix increment and return the current value size_t AtomicCount::operator++(int) { ATOMIC_COUNT* c = reinterpret_cast<ATOMIC_COUNT*>(_value); - + Guard<FastLock> g(c->lock); return c->count++; @@ -79,17 +79,17 @@ size_t AtomicCount::operator++(int) { size_t AtomicCount::operator--() { ATOMIC_COUNT* c = reinterpret_cast<ATOMIC_COUNT*>(_value); - + Guard<FastLock> g(c->lock); return --c->count; } - + //! Prefix increment and return the current value size_t AtomicCount::operator++() { - + ATOMIC_COUNT* c = reinterpret_cast<ATOMIC_COUNT*>(_value); - + Guard<FastLock> g(c->lock); return ++c->count; diff --git a/dep/src/zthread/vanilla/SimpleRecursiveLock.h b/dep/src/zthread/vanilla/SimpleRecursiveLock.h index 6adf4154fc4..ecd1a403ce8 100644 --- a/dep/src/zthread/vanilla/SimpleRecursiveLock.h +++ b/dep/src/zthread/vanilla/SimpleRecursiveLock.h @@ -128,3 +128,4 @@ public: } // namespace ZThread #endif + diff --git a/dep/src/zthread/win32/AtomicCount.cxx b/dep/src/zthread/win32/AtomicCount.cxx index 84cbf8c3ddc..7fe63b0da0c 100644 --- a/dep/src/zthread/win32/AtomicCount.cxx +++ b/dep/src/zthread/win32/AtomicCount.cxx @@ -32,7 +32,7 @@ namespace ZThread { AtomicCount::AtomicCount() { _value = reinterpret_cast<void*>(new LONG(0)); - + } AtomicCount::~AtomicCount() { @@ -41,20 +41,20 @@ AtomicCount::~AtomicCount() { delete reinterpret_cast<LPLONG>(_value); } - + void AtomicCount::increment() { ::InterlockedIncrement(reinterpret_cast<LPLONG>(_value)); - + } - + bool AtomicCount::decrement() { LONG v = ::InterlockedDecrement(reinterpret_cast<LPLONG>(_value)); return static_cast<unsigned long>(v) == 0; - + } - + }; #endif // __ZTATOMICCOUNTIMPL_H__ diff --git a/dep/src/zthread/win32/AtomicFastLock.h b/dep/src/zthread/win32/AtomicFastLock.h index 8d09f132a35..17a38871ae7 100644 --- a/dep/src/zthread/win32/AtomicFastLock.h +++ b/dep/src/zthread/win32/AtomicFastLock.h @@ -120,3 +120,4 @@ class FastLock : private NonCopyable { }; #endif + diff --git a/dep/src/zthread/win32/AtomicFastRecursiveLock.h b/dep/src/zthread/win32/AtomicFastRecursiveLock.h index a4dc3755265..0018a299b17 100644 --- a/dep/src/zthread/win32/AtomicFastRecursiveLock.h +++ b/dep/src/zthread/win32/AtomicFastRecursiveLock.h @@ -156,3 +156,4 @@ class FastRecursiveLock : private NonCopyable { }; #endif + diff --git a/dep/src/zthread/win32/FastLock.h b/dep/src/zthread/win32/FastLock.h index 3b212e1d891..7f056413b96 100644 --- a/dep/src/zthread/win32/FastLock.h +++ b/dep/src/zthread/win32/FastLock.h @@ -144,3 +144,4 @@ namespace ZThread { } // namespace ZThread #endif + diff --git a/dep/src/zthread/win32/FastRecursiveLock.h b/dep/src/zthread/win32/FastRecursiveLock.h index de556ac4aa8..4f32dccf933 100644 --- a/dep/src/zthread/win32/FastRecursiveLock.h +++ b/dep/src/zthread/win32/FastRecursiveLock.h @@ -107,3 +107,4 @@ class FastRecursiveLock : private NonCopyable { } // namespace ZThread #endif + diff --git a/dep/src/zthread/win32/Monitor.cxx b/dep/src/zthread/win32/Monitor.cxx index 6e69487c054..fff056ffaf1 100644 --- a/dep/src/zthread/win32/Monitor.cxx +++ b/dep/src/zthread/win32/Monitor.cxx @@ -29,24 +29,24 @@ using namespace ZThread; Monitor::Monitor() : _owner(0), _waiting(false) { - - _handle = ::CreateEvent(0, TRUE, FALSE, 0); + + _handle = ::CreateEvent(0, TRUE, FALSE, 0); if(_handle == NULL) { assert(0); } } - + Monitor::~Monitor() { - + assert(!_waiting); - ::CloseHandle(_handle); + ::CloseHandle(_handle); } Monitor::STATE Monitor::wait(unsigned long ms) { - + // Update the owner on first use. The owner will not change, each // thread waits only on a single Monitor and a Monitor is never // shared @@ -54,13 +54,13 @@ Monitor::STATE Monitor::wait(unsigned long ms) { _owner = ::GetCurrentThreadId(); STATE state; //(INVALID); - + // Serialize access to the state of the Monitor // and test the state to determine if a wait is needed. _waitLock.acquire(); if(pending(ANYTHING)) { - + // Return without waiting when possible state = next(); @@ -68,12 +68,12 @@ Monitor::STATE Monitor::wait(unsigned long ms) { return state; } - // Unlock the external lock if a wait() is probably needed. + // Unlock the external lock if a wait() is probably needed. // Access to the state is still serial. _lock.release(); // Wait for a transition in the state that is of interest, this - // allows waits to exclude certain flags (e.g. INTERRUPTED) + // allows waits to exclude certain flags (e.g. INTERRUPTED) // for a single wait() w/o actually discarding those flags - // they will remain set until a wait interested in those flags // occurs. @@ -82,13 +82,13 @@ Monitor::STATE Monitor::wait(unsigned long ms) { // Wait, ignoring signals _waiting = true; - // Block until the event is set. + // Block until the event is set. _waitLock.release(); // The event is manual reset so this lack of atmoicity will not // be an issue - DWORD dwResult = + DWORD dwResult = ::WaitForSingleObject(_handle, ((ms == 0) ? INFINITE : (DWORD)ms)); // Reacquire serialized access to the state @@ -99,20 +99,20 @@ Monitor::STATE Monitor::wait(unsigned long ms) { if(dwResult == WAIT_TIMEOUT) push(TIMEDOUT); - + // Get the next available STATE - state = next(); - _waiting = false; + state = next(); + _waiting = false; ::ResetEvent(_handle); // Acquire the internal lock & release the external lock _waitLock.release(); - - // Reaquire the external lock, keep from deadlocking threads calling + + // Reaquire the external lock, keep from deadlocking threads calling // notify(), interrupt(), etc. _lock.acquire(); - + return state; } @@ -122,12 +122,12 @@ bool Monitor::interrupt() { // Serialize access to the state _waitLock.acquire(); - + bool wasInterruptable = !pending(INTERRUPTED); bool hadWaiter = _waiting; - + if(wasInterruptable) { - + // Update the state & wake the waiter if there is one push(INTERRUPTED); @@ -140,9 +140,9 @@ bool Monitor::interrupt() { assert(0); } - } else + } else wasInterruptable = !(_owner == ::GetCurrentThreadId()); - + } _waitLock.release(); @@ -159,7 +159,7 @@ bool Monitor::isInterrupted() { bool wasInterrupted = pending(INTERRUPTED); clear(INTERRUPTED); - + _waitLock.release(); return wasInterrupted; @@ -173,15 +173,15 @@ bool Monitor::notify() { _waitLock.acquire(); bool wasNotifyable = !pending(INTERRUPTED); - + if(wasNotifyable) { - + // Set the flag and wake the waiter if there // is one push(SIGNALED); - + // If there is a waiter then send the signal. - if(_waiting) + if(_waiting) if(::SetEvent(_handle) == FALSE) { assert(0); } @@ -202,20 +202,20 @@ bool Monitor::cancel() { bool wasInterrupted = !pending(INTERRUPTED); bool hadWaiter = _waiting; - + push(CANCELED); if(wasInterrupted) { - + // Update the state & wake the waiter if there is one push(INTERRUPTED); - + // If there is a waiter then send the signal. - if(hadWaiter && !masked(Monitor::INTERRUPTED)) + if(hadWaiter && !masked(Monitor::INTERRUPTED)) if(::SetEvent(_handle) == FALSE) { assert(0); } - + } _waitLock.release(); @@ -230,7 +230,7 @@ bool Monitor::isCanceled() { _waitLock.acquire(); bool wasCanceled = examine(CANCELED); - + if(_owner == ::GetCurrentThreadId()) clear(INTERRUPTED); diff --git a/dep/src/zthread/win32/Monitor.h b/dep/src/zthread/win32/Monitor.h index a527b8afff6..7fb57a33972 100644 --- a/dep/src/zthread/win32/Monitor.h +++ b/dep/src/zthread/win32/Monitor.h @@ -151,3 +151,4 @@ class Monitor : public Status, private NonCopyable { }; #endif + diff --git a/dep/src/zthread/win32/PerformanceCounterStrategy.h b/dep/src/zthread/win32/PerformanceCounterStrategy.h index 4c657af0c8a..79f042cd194 100644 --- a/dep/src/zthread/win32/PerformanceCounterStrategy.h +++ b/dep/src/zthread/win32/PerformanceCounterStrategy.h @@ -106,3 +106,4 @@ private: }; #endif // __ZTTIMESTRATEGY_H__ + diff --git a/dep/src/zthread/win32/TSS.h b/dep/src/zthread/win32/TSS.h index d1307a51e2a..2f8dfd6c847 100644 --- a/dep/src/zthread/win32/TSS.h +++ b/dep/src/zthread/win32/TSS.h @@ -106,3 +106,4 @@ namespace ZThread { #endif + diff --git a/dep/src/zthread/win32/ThreadOps.cxx b/dep/src/zthread/win32/ThreadOps.cxx index 6e8fb8d3b71..8812b9996b1 100644 --- a/dep/src/zthread/win32/ThreadOps.cxx +++ b/dep/src/zthread/win32/ThreadOps.cxx @@ -26,7 +26,7 @@ namespace ZThread { -const ThreadOps ThreadOps::INVALID(0); +const ThreadOps ThreadOps::INVALID(0); /** * Detect OS at runtime and attempt to locate the SwitchToThread @@ -46,10 +46,10 @@ public: v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); if(::GetVersionEx(&v) && (v.dwPlatformId == VER_PLATFORM_WIN32_NT)) { - + // Uses GetModuleHandle() so the reference count on the dll is // not affected. There is a warning about race conditions involving - // this function being called as FreeLibrary() completes; however + // this function being called as FreeLibrary() completes; however // nearly all win32 applications load this particular and will keep it // in memory until the process exits. HINSTANCE hInst = ::GetModuleHandle("Kernel32.dll"); @@ -62,10 +62,10 @@ public: } bool operator()() { - + // Attempt to yield using the best function available - if(!_fnYield || !_fnYield()) - ::Sleep(0); + if(!_fnYield || !_fnYield()) + ::Sleep(0); return true; @@ -78,8 +78,8 @@ bool ThreadOps::join(ThreadOps* ops) { assert(ops); assert(ops->_tid != 0); assert(ops->_hThread != NULL); - - if(::WaitForSingleObjectEx(ops->_hThread, INFINITE, FALSE) != WAIT_OBJECT_0) + + if(::WaitForSingleObjectEx(ops->_hThread, INFINITE, FALSE) != WAIT_OBJECT_0) return false; ::CloseHandle(ops->_hThread); @@ -102,11 +102,11 @@ bool ThreadOps::yield() { bool ThreadOps::setPriority(ThreadOps* impl, Priority p) { assert(impl); - + #if !defined(ZTHREAD_DISABLE_PRIORITY) bool result; - + // Convert int n; switch(p) { @@ -121,7 +121,7 @@ bool ThreadOps::setPriority(ThreadOps* impl, Priority p) { n = THREAD_PRIORITY_NORMAL; } - + result = (::SetThreadPriority(impl->_hThread, n) != THREAD_PRIORITY_ERROR_RETURN); return result; @@ -137,7 +137,7 @@ bool ThreadOps::getPriority(ThreadOps* impl, Priority& p) { assert(impl); bool result = true; - + #if !defined(ZTHREAD_DISABLE_PRIORITY) // Convert to one of the PRIORITY values @@ -154,7 +154,7 @@ bool ThreadOps::getPriority(ThreadOps* impl, Priority& p) { default: p = Medium; } - + #endif return result; @@ -191,7 +191,7 @@ unsigned int __stdcall ThreadOps::_dispatch(void *arg) { #endif return 0; - + } } diff --git a/dep/src/zthread/win32/ThreadOps.h b/dep/src/zthread/win32/ThreadOps.h index 1b3a0bfa174..3352e524e58 100644 --- a/dep/src/zthread/win32/ThreadOps.h +++ b/dep/src/zthread/win32/ThreadOps.h @@ -150,3 +150,4 @@ protected: } #endif + diff --git a/dep/src/zthread/win9x/AtomicCount.cxx b/dep/src/zthread/win9x/AtomicCount.cxx index 2bf07dcd2e7..c569af1a8a0 100644 --- a/dep/src/zthread/win9x/AtomicCount.cxx +++ b/dep/src/zthread/win9x/AtomicCount.cxx @@ -29,12 +29,12 @@ namespace ZThread { typedef struct atomic_count_t { - + CRITICAL_SECTION cs; size_t count; atomic_count_t() : count(0) {} - + } ATOMIC_COUNT; AtomicCount::AtomicCount() { @@ -42,13 +42,13 @@ AtomicCount::AtomicCount() { ATOMIC_COUNT* c = new ATOMIC_COUNT; _value = reinterpret_cast<void*>(c); ::InitializeCriticalSection(&c->cs); - + } AtomicCount::~AtomicCount() { ATOMIC_COUNT* c = reinterpret_cast<ATOMIC_COUNT*>(_value); - assert(c->count == 0); + assert(c->count == 0); ::DeleteCriticalSection(&c->cs); delete c; @@ -58,8 +58,8 @@ AtomicCount::~AtomicCount() { size_t AtomicCount::operator--(int) { ATOMIC_COUNT* c = reinterpret_cast<ATOMIC_COUNT*>(_value); - size_t value; - + size_t value; + ::EnterCriticalSection(&c->cs); value = c->count--; ::LeaveCriticalSection(&c->cs); @@ -67,13 +67,13 @@ size_t AtomicCount::operator--(int) { return value; } - + //! Postfix increment and return the current value size_t AtomicCount::operator++(int) { ATOMIC_COUNT* c = reinterpret_cast<ATOMIC_COUNT*>(_value); - size_t value; - + size_t value; + ::EnterCriticalSection(&c->cs); value = c->count++; ::LeaveCriticalSection(&c->cs); @@ -86,8 +86,8 @@ size_t AtomicCount::operator++(int) { size_t AtomicCount::operator--() { ATOMIC_COUNT* c = reinterpret_cast<ATOMIC_COUNT*>(_value); - size_t value; - + size_t value; + ::EnterCriticalSection(&c->cs); value = --c->count; ::LeaveCriticalSection(&c->cs); @@ -95,13 +95,13 @@ size_t AtomicCount::operator--() { return value; } - + //! Prefix increment and return the current value size_t AtomicCount::operator++() { - + ATOMIC_COUNT* c = reinterpret_cast<ATOMIC_COUNT*>(_value); - size_t value; - + size_t value; + ::EnterCriticalSection(&c->cs); value = ++c->count; ::LeaveCriticalSection(&c->cs); diff --git a/dep/src/zthread/win9x/AtomicFastLock.h b/dep/src/zthread/win9x/AtomicFastLock.h index 7723b7077d8..0736267233a 100644 --- a/dep/src/zthread/win9x/AtomicFastLock.h +++ b/dep/src/zthread/win9x/AtomicFastLock.h @@ -128,3 +128,4 @@ class FastLock : private NonCopyable { } // namespace ZThread #endif + diff --git a/sql/characters.sql b/sql/characters.sql index 514bc634f55..8433c343233 100644 --- a/sql/characters.sql +++ b/sql/characters.sql @@ -1452,3 +1452,4 @@ UNLOCK TABLES; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; -- Dump completed on 2008-01-10 11:37:06 + diff --git a/sql/create_mysql.sql b/sql/create_mysql.sql index f71ced7d07d..2932595939e 100644 --- a/sql/create_mysql.sql +++ b/sql/create_mysql.sql @@ -12,3 +12,4 @@ GRANT ALL PRIVILEGES ON `characters` . * TO 'trinity'@'localhost' WITH GRANT OPT GRANT ALL PRIVILEGES ON `realmd` . * TO 'trinity'@'localhost' WITH GRANT OPTION; + diff --git a/sql/drop_mysql.sql b/sql/drop_mysql.sql index 1f2bf090ef8..e2ae8a3a7de 100644 --- a/sql/drop_mysql.sql +++ b/sql/drop_mysql.sql @@ -19,3 +19,4 @@ DROP DATABASE IF EXISTS `world` ; DROP DATABASE IF EXISTS `characters` ; DROP DATABASE IF EXISTS `realmd` ; + diff --git a/sql/realmd.sql b/sql/realmd.sql index 2f4ea16d172..2e2be75ef47 100644 --- a/sql/realmd.sql +++ b/sql/realmd.sql @@ -165,3 +165,4 @@ UNLOCK TABLES; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; -- Dump completed on 2008-01-10 11:37:06 + diff --git a/sql/tools/characters_item_duplicates_remove.sql b/sql/tools/characters_item_duplicates_remove.sql index 9cdd8738ecd..fdd88262b2e 100644 --- a/sql/tools/characters_item_duplicates_remove.sql +++ b/sql/tools/characters_item_duplicates_remove.sql @@ -20,3 +20,4 @@ DELETE FROM guild_bank_item WHERE item_guid IN (SELECT item_guid FROM item_test DELETE FROM guild_bank_item WHERE item_guid IN (SELECT item_guid FROM item_test WHERE `source`='m'); DROP TABLE IF EXISTS item_test; + diff --git a/sql/tools/characters_pet_data_cleanup.sql b/sql/tools/characters_pet_data_cleanup.sql index f4454ca856f..06c48882780 100644 --- a/sql/tools/characters_pet_data_cleanup.sql +++ b/sql/tools/characters_pet_data_cleanup.sql @@ -1,3 +1,4 @@ DELETE FROM pet_aura WHERE guid NOT IN (SELECT id FROM character_pet); DELETE FROM pet_spell WHERE guid NOT IN (SELECT id FROM character_pet); DELETE FROM pet_spell_cooldown WHERE guid NOT IN (SELECT id FROM character_pet); + diff --git a/sql/trinityscript_script_texts.sql b/sql/trinityscript_script_texts.sql index 33899984e6b..556d330685b 100644 --- a/sql/trinityscript_script_texts.sql +++ b/sql/trinityscript_script_texts.sql @@ -1546,4 +1546,5 @@ INSERT INTO `script_texts` (`entry`, `content_default`, `content_loc1`, `content -- Below just for beautiful view in table, run at own desire -- --- ALTER TABLE `script_texts` ORDER BY `entry` desc;
\ No newline at end of file +-- ALTER TABLE `script_texts` ORDER BY `entry` desc; + diff --git a/sql/updates/1018_world.sql b/sql/updates/1018_world.sql new file mode 100644 index 00000000000..89a13686d8a --- /dev/null +++ b/sql/updates/1018_world.sql @@ -0,0 +1,7 @@ +DELETE FROM `spell_linked_spell` WHERE `spell_trigger` IN (31224,41292,44007,44867); +INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES +(31224, -1543, 2, 'Cloak of Shadows - Flare'), +(41292, 42017, 2, 'Aura of Suffering'), +(44007, -43657, 2, 'Storm Eye Safe Zone Immune'), +(44867, -46019, 2, 'Spectral Exhaustion - Teleport: Spectral Realm'); + diff --git a/sql/updates/1026_world.sql b/sql/updates/1026_world.sql new file mode 100644 index 00000000000..1ed2e34316a --- /dev/null +++ b/sql/updates/1026_world.sql @@ -0,0 +1,6 @@ +DELETE FROM `spell_linked_spell` WHERE `spell_effect` IN ('33686', '31705'); +INSERT INTO `spell_linked_spell`(`spell_trigger`,`spell_effect`,`type`,`comment`) VALUES +('-33711','33686','0','Murmur\'s Shockwave (Normal)'), +('-38794','33686','0','Murmur\'s Shockwave (Heroic)'), +('33686','31705','0','Murmur\'s Shockwave Jump'); + diff --git a/sql/updates/1028_world_scripts.sql b/sql/updates/1028_world_scripts.sql new file mode 100644 index 00000000000..21891693f29 --- /dev/null +++ b/sql/updates/1028_world_scripts.sql @@ -0,0 +1,2 @@ +UPDATE `creature_template` SET `ScriptName`='boss_the_black_stalker' WHERE `entry`='17882'; + diff --git a/sql/updates/102_world.sql b/sql/updates/102_world.sql new file mode 100644 index 00000000000..b3818da5b9f --- /dev/null +++ b/sql/updates/102_world.sql @@ -0,0 +1,3 @@ +ALTER TABLE `quest_template` + ADD `RewHonorableKills` mediumint(9) unsigned NOT NULL default '0' AFTER `RewRepValue5`; + diff --git a/sql/updates/1069_world_scripts.sql b/sql/updates/1069_world_scripts.sql index 0fafabf63f1..1f3b7a728e9 100644 --- a/sql/updates/1069_world_scripts.sql +++ b/sql/updates/1069_world_scripts.sql @@ -9,4 +9,5 @@ INSERT INTO `spell_script_target` (`entry`,`type`,`targetEntry`) VALUES ('32314', '2', '17138'), ('32314', '2', '18037'), ('32314', '2', '18064'), -('32314', '2', '18065');
\ No newline at end of file +('32314', '2', '18065'); + diff --git a/sql/updates/1073_world_scripts.sql b/sql/updates/1073_world_scripts.sql new file mode 100644 index 00000000000..038f5f79466 --- /dev/null +++ b/sql/updates/1073_world_scripts.sql @@ -0,0 +1,2 @@ +update creature_template set scriptname = 'npc_plains_vision' where entry = 2983; + diff --git a/sql/updates/1074_world_scripts.sql b/sql/updates/1074_world_scripts.sql new file mode 100644 index 00000000000..4ed882ffea5 --- /dev/null +++ b/sql/updates/1074_world_scripts.sql @@ -0,0 +1,2 @@ +update creature_template set scriptname = 'npc_plucky' where entry in (6626); + diff --git a/sql/updates/112_world_scripts.sql b/sql/updates/112_world_scripts.sql new file mode 100644 index 00000000000..f812c6f3c68 --- /dev/null +++ b/sql/updates/112_world_scripts.sql @@ -0,0 +1,3 @@ +UPDATE `item_template` SET `ScriptName`='item_arcane_charges' WHERE `entry`='34475'; +UPDATE gameobject_template SET faction = 14 WHERE entry = 185134; + diff --git a/sql/updates/116_world.sql b/sql/updates/116_world.sql new file mode 100644 index 00000000000..9923f7f4540 --- /dev/null +++ b/sql/updates/116_world.sql @@ -0,0 +1,9 @@ +INSERT INTO `spell_script_target` VALUES ('30531', '1', '17256'); +INSERT INTO `spell_script_target` VALUES ('41455', '1', '22949'); +INSERT INTO `spell_script_target` VALUES ('41455', '1', '22950'); +INSERT INTO `spell_script_target` VALUES ('41455', '1', '22951'); +INSERT INTO `spell_script_target` VALUES ('41455', '1', '22952'); +INSERT INTO `spell_script_target` VALUES ('42471', '1', '23817'); +INSERT INTO `spell_script_target` VALUES ('43734', '1', '23817'); +INSERT INTO `spell_script_target` VALUES ('42631', '1', '23920'); + diff --git a/sql/updates/117_world_scripts.sql b/sql/updates/117_world_scripts.sql new file mode 100644 index 00000000000..669810b4685 --- /dev/null +++ b/sql/updates/117_world_scripts.sql @@ -0,0 +1,65 @@ +-- +-- NOTE: If you have temporary stored data in table `eventai_localized_texts` make sure to make backup of this before running this update! +-- NOTE: If you have any texts in current eventai_texts and they are not using entries valid for *_texts table, you _will_ get error messages on startup. +-- NOTE: Do not run this update twice, it may create bad data if you choose to do so. +-- + +-- drop obsolete table +DROP TABLE eventai_localized_texts; + +-- alter and add fields in table `eventai_texts` +ALTER TABLE eventai_texts CHANGE COLUMN `id` `entry` mediumint(8) NOT NULL; +ALTER TABLE eventai_texts CHANGE COLUMN `text` `content_default` text NOT NULL AFTER `entry`; +ALTER TABLE eventai_texts ADD COLUMN `content_loc1` text AFTER `content_default`; +ALTER TABLE eventai_texts ADD COLUMN `content_loc2` text AFTER `content_loc1`; +ALTER TABLE eventai_texts ADD COLUMN `content_loc3` text AFTER `content_loc2`; +ALTER TABLE eventai_texts ADD COLUMN `content_loc4` text AFTER `content_loc3`; +ALTER TABLE eventai_texts ADD COLUMN `content_loc5` text AFTER `content_loc4`; +ALTER TABLE eventai_texts ADD COLUMN `content_loc6` text AFTER `content_loc5`; +ALTER TABLE eventai_texts ADD COLUMN `content_loc7` text AFTER `content_loc6`; +ALTER TABLE eventai_texts ADD COLUMN `content_loc8` text AFTER `content_loc7`; +ALTER TABLE eventai_texts ADD COLUMN `sound` mediumint(8) unsigned NOT NULL default '0' AFTER `content_loc8`; +ALTER TABLE eventai_texts ADD COLUMN `type` tinyint unsigned NOT NULL default '0' AFTER `sound`; +ALTER TABLE eventai_texts ADD COLUMN `language` tinyint unsigned NOT NULL default '0' AFTER `type`; +ALTER TABLE eventai_texts MODIFY COLUMN `comment` text; + +-- get our current action type, and update text type = yell +UPDATE eventai_texts,eventai_scripts SET eventai_texts.type=1 WHERE eventai_scripts.action1_type IN (2,7) AND eventai_scripts.action1_param1=eventai_texts.entry; +UPDATE eventai_texts,eventai_scripts SET eventai_texts.type=1 WHERE eventai_scripts.action2_type IN (2,7) AND eventai_scripts.action2_param1=eventai_texts.entry; +UPDATE eventai_texts,eventai_scripts SET eventai_texts.type=1 WHERE eventai_scripts.action3_type IN (2,7) AND eventai_scripts.action3_param1=eventai_texts.entry; +-- get our current action type, and update text type = textemote +UPDATE eventai_texts,eventai_scripts SET eventai_texts.type=2 WHERE eventai_scripts.action1_type IN (3,8) AND eventai_scripts.action1_param1=eventai_texts.entry; +UPDATE eventai_texts,eventai_scripts SET eventai_texts.type=2 WHERE eventai_scripts.action2_type IN (3,8) AND eventai_scripts.action2_param1=eventai_texts.entry; +UPDATE eventai_texts,eventai_scripts SET eventai_texts.type=2 WHERE eventai_scripts.action3_type IN (3,8) AND eventai_scripts.action3_param1=eventai_texts.entry; + +-- update our scripts, for all action type 2, 3, 6, 7 & 8 to become 1 +UPDATE eventai_scripts SET action1_type=1 WHERE action1_type IN (2,3,6,7,8); +UPDATE eventai_scripts SET action2_type=1 WHERE action2_type IN (2,3,6,7,8); +UPDATE eventai_scripts SET action3_type=1 WHERE action3_type IN (2,3,6,7,8); + +-- was OOC, so at least one could be -1, set this to 0 (dev note: below will be bad, if run twice) +UPDATE eventai_scripts SET action1_param2=0 WHERE action1_type=1 AND action1_param2=-1; +UPDATE eventai_scripts SET action1_param3=0 WHERE action1_type=1 AND action1_param3=-1; +UPDATE eventai_scripts SET action2_param2=0 WHERE action2_type=1 AND action2_param2=-1; +UPDATE eventai_scripts SET action2_param3=0 WHERE action2_type=1 AND action2_param3=-1; +UPDATE eventai_scripts SET action3_param2=0 WHERE action3_type=1 AND action3_param2=-1; +UPDATE eventai_scripts SET action3_param3=0 WHERE action3_type=1 AND action3_param3=-1; + +-- expect all to be action type 1 now, continue convert to negative text entry +UPDATE eventai_scripts SET action1_param1=(`action1_param1`) *-1 WHERE action1_type=1 AND action1_param1>0; +UPDATE eventai_scripts SET action2_param1=(`action2_param1`) *-1 WHERE action2_type=1 AND action2_param1>0; +UPDATE eventai_scripts SET action3_param1=(`action3_param1`) *-1 WHERE action3_type=1 AND action3_param1>0; + +UPDATE eventai_scripts SET action1_param2=(`action1_param2`) *-1 WHERE action1_type=1 AND action1_param2>0; +UPDATE eventai_scripts SET action2_param2=(`action2_param2`) *-1 WHERE action2_type=1 AND action2_param2>0; +UPDATE eventai_scripts SET action3_param2=(`action3_param2`) *-1 WHERE action3_type=1 AND action3_param2>0; + +UPDATE eventai_scripts SET action1_param3=(`action1_param3`) *-1 WHERE action1_type=1 AND action1_param3>0; +UPDATE eventai_scripts SET action2_param3=(`action2_param3`) *-1 WHERE action2_type=1 AND action2_param3>0; +UPDATE eventai_scripts SET action3_param3=(`action3_param3`) *-1 WHERE action3_type=1 AND action3_param3>0; + +-- now we have negative numbers in script, must make sure text entries have same entry as script +UPDATE eventai_texts SET entry=(`entry`) *-1 WHERE entry>0; + +ALTER TABLE script_texts MODIFY COLUMN `sound` mediumint(8) unsigned NOT NULL default '0'; + diff --git a/sql/updates/11_characters.sql b/sql/updates/11_characters.sql new file mode 100644 index 00000000000..489ee028dbc --- /dev/null +++ b/sql/updates/11_characters.sql @@ -0,0 +1,6 @@ +ALTER TABLE `arena_team_member` ADD COLUMN `points_to_add` int(10) UNSIGNED NOT NULL DEFAULT '0'; +DROP TABLE IF EXISTS `saved_variables`; +CREATE TABLE `saved_variables` ( + `NextArenaPointDistributionTime` timestamp NOT NULL +) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Variable Saves'; + diff --git a/sql/updates/120_world.sql b/sql/updates/120_world.sql new file mode 100644 index 00000000000..f2ff5138745 --- /dev/null +++ b/sql/updates/120_world.sql @@ -0,0 +1,163 @@ +-- Add/Edit/Move lang strings +DELETE FROM `trinity_string` WHERE `entry` IN (25,52,54,55,56,171,401,413,438,593,594,595,596,597,598,599,614,615,636,637,638,809,1000,1001,1002,1003,1004,1005,1006,1007,1008,1009,1010,1011,1100,1101,1102,1103,1104,1105,1106,1107,1108,1109,1110,1111,1112,1113,1114,1115,1116,1117,1118); +DELETE FROM `trinity_string` WHERE `entry` BETWEEN '667' AND '687'; +DELETE FROM `trinity_string` WHERE `entry` BETWEEN '711' AND '716'; +DELETE FROM `trinity_string` WHERE `entry` BETWEEN '730' AND '747'; +DELETE FROM `trinity_string` WHERE `entry` BETWEEN '5000' AND '5006'; +INSERT INTO trinity_string VALUES +('25','Password not changed (unknown error)!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +('52', 'Invaid item count (%u) for item %u', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), +('54','The new passwords do not match',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +('55','Your password can\'t be longer than 16 characters (client limit), password not changed!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +('56','Current Message of the day: \r\n%s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(171,'You are being teleported by server console command.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(401,'You change security level of account %s to %i.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(413,'Account not exist: %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(438,'Found items %u: %u ( inventory %u mail %u auction %u guild %u)',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(593,'Currently Banned Accounts:',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(594,'| Account | BanDate | UnbanDate | Banned By | Ban Reason |',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(595,'Currently Banned IPs:',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(596,'| IP | BanDate | UnbanDate | Banned By | Ban Reason |',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(597,'Current gamemasters:',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(598,'| Account | GM |',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(599,'No gamemasters.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +('614', 'The Alliance flag has been respawned!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), +('615', 'The Horde flag has been respawned!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), +('636', 'The Battle for Eye of the Storm begins in 1 minute.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), +('637', 'The Battle for Eye of the Storm begins in 30 seconds.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), +('638', 'The Battle for Eye of the Storm has begun!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), +('667', 'The Alliance has taken control of the Mage Tower!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), +('668', 'The Horde has taken control of the Mage Tower!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), +('669', 'The Alliance has taken control of the Draenei Ruins!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), +('670', 'The Horde has taken control of the Draenei Ruins!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), +('671', 'The Alliance has taken control of the Blood Elf Tower!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), +('672', 'The Horde has taken control of the Blood Elf Tower!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), +('673', 'The Alliance has taken control of the Fel Reaver Ruins!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), +('674', 'The Horde has taken control of the Fel Reaver Ruins!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), +('675', 'The Alliance has lost control of the Mage Tower!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), +('676', 'The Horde has lost control of the Mage Tower!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), +('677', 'The Alliance has lost control of the Draenei Ruins!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), +('678', 'The Horde has lost control of the Draenei Ruins!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), +('679', 'The Alliance has lost control of the Blood Elf Tower!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), +('680', 'The Horde has lost control of the Blood Elf Tower!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), +('681', 'The Alliance has lost control of the Fel Reaver Ruins!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), +('682', 'The Horde has lost control of the Fel Reaver Ruins!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), +('683', '$N has taken the flag!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), +('684', 'The Alliance has captured the flag!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), +('685', 'The Horde has captured the flag!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), +('686', 'The Flag has been dropped!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), +('687', 'The flag has been reset', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), +('711', 'Your group is too large for this battleground. Please regroup to join.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), +('712', 'Your group is too large for this arena. Please regroup to join.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), +('713', 'You must be level %u to join an arena team!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), +('714', '%s is not high enough level to join your team', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), +('715', 'You don\'t meet Battleground level requirements', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), +('716', 'Your arena team is full, %s cannot join it.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), +('730', 'Your group has members not in your arena team. Please regroup to join.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), +('731', 'Your group does not have enough players to join this match.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), +('732', 'The Gold Team wins!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), +('733', 'The Green Team wins!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), +('734', 'There aren\'t enough players in this battleground. It will end soon unless some more players join to balance the fight.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), +('735', 'Your group has an offline member. Please remove him before joining.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), +('736', 'Your group has players from the opposing faction. You can\'t join the battleground as a group.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), +('737', 'Your group has players from different battleground brakets. You can\'t join as group.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), +('738', 'Someone in your party is already in this battleground queue. (S)he must leave it before joining as group.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), +('739', 'Someone in your party is Deserter. You can\'t join as group.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), +('740', 'Someone in your party is already in three battleground queues. You cannot join as group.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), +('741', 'You cannot teleport to a battleground or arena map.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), +('742', 'You cannot summon players to a battleground or arena map.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), +('743', 'You must be in GM mode to teleport to a player in a battleground.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), +('744', 'You cannot teleport to a battleground from another battleground. Please leave the current battleground first.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), +('745', 'Arena testing turned %s', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), +('746','|cffff0000[Automatic]:|r', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), +('747','|cffffff00[|c1f40af20Announce by|r |cffff0000%s|cffffff00]:|r %s|r', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), +('809','Account for character %s not found',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +('1000','Exiting daemon...',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +('1001','Account deleted: %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +('1002','Account %s NOT deleted (probably sql file format was updated)',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +('1003','Account %s NOT deleted (unknown error)',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +('1004','Account created: %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +('1005','Account name can\'t be longer than 16 characters (client limit), account not created!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(1006,'Account with this name already exist!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(1007,'Account %s NOT created (probably sql file format was updated)',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(1008,'Account %s NOT created (unknown error)',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(1009,'Player %s (Guid: %u) Account %s (Id: %u) deleted.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(1010,'| Account | Character | IP | GM | TBC |',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(1011,'|<Error> | %20s |<Error> |<Er>|<Err>|',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(1100,'Account %s (Id: %u) have up to %u expansion allowed now.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(1101,'Message of the day changed to:\r\n%s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(1102,'Message sent to %s: %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(1103,'%d - %s %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(1104,'%d - %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(1105,'%d - %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(1106,'%d - %s %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(1107,'%d - %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(1108,'%d - %s %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(1109,'%d - %s %s %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(1110,'%d - %s X:%f Y:%f Z:%f MapId:%d',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(1111,'%d - %s X:%f Y:%f Z:%f MapId:%d',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(1112,'Failed to open file: %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(1113,'Account %s (%u) have max amount allowed characters (client limit)',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(1114,'Dump file has broken data!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(1115,'Invalid character name!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(1116,'Invalid character guid!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(1117,'Character guid %u in use!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(1118,'%d - guild: %s (guid: %u) %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(5000,'You froze player %s.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(5001,'It might be amusing but no... you cant freeze yourself!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(5002,'Invalid input check the name of target.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(5003,'You unfroze player %s.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(5004,'There are no frozen players.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(5005,'Following players are frozen on the server:',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(5006,'- %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); + + +-- cleanup command syntax +DELETE FROM command WHERE name IN ( + 'gm ingame','gm online', + 'ban','ban account','ban character','ban ip', + 'baninfo','baninfo account','baninfo character','baninfo ip','pdump load', + 'banlist','banlist account','banlist character','banlist ip','help','transport', + 'unban','unban account','unban character','unban ip','list item','pdump write', + 'acct','account','account create','account delete','account onlinelist', + 'account set addon','account set gmlevel','account set password', + 'chardelete','gm list','gm online','sendmessage','server corpses','server exit','server motd', + 'server set loglevel','server set motd','security' + +); + +INSERT INTO command VALUES +('gm ingame',0,'Syntax: .gm ingame\r\n\r\nDisplay a list of available in game Game Masters.'), +('ban account',3,'Syntax is: ban account $Name $bantime $reason\r\nBan account kick player.\r\n$bantime: negative value leads to permban, otherwise use a timestring like \"4d20h3s\".'), +('ban character',3,'Syntax is: ban character $Name $bantime $reason\r\nBan account and kick player.\r\n$bantime: negative value leads to permban, otherwise use a timestring like \"4d20h3s\".'), +('ban ip',3,'Syntax is: ban ip $Ip $bantime $reason\r\nBan IP.\r\n$bantime: negative value leads to permban, otherwise use a timestring like \"4d20h3s\".'), +('baninfo account',3,'Syntax is: baninfo account\r\nWatch full information about a specific ban.'), +('baninfo character',3,'Syntax is: baninfo character\r\nWatch full information about a specific ban.'), +('baninfo ip',3,'Syntax is: baninfo ip\r\nWatch full information about a specific ban.'), +('banlist account',3,'Syntax is: banlist account [$Name]\r\nSearches the banlist for a account name pattern or show full list account bans.'), +('banlist character',3,'Syntax is: banlist character $Name\r\nSearches the banlist for a character name pattern. Pattern required.'), +('banlist ip',3,'Syntax is: banlist ip [$Ip]\r\nSearches the banlist for a IP pattern or show full list of IP bans.'), +('unban account',3,'Syntax is: unban account $Name\r\nUnban accounts for account name pattern.'), +('unban character',3,'Syntax is: unban character $Name\r\nUnban accounts for character name pattern.'), +('unban ip',3,'Syntax is: unban ip $Ip\r\nUnban accounts for IP pattern.'), +('pdump write',3,'Syntax is: pdump write $filename $playerNameOrGUID\r\nWrite character dump with name/guid $playerNameOrGUID to file $filename.'), +('pdump load',3,'Syntax is: pdump load $filename $account [$newname] [$newguid]\r\nLoad character dump from dump file into character list of $account with saved or $newname, with saved (or first free) or $newguid guid.'), +('list item',3,'Syntax: .list item #item_id [#max_count]\r\n\r\nOutput items with item id #item_id found in all character inventories, mails, auctions, and guild banks. Output item guids, item owner guid, owner account and owner name (guild name and guid in case guild bank). Will be output maximum #max_count items. If #max_count not provided use 10 as default value.'), +('help',0,'Syntax: .help [$command]\r\n\r\nDisplay usage instructions for the given $command. If no $command provided show list available commands.'), +('account',0,'Syntax: .account\r\n\r\nDisplay the access level of your account.'), +('account create',4,'Syntax: .account create $account $password\r\n\r\nCreate account and set password to it.'), +('account delete',4,'Syntax: .account delete $account\r\n\r\nDelete account with all characters.'), +('account onlinelist',4,'Syntax: .account onlinelist\r\n\r\nShow list of online accounts.'), +('account set addon',3,'Syntax: .account set addon [$account] #addon\r\n\r\nSet user (posible targeted) expansion addon level allowed. Addon values: 0 - normal, 1 - tbc, 2 - wotlk.'), +('account set gmlevel',4,'Syntax: .account set gmlevel [$account] #level\r\n\r\nSet the security level for targeted player (can''t be used at self) or for account $name to a level of #level.\r\n\r\n#level may range from 0 to 3.'), +('account set password',4,'Syntax: .account set password $account $password $password\r\n\r\nSet password for account.'), +('chardelete',4,'Syntax: .chardelete $charactername\r\n\r\nDelete character.'), +('gm list',3,'Syntax: .gm list\r\n\r\nDisplay a list of all Game Masters accounts and security levels.'), +('gm online',0,'Syntax: .gm online\r\n\r\nDisplay a list of available Game Masters.'), +('sendmessage',3,'Syntax: .sendmessage $playername $message\r\n\r\nSend screen message to player from ADMINISTRATOR.'), +('server corpses',2,'Syntax: .server corpses\r\n\r\nTriggering corpses expire check in world.'), +('server exit',4,'Syntax: .server exit\r\n\r\nTerminate Trinity NOW.'), +('server motd',0,'Syntax: .server motd\r\n\r\nShow server Message of the day.'), +('server set loglevel',4,'Syntax: .server set loglevel #level\r\n\r\nSet server log level (0 - errors only, 1 - basic, 2 - detail, 3 - debug).'), +('server set motd',3,'Syntax: .server set motd $MOTD\r\n\r\nSet server Message of the day.'); + diff --git a/sql/updates/123_world_scripts.sql b/sql/updates/123_world_scripts.sql new file mode 100644 index 00000000000..7281193a208 --- /dev/null +++ b/sql/updates/123_world_scripts.sql @@ -0,0 +1,216 @@ +-- +-- trinity_script_texts.sql Contains data for table `script_texts` mainly used in C++ parts. +-- valid entries for table are between -1000000 and -1999999 +-- + +TRUNCATE `script_texts`; + +-- +-- -1 000 000 First 100 entries are reserved for special use, do not add regular text here. +-- + +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1000000,'<TrinityScript Text Entry Missing!>',0,0,0,'DEFAULT_TEXT'); + +-- +-- Normal text entries. Say/Yell/Whisper/Emote for any regular world object. +-- + +-- -1 000 100 GENERAL MAPS (not typical instance maps) + +-- -1 033 000 SHADOWFANG KEEP + +-- -1 034 000 STOCKADES + +-- -1 036 000 DEADMINES + +-- -1 043 000 WAILING CAVERNS + +-- -1 047 000 RAZORFEN KRAUL + +-- -1 048 000 BLACKFATHOM DEEPS + +-- -1 070 000 ULDAMAN + +-- -1 090 000 GNOMEREGAN + +-- -1 109 000 SUNKEN TEMPLE + +-- -1 129 000 RAZORFEN DOWNS + +-- -1 189 000 SCARLET MONASTERY + +-- -1 209 000 ZUL'FARRAK + +-- -1 229 000 BLACKROCK SPIRE + +-- -1 230 000 BLACKROCK DEPTHS + +-- -1 249 000 ONYXIA'S LAIR + +-- -1 269 000 OPENING OF THE DARK PORTAL (BLACK MORASS) + +-- -1 289 000 SCHOLOMANCE + +-- -1 309 000 ZUL'GURUB + +-- -1 329 000 STRATHOLME + +-- -1 349 000 MARAUDON + +-- -1 389 000 RAGEFIRE CHASM + +-- -1 409 000 MOLTEN CORE + +-- -1 429 000 DIRE MAUL + +-- -1 469 000 BLACKWING LAIR + +-- -1 509 000 RUINS OF AHN'QIRAJ + +-- -1 531 000 TEMPLE OF AHN'QIRAJ + +-- -1 532 000 KARAZHAN + +-- -1 533 000 NAXXRAMAS + +-- -1 534 000 THE BATTLE OF MT. HYJAL + +-- -1 540 000 SHATTERED HALLS + +-- -1 542 000 BLOOD FURNACE + +-- -1 543 000 HELLFIRE RAMPARTS + +-- -1 544 000 MAGTHERIDON'S LAIR + +-- -1 545 000 THE STEAMVAULT + +-- -1 546 000 THE UNDERBOG + +-- -1 547 000 THE SLAVE PENS + +-- -1 548 000 SERPENTSHRINE CAVERN + +-- -1 550 000 THE EYE + +-- -1 552 000 THE ARCATRAZ + +-- -1 553 000 THE BOTANICA + +-- -1 554 000 THE MECHANAR + +-- -1 555 000 SHADOW LABYRINTH +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1555000,'Infidels have invaded the sanctuary! Sniveling pests...You have yet to learn the true meaning of agony!',10473,1,0,'hellmaw SAY_INTRO'), +(-1555001,'Pathetic mortals! You will pay dearly!',10475,1,0,'hellmaw SAY_AGGRO1'), +(-1555002,'I will break you!',10476,1,0,'hellmaw SAY_AGGRO2'), +(-1555003,'Finally! Something to relieve the tedium!',10477,1,0,'hellmaw SAY_AGGRO3'), +(-1555004,'Aid me, you fools, before it\'s too late!',10474,1,0,'hellmaw SAY_HELP'), +(-1555005,'Do you fear death?',10478,1,0,'hellmaw SAY_SLAY1'), +(-1555006,'This is the part I enjoy most.',10479,1,0,'hellmaw SAY_SLAY2'), +(-1555007,'Do not...grow...overconfident, mortal.',10480,1,0,'hellmaw SAY_DEATH'), + +(-1555008,'All flesh must burn.',10482,1,0,'blackhearth SAY_INTRO1'), +(-1555009,'All creation must be unmade!',10483,1,0,'blackhearth SAY_INTRO2'), +(-1555010,'Power will be yours!',10484,1,0,'blackhearth SAY_INTRO3'), +(-1555011,'You\'ll be sorry!',10486,1,0,'blackhearth SAY_AGGRO1'), +(-1555012,'Time for fun!',10487,1,0,'blackhearth SAY_AGGRO2'), +(-1555013,'I see dead people!',10488,1,0,'blackhearth SAY_AGGRO3'), +(-1555014,'No comin\' back for you!',10489,1,0,'blackhearth SAY_SLAY1'), +(-1555015,'Nice try!',10490,1,0,'blackhearth SAY_SLAY2'), +(-1555016,'Help us, hurry!',10485,1,0,'blackhearth SAY_HELP'), +(-1555017,'This... no... good...',10491,1,0,'blackhearth SAY_DEATH'), + +(-1555018,'Be ready for Dark One\'s return.',10492,1,0,'blackhearth SAY2_INTRO1'), +(-1555019,'So we have place in new universe.',10493,1,0,'blackhearth SAY2_INTRO2'), +(-1555020,'Dark one promise!',10494,1,0,'blackhearth SAY2_INTRO3'), +(-1555021,'You\'ll be sorry!',10496,1,0,'blackhearth SAY2_AGGRO1'), +(-1555022,'Time to kill!',10497,1,0,'blackhearth SAY2_AGGRO2'), +(-1555023,'You be dead people!',10498,1,0,'blackhearth SAY2_AGGRO3'), +(-1555024,'Now you gone for good.',10499,1,0,'blackhearth SAY2_SLAY1'), +(-1555025,'You failed, haha haha',10500,1,0,'blackhearth SAY2_SLAY2'), +(-1555026,'Help us, hurry!',10495,1,0,'blackhearth SAY2_HELP'), +(-1555027,'Arrgh, aah...ahhh',10501,1,0,'blackhearth SAY2_DEATH'), + +(-1555028,'Keep your minds focused for the days of reckoning are close at hand. Soon, the destroyer of worlds will return to make good on his promise. Soon the destruction of all that is will begin!',10522,1,0,'vorpil SAY_INTRO'), +(-1555029,'I\'ll make an offering of your blood!',10524,1,0,'vorpil SAY_AGGRO1'), +(-1555030,'You\'ll be a fine example, for the others.',10525,1,0,'vorpil SAY_AGGRO2'), +(-1555031,'Good, a worthy sacrifice.',10526,1,0,'vorpil SAY_AGGRO3'), +(-1555032,'Come to my aid, heed your master now!',10523,1,0,'vorpil SAY_HELP'), +(-1555033,'I serve with pride.',10527,1,0,'vorpil SAY_SLAY1'), +(-1555034,'Your death is for the greater cause!',10528,1,0,'vorpil SAY_SLAY2'), +(-1555035,'I give my life... Gladly.',10529,1,0,'vorpil SAY_DEATH'), + +(-1555036,'draws energy from the air.',0,2,0,'murmur EMOTE_SONIC_BOOM'); + +-- -1 556 000 SETHEKK HALLS +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1556000,'I have pets..<squawk>..of my own!',10502,1,0,'syth SAY_SUMMON'), +(-1556001,'Hrrmm.. Time to.. hrrm.. make my move.',10503,1,0,'syth SAY_AGGRO_1'), +(-1556002,'Nice pets..hrm.. Yes! <squawking>',10504,1,0,'syth SAY_AGGRO_2'), +(-1556003,'Nice pets have.. weapons. No so..<squawk>..nice.',10505,1,0,'syth SAY_AGGRO_3'), +(-1556004,'Death.. meeting life is.. <squawking>',10506,1,0,'syth SAY_SLAY_1'), +(-1556005,'Uhn.. Be free..<squawk>',10507,1,0,'syth SAY_SLAY_2'), +(-1556006,'No more life..hrm. No more pain. <squawks weakly>',10508,1,0,'syth SAY_DEATH'), + +(-1556007,'<squawk>..Trinkets yes pretty Trinkets..<squawk>..power, great power.<squawk>..power in Trinkets..<squawk>',10557,1,0,'ikiss SAY_INTRO'), +(-1556008,'You make war on Ikiss?..<squawk>',10554,1,0,'ikiss SAY_AGGRO_1'), +(-1556009,'Ikiss cut you pretty..<squawk>..slice you. Yes!',10555,1,0,'ikiss SAY_AGGRO_2'), +(-1556010,'No escape for..<squawk>..for you',10556,1,0,'ikiss SAY_AGGRO_3'), +(-1556011,'You die..<squawk>..stay away from Trinkets',10558,1,0,'ikiss SAY_SLAY_1'), +(-1556012,'<squawk>',10559,1,0,'ikiss SAY_SLAY_2'), +(-1556013,'Ikiss will not..<squawk>..die',10560,1,0,'ikiss SAY_DEATH'), +(-1556015,'begins to channel arcane energy...',0,3,0,'ikiss EMOTE_ARCANE_EXP'); + +-- -1 557 000 MANA TOMBS +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1557000,'What is this? You must forgive me, but I was not expecting company. As you can see, we are somewhat preoccupied right now. But no matter. As I am a gracious host, I will tend to you... personally.',10539,1,0,'shaffar SAY_INTRO'), +(-1557001,'We have not yet been properly introduced.',10541,1,0,'shaffar SAY_AGGRO_1'), +(-1557002,'An epic battle. How exciting!',10542,1,0,'shaffar SAY_AGGRO_2'), +(-1557003,'I have longed for a good adventure.',10543,1,0,'shaffar SAY_AGGRO_3'), +(-1557004,'It has been... entertaining.',10544,1,0,'shaffar SAY_SLAY_1'), +(-1557005,'And now we part company.',10545,1,0,'shaffar SAY_SLAY_2'), +(-1557006,'I have such fascinating things to show you.',10540,1,0,'shaffar SAY_SUMMON'), +(-1557007,'I must bid you... farewell.',10546,1,0,'shaffar SAY_DEAD'), + +(-1557008,'I will feed on your soul.',10561,1,0,'pandemonius SAY_AGGRO_1'), +(-1557009,'So... full of life!',10562,1,0,'pandemonius SAY_AGGRO_2'), +(-1557010,'Do not... resist.',10563,1,0,'pandemonius SAY_AGGRO_3'), +(-1557011,'Yes! I am... empowered!',10564,1,0,'pandemonius SAY_KILL_1'), +(-1557012,'More... I must have more!',10565,1,0,'pandemonius SAY_KILL_2'), +(-1557013,'To the void... once... more..',10566,1,0,'pandemonius SAY_DEATH'), +(-1557014,'shifts into the void...',0,3,0,'pandemonius EMOTE_DARK_SHELL'); + +-- -1 558 000 AUCHENAI CRYPTS +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1558000,'You have defiled the resting place of our ancestors. For this offense, there can be but one punishment. It is fitting that you have come to a place of the dead... for you will soon be joining them.',10509,1,0,'maladaar SAY_INTRO'), +(-1558001,'Rise my fallen brothers. Take form and fight!',10512,1,0,'maladaar SAY_SUMMON'), +(-1558002,'You will pay with your life!',10513,1,0,'maladaar SAY_AGGRO_1'), +(-1558003,'There\'s no turning back now!',10514,1,0,'maladaar SAY_AGGRO_2'), +(-1558004,'Serve your penitence!',10515,1,0,'maladaar SAY_AGGRO_3'), +(-1558005,'Let your mind be clouded.',10510,1,0,'maladaar SAY_ROAR'), +(-1558006,'Stare into the darkness of your soul.',10511,1,0,'maladaar SAY_SOUL_CLEAVE'), +(-1558007,'These walls will be your doom.',10516,1,0,'maladaar SAY_SLAY_1'), +(-1558008,'<laugh> Now, you\'ll stay for eternity!',10517,1,0,'maladaar SAY_SLAY_2'), +(-1558009,'This is... where.. I belong...',10518,1,0,'maladaar SAY_DEATH'); + +-- -1 560 000 ESCAPE FROM DURNHOLDE (OLD HILLSBRAD) + +-- -1 564 000 BLACK TEMPLE + +-- -1 565 000 GRUUL'S LAIR + +-- -1 568 000 ZUL'AMAN + +-- -1 580 000 SUNWELL PLATEAU + +-- -1 585 000 MAGISTER'S TERRACE + + +-- +-- Below just for beautiful view in table, run at own desire +-- + +-- ALTER TABLE `script_texts` ORDER BY `entry` desc; + diff --git a/sql/updates/125_world_scripts.sql b/sql/updates/125_world_scripts.sql new file mode 100644 index 00000000000..5d28ec325b5 --- /dev/null +++ b/sql/updates/125_world_scripts.sql @@ -0,0 +1,6 @@ +update creature_template set speed='0.01', scriptname='mob_toxic_sporebat' WHERE entry=22140; +update creature_template SET scriptname='npc_overlord_morghor' WHERE entry=23139; +update creature_template SET scriptname='npc_lord_illidan_stormrage' WHERE entry=22083; +update creature_template SET scriptname='npc_yarzill_the_merc' WHERE entry=23141; +update quest_template SET StartScript=0 WHERE entry=11108; + diff --git a/sql/updates/133_world_scripts.sql b/sql/updates/133_world_scripts.sql new file mode 100644 index 00000000000..cd082ee2ad9 --- /dev/null +++ b/sql/updates/133_world_scripts.sql @@ -0,0 +1,81 @@ +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1469030 AND -1469000; +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1469000,'None of your kind should be here! You\'ve doomed only yourselves!',8286,1,0,'broodlord SAY_AGGRO'), +(-1469001,'Clever Mortals but I am not so easily lured away from my sanctum!',8287,1,0,'broodlord SAY_LEASH'), +(-1469002,'goes into a killing frenzy!',0,2,0,'chromaggus EMOTE_FRENZY'), +(-1469003,'flinches as its skin shimmers.',0,2,0,'chromaggus EMOTE_SHIMMER'), +(-1469004,'In this world where time is your enemy, it is my greatest ally. This grand game of life that you think you play in fact plays you. To that I say...',0,0,0,'victor_nefarius SAY_GAMESBEGIN_1'), +(-1469005,'Let the games begin!',8280,1,0,'victor_nefarius SAY_GAMESBEGIN_2'), +(-1469006,'Ah, the heroes. You are persistent, aren\'t you. Your allied attempted to match his power against mine, and had to pay the price. Now he shall serve me, by slaughtering you. Get up little red wyrm and destroy them!',8279,1,0,'victor_nefarius SAY_VAEL_INTRO'), +(-1469007,'Well done, my minions. The mortals\' courage begins to wane! Now, let\'s see how they contend with the true Lord of Blackrock Spire!',8288,1,0,'nefarian SAY_AGGRO'), +(-1469008,'Enough! Now you vermin shall feel the force of my birthright, the fury of the earth itself.',8289,1,0,'nefarian SAY_XHEALTH'), +(-1469009,'Burn, you wretches! Burn!',8290,1,0,'nefarian SAY_SHADOWFLAME'), +(-1469010,'Impossible! Rise my minions! Serve your master once more!',8291,1,0,'nefarian SAY_RAISE_SKELETONS'), +(-1469011,'Worthless $N! Your friends will join you soon enough!',8293,1,0,'nefarian SAY_SLAY'), +(-1469012,'This cannot be! I am the Master here! You mortals are nothing to my kind! DO YOU HEAR? NOTHING!',8292,1,0,'nefarian SAY_DEATH'), +(-1469013,'Mages too? You should be more careful when you play with magic...',0,1,0,'nefarian SAY_MAGE'), +(-1469014,'Warriors, I know you can hit harder than that! Let\'s see it!',0,1,0,'nefarian SAY_WARRIOR'), +(-1469015,'Druids and your silly shapeshifting. Let\'s see it in action!',0,1,0,'nefarian SAY_DRUID'), +(-1469016,'Priests! If you\'re going to keep healing like that, we might as well make it a little more interesting!',0,1,0,'nefarian SAY_PRIEST'), +(-1469017,'Paladins, I\'ve heard you have many lives. Show me.',0,1,0,'nefarian SAY_PALADIN'), +(-1469018,'Shamans, show me what your totems can do!',0,1,0,'nefarian SAY_SHAMAN'), +(-1469019,'Warlocks, you shouldn\'t be playing with magic you don\'t understand. See what happens?',0,1,0,'nefarian SAY_WARLOCK'), +(-1469020,'Hunters and your annoying pea-shooters!',0,1,0,'nefarian SAY_HUNTER'), +(-1469021,'Rogues? Stop hiding and face me!',0,1,0,'nefarian SAY_ROGUE'), +(-1469022,'You\'ll pay for forcing me to do this.',8275,1,0,'razorgore SAY_EGGS_BROKEN1'), +(-1469023,'Fools! These eggs are more precious than you know.',8276,1,0,'razorgore SAY_EGGS_BROKEN2'), +(-1469024,'No! Not another one! I\'ll have your heads for this atrocity.',8277,1,0,'razorgore SAY_EGGS_BROKEN3'), +(-1469025,'If I fall into the abyss I\'ll take all of you mortals with me...',8278,1,0,'razorgore SAY_DEATH'), +(-1469026,'Too late...friends. Nefarius\' corruption has taken hold. I cannot...control myself.',8281,1,0,'vaelastrasz SAY_LINE1'), +(-1469027,'I beg you Mortals, flee! Flee before I lose all control. The Black Fire rages within my heart. I must release it!',8282,1,0,'vaelastrasz SAY_LINE2'), +(-1469028,'FLAME! DEATH! DESTRUCTION! COWER MORTALS BEFORE THE WRATH OF LORD....NO! I MUST FIGHT THIS!',8283,1,0,'vaelastrasz SAY_LINE3'), +(-1469029,'Nefarius\' hate has made me stronger than ever before. You should have fled, while you could, mortals! The fury of Blackrock courses through my veins!',8285,1,0,'vaelastrasz SAY_HALFLIFE'), +(-1469030,'Forgive me $N, your death only adds to my failure.',8284,1,0,'vaelastrasz SAY_KILLTARGET'); + +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1269017 AND -1269000; +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1269000,'Why do you persist? Surely you can see the futility of it all. It is not too late! You may still leave with your lives ...',10442,1,0,'temporus SAY_ENTER'), +(-1269001,'So be it ... you have been warned.',10444,1,0,'temporus SAY_AGGRO'), +(-1269002,'Time... sands of time is run out for you.',10443,1,0,'temporus SAY_BANISH'), +(-1269003,'You should have left when you had the chance.',10445,1,0,'temporus SAY_SLAY1'), +(-1269004,'Your days are done.',10446,1,0,'temporus SAY_SLAY2'), +(-1269005,'My death means ... little.',10447,1,0,'temporus SAY_DEATH'), +(-1269006,'Why do you aid the Magus? Just think of how many lives could be saved if the portal is never opened, if the resulting wars could be erased ...',10412,1,0,'chrono_lord_deja SAY_ENTER'), +(-1269007,'If you will not cease this foolish quest, then you will die!',10414,1,0,'chrono_lord_deja SAY_AGGRO'), +(-1269008,'You have outstayed your welcome, Timekeeper. Begone!',10413,1,0,'chrono_lord_deja SAY_BANISH'), +(-1269009,'I told you it was a fool\'s quest!',10415,1,0,'chrono_lord_deja SAY_SLAY1'), +(-1269010,'Leaving so soon?',10416,1,0,'chrono_lord_deja SAY_SLAY2'), +(-1269011,'Time ... is on our side.',10417,1,0,'chrono_lord_deja SAY_DEATH'), +(-1269012,'The time has come to shatter this clockwork universe forever! Let us no longer be slaves of the hourglass! I warn you: those who do not embrace the greater path shall become victims of its passing!',10400,1,0,'aeonus SAY_ENTER'), +(-1269013,'Let us see what fate lays in store...',10402,1,0,'aeonus SAY_AGGRO'), +(-1269014,'Your time is up, slave of the past!',10401,1,0,'aeonus SAY_BANISH'), +(-1269015,'One less obstacle in our way!',10403,1,0,'aeonus SAY_SLAY1'), +(-1269016,'No one can stop us! No one!',10404,1,0,'aeonus SAY_SLAY2'), +(-1269017,'It is only a matter...of time.',10405,1,0,'aeonus SAY_DEATH'); + +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1560022 AND -1560000; +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1560000,'Thrall! You didn\'t really think you would escape did you? You and your allies shall answer to Blackmoore - after I\'ve had my fun!',10406,1,0,'skarloc SAY_ENTER'), +(-1560001,'You\'re a slave. That\'s all you\'ll ever be.',10407,1,0,'skarloc SAY_TAUNT1'), +(-1560002,'I don\'t know what Blackmoore sees in you. For my money, you\'re just another ignorant savage!',10408,1,0,'skarloc SAY_TAUNT2'), +(-1560003,'Thrall will never be free!',10409,1,0,'skarloc SAY_SLAY1'), +(-1560004,'Did you really think you would leave here alive?',10410,1,0,'skarloc SAY_SLAY2'), +(-1560005,'Guards! Urgh..Guards..!',10411,1,0,'skarloc SAY_DEATH'), +(-1560006,'You there, fetch water quickly! Get these flames out before they spread to the rest of the keep! Hurry, damn you!',10428,1,0,'lieutenant_drake SAY_ENTER'), +(-1560007,'I know what you\'re up to, and I mean to put an end to it, permanently!',10429,1,0,'lieutenant_drake SAY_AGGRO'), +(-1560008,'No more middling for you.',10432,1,0,'lieutenant_drake SAY_SLAY1'), +(-1560009,'You will not interfere!',10433,1,0,'lieutenant_drake SAY_SLAY2'), +(-1560010,'Time to bleed!',10430,1,0,'lieutenant_drake SAY_MORTAL'), +(-1560011,'Run, you blasted cowards!',10431,1,0,'lieutenant_drake SAY_SHOUT'), +(-1560012,'Thrall... must not... go free.',10434,1,0,'lieutenant_drake SAY_DEATH'), +(-1560013,'Thrall! Come outside and face your fate!',10418,1,0,'epoch SAY_ENTER1'), +(-1560014,'Taretha\'s life hangs in the balance. Surely you care for her. Surely you wish to save her...',10419,1,0,'epoch SAY_ENTER2'), +(-1560015,'Ah, there you are. I had hoped to accomplish this with a bit of subtlety, but I suppose direct confrontation was inevitable. Your future, Thrall, must not come to pass and so...you and your troublesome friends must die!',10420,1,0,'epoch SAY_ENTER3'), +(-1560016,'Enough! I will erase your very existence!',10421,1,0,'epoch SAY_AGGRO1'), +(-1560017,'You cannot fight fate!',10422,1,0,'epoch SAY_AGGRO2'), +(-1560018,'You are...irrelevant.',10425,1,0,'epoch SAY_SLAY1'), +(-1560019,'Thrall will remain a slave. Taretha will die. You have failed.',10426,1,0,'epoch SAY_SLAY2'), +(-1560020,'Not so fast!',10423,1,0,'epoch SAY_BREATH1'), +(-1560021,'Struggle as much as you like!',10424,1,0,'epoch SAY_BREATH2'), +(-1560022,'No!...The master... will not... be pleased.',10427,1,0,'epoch SAY_DEATH'); + diff --git a/sql/updates/140_world.sql b/sql/updates/140_world.sql new file mode 100644 index 00000000000..a743fa69fee --- /dev/null +++ b/sql/updates/140_world.sql @@ -0,0 +1,22 @@ +DELETE FROM command WHERE name IN ('npc follow','npc unfollow','waterwalk','repairitems'); + +INSERT INTO command VALUES +('repairitems',2,'Syntax: .repairitems\r\n\r\nRepair all selected player''s items.'), +('npc follow',2,'Syntax: .npc follow\r\n\r\nSelected creature start follow you until death/fight/etc.'), +('npc unfollow',2,'Syntax: .npc unfollow\r\n\r\nSelected creature (non pet) stop follow you.'), +('waterwalk',2,'Syntax: .waterwalk on/off\r\n\r\nSet on/off waterwalk state for selected player or self if no player selected.'); + +DELETE FROM trinity_string WHERE entry IN (171,172,336,337,338,339,340,341,342,5007,5008); + +INSERT INTO trinity_string VALUES +(172,'server console command',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(336,'You repair all %s''s items.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(337,'All your items repaired by %s.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(338,'You set waterwalk mode %s for %s.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(339,'Your waterwalk mode set to %s by %s.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(340,'%s is now following you.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(341,'%s is not following you.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(342,'%s is now not following you.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(810,'You must be in a raid group to enter the instance %s!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(811,'You cannot enter %s while in a ghost mode!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); + diff --git a/sql/updates/145_world_scripts.sql b/sql/updates/145_world_scripts.sql new file mode 100644 index 00000000000..1d9341dd6a4 --- /dev/null +++ b/sql/updates/145_world_scripts.sql @@ -0,0 +1,28 @@ +DELETE FROM gameobject_template WHERE `entry` IN (187578, 188173); +INSERT INTO gameobject_template () VALUES (187578, 10, 4891, 'Scrying Orb', '', 0, 0, 2.16851, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'go_movie_orb'); +INSERT INTO gameobject_template () VALUES (188173, 10, 7161, 'Escape to the Isle of Quel\'Danas', '', 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'go_kael_orb'); + +DELETE FROM spell_script_target WHERE `entry` IN (44320, 44321); +INSERT INTO spell_script_target () VALUES (44320, 1, 24723); +INSERT INTO spell_script_target () VALUES (44321, 1, 24723); + +UPDATE creature_template SET modelid_A = '17612' WHERE entry = '24745'; +UPDATE creature_template SET modelid_H = '17612' WHERE entry = '24745'; + +UPDATE `creature_template` SET `minhealth` = '6900' WHERE `entry` = 24675; +UPDATE `creature_template` SET `maxhealth` = '6900' WHERE `entry` = 24675; + +UPDATE `creature_template` SET `minlevel` = '70' WHERE `entry` = 24708; +UPDATE `creature_template` SET `maxlevel` = '70' WHERE `entry` = 24708; + +UPDATE `creature_template` SET `minlevel` = '70' WHERE `entry` = 24666; +UPDATE `creature_template` SET `maxlevel` = '70' WHERE `entry` = 24666; + +UPDATE `creature_template` SET `scale` = '0.5' WHERE `entry` = 24708; + +UPDATE `gameobject_template` SET `ScriptName` = 'go_kael_orb' WHERE `entry` = 188173; +UPDATE `gameobject_template` SET `ScriptName` = 'go_movie_orb' WHERE `entry` = 187578; + +update creature_template SET spell1=6474 WHERE entry=22487; +update creature_template SET spell1=3600 WHERE entry=22486; + diff --git a/sql/updates/146_world.sql b/sql/updates/146_world.sql new file mode 100644 index 00000000000..bc419f47181 --- /dev/null +++ b/sql/updates/146_world.sql @@ -0,0 +1,94 @@ +DROP TABLE IF EXISTS `spell_linked_spell`; +CREATE TABLE `spell_linked_spell` ( + `spell_trigger` int(10) NOT NULL, + `spell_effect` int(10) NOT NULL default '0', + `type` smallint(3) unsigned NOT NULL default '0', + `comment` text NOT NULL, + PRIMARY KEY (`spell_trigger`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + +INSERT INTO spell_linked_spell + (`spell_trigger`, `spell_effect`, `type`, `comment`) +VALUES + (44008, 45265, 1, 'Static Disruption Visual'); + +INSERT INTO spell_linked_spell + (`spell_trigger`, `spell_effect`, `type`, `comment`) +VALUES + (-30410, 44032, 0, 'Manticron Cube Mind Exhaustion'); + +INSERT INTO spell_linked_spell + (`spell_trigger`, `spell_effect`, `type`, `comment`) +VALUES + (45661, 45665, 1, 'Encapsulate\r\n'); + +INSERT INTO spell_linked_spell + (`spell_trigger`, `spell_effect`, `type`, `comment`) +VALUES + (40604, 40616, 1, 'Fel Rage Aura'); + +INSERT INTO spell_linked_spell + (`spell_trigger`, `spell_effect`, `type`, `comment`) +VALUES + (40616, 41625, 1, 'Fel Rage Aura'); + +INSERT INTO spell_linked_spell + (`spell_trigger`, `spell_effect`, `type`, `comment`) +VALUES + (41292, 42017, 1, 'Aura of Suffering'); + +INSERT INTO spell_linked_spell + (`spell_trigger`, `spell_effect`, `type`, `comment`) +VALUES + (-41292, -42017, 0, 'Aura of Suffering'); + +INSERT INTO spell_linked_spell + (`spell_trigger`, `spell_effect`, `type`, `comment`) +VALUES + (45347, -45348, 1, 'Remove Flame Touched'); + +INSERT INTO spell_linked_spell + (`spell_trigger`, `spell_effect`, `type`, `comment`) +VALUES + (45348, -45347, 1, 'Remove Dark Touched'); + +INSERT INTO spell_linked_spell + (`spell_trigger`, `spell_effect`, `type`, `comment`) +VALUES + (45248, 45347, 1, 'Apply Dark Touched'); + +INSERT INTO spell_linked_spell + (`spell_trigger`, `spell_effect`, `type`, `comment`) +VALUES + (45329, 45347, 1, 'Apply Dark Touched'); + +INSERT INTO spell_linked_spell + (`spell_trigger`, `spell_effect`, `type`, `comment`) +VALUES + (45256, 45347, 1, 'Apply Dark Touched'); + +INSERT INTO spell_linked_spell + (`spell_trigger`, `spell_effect`, `type`, `comment`) +VALUES + (45270, 45347, 1, 'Apply Dark Touched'); + +INSERT INTO spell_linked_spell + (`spell_trigger`, `spell_effect`, `type`, `comment`) +VALUES + (45342, 45348, 1, 'Apply Flame Touched'); + +INSERT INTO spell_linked_spell + (`spell_trigger`, `spell_effect`, `type`, `comment`) +VALUES + (46771, 45348, 1, 'Apply Flame Touched'); + +INSERT INTO spell_linked_spell + (`spell_trigger`, `spell_effect`, `type`, `comment`) +VALUES + (45271, 45347, 1, 'Apply Dark Touched'); + +INSERT INTO spell_linked_spell + (`spell_trigger`, `spell_effect`, `type`, `comment`) +VALUES + (45246, 45348, 1, 'Apply Flame Touched'); + diff --git a/sql/updates/147_world.sql b/sql/updates/147_world.sql new file mode 100644 index 00000000000..a6dca5be3db --- /dev/null +++ b/sql/updates/147_world.sql @@ -0,0 +1,4 @@ +-- Magtheridon Earthquake +DELETE FROM spell_script_target WHERE `entry` IN (30657); +INSERT INTO spell_script_target VALUES ('30657', '1', '24136'); + diff --git a/sql/updates/152_world.sql b/sql/updates/152_world.sql new file mode 100644 index 00000000000..52d02a13258 --- /dev/null +++ b/sql/updates/152_world.sql @@ -0,0 +1,9 @@ +delete from `spell_linked_spell` where `spell_trigger` in ('15237','15430','15431','27799','27800','27801','25331'); +insert into `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`) values('15237','23455','0','Holy Nova (rank1)'); +insert into `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`) values('15430','23458','0','Holy Nova (rank2)'); +insert into `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`) values('15431','23459','0','Holy Nova (rank3)'); +insert into `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`) values('27799','27803','0','Holy Nova (rank4)'); +insert into `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`) values('27800','27804','0','Holy Nova (rank5)'); +insert into `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`) values('27801','27805','0','Holy Nova (rank6)'); +insert into `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`) values('25331','25329','0','Holy Nova (rank7)'); + diff --git a/sql/updates/153_world.sql b/sql/updates/153_world.sql new file mode 100644 index 00000000000..5b135c844d6 --- /dev/null +++ b/sql/updates/153_world.sql @@ -0,0 +1,2 @@ +update creature_template set flags_extra = 128 where entry = 12999; + diff --git a/sql/updates/171_world.sql b/sql/updates/171_world.sql new file mode 100644 index 00000000000..f7c9105eb38 --- /dev/null +++ b/sql/updates/171_world.sql @@ -0,0 +1,18 @@ +DELETE FROM trinity_string WHERE entry IN (57,58,5009); + +INSERT INTO trinity_string VALUES +(57,'Using World DB: %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(58,'Using script library: %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(5009,'Sound %u Played to server',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); + + +DELETE FROM `command` WHERE name IN ('pet create','pet learn','pet unlearn','pet tp','gobject activate','playall'); +INSERT INTO `command` (name,security,help) VALUES +('pet create',2,'Syntax: .pet create\r\n\r\nCreates a pet of the selected creature.'), +('pet learn',2,'Syntax: .pet learn\r\n\r\nLearn #spellid to pet.'), +('pet unlearn',2,'Syntax: .pet unlean\r\n\r\nunLearn #spellid to pet.'), +('pet tp',2,'Syntax: .pet tp #\r\n\r\nChange pet\'s amount of training points.'), +('modify gender',2,'Syntax: .modify gender\r\n\r\n.modify gender #male/female - Turns selected player into a male or female'), +('gobject activate',2,'Syntax: .gobject activate #guid\r\n\r\nActivates an object like a door or a button.'), +('playall',2,'Syntax: .playall #soundid\r\n\r\nPlayer a sound to whole server.'); + diff --git a/sql/updates/172_world_scripts.sql b/sql/updates/172_world_scripts.sql new file mode 100644 index 00000000000..82de4e3eb2a --- /dev/null +++ b/sql/updates/172_world_scripts.sql @@ -0,0 +1,779 @@ +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1548055 AND -1548000; +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1548000,'I cannot allow you to interfere!',11289,1,0,'hydross SAY_AGGRO'), +(-1548001,'Better, much better.',11290,1,0,'hydross SAY_SWITCH_TO_CLEAN'), +(-1548002,'They have forced me to this...',11291,1,0,'hydross SAY_CLEAN_SLAY1'), +(-1548003,'I have no choice.',11292,1,0,'hydross SAY_CLEAN_SLAY2'), +(-1548004,'I am... released...',11293,1,0,'hydross SAY_CLEAN_DEATH'), +(-1548005,'Aaghh, the poison...',11297,1,0,'hydross SAY_SWITCH_TO_CORRUPT'), +(-1548006,'I will purge you from this place.',11298,1,0,'hydross SAY_CORRUPT_SLAY1'), +(-1548007,'You are no better than they!',11299,1,0,'hydross SAY_CORRUPT_SLAY2'), +(-1548008,'You are the disease, not I',11300,1,0,'hydross SAY_CORRUPT_DEATH'), +(-1548009,'Finally my banishment ends!',11312,1,0,'leotheras SAY_AGGRO'), +(-1548010,'Be gone trifling elf. I\'m in control now.',11304,1,0,'leotheras SAY_SWITCH_TO_DEMON'), +(-1548011,'We all have our demons...',11305,1,0,'leotheras SAY_INNER_DEMONS'), +(-1548012,'I have no equal.',11306,1,0,'leotheras SAY_DEMON_SLAY1'), +(-1548013,'Perish, mortal.',11307,1,0,'leotheras SAY_DEMON_SLAY2'), +(-1548014,'Yes, YES! Ahahah!',11308,1,0,'leotheras SAY_DEMON_SLAY3'), +(-1548015,'Kill! KILL!',11314,1,0,'leotheras SAY_NIGHTELF_SLAY1'), +(-1548016,'That\'s right! Yes!',11315,1,0,'leotheras SAY_NIGHTELF_SLAY2'), +(-1548017,'Who\'s the master now?',11316,1,0,'leotheras SAY_NIGHTELF_SLAY3'), +(-1548018,'No! NO! What have you done?! I am the master, do you hear me? I... aaghh... Can\'t... contain him...',11313,1,0,'leotheras SAY_FINAL_FORM'), +(-1548019,'At last I am liberated. It has been too long since I have tasted true freedom!',11309,1,0,'leotheras SAY_FREE'), +(-1548020,'You cannot kill me! Fools, I\'ll be back! I\'ll... aarghh...',11317,1,0,'leotheras SAY_DEATH'), +(-1548021,'Guards, attention! We have visitors...',11277,1,0,'karathress SAY_AGGRO'), +(-1548022,'Your overconfidence will be your undoing! Guards, lend me your strength!',11278,1,0,'karathress SAY_GAIN_BLESSING'), +(-1548023,'Go on, kill them! I\'ll be the better for it!',11279,1,0,'karathress SAY_GAIN_ABILITY1'), +(-1548024,'I am more powerful than ever!',11280,1,0,'karathress SAY_GAIN_ABILITY2'), +(-1548025,'More knowledge, more power!',11281,1,0,'karathress SAY_GAIN_ABILITY3'), +(-1548026,'Land-dwelling scum!',11282,1,0,'karathress SAY_SLAY1'), +(-1548027,'Alana be\'lendor!',11283,1,0,'karathress SAY_SLAY2'), +(-1548028,'I am rid of you.',11284,1,0,'karathress SAY_SLAY3'), +(-1548029,'Her ... excellency ... awaits!',11285,1,0,'karathress SAY_DEATH'), +(-1548030,'Flood of the deep, take you!',11321,1,0,'morogrim SAY_AGGRO'), +(-1548031,'By the Tides, kill them at once!',11322,1,0,'morogrim SAY_SUMMON1'), +(-1548032,'Destroy them my subjects!',11323,1,0,'morogrim SAY_SUMMON2'), +(-1548033,'There is nowhere to hide!',11324,1,0,'morogrim SAY_SUMMON_BUBL1'), +(-1548034,'Soon it will be finished!',11325,1,0,'morogrim SAY_SUMMON_BUBL2'), +(-1548035,'It is done!',11326,1,0,'morogrim SAY_SLAY1'), +(-1548036,'Strugging only makes it worse.',11327,1,0,'morogrim SAY_SLAY2'), +(-1548037,'Only the strong survive.',11328,1,0,'morogrim SAY_SLAY3'), +(-1548038,'Great... currents of... Ageon.',11329,1,0,'morogrim SAY_DEATH'), +(-1548039,'sends his enemies to their watery graves!',0,2,0,'morogrim EMOTE_WATERY_GRAVE'), +(-1548040,'The violent earthquake has alerted nearby murlocs!',0,3,0,'morogrim EMOTE_EARTHQUAKE'), +(-1548041,'summons Watery Globules!',0,2,0,'morogrim EMOTE_WATERY_GLOBULES'), +(-1548042,'Water is life. It has become a rare commodity here in Outland. A commodity that we alone shall control. We are the Highborne, and the time has come at last for us to retake our rightful place in the world!',11531,1,0,'vashj SAY_INTRO'), +(-1548043,'I\'ll split you from stem to stern!',11532,1,0,'vashj SAY_AGGRO1'), +(-1548044,'Victory to Lord Illidan!',11533,1,0,'vashj SAY_AGGRO2'), +(-1548045,'I spit on you, surface filth!',11534,1,0,'vashj SAY_AGGRO3'), +(-1548046,'Death to the outsiders!',11535,1,0,'vashj SAY_AGGRO4'), +(-1548047,'I did not wish to lower myself by engaging your kind, but you leave me little choice!',11538,1,0,'vashj SAY_PHASE1'), +(-1548048,'The time is now! Leave none standing!',11539,1,0,'vashj SAY_PHASE2'), +(-1548049,'You may want to take cover.',11540,1,0,'vashj SAY_PHASE3'), +(-1548050,'Straight to the heart!',11536,1,0,'vashj SAY_BOWSHOT1'), +(-1548051,'Seek your mark!',11537,1,0,'vashj SAY_BOWSHOT2'), +(-1548052,'Your time ends now!',11541,1,0,'vashj SAY_SLAY1'), +(-1548053,'You have failed!',11542,1,0,'vashj SAY_SLAY2'), +(-1548054,'Be\'lamere an\'delay',11543,1,0,'vashj SAY_SLAY3'), +(-1548055,'Lord Illidan, I... I am... sorry.',11544,1,0,'vashj SAY_DEATH'); + +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1545023 AND -1545000; +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1545000,'Surge forth my pets!',10360,1,0,'thespia SAY_SUMMON'), +(-1545001,'The depths will consume you!',10361,1,0,'thespia SAY_AGGRO_1'), +(-1545002,'Meet your doom, surface dwellers!',10362,1,0,'thespia SAY_AGGRO_2'), +(-1545003,'You will drown in blood!',10363,1,0,'thespia SAY_AGGRO_3'), +(-1545004,'To the depths of oblivion with you!',10364,1,0,'thespia SAY_SLAY_1'), +(-1545005,'For my lady and master!',10365,1,0,'thespia SAY_SLAY_2'), +(-1545006,'Our matron will be.. the end of.. you..',10366,1,0,'thespia SAY_DEAD'), +(-1545007,'I\'m bringin\' the pain!',10367,1,0,'mekgineer SAY_MECHANICS'), +(-1545008,'You\'re in for a world of hurt!',10368,1,0,'mekgineer SAY_AGGRO_1'), +(-1545009,'Eat hot metal, scumbag!',10369,1,0,'mekgineer SAY_AGGRO_2'), +(-1545010,'I\'ll come over there!',10370,1,0,'mekgineer SAY_AGGRO_3'), +(-1545011,'I\'m bringin\' the pain!',10371,1,0,'mekgineer SAY_AGGRO_4'), +(-1545012,'You just got served, punk!',10372,1,0,'mekgineer SOUND_SLAY_1'), +(-1545013,'I own you!',10373,1,0,'mekgineer SOUND_SLAY_2'), +(-1545014,'Have fun dyin\', cupcake!',10374,1,0,'mekgineer SOUND_SLAY_3'), +(-1545015,'Mommy!',10375,1,0,'mekgineer SAY_DEATH'), +(-1545016,'You deem yourselves worthy simply because you bested my guards? Our work here will not be compromised!',10390,1,0,'kalithresh SAY_INTRO'), +(-1545017,'This is not nearly over...',10391,1,0,'kalithresh SAY_REGEN'), +(-1545018,'Your head will roll!',10392,1,0,'kalithresh SAY_AGGRO1'), +(-1545019,'I despise all of your kind!',10393,1,0,'kalithresh SAY_AGGRO2'), +(-1545020,'Ba\'ahntha sol\'dorei!',10394,1,0,'kalithresh SAY_AGGRO3'), +(-1545021,'Scram, surface filth!',10395,1,0,'kalithresh SAY_SLAY1'), +(-1545022,'Ah ha ha ha ha ha ha!',10396,1,0,'kalithresh SAY_SLAY2'), +(-1545023,'For her Excellency... for... Vashj!',10397,1,0,'kalithresh SAY_DEATH'); + +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1540041 AND -1540000; +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1540000,'You wish to fight us all at once? This should be amusing!',10262,1,0,'nethekurse SAY_INTRO'), +(-1540001,'You can have that one. I no longer need him.',10263,1,0,'nethekurse PEON_ATTACK_1'), +(-1540002,'Yes, beat him mercilessly. His skull is a thick as an ogres.',10264,1,0,'nethekurse PEON_ATTACK_2'), +(-1540003,'Don\'t waste your time on that one. He\'s weak!',10265,1,0,'nethekurse PEON_ATTACK_3'), +(-1540004,'You want him? Very well, take him!',10266,1,0,'nethekurse PEON_ATTACK_4'), +(-1540005,'One pitiful wretch down. Go on, take another one.',10267,1,0,'nethekurse PEON_DIE_1'), +(-1540006,'Ahh, what a waste... Next!',10268,1,0,'nethekurse PEON_DIE_2'), +(-1540007,'I was going to kill him anyway!',10269,1,0,'nethekurse PEON_DIE_3'), +(-1540008,'Thank you for saving me the trouble! Now it\'s my turn to have some fun...',10270,1,0,'nethekurse PEON_DIE_4'), +(-1540009,'Beg for your pittyfull life!',10259,1,0,'nethekurse SAY_TAUNT_1'), +(-1540010,'Run covad, ruun!',10260,1,0,'nethekurse SAY_TAUNT_2'), +(-1540011,'Your pain amuses me.',10261,1,0,'nethekurse SAY_TAUNT_3'), +(-1540012,'I\'m already bored.',10271,1,0,'nethekurse SAY_AGGRO_1'), +(-1540013,'Come on! ... Show me a real fight.',10272,1,0,'nethekurse SAY_AGGRO_2'), +(-1540014,'I had more fun torturing the peons.',10273,1,0,'nethekurse SAY_AGGRO_3'), +(-1540015,'You Loose.',10274,1,0,'nethekurse SAY_SLAY_1'), +(-1540016,'Ohh! Just die.',10275,1,0,'nethekurse SAY_SLAY_2'), +(-1540017,'What a ... a shame.',10276,1,0,'nethekurse SAY_DIE'), +(-1540018,'Smash!',10306,1,0,'omrogg GoCombat_1'), +(-1540019,'If you nice me let you live.',10308,1,0,'omrogg GoCombat_2'), +(-1540020,'Me hungry!',10309,1,0,'omrogg GoCombat_3'), +(-1540021,'Why don\'t you let me do the talking?',10317,1,0,'omrogg GoCombatDelay_1'), +(-1540022,'No, we will NOT let you live!',10318,1,0,'omrogg GoCombatDelay_2'), +(-1540023,'You always hungry. That why we so fat!',10319,1,0,'omrogg GoCombatDelay_3'), +(-1540024,'You stay here. Me go kill someone else!',10303,1,0,'omrogg Threat_1'), +(-1540025,'What are you doing!',10315,1,0,'omrogg Threat_2'), +(-1540026,'Me kill someone else...',10302,1,0,'omrogg Threat_3'), +(-1540027,'Me not like this one...',10300,1,0,'omrogg Threat_4'), +(-1540028,'That\'s not funny!',10314,1,0,'omrogg ThreatDelay1_1'), +(-1540029,'Me get bored...',10305,1,0,'omrogg ThreatDelay1_2'), +(-1540030,'I\'m not done yet, idiot!',10313,1,0,'omrogg ThreatDelay1_3'), +(-1540031,'Hey you numbskull!',10312,1,0,'omrogg ThreatDelay1_4'), +(-1540032,'Ha ha ha.',10304,1,0,'omrogg ThreatDelay2_1'), +(-1540033,'Whhy! He almost dead!',10316,1,0,'omrogg ThreatDelay2_2'), +(-1540034,'H\'ey...',10307,1,0,'omrogg ThreatDelay2_3'), +(-1540035,'We kill his friend!',10301,1,0,'omrogg ThreatDelay2_4'), +(-1540036,'This one die easy!',10310,1,0,'omrogg Killing_1'), +(-1540037,'I\'m tired. You kill next one!',10320,1,0,'omrogg Killing_2'), +(-1540038,'That\'s because I do all the hard work!',10321,1,0,'omrogg KillingDelay_1'), +(-1540039,'This all...your fault!',10311,1,0,'omrogg YELL_DIE_L'), +(-1540040,'I...hate...you...',10322,1,0,'omrogg YELL_DIE_R'), +(-1540041,'enrages',0,2,0,'omrogg EMOTE_ENRAGE'); + +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1542014 AND -1542000; +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1542000,'Who dares interrupt... What is this? What have you done? You ruin everything!',10164,1,0,'kelidan SAY_WAKE'), +(-1542001,'You mustn\'t let him loose!',10166,1,0,'kelidan SAY_ADD_AGGRO_1'), +(-1542002,'Ignorant whelps!',10167,1,0,'kelidan SAY_ADD_AGGRO_2'), +(-1542003,'You fools! He\'ll kill us all!',10168,1,0,'kelidan SAY_ADD_AGGRO_3'), +(-1542004,'Just as you deserve!',10169,1,0,'kelidan SAY_KILL_1'), +(-1542005,'Your friends will soon be joining you.',10170,1,0,'kelidan SAY_KILL_2'), +(-1542006,'Closer... Come closer.. and burn!',10165,1,0,'kelidan SAY_NOVA'), +(-1542007,'Good luck... you\'ll need it..',10171,1,0,'kelidan SAY_DIE'), +(-1542008,'Come intruders....',0,1,0,'broggok SAY_AGGRO'), +(-1542009,'My work must not be interrupted.',10286,1,0,'the_maker SAY_AGGRO_1'), +(-1542010,'Perhaps I can find a use for you.',10287,1,0,'the_maker SAY_AGGRO_2'), +(-1542011,'Anger... Hate... These are tools I can use.',10288,1,0,'the_maker SAY_AGGRO_3'), +(-1542012,'Let\'s see what I can make of you.',10289,1,0,'the_maker SAY_KILL_1'), +(-1542013,'It is pointless to resist.',10290,1,0,'the_maker SAY_KILL_2'), +(-1542014,'Stay away from... me.',10291,1,0,'the_maker SAY_DIE'); + +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1543016 AND -1543000; +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1543000,'Do you smell that? Fresh meat has somehow breached our citadel. Be wary of any intruders.',0,1,0,'gargolmar SAY_TAUNT'), +(-1543001,'Heal me! QUICKLY!',10329,1,0,'gargolmar SAY_HEAL'), +(-1543002,'Back off, pup!',10330,1,0,'gargolmar SAY_SURGE'), +(-1543003,'What have we here...?',10331,1,0,'gargolmar SAY_AGGRO_1'), +(-1543004,'Heh... this may hurt a little.',10332,1,0,'gargolmar SAY_AGGRO_2'), +(-1543005,'I\'m gonna enjoy this.',10333,1,0,'gargolmar SAY_AGGRO_3'), +(-1543006,'Say farewell!',10334,1,0,'gargolmar SAY_KILL_1'), +(-1543007,'Much too easy...',10335,1,0,'gargolmar SAY_KILL_2'), +(-1543008,'Hahah.. <cough> ..argh!',10336,1,0,'gargolmar SAY_DIE'), +(-1543009,'You dare stand against me?!',10280,1,0,'omor SAY_AGGRO_1'), +(-1543010,'I will not be defeated!',10279,1,0,'omor SAY_AGGRO_2'), +(-1543011,'Your insolence will be your death.',10281,1,0,'omor SAY_AGGRO_3'), +(-1543012,'Achor-she-ki! Feast my pet! Eat your fill!',10277,1,0,'omor SAY_SUMMON'), +(-1543013,'A-Kreesh!',10278,1,0,'omor SAY_CURSE'), +(-1543014,'Die, weakling!',10282,1,0,'omor SAY_KILL_1'), +(-1543015,'It is... not over.',10284,1,0,'omor SAY_DIE'), +(-1543016,'I am victorious!',10283,1,0,'omor SAY_WIPE'); + +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1544014 AND -1544000; +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1544000,'Wretched, meddling insects. Release me and perhaps i will grant you a merciful death!',10247,1,0,'magtheridon SAY_TAUNT1'), +(-1544001,'Vermin! Leeches! Take my blood and choke on it!',10248,1,0,'magtheridon SAY_TAUNT2'), +(-1544002,'Illidan is an arrogant fool. I will crush him and reclaim Outland as my own.',10249,1,0,'magtheridon SAY_TAUNT3'), +(-1544003,'Away, you mindless parasites. My blood is my own!',10250,1,0,'magtheridon SAY_TAUNT4'), +(-1544004,'How long do you believe your pathetic sorcery can hold me?',10251,1,0,'magtheridon SAY_TAUNT5'), +(-1544005,'My blood will be the end of you!',10252,1,0,'magtheridon SAY_TAUNT6'), +(-1544006,'I...am...UNLEASHED!!!',10253,1,0,'magtheridon SAY_FREED'), +(-1544007,'Thank you for releasing me. Now...die!',10254,1,0,'magtheridon SAY_AGGRO'), +(-1544008,'Not again...NOT AGAIN!',10256,1,0,'magtheridon SAY_BANISH'), +(-1544009,'I will not be taken so easily. Let the walls of this prison tremble...and FALL!!!',10257,1,0,'magtheridon SAY_CHAMBER_DESTROY'), +(-1544010,'Did you think me weak? Soft? Who is the weak one now?!',10255,1,0,'magtheridon SAY_PLAYER_KILLED'), +(-1544011,'The Legion...will consume you...all...',10258,1,0,'magtheridon SAY_DEATH'), +(-1544012,'becomes enraged!',0,2,0,'magtheridon EMOTE_BERSERK'), +(-1544013,'begins to cast Blast Nova!',0,2,0,'magtheridon EMOTE_BLASTNOVA'), +(-1544014,'bonds begin to weaken!',0,2,0,'magtheridon EMOTE_BEGIN'); + +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1565019 AND -1565000; +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1565000,'Gronn are the real power in outland.',11367,1,0,'maulgar SAY_AGGRO'), +(-1565001,'You will not defeat the hand of Gruul!',11368,1,0,'maulgar SAY_ENRAGE'), +(-1565002,'You won\'t kill next one so easy!',11369,1,0,'maulgar SAY_OGRE_DEATH1'), +(-1565003,'Pah! Does not prove anything!',11370,1,0,'maulgar SAY_OGRE_DEATH2'), +(-1565004,'I\'m not afraid of you.',11371,1,0,'maulgar SAY_OGRE_DEATH3'), +(-1565005,'Good, now you fight me!',11372,1,0,'maulgar SAY_OGRE_DEATH4'), +(-1565006,'You not so tough afterall!',11373,1,0,'maulgar SAY_SLAY1'), +(-1565007,'Aha-ha ha ha!',11374,1,0,'maulgar SAY_SLAY2'), +(-1565008,'Mulgar is king!',11375,1,0,'maulgar SAY_SLAY3'), +(-1565009,'Gruul... will crush you...',11376,1,0,'maulgar SAY_DEATH'), +(-1565010,'Come... and die.',11355,1,0,'gruul SAY_AGGRO'), +(-1565011,'Scurry',11356,1,0,'gruul SAY_SLAM1'), +(-1565012,'No escape',11357,1,0,'gruul SAY_SLAM2'), +(-1565013,'Stay',11358,1,0,'gruul SAY_SHATTER1'), +(-1565014,'Beg... for life',11359,1,0,'gruul SAY_SHATTER2'), +(-1565015,'No more',11360,1,0,'gruul SAY_SLAY1'), +(-1565016,'Unworthy',11361,1,0,'gruul SAY_SLAY2'), +(-1565017,'Die',11362,1,0,'gruul SAY_SLAY3'), +(-1565018,'Aaargh...',11363,1,0,'gruul SAY_DEATH'), +(-1565019,'grows in size!',0,2,0,'gruul EMOTE_GROW'); + +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1532102 AND -1532000; +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1532000,'Well done Midnight!',9173,1,0,'attumen SAY_MIDNIGHT_KILL'), +(-1532001,'Cowards! Wretches!',9167,1,0,'attumen SAY_APPEAR1'), +(-1532002,'Who dares attack the steed of the Huntsman?',9298,1,0,'attumen SAY_APPEAR2'), +(-1532003,'Perhaps you would rather test yourselves against a more formidable opponent?!',9299,1,0,'attumen SAY_APPEAR3'), +(-1532004,'Come, Midnight, let\'s disperse this petty rabble!',9168,1,0,'attumen SAY_MOUNT'), +(-1532005,'It was... inevitable.',9169,1,0,'attumen SAY_KILL1'), +(-1532006,'Another trophy to add to my collection!',9300,1,0,'attumen SAY_KILL2'), +(-1532007,'Weapons are merely a convenience for a warrior of my skill!',9166,1,0,'attumen SAY_DISARMED'), +(-1532008,'I always knew... someday I would become... the hunted.',9165,1,0,'attumen SAY_DEATH'), +(-1532009,'Such easy sport.',9170,1,0,'attumen SAY_RANDOM1'), +(-1532010,'Amateurs! Do not think you can best me! I kill for a living.',9304,1,0,'attumen SAY_RANDOM2'), +(-1532011,'Hmm, unannounced visitors? Preparations must be made.',9211,1,0,'moroes SAY_AGGRO'), +(-1532012,'Now, where was I? Oh yes...',9215,1,0,'moroes SAY_SPECIAL_1'), +(-1532013,'You rang?',9316,1,0,'moroes SAY_SPECIAL_2'), +(-1532014,'One more for dinner this evening.',9214,1,0,'moroes SAY_KILL_1'), +(-1532015,'Time... Never enough time.',9314,1,0,'moroes SAY_KILL_2'), +(-1532016,'I\'ve gone and made a mess.',9315,1,0,'moroes SAY_KILL_3'), +(-1532017,'How terribly clumsy of me...',9213,1,0,'moroes SAY_DEATH'), +(-1532018,'Your behavior will not be tolerated!',9204,1,0,'maiden SAY_AGGRO'), +(-1532019,'Ah ah ah...',9207,1,0,'maiden SAY_SLAY1'), +(-1532020,'This is for the best.',9312,1,0,'maiden SAY_SLAY2'), +(-1532021,'Impure thoughts lead to profane actions.',9311,1,0,'maiden SAY_SLAY3'), +(-1532022,'Cast out your corrupt thoughts.',9313,1,0,'maiden SAY_REPENTANCE1'), +(-1532023,'Your impurity must be cleansed.',9208,1,0,'maiden SAY_REPENTANCE2'), +(-1532024,'Death comes. Will your conscience be clear?',9206,1,0,'maiden SAY_DEATH'), +(-1532025,'Oh at last, at last. I can go home.',9190,1,0,'dorothee SAY_DOROTHEE_DEATH'), +(-1532026,'Don\'t let them hurt us, Tito! Oh, you won\'t, will you?',9191,1,0,'dorothee SAY_DOROTHEE_SUMMON'), +(-1532027,'Tito, oh Tito, no!',9192,1,0,'dorothee SAY_DOROTHEE_TITO_DEATH'), +(-1532028,'Oh dear, we simply must find a way home! The old wizard could be our only hope! Strawman, Roar, Tinhead, will you... wait! Oh golly, look! We have visitors!',9195,1,0,'dorothee SAY_DOROTHEE_AGGRO'), +(-1532029,'Wanna fight? Huh? Do ya? C\'mon, I\'ll fight you with both claws behind my back!',9227,1,0,'roar SAY_ROAR_AGGRO'), +(-1532030,'You didn\'t have to go and do that.',9229,1,0,'roar SAY_ROAR_DEATH'), +(-1532031,'I think I\'m going to go take fourty winks.',9230,1,0,'roar SAY_ROAR_SLAY'), +(-1532032,'Now what should I do with you? I simply can\'t make up my mind.',9254,1,0,'strawman SAY_STRAWMAN_AGGRO'), +(-1532033,'Don\'t let them make a mattress... out of me.',9256,1,0,'strawman SAY_STRAWMAN_DEATH'), +(-1532034,'I guess I\'m not a failure after all.',9257,1,0,'strawman SAY_STRAWMAN_SLAY'), +(-1532035,'I could really use a heart. Say, can I have yours?',9268,1,0,'tinhead SAY_TINHEAD_AGGRO'), +(-1532036,'Back to being an old rustbucket.',9270,1,0,'tinhead SAY_TINHEAD_DEATH'), +(-1532037,'Guess I\'m not so rusty, after all.',9271,1,0,'tinhead SAY_TINHEAD_SLAY'), +(-1532038,'begins to rust.',0,2,0,'tinhead EMOTE_RUST'), +(-1532039,'Woe to each and every one of you my pretties! <cackles>',9179,1,0,'crone SAY_CRONE_AGGRO'), +(-1532040,'It will all be over soon! <cackles>',9307,1,0,'crone SAY_CRONE_AGGRO2'), +(-1532041,'How could you? What a cruel, cruel world!',9178,1,0,'crone SAY_CRONE_DEATH'), +(-1532042,'Fixed you, didn\'t I? <cackles>',9180,1,0,'crone SAY_CRONE_SLAY'), +(-1532043,'All the better to own you with!',9276,1,0,'wolf SAY_WOLF_AGGRO'), +(-1532044,'Mmmm... delicious.',9277,1,0,'wolf SAY_WOLF_SLAY'), +(-1532045,'Run away little girl, run away!',9278,1,0,'wolf SAY_WOLF_HOOD'), +(-1532046,'What devil art thou, that dost torment me thus?',9196,1,0,'julianne SAY_JULIANNE_AGGRO'), +(-1532047,'Where is my lord? Where is my Romulo?',9199,1,0,'julianne SAY_JULIANNE_ENTER'), +(-1532048,'Romulo, I come! Oh... this do I drink to thee!',9198,1,0,'julianne SAY_JULIANNE_DEATH01'), +(-1532049,'Where is my Lord? Where is my Romulo? Ohh, happy dagger! This is thy sheath! There rust, and let me die!',9310,1,0,'julianne SAY_JULIANNE_DEATH02'), +(-1532050,'Come, gentle night; and give me back my Romulo!',9200,1,0,'julianne SAY_JULIANNE_RESURRECT'), +(-1532051,'Parting is such sweet sorrow.',9201,1,0,'julianne SAY_JULIANNE_SLAY'), +(-1532052,'Wilt thou provoke me? Then have at thee, boy!',9233,1,0,'romulo SAY_ROMULO_AGGRO'), +(-1532053,'Thou smilest... upon the stroke that... murders me.',9235,1,0,'romulo SAY_ROMULO_DEATH'), +(-1532054,'This day\'s black fate on more days doth depend. This but begins the woe. Others must end.',9236,1,0,'romulo SAY_ROMULO_ENTER'), +(-1532055,'Thou detestable maw, thou womb of death; I enforce thy rotten jaws to open!',9237,1,0,'romulo SAY_ROMULO_RESURRECT'), +(-1532056,'How well my comfort is revived by this!',9238,1,0,'romulo SAY_ROMULO_SLAY'), +(-1532057,'The Menagerie is for guests only.',9183,1,0,'curator SAY_AGGRO'), +(-1532058,'Gallery rules will be strictly enforced.',9188,1,0,'curator SAY_SUMMON1'), +(-1532059,'This curator is equipped for gallery protection.',9309,1,0,'curator SAY_SUMMON2'), +(-1532060,'Your request cannot be processed.',9186,1,0,'curator SAY_EVOCATE'), +(-1532061,'Failure to comply will result in offensive action.',9185,1,0,'curator SAY_ENRAGE'), +(-1532062,'Do not touch the displays.',9187,1,0,'curator SAY_KILL1'), +(-1532063,'You are not a guest.',9308,1,0,'curator SAY_KILL2'), +(-1532064,'This Curator is no longer op... er... ation... al.',9184,1,0,'curator SAY_DEATH'), +(-1532065,'Your blood will anoint my circle.',9264,1,0,'terestian SAY_SLAY1'), +(-1532066,'The great one will be pleased.',9329,1,0,'terestian SAY_SLAY2'), +(-1532067,'My life, is yours. Oh great one.',9262,1,0,'terestian SAY_DEATH'), +(-1532068,'Ah, you\'re just in time. The rituals are about to begin.',9260,1,0,'terestian SAY_AGGRO'), +(-1532069,'Please, accept this humble offering, oh great one.',9263,1,0,'terestian SAY_SACRIFICE1'), +(-1532070,'Let the sacrifice serve his testament to my fealty.',9330,1,0,'terestian SAY_SACRIFICE2'), +(-1532071,'Come, you dwellers in the dark. Rally to my call!',9265,1,0,'terestian SAY_SUMMON1'), +(-1532072,'Gather, my pets. There is plenty for all.',9331,1,0,'terestian SAY_SUMMON2'), +(-1532073,'Please, no more. My son... he\'s gone mad!',9241,1,0,'aran SAY_AGGRO1'), +(-1532074,'I\'ll not be tortured again!',9323,1,0,'aran SAY_AGGRO2'), +(-1532075,'Who are you? What do you want? Stay away from me!',9324,1,0,'aran SAY_AGGRO3'), +(-1532076,'I\'ll show you this beaten dog still has some teeth!',9245,1,0,'aran SAY_FLAMEWREATH1'), +(-1532077,'Burn you hellish fiends!',9326,1,0,'aran SAY_FLAMEWREATH2'), +(-1532078,'I\'ll freeze you all!',9246,1,0,'aran SAY_BLIZZARD1'), +(-1532079,'Back to the cold dark with you!',9327,1,0,'aran SAY_BLIZZARD2'), +(-1532080,'Yes, yes, my son is quite powerful... but I have powers of my own!',9242,1,0,'aran SAY_EXPLOSION1'), +(-1532081,'I am not some simple jester! I am Nielas Aran!',9325,1,0,'aran SAY_EXPLOSION2'), +(-1532082,'Surely you would not deny an old man a replenishing drink? No, no I thought not.',9248,1,0,'aran SAY_DRINK'), +(-1532083,'I\'m not finished yet! No, I have a few more tricks up me sleeve.',9251,1,0,'aran SAY_ELEMENTALS'), +(-1532084,'I want this nightmare to be over!',9250,1,0,'aran SAY_KILL1'), +(-1532085,'Torment me no more!',9328,1,0,'aran SAY_KILL2'), +(-1532086,'You\'ve wasted enough of my time. Let these games be finished!',9247,1,0,'aran SAY_TIMEOVER'), +(-1532087,'At last... The nightmare is.. over...',9244,1,0,'aran SAY_DEATH'), +(-1532088,'Where did you get that?! Did HE send you?!',9249,1,0,'aran SAY_ATIESH'), +(-1532089,'cries out in withdrawal, opening gates to the warp.',0,2,0,'netherspite EMOTE_PHASE_PORTAL'), +(-1532090,'goes into a nether-fed rage!',0,2,0,'netherspite EMOTE_PHASE_BANISH'), +(-1532091,'Madness has brought you here to me. I shall be your undoing!',9218,1,0,'malchezaar SAY_AGGRO'), +(-1532092,'Simple fools! Time is the fire in which you\'ll burn!',9220,1,0,'malchezaar SAY_AXE_TOSS1'), +(-1532093,'I see the subtlety of conception is beyond primitives such as you.',9317,1,0,'malchezaar SAY_AXE_TOSS2'), +(-1532094,'Who knows what secrets hide in the dark.',9223,1,0,'malchezaar SAY_SPECIAL1'), +(-1532095,'The cerestial forces are mine to manipulate.',9320,1,0,'malchezaar SAY_SPECIAL2'), +(-1532096,'How can you hope to withstand against such overwhelming power?',9321,1,0,'malchezaar SAY_SPECIAL3'), +(-1532097,'Surely you did not think you could win.',9222,1,0,'malchezaar SAY_SLAY1'), +(-1532098,'Your greed, your foolishness has brought you to this end.',9318,1,0,'malchezaar SAY_SLAY2'), +(-1532099,'You are, but a plaything, unfit even to amuse.',9319,1,0,'malchezaar SAY_SLAY3'), +(-1532100,'All realities, all dimensions are open to me!',9224,1,0,'malchezaar SAY_SUMMON1'), +(-1532101,'You face not Malchezaar alone, but the legions I command!',9322,1,0,'malchezaar SAY_SUMMON2'), +(-1532102,'I refuse to concede defeat. I am a prince of the Eredar! I am...',9221,1,0,'malchezaar SAY_DEATH'); + +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1550043 AND -1550000; +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1550000,'Alert, you are marked for extermination!',11213,1,0,'voidreaver SAY_AGGRO'), +(-1550001,'Extermination, successful.',11215,1,0,'voidreaver SAY_SLAY1'), +(-1550002,'Imbecile life form, no longer functional.',11216,1,0,'voidreaver SAY_SLAY2'), +(-1550003,'Threat neutralized.',11217,1,0,'voidreaver SAY_SLAY3'), +(-1550004,'Systems... shutting... down...',11214,1,0,'voidreaver SAY_DEATH'), +(-1550005,'Alternative measure commencing...',11218,1,0,'voidreaver SAY_POUNDING1'), +(-1550006,'Calculating force parameters...',11219,1,0,'voidreaver SAY_POUNDING2'), +(-1550007,'Tal anu\'men no Sin\'dorei!',11134,1,0,'solarian SAY_AGGRO'), +(-1550008,'Ha ha ha! You are hopelessly outmatched!',11139,1,0,'solarian SAY_SUMMON1'), +(-1550009,'I will crush your delusions of grandeur!',11140,1,0,'solarian SAY_SUMMON2'), +(-1550010,'Your soul belongs to the Abyss!',11136,1,0,'solarian SAY_KILL1'), +(-1550011,'By the blood of the Highborne!',11137,1,0,'solarian SAY_KILL2'), +(-1550012,'For the Sunwell!',11138,1,0,'solarian SAY_KILL3'), +(-1550013,'The warmth of the sun... awaits.',11135,1,0,'solarian SAY_DEATH'), +(-1550014,'Enough of this! Now I call upon the fury of the cosmos itself.',0,1,0,'solarian SAY_VOIDA'), +(-1550015,'I become ONE... with the VOID!',0,1,0,'solarian SAY_VOIDB'), +(-1550016,'Energy. Power. My people are addicted to it... a dependence made manifest after the Sunwell was destroyed. Welcome... to the future. A pity you are too late to stop it. No one can stop me now! Selama ashal\'anore!',11256,1,0,'kaelthas SAY_INTRO'), +(-1550017,'Capernian will see to it that your stay here is a short one.',11257,1,0,'kaelthas SAY_INTRO_CAPERNIAN'), +(-1550018,'Well done, you have proven worthy to test your skills against my master engineer, Telonicus.',11258,1,0,'kaelthas SAY_INTRO_TELONICUS'), +(-1550019,'Let us see how your nerves hold up against the Darkener, Thaladred.',11259,1,0,'kaelthas SAY_INTRO_THALADRED'), +(-1550020,'You have persevered against some of my best advisors... but none can withstand the might of the Blood Hammer. Behold, Lord Sanguinar!',11260,1,0,'kaelthas SAY_INTRO_SANGUINAR'), +(-1550021,'As you see, I have many weapons in my arsenal...',11261,1,0,'kaelthas SAY_PHASE2_WEAPON'), +(-1550022,'Perhaps I underestimated you. It would be unfair to make you fight all four advisors at once, but... fair treatment was never shown to my people. I\'m just returning the favor.',11262,1,0,'kaelthas SAY_PHASE3_ADVANCE'), +(-1550023,'Alas, sometimes one must take matters into one\'s own hands. Balamore shanal!',11263,1,0,'kaelthas SAY_PHASE4_INTRO2'), +(-1550024,'I have not come this far to be stopped! The future I have planned will not be jeopardized! Now you will taste true power!!',11273,1,0,'kaelthas SAY_PHASE5_NUTS'), +(-1550025,'You will not prevail.',11270,1,0,'kaelthas SAY_SLAY1'), +(-1550026,'You gambled...and lost.',11271,1,0,'kaelthas SAY_SLAY2'), +(-1550027,'This was Child\'s play.',11272,1,0,'kaelthas SAY_SLAY3'), +(-1550028,'Obey me.',11268,1,0,'kaelthas SAY_MINDCONTROL1'), +(-1550029,'Bow to my will.',11269,1,0,'kaelthas SAY_MINDCONTROL2'), +(-1550030,'Let us see how you fare when your world is turned upside down.',11264,1,0,'kaelthas SAY_GRAVITYLAPSE1'), +(-1550031,'Having trouble staying grounded?',11265,1,0,'kaelthas SAY_GRAVITYLAPSE2'), +(-1550032,'Anara\'nel belore!',11267,1,0,'kaelthas SAY_SUMMON_PHOENIX1'), +(-1550033,'By the power of the sun!',11266,1,0,'kaelthas SAY_SUMMON_PHOENIX2'), +(-1550034,'For...Quel...thalas!',11274,1,0,'kaelthas SAY_DEATH'), +(-1550035,'Prepare yourselves!',11203,1,0,'thaladred SAY_THALADRED_AGGRO'), +(-1550036,'Forgive me, my prince! I have... failed.',11204,1,0,'thaladred SAY_THALADRED_DEATH'), +(-1550037,'sets his gaze on $N!',0,2,0,'thaladred EMOTE_THALADRED_GAZE'), +(-1550038,'Blood for blood!',11152,1,0,'sanguinar SAY_SANGUINAR_AGGRO'), +(-1550039,'NO! I ...will... not...',11153,1,0,'sanguinar SAY_SANGUINAR_DEATH'), +(-1550040,'The sin\'dore reign supreme!',11117,1,0,'capernian SAY_CAPERNIAN_AGGRO'), +(-1550041,'This is not over!',11118,1,0,'capernian SAY_CAPERNIAN_DEATH'), +(-1550042,'Anar\'alah belore!',11157,1,0,'telonicus SAY_TELONICUS_AGGRO'), +(-1550043,'More perils... await',11158,1,0,'telonicus SAY_TELONICUS_DEATH'); + +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1553012 AND -1553000; +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1553000,'What are you doing? These specimens are very delicate!',11144,1,0,'freywinn SAY_AGGRO'), +(-1553001,'Your life cycle is now concluded!',11145,1,0,'freywinn SAY_KILL_1'), +(-1553002,'You will feed the worms.',11146,1,0,'freywinn SAY_KILL_2'), +(-1553003,'Endorel aluminor!',11147,1,0,'freywinn SAY_TREE_1'), +(-1553004,'Nature bends to my will!',11148,1,0,'freywinn SAY_TREE_2'), +(-1553005,'The specimens...must be preserved.',11149,1,0,'freywinn SAY_DEATH'), +(-1553006,'emits a strange noise.',0,2,0,'laj EMOTE_SUMMON'), +(-1553007,'Who disturbs this sanctuary?',11230,1,0,'warp SAY_AGGRO'), +(-1553008,'You must die! But wait: this does not--No, no... you must die!',11231,1,0,'warp SAY_SLAY_1'), +(-1553009,'What am I doing? Why do I...',11232,1,0,'warp SAY_SLAY_2'), +(-1553010,'Children, come to me!',11233,1,0,'warp SAY_SUMMON_1'), +(-1553011,'Maybe this is not--No, we fight! Come to my aid.',11234,1,0,'warp SAY_SUMMON_2'), +(-1553012,'So... confused. Do not... belong here!',11235,1,0,'warp SAY_DEATH'); + +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1554027 AND -1554000; +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1554000,'I predict a painful death.',11101,1,0,'gyro SAY_AGGRO'), +(-1554001,'Measure twice; cut once!',11104,1,0,'gyro SAY_SAW_ATTACK1'), +(-1554002,'If my division is correct, you should be quite dead.',11105,1,0,'gyro SAY_SAW_ATTACK2'), +(-1554003,'Your strategy was flawed!',11102,1,0,'gyro SAY_SLAY1'), +(-1554004,'Yes, the only logical outcome.',11103,1,0,'gyro SAY_SLAY2'), +(-1554005,'An unforseen... contingency',11106,1,0,'gyro SAY_DEATH'), +(-1554006,'You have approximately five seconds to live.',11109,1,0,'ironhand SAY_AGGRO_1'), +(-1554007,'With the precise angle and velocity...',11112,1,0,'ironhand SAY_HAMMER_1'), +(-1554008,'Low tech yet quiet effective!',11113,1,0,'ironhand SAY_HAMMER_2'), +(-1554009,'A foregone conclusion.',11110,1,0,'ironhand SAY_SLAY_1'), +(-1554010,'The processing will continue a schedule!',11111,1,0,'ironhand SAY_SLAY_2'), +(-1554011,'My calculations did not...',11114,1,0,'ironhand SAY_DEATH_1'), +(-1554012,'raises his hammer menacingly...',0,3,0,'ironhand EMOTE_HAMMER'), +(-1554013,'Don\'t value your life very much, do you?',11186,1,0,'sepethrea SAY_AGGRO'), +(-1554014,'I am not alone.',11191,1,0,'sepethrea SAY_SUMMON'), +(-1554015,'Think you can take the heat?',11189,1,0,'sepethrea SAY_DRAGONS_BREATH_1'), +(-1554016,'Anar\'endal dracon!',11190,1,0,'sepethrea SAY_DRAGONS_BREATH_2'), +(-1554017,'And don\'t come back!',11187,1,0,'sepethrea SAY_SLAY1'), +(-1554018,'En\'dala finel el\'dal',11188,1,0,'sepethrea SAY_SLAY2'), +(-1554019,'Anu... bala belore...alon.',11192,1,0,'sepethrea SAY_DEATH'), +(-1554020,'We are on a strict timetable. You will not interfere!',11193,1,0,'pathaleon SAY_AGGRO'), +(-1554021,'I\'m looking for a team player...',11197,1,0,'pathaleon SAY_DOMINATION_1'), +(-1554022,'You work for me now!',11198,1,0,'pathaleon SAY_DOMINATION_2'), +(-1554023,'Time to supplement my work force.',11196,1,0,'pathaleon SAY_SUMMON'), +(-1554024,'I prefeer to be hands-on...',11199,1,0,'pathaleon SAY_ENRAGE'), +(-1554025,'A minor inconvenience.',11194,1,0,'pathaleon SAY_SLAY_1'), +(-1554026,'Looks like you lose.',11195,1,0,'pathaleon SAY_SLAY_2'), +(-1554027,'The project will... continue.',11200,1,0,'pathaleon SAY_DEATH'); + +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1585029 AND -1585000; +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1585000,'You only waste my time!',12378,1,0,'selin SAY_AGGRO'), +(-1585001,'My hunger knows no bounds!',12381,1,0,'selin SAY_ENERGY'), +(-1585002,'Yes! I am a god!',12382,1,0,'selin SAY_EMPOWERED'), +(-1585003,'Enough distractions!',12388,1,0,'selin SAY_KILL_1'), +(-1585004,'I am invincible!',12385,1,0,'selin SAY_KILL_2'), +(-1585005,'No! More... I must have more!',12383,1,0,'selin SAY_DEATH'), +(-1585006,'begins to channel from the nearby Fel Crystal...',0,3,0,'selin EMOTE_CRYSTAL'), +(-1585007,'Drain...life!',12389,1,0,'vexallus SAY_AGGRO'), +(-1585008,'Un...con...tainable.',12392,1,0,'vexallus SAY_ENERGY'), +(-1585009,'Un...leash...',12390,1,0,'vexallus SAY_OVERLOAD'), +(-1585010,'Con...sume.',12393,1,0,'vexallus SAY_KILL'), +(-1585011,'discharges pure energy!',0,3,0,'vexallus EMOTE_DISCHARGE_ENERGY'), +(-1585012,'Annihilate them!',12395,1,0,'delrissa SAY_AGGRO'), +(-1585013,'Oh, the horror.',12398,1,0,'delrissa LackeyDeath1'), +(-1585014,'Well, aren\'t you lucky?',12400,1,0,'delrissa LackeyDeath2'), +(-1585015,'Now I\'m getting annoyed.',12401,1,0,'delrissa LackeyDeath3'), +(-1585016,'Lackies be damned! I\'ll finish you myself!',12403,1,0,'delrissa LackeyDeath4'), +(-1585017,'I call that a good start.',12405,1,0,'delrissa PlayerDeath1'), +(-1585018,'I could have sworn there were more of you.',12407,1,0,'delrissa PlayerDeath2'), +(-1585019,'Not really much of a group, anymore, is it?',12409,1,0,'delrissa PlayerDeath3'), +(-1585020,'One is such a lonely number.',12410,1,0,'delrissa PlayerDeath4'), +(-1585021,'It\'s been a kick, really.',12411,1,0,'delrissa PlayerDeath5'), +(-1585022,'Not what I had... planned...',12397,1,0,'delrissa SAY_DEATH'), +(-1585023,'Don\'t look so smug! I know what you\'re thinking, but Tempest Keep was merely a set back. Did you honestly believe I would trust the future to some blind, half-night elf mongrel? Oh no, he was merely an instrument, a stepping stone to a much larger plan! It has all led to this, and this time, you will not interfere!',12413,1,0,'kaelthas MT SAY_AGGRO'), +(-1585024,'Vengeance burns!',12415,1,0,'kaelthas MT SAY_PHOENIX'), +(-1585025,'Felomin ashal!',12417,1,0,'kaelthas MT SAY_FLAMESTRIKE'), +(-1585026,'I\'ll turn your world... upside... down...',12418,1,0,'kaelthas MT SAY_GRAVITY_LAPSE'), +(-1585027,'Master... grant me strength.',12419,1,0,'kaelthas MT SAY_TIRED'), +(-1585028,'Do not... get too comfortable.',12420,1,0,'kaelthas MT SAY_RECAST_GRAVITY'), +(-1585029,'My demise accomplishes nothing! The Master will have you! You will drown in your own blood! This world shall burn! Aaaghh!',12421,1,0,'kaelthas MT SAY_DEATH'); + +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1580035 AND -1580000; +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1580000,'Aggh! No longer will I be a slave to Malygos! Challenge me and you will be destroyed!',12422,1,0,'kalecgos SAY_EVIL_AGGRO'), +(-1580001,'I will purge you!',12423,1,0,'kalecgos SAY_EVIL_SPELL1'), +(-1580002,'Your pain has only begun!',12424,1,0,'kalecgos SAY_EVIL_SPELL2'), +(-1580003,'In the name of Kil\'jaeden!',12425,1,0,'kalecgos SAY_EVIL_SLAY1'), +(-1580004,'You were warned!',12426,1,0,'kalecgos SAY_EVIL_SLAY2'), +(-1580005,'My awakening is complete! You shall all perish!',12427,1,0,'kalecgos SAY_EVIL_ENRAGE'), +(-1580006,'I need... your help... Cannot... resist him... much longer...',12428,1,0,'kalecgos humanoid SAY_GOOD_AGGRO'), +(-1580007,'Aaahhh! Help me, before I lose my mind!',12429,1,0,'kalecgos humanoid SAY_GOOD_NEAR_DEATH'), +(-1580008,'Hurry! There is not much of me left!',12430,1,0,'kalecgos humanoid SAY_GOOD_NEAR_DEATH2'), +(-1580009,'I am forever in your debt. Once we have triumphed over Kil\'jaeden, this entire world will be in your debt as well.',12431,1,0,'kalecgos humanoid SAY_GOOD_PLRWIN'), +(-1580010,'There will be no reprieve. My work here is nearly finished.',12451,1,0,'sathrovarr SAY_SATH_AGGRO'), +(-1580011,'I\'m... never on... the losing... side...',12452,1,0,'sathrovarr SAY_SATH_DEATH'), +(-1580012,'Your misery is my delight!',12453,1,0,'sathrovarr SAY_SATH_SPELL1'), +(-1580013,'I will watch you bleed!',12454,1,0,'sathrovarr SAY_SATH_SPELL2'), +(-1580014,'Pitious mortal!',12455,1,0,'sathrovarr SAY_SATH_SLAY1'), +(-1580015,'Haven\'t you heard? I always win!',12456,1,0,'sathrovarr SAY_SATH_SLAY2'), +(-1580016,'I have toyed with you long enough!',12457,1,0,'sathrovarr SAY_SATH_ENRAGE'), +(-1580017,'Puny lizard! Death is the only answer you\'ll find here!',12458,1,0,'brutallus YELL_INTRO'), +(-1580018,'Grah! Your magic is weak!',12459,1,0,'brutallus YELL_INTRO_BREAK_ICE'), +(-1580019,'I will crush you!',12460,1,0,'brutallus YELL_INTRO_CHARGE'), +(-1580020,'That was fun.',12461,1,0,'brutallus YELL_INTRO_KILL_MADRIGOSA'), +(-1580021,'Come, try your luck!',12462,1,0,'brutallus YELL_INTRO_TAUNT'), +(-1580022,'Ahh! More lambs to the slaughter!',12463,1,0,'brutallus YELL_AGGRO'), +(-1580023,'Perish, insect!',12464,1,0,'brutallus YELL_KILL1'), +(-1580024,'You are meat!',12465,1,0,'brutallus YELL_KILL2'), +(-1580025,'Too easy!',12466,1,0,'brutallus YELL_KILL3'), +(-1580026,'Bring the fight to me!',12467,1,0,'brutallus YELL_LOVE1'), +(-1580027,'Another day, another glorious battle!',12468,1,0,'brutallus YELL_LOVE2'), +(-1580028,'I live for this!',12469,1,0,'brutallus YELL_LOVE3'), +(-1580029,'So much for a real challenge... Die!',12470,1,0,'brutallus YELL_BERSERK'), +(-1580030,'Gah! Well done... Now... this gets... interesting...',12471,1,0,'brutallus YELL_DEATH'), +(-1580031,'Hold, friends! There is information to be had before this devil meets his fate!',12472,1,0,'madrigosa YELL_MADR_ICE_BARRIER'), +(-1580032,'Where is Anveena, demon? What has become of Kalec?',12473,1,0,'madrigosa YELL_MADR_INTRO'), +(-1580033,'You will tell me where they are!',12474,1,0,'madrigosa YELL_MADR_ICE_BLOCK'), +(-1580034,'Speak, I grow weary of asking!',12475,1,0,'madrigosa YELL_MADR_TRAP'), +(-1580035,'Malygos, my lord! I did my best!',12476,1,0,'madrigosa YELL_MADR_DEATH'); + +DELETE FROM `script_texts` WHERE `entry`=-1033000; +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1033000,'Thanks for freeing me, I\'ll open this door for you, then I will get out of here.',0,0,0,'shadowfang_prisoner SAY_FREE'); + +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1309023 AND -1309000; +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1309000,'Let the coils of hate unfurl!',8421,1,0,'venoxis SAY_TRANSFORM'), +(-1309001,'Ssserenity..at lassst!',0,1,0,'venoxis SAY_DEATH'), +(-1309002,'Lord Hir\'eek, grant me wings of vengance!',8417,1,0,'jeklik SAY_AGGRO'), +(-1309003,'I command you to rain fire down upon these invaders!',0,1,0,'jeklik SAY_RAIN_FIRE'), +(-1309004,'Finally ...death. Curse you Hakkar! Curse you!',8422,1,0,'jeklik SAY_DEATH'), +(-1309005,'Draw me to your web mistress Shadra. Unleash your venom!',8418,1,0,'marli SAY_AGGRO'), +(-1309006,'Shadra, make of me your avatar!',0,1,0,'marli SAY_TRANSFORM'), +(-1309007,'Aid me my brood!',0,1,0,'marli SAY_SPIDER_SPAWN'), +(-1309008,'Bless you mortal for this release. Hakkar controls me no longer...',8423,1,0,'marli SAY_DEATH'), +(-1309009,'Shirvallah, fill me with your RAGE!',8419,1,0,'thekal SAY_AGGRO'), +(-1309010,'Hakkar binds me no more! Peace at last!',8424,1,0,'thekal SAY_DEATH'), +(-1309011,'Bethekk, your priestess calls upon your might!',8416,1,0,'arlokk SAY_AGGRO'), +(-1309012,'Feast on $n, my pretties!',0,1,0,'arlokk SAY_FEAST_PANTHER'), +(-1309013,'At last, I am free of the Soulflayer!',8412,1,0,'arlokk SAY_DEATH'), +(-1309014,'Welcome to da great show friends! Step right up to die!',8425,1,0,'jindo SAY_AGGRO'), +(-1309015,'I\'ll feed your souls to Hakkar himself!',8413,1,0,'mandokir SAY_AGGRO'), +(-1309016,'DING!',0,1,0,'mandokir SAY_DING_KILL'), +(-1309017,'GRATS!',0,1,0,'mandokir SAY_GRATS_JINDO'), +(-1309018,'I\'m keeping my eye on you, $N!',0,1,0,'mandokir SAY_WATCH'), +(-1309019,'Don\'t make me angry. You won\'t like it when I\'m angry.',0,1,0,'mandokir SAY_WATCH_WHISPER'), +(-1309020,'PRIDE HERALDS THE END OF YOUR WORLD. COME, MORTALS! FACE THE WRATH OF THE SOULFLAYER!',8414,1,0,'hakkar SAY_AGGRO'), +(-1309021,'Fleeing will do you no good, mortals!',0,1,0,'hakkar SAY_FLEEING'), +(-1309022,'You dare set foot upon Hakkari holy ground? Minions of Hakkar, destroy the infidels!',0,1,0,'hakkar SAY_MINION_DESTROY'), +(-1309023,'Minions of Hakkar, hear your God. The sanctity of this temple has been compromised. Invaders encroach upon holy ground! The Altar of Blood must be protected. Kill them all!',0,1,0,'hakkar SAY_PROTECT_ALTAR'); + +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1568023 AND -1568000; +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1568000,'Spirits of da wind be your doom!',12031,1,0,'janalai SAY_AGGRO'), +(-1568001,'I burn ya now!',12032,1,0,'janalai SAY_FIRE_BOMBS'), +(-1568002,'Where ma hatcha? Get to work on dem eggs!',12033,1,0,'janalai SAY_SUMMON_HATCHER'), +(-1568003,'I show you strength... in numbers.',12034,1,0,'janalai SAY_ALL_EGGS'), +(-1568004,'You done run outta time!',12035,1,0,'janalai SAY_BERSERK'), +(-1568005,'It all be over now, mon!',12036,1,0,'janalai SAY_SLAY_1'), +(-1568006,'Tazaga-choo!',12037,1,0,'janalai SAY_SLAY_2'), +(-1568007,'Zul\'jin... got a surprise for you...',12038,1,0,'janalai SAY_DEATH'), +(-1568008,'Come, strangers. The spirit of the dragonhawk hot be hungry for worthy souls.',12039,1,0,'janalai SAY_EVENT_STRANGERS'), +(-1568009,'Come, friends. Your bodies gonna feed ma hatchlings, and your souls are going to feed me with power!',12040,1,0,'janalai SAY_EVENT_FRIENDS'), +(-1568010,'Get da move on, guards! It be killin\' time!',12066,1,0,'nalorakk SAY_WAVE1_AGGRO'), +(-1568011,'Guards, go already! Who you more afraid of, dem... or me?',12067,1,0,'nalorakk SAY_WAVE2_STAIR1'), +(-1568012,'Ride now! Ride out dere and bring me back some heads!',12068,1,0,'nalorakk SAY_WAVE3_STAIR2'), +(-1568013,'I be losin\' me patience! Go on: make dem wish dey was never born!',12069,1,0,'nalorakk SAY_WAVE4_PLATFORM'), +(-1568014,'What could be better than servin\' da bear spirit for eternity? Come closer now. Bring your souls to me!',12078,1,0,'nalorakk SAY_EVENT1_SACRIFICE'), +(-1568015,'Don\'t be delayin\' your fate. Come to me now. I make your sacrifice quick.',12079,1,0,'nalorakk SAY_EVENT2_SACRIFICE'), +(-1568016,'You be dead soon enough!',12070,1,0,'nalorakk SAY_AGGRO'), +(-1568017,'I bring da pain!',12071,1,0,'nalorakk SAY_SURGE'), +(-1568018,'You call on da beast, you gonna get more dan you bargain for!',12072,1,0,'nalorakk SAY_TOBEAR'), +(-1568019,'Make way for Nalorakk!',12073,1,0,'nalorakk SAY_TOTROLL'), +(-1568020,'You had your chance, now it be too late!',12074,1,0,'nalorakk SAY_BERSERK'), +(-1568021,'Mua-ha-ha! Now whatchoo got to say?',12075,1,0,'nalorakk SAY_SLAY1'), +(-1568022,'Da Amani gonna rule again!',12076,1,0,'nalorakk SAY_SLAY2'), +(-1568023,'I... be waitin\' on da udda side....',12077,1,0,'nalorakk SAY_DEATH'); + +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1509027 AND -1509000; +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1509000,'senses your fear.',0,2,0,'moam EMOTE_AGGRO'), +(-1509001,'bristles with energy!',0,2,0,'moan EMOTE_MANA_FULL'), +(-1509002,'sets eyes on $N!',0,2,0,'buru EMOTE_TARGET'), +(-1509003,'They come now. Try not to get yourself killed, young blood.',0,1,0,'andorov SAY_ANDOROV_INTRO'), +(-1509004,'Remember, Rajaxx, when I said I\'d kill you last? I lied...',0,1,0,'andorov SAY_ANDOROV_ATTACK'), +(-1509005,'The time of our retribution is at hand! Let darkness reign in the hearts of our enemies!',8612,1,0,'rajaxx SAY_WAVE3'), +(-1509006,'No longer will we wait behind barred doors and walls of stone! No longer will our vengeance be denied! The dragons themselves will tremble before our wrath!',8610,1,0,'rajaxx SAY_WAVE4'), +(-1509007,'Fear is for the enemy! Fear and death!',8608,1,0,'rajaxx SAY_WAVE5'), +(-1509008,'Staghelm will whimper and beg for his life, just as his whelp of a son did! One thousand years of injustice will end this day!',8611,1,0,'rajaxx SAY_WAVE6'), +(-1509009,'Fandral! Your time has come! Go and hide in the Emerald Dream and pray we never find you!',8607,1,0,'rajaxx SAY_WAVE7'), +(-1509010,'Impudent fool! I will kill you myself!',8609,1,0,'rajaxx SAY_INTRO'), +(-1509011,'Attack and make them pay dearly!',8603,1,0,'rajaxx SAY_UNK1'), +(-1509012,'Crush them! Drive them out!',8605,1,0,'rajaxx SAY_UNK2'), +(-1509013,'Do not hesitate! Destroy them!',8606,1,0,'rajaxx SAY_UNK3'), +(-1509014,'Warriors! Captains! Continue the fight!',8613,1,0,'rajaxx SAY_UNK4'), +(-1509015,'You are not worth my time $N!',8614,1,0,'rajaxx SAY_DEAGGRO'), +(-1509016,'Breath your last!',8604,1,0,'rajaxx SAY_KILLS_ANDOROV'), +(-1509017,'Soon you will know the price of your meddling, mortals... The master is nearly whole... And when he rises, your world will be cease!',0,1,0,'rajaxx SAY_COMPLETE_QUEST'), +(-1509018,'I am rejuvinated!',8593,1,0,'ossirian SAY_SURPREME1'), +(-1509019,'My powers are renewed!',8595,1,0,'ossirian SAY_SURPREME2'), +(-1509020,'My powers return!',8596,1,0,'ossirian SAY_SURPREME3'), +(-1509021,'Protect the city at all costs!',8597,1,0,'ossirian SAY_RAND_INTRO1'), +(-1509022,'The walls have been breached!',8599,1,0,'ossirian SAY_RAND_INTRO2'), +(-1509023,'To your posts. Defend the city.',8600,1,0,'ossirian SAY_RAND_INTRO3'), +(-1509024,'Tresspassers will be terminated.',8601,1,0,'ossirian SAY_RAND_INTRO4'), +(-1509025,'Sands of the desert rise and block out the sun!',8598,1,0,'ossirian SAY_AGGRO'), +(-1509026,'You are terminated.',8602,1,0,'ossirian SAY_SLAY'), +(-1509027,'I...have...failed.',8594,1,0,'ossirian SAY_DEATH'); + +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1531011 AND -1531000; +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1531000,'Are you so eager to die? I would be happy to accomodate you.',8615,1,0,'skeram SAY_AGGRO1'), +(-1531001,'Cower mortals! The age of darkness is at hand.',8616,1,0,'skeram SAY_AGGRO2'), +(-1531002,'Tremble! The end is upon you.',8621,1,0,'skeram SAY_AGGRO3'), +(-1531003,'Let your death serve as an example!',8617,1,0,'skeram SAY_SLAY1'), +(-1531004,'Spineless wretches! You will drown in rivers of blood!',8619,1,0,'skeram SAY_SLAY2'), +(-1531005,'The screams of the dying will fill the air. A symphony of terror is about to begin!',8620,1,0,'skeram SAY_SLAY3'), +(-1531006,'Prepare for the return of the ancient ones!',8618,1,0,'skeram SAY_SPLIT'), +(-1531007,'You only delay... the inevetable.',8622,1,0,'skeram SAY_DEATH'), +(-1531008,'You will be judged for defiling these sacred grounds! The laws of the Ancients will not be challenged! Trespassers will be annihilated!',8646,1,0,'sartura SAY_AGGRO'), +(-1531009,'I sentence you to death!',8647,1,0,'sartura SAY_SLAY'), +(-1531010,'I serve to the last!',8648,1,0,'sartura SAY_DEATH'), +(-1531011,'is weakened!',0,2,0,'cthun EMOTE_WEAKENED'); + +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1509027 AND -1509018; +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1509018,'I am rejuvinated!',8593,1,0,'ossirian SAY_SURPREME1'), +(-1509019,'My powers are renewed!',8595,1,0,'ossirian SAY_SURPREME2'), +(-1509020,'My powers return!',8596,1,0,'ossirian SAY_SURPREME3'), +(-1509021,'Protect the city at all costs!',8597,1,0,'ossirian SAY_RAND_INTRO1'), +(-1509022,'The walls have been breached!',8599,1,0,'ossirian SAY_RAND_INTRO2'), +(-1509023,'To your posts. Defend the city.',8600,1,0,'ossirian SAY_RAND_INTRO3'), +(-1509024,'Tresspassers will be terminated.',8601,1,0,'ossirian SAY_RAND_INTRO4'), +(-1509025,'Sands of the desert rise and block out the sun!',8598,1,0,'ossirian SAY_AGGRO'), +(-1509026,'You are terminated.',8602,1,0,'ossirian SAY_SLAY'), +(-1509027,'I...have...failed.',8594,1,0,'ossirian SAY_DEATH'); + +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1564096 AND -1564000; +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1564000,'You will die in the name of Lady Vashj!',11450,1,0,'SAY_AGGRO'), +(-1564001,'Stick around!',11451,1,0,'SAY_NEEDLE1'), +(-1564002,'I\'ll deal with you later!',11452,1,0,'SAY_NEEDLE2'), +(-1564003,'Your success was short lived!',11455,1,0,'SAY_SLAY1'), +(-1564004,'Time for you to go!',11456,1,0,'SAY_SLAY2'), +(-1564005,'Bel\'anen dal\'lorei!',11453,1,0,'SAY_SPECIAL1'), +(-1564006,'Blood will flow!',11454,1,0,'SAY_SPECIAL2'), +(-1564007,'Bal\'amer ch\'itah!',11457,1,0,'SAY_ENRAGE1'), +(-1564008,'My patience has ran out! Die, DIE!',11458,1,0,'SAY_ENRAGE2'), +(-1564009,'Lord Illidan will... crush you.',11459,1,0,'SAY_DEATH'), +(-1564010,'%s acquires a new target!',0,3,0,'supremus EMOTE_NEW_TARGET'), +(-1564011,'%s punches the ground in anger!',0,3,0,'supremus EMOTE_PUNCH_GROUND'), +(-1564012,'The ground begins to crack open!',0,3,0,'supremus EMOTE_GROUND_CRACK'), +(-1564013,'No! Not yet...',11385,1,0,'akama shade SAY_LOW_HEALTH'), +(-1564014,'I will not last much longer...',11386,1,0,'akama shade SAY_DEATH'), +(-1564015,'Come out from the shadows! I\'ve returned to lead you against our true enemy! Shed your chains and raise your weapons against your Illidari masters!',0,1,0,'akama shade SAY_FREE'), +(-1564016,'Hail our leader! Hail Akama!',0,1,0,'akama shade broken SAY_BROKEN_FREE_01'), +(-1564017,'Hail Akama!',0,1,0,'akama shade broken SAY_BROKEN_FREE_02'), +(-1564018,'You play, you pay.',11501,1,0,'shahraz SAY_TAUNT1'), +(-1564019,'I\'m not impressed.',11502,1,0,'shahraz SAY_TAUNT2'), +(-1564020,'Enjoying yourselves?',11503,1,0,'shahraz SAY_TAUNT3'), +(-1564021,'So... business or pleasure?',11504,1,0,'shahraz SAY_AGGRO'), +(-1564022,'You seem a little tense.',11505,1,0,'shahraz SAY_SPELL1'), +(-1564023,'Don\'t be shy.',11506,1,0,'shahraz SAY_SPELL2'), +(-1564024,'I\'m all... yours.',11507,1,0,'shahraz SAY_SPELL3'), +(-1564025,'Easy come, easy go.',11508,1,0,'shahraz SAY_SLAY1'), +(-1564026,'So much for a happy ending.',11509,1,0,'shahraz SAY_SLAY2'), +(-1564027,'Stop toying with my emotions!',11510,1,0,'shahraz SAY_ENRAGE'), +(-1564028,'I wasn\'t... finished.',11511,1,0,'shahraz SAY_DEATH'), +(-1564029,'Horde will... crush you.',11432,1,0,'bloodboil SOUND_AGGRO'), +(-1564030,'Time to feast!',11433,1,0,'bloodboil SAY_SLAY1'), +(-1564031,'More! I want more!',11434,1,0,'bloodboil SAY_SLAY2'), +(-1564032,'Drink your blood! Eat your flesh!',11435,1,0,'bloodboil SAY_SPECIAL1'), +(-1564033,'I hunger!',11436,1,0,'bloodboil SAY_SPECIAL2'), +(-1564034,'<babbling>',11437,1,0,'bloodboil SAY_ENRAGE1'), +(-1564035,'I\'ll rip the meat from your bones!',11438,1,0,'bloodboil SAY_ENRAGE2'), +(-1564036,'Aaaahrg...',11439,1,0,'bloodboil SAY_DEATH'), +(-1564037,'I was the first, you know. For me, the wheel of death has spun many times. <laughs> So much time has passed. I have a lot of catching up to do...',11512,1,0,'teron SAY_INTRO'), +(-1564038,'Vengeance is mine!',11513,1,0,'teron SAY_AGGRO'), +(-1564039,'I have use for you!',11514,1,0,'teron SAY_SLAY1'), +(-1564040,'It gets worse...',11515,1,0,'teron SAY_SLAY2'), +(-1564041,'What are you afraid of?',11517,1,0,'teron SAY_SPELL1'), +(-1564042,'Death... really isn\'t so bad.',11516,1,0,'teron SAY_SPELL2'), +(-1564043,'Give in!',11518,1,0,'teron SAY_SPECIAL1'), +(-1564044,'I have something for you...',11519,1,0,'teron SAY_SPECIAL2'), +(-1564045,'YOU WILL SHOW THE PROPER RESPECT!',11520,1,0,'teron SAY_ENRAGE'), +(-1564046,'The wheel...spins...again....',11521,1,0,'teron SAY_DEATH'), +(-1564047,'Pain and suffering are all that await you!',11415,1,0,'essence SUFF_SAY_FREED'), +(-1564048,'Don\'t leave me alone!',11416,1,0,'essence SUFF_SAY_AGGRO'), +(-1564049,'Look at what you make me do!',11417,1,0,'essence SUFF_SAY_SLAY1'), +(-1564050,'I didn\'t ask for this!',11418,1,0,'essence SUFF_SAY_SLAY2'), +(-1564051,'The pain is only beginning!',11419,1,0,'essence SUFF_SAY_SLAY3'), +(-1564052,'I don\'t want to go back!',11420,1,0,'essence SUFF_SAY_RECAP'), +(-1564053,'Now what do I do?',11421,1,0,'essence SUFF_SAY_AFTER'), +(-1564054,'%s becomes enraged!',0,3,0,'essence SUFF_EMOTE_ENRAGE'), +(-1564055,'You can have anything you desire... for a price.',11408,1,0,'essence DESI_SAY_FREED'), +(-1564056,'Fulfilment is at hand!',11409,1,0,'essence DESI_SAY_SLAY1'), +(-1564057,'Yes... you\'ll stay with us now...',11410,1,0,'essence DESI_SAY_SLAY2'), +(-1564058,'Your reach exceeds your grasp.',11412,1,0,'essence DESI_SAY_SLAY3'), +(-1564059,'Be careful what you wish for...',11411,1,0,'essence DESI_SAY_SPEC'), +(-1564060,'I\'ll be waiting...',11413,1,0,'essence DESI_SAY_RECAP'), +(-1564061,'I won\'t be far...',11414,1,0,'essence DESI_SAY_AFTER'), +(-1564062,'Beware: I live!',11399,1,0,'essence ANGER_SAY_FREED'), +(-1564063,'So... foolish.',11400,1,0,'essence ANGER_SAY_FREED2'), +(-1564064,'<maniacal cackle>',11401,1,0,'essence ANGER_SAY_SLAY1'), +(-1564065,'Enough. No more.',11402,1,0,'essence ANGER_SAY_SLAY2'), +(-1564066,'On your knees!',11403,1,0,'essence ANGER_SAY_SPEC'), +(-1564067,'Beware, coward.',11405,1,0,'essence ANGER_SAY_BEFORE'), +(-1564068,'I won\'t... be... ignored.',11404,1,0,'essence ANGER_SAY_DEATH'), +(-1564069,'You wish to test me?',11524,1,0,'council vera AGGRO'), +(-1564070,'I have better things to do...',11422,1,0,'council gath AGGRO'), +(-1564071,'Flee or die!',11482,1,0,'council mala AGGRO'), +(-1564072,'Common... such a crude language. Bandal!',11440,1,0,'council zere AGGRO'), +(-1564073,'Enough games!',11428,1,0,'council gath ENRAGE'), +(-1564074,'You wish to kill me? Hahaha, you first!',11530,1,0,'council vera ENRAGE'), +(-1564075,'For Quel\'Thalas! For the Sunwell!',11488,1,0,'council mala ENRAGE'), +(-1564076,'Sha\'amoor sine menoor!',11446,1,0,'council zere ENRAGE'), +(-1564077,'Enjoy your final moments!',11426,1,0,'council gath SPECIAL1'), +(-1564078,'You\'re not caught up for this!',11528,1,0,'council vera SPECIAL1'), +(-1564079,'No second chances!',11486,1,0,'council mala SPECIAL1'), +(-1564080,'Diel fin\'al',11444,1,0,'council zere SPECIAL1'), +(-1564081,'You are mine!',11427,1,0,'council gath SPECIAL2'), +(-1564082,'Anar\'alah belore!',11529,1,0,'council vera SPECIAL2'), +(-1564083,'I\'m full of surprises!',11487,1,0,'council mala SPECIAL2'), +(-1564084,'Sha\'amoor ara mashal?',11445,1,0,'council zere SPECIAL2'), +(-1564085,'Selama am\'oronor!',11423,1,0,'council gath SLAY'), +(-1564086,'Valiant effort!',11525,1,0,'council vera SLAY'), +(-1564087,'My work is done.',11483,1,0,'council mala SLAY'), +(-1564088,'Shorel\'aran.',11441,1,0,'council zere SLAY'), +(-1564089,'Well done!',11424,1,0,'council gath SLAY_COMT'), +(-1564090,'A glorious kill!',11526,1,0,'council vera SLAY_COMT'), +(-1564091,'As it should be!',11484,1,0,'council mala SLAY_COMT'), +(-1564092,'Belesa menoor!',11442,1,0,'council zere SLAY_COMT'), +(-1564093,'Lord Illidan... I...',11425,1,0,'council gath DEATH'), +(-1564094,'You got lucky!',11527,1,0,'council vera DEATH'), +(-1564095,'Destiny... awaits.',11485,1,0,'council mala DEATH'), +(-1564096,'Diel ma\'ahn... oreindel\'o',11443,1,0,'council zere DEATH'); + +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1409018 AND -1409000; +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1409000,'performs one last service for Ragnaros.',0,2,0,'geddon EMOTE_SERVICE'), +(-1409001,'goes into a killing frenzy!',0,2,0,'magmadar EMOTE_FRENZY'), +(-1409002,'refuses to die while its master is in trouble.',0,2,0,'core rager EMOTE_AEGIS'), +(-1409003,'Reckless mortals, none may challenge the sons of the living flame!',8035,1,0,'majordomo SAY_AGGRO'), +(-1409004,'The runes of warding have been destroyed! Hunt down the infedels my bretheren.',8039,1,0,'majordomo SAY_SPAWN'), +(-1409005,'Ashes to Ashes!',8037,1,0,'majordomo SAY_SLAY'), +(-1409006,'Burn mortals! Burn for this transgression!',8036,1,0,'majordomo SAY_SPECIAL'), +(-1409007,'Impossible! Stay your attack mortals! I submitt! I submitt! Brashly you have come to rest the secrets of the living flame. You will soon regret the recklessness of your quest. I go now to summon the lord whos house this is. Should you seek an audiance with him your paltry lives will surly be forfit. Nevertheless seek out his lair if you dare!',8038,1,0,'majordomo SAY_DEFEAT'), +(-1409008,'Behold Ragnaros, the Firelord! He who was ancient when this world was young! Bow before him, mortals! Bow before your ending!',8040,1,0,'ragnaros SAY_SUMMON_MAJ'), +(-1409009,'TOO SOON! YOU HAVE AWAKENED ME TOO SOON, EXECUTUS! WHAT IS THE MEANING OF THIS INTRUSION?',8043,1,0,'ragnaros SAY_ARRIVAL1_RAG'), +(-1409010,'These mortal infidels, my lord! They have invaded your sanctum, and seek to steal your secrets!',8041,1,0,'ragnaros SAY_ARRIVAL2_MAJ'), +(-1409011,'FOOL! YOU ALLOWED THESE INSECTS TO RUN RAMPANT THROUGH THE HALLOWED CORE, AND NOW YOU LEAD THEM TO MY VERY LAIR? YOU HAVE FAILED ME, EXECUTUS! JUSTICE SHALL BE MET, INDEED!',8044,1,0,'ragnaros SAY_ARRIVAL3_RAG'), +(-1409012,'NOW FOR YOU, INSECTS. BOLDLY YOU SAUGHT THE POWER OF RAGNAROS NOW YOU SHALL SEE IT FIRST HAND.',8045,1,0,'ragnaros SAY_ARRIVAL5_RAG'), +(-1409013,'COME FORTH, MY SERVANTS! DEFEND YOUR MASTER!',8049,1,0,'ragnaros SAY_REINFORCEMENTS1'), +(-1409014,'YOU CANNOT DEFEAT THE LIVING FLAME! COME YOU MINIONS OF FIRE! COME FORTH YOU CREATURES OF HATE! YOUR MASTER CALLS!',8050,1,0,'ragnaros SAY_REINFORCEMENTS2'), +(-1409015,'BY FIRE BE PURGED!',8046,1,0,'ragnaros SAY_HAND'), +(-1409016,'TASTE THE FLAMES OF SULFURON!',8047,1,0,'ragnaros SAY_WRATH'), +(-1409017,'DIE INSECT!',8051,1,0,'ragnaros SAY_KILL'), +(-1409018,'MY PATIENCE IS DWINDILING! COME NATS TO YOUR DEATH!',8048,1,0,'ragnaros SAY_MAGMABURST'); + +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1552030 AND -1552000; +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1552000,'It is a small matter to control the mind of the weak... for I bear allegiance to powers untouched by time, unmoved by fate. No force on this world or beyond harbors the strength to bend our knee... not even the mighty Legion!',11122,1,0,'skyriss SAY_INTRO'), +(-1552001,'Bear witness to the agent of your demise!',11123,1,0,'skyriss SAY_AGGRO'), +(-1552002,'Your fate is written!',11124,1,0,'skyriss SAY_KILL_1'), +(-1552003,'The chaos I have sown here is but a taste...',11125,1,0,'skyriss SAY_KILL_2'), +(-1552004,'You will do my bidding, weakling.',11127,1,0,'skyriss SAY_MIND_1'), +(-1552005,'Your will is no longer your own.',11128,1,0,'skyriss SAY_MIND_2'), +(-1552006,'Flee in terror!',11129,1,0,'skyriss SAY_FEAR_1'), +(-1552007,'I will show you horrors undreamed of!',11130,1,0,'skyriss SAY_FEAR_2'), +(-1552008,'We span the universe, as countless as the stars!',11131,1,0,'skyriss SAY_IMAGE'), +(-1552009,'I am merely one of... infinite multitudes.',11126,1,0,'skyriss SAY_DEATH'), +(-1552010,'Where in Bonzo\'s brass buttons am I? And who are-- yaaghh, that\'s one mother of a headache!',11171,1,0,'millhouse SAY_INTRO_1'), +(-1552011,'\"Lowly\"? I don\'t care who you are friend, no one refers to the mighty Millhouse Manastorm as \"Lowly\"! I have no idea what goes on here, but I will gladly join your fight against this impudent imbecile! Prepare to defend yourself, cretin!',11172,1,0,'millhouse SAY_INTRO_2'), +(-1552012,'I just need to get some things ready first. You guys go ahead and get started. I need to summon up some water...',11173,1,0,'millhouse SAY_WATER'), +(-1552013,'Fantastic! Next, some protective spells. Yes! Now we\'re cookin\'',11174,1,0,'millhouse SAY_BUFFS'), +(-1552014,'And of course i\'ll need some mana. You guys are gonna love this, just wait.',11175,1,0,'millhouse SAY_DRINK'), +(-1552015,'Aaalllriiiight!! Who ordered up an extra large can of whoop-ass?',11176,1,0,'millhouse SAY_READY'), +(-1552016,'I didn\'t even break a sweat on that one.',11177,1,0,'millhouse SAY_KILL_1'), +(-1552017,'You guys, feel free to jump in anytime.',11178,1,0,'millhouse SAY_KILL_2'), +(-1552018,'I\'m gonna light you up, sweet cheeks!',11179,1,0,'millhouse SAY_PYRO'), +(-1552019,'Ice, ice, baby!',11180,1,0,'millhouse SAY_ICEBLOCK'), +(-1552020,'Heal me! Oh, for the love of all that is holy, HEAL me! I\'m dying!',11181,1,0,'millhouse SAY_LOWHP'), +(-1552021,'You\'ll be hearing from my lawyer...',11182,1,0,'millhouse SAY_DEATH'), +(-1552022,'Who\'s bad? Who\'s bad? That\'s right: we bad!',11183,1,0,'millhouse SAY_COMPLETE'), +(-1552023,'I knew the prince would be angry but, I... I have not been myself. I had to let them out! The great one speaks to me, you see. Wait--outsiders. Kael\'thas did not send you! Good... I\'ll just tell the prince you released the prisoners!',11222,1,0,'mellichar YELL_INTRO1'), +(-1552024,'The naaru kept some of the most dangerous beings in existence here in these cells. Let me introduce you to another...',11223,1,0,'mellichar YELL_INTRO2'), +(-1552025,'Yes, yes... another! Your will is mine!',11224,1,0,'mellichar YELL_RELEASE1'), +(-1552026,'Behold another terrifying creature of incomprehensible power!',11225,1,0,'mellichar YELL_RELEASE2A'), +(-1552027,'What is this? A lowly gnome? I will do better, O\'great one.',11226,1,0,'mellichar YELL_RELEASE2B'), +(-1552028,'Anarchy! Bedlam! Oh, you are so wise! Yes, I see it now, of course!',11227,1,0,'mellichar YELL_RELEASE3'), +(-1552029,'One final cell remains. Yes, O\'great one, right away!',11228,1,0,'mellichar YELL_RELEASE4'), +(-1552030,'Welcome, O\'great one. I am your humble servant.',11229,1,0,'mellichar YELL_WELCOME'); + +DELETE FROM `script_texts` WHERE `entry`=-1000100; +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1000100,'Come, little ones. Face me!',0,1,0,'azuregos SAY_TELEPORT'); + +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1249004 AND -1249000; +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1249000,'How fortuitous. Usually, I must leave my lair to feed.',0,1,0,'onyxia SAY_AGGRO'), +(-1249001,'Learn your place mortal!',0,1,0,'onyxia SAY_KILL'), +(-1249002,'This meaningless exertion bores me. I\'ll incinerate you all from above!',0,1,0,'onyxia SAY_PHASE_2_TRANS'), +(-1249003,'It seems you\'ll need another lesson, mortals!',0,1,0,'onyxia SAY_PHASE_3_TRANS'), +(-1249004,'takes in a deep breath...',0,1,0,'onyxia EMOTE_BREATH'); + +DELETE FROM `script_texts` WHERE `entry`=-1469031; +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1469031,'goes into a frenzy!',0,2,0,'flamegor EMOTE_FRENZY'); + +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000105 AND -1000101; +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1000101,'Follow me, $N. I\'ll take you to the Defias hideout. But you better protect me or I am as good as dead',0,0,7,'defias traitor SAY_START'), +(-1000102,'The entrance is hidden here in Moonbrook. Keep your eyes peeled for thieves. They want me dead.',0,0,7,'defias traitor SAY_PROGRESS'), +(-1000103,'You can go tell Stoutmantle this is where the Defias Gang is holed up, $N.',0,0,7,'defias traitor SAY_END'), +(-1000104,'%s coming in fast! Prepare to fight!',0,0,7,'defias traitor SAY_AGGRO_1'), +(-1000105,'Help!',0,0,7,'defias traitor SAY_AGGRO_2'); + diff --git a/sql/updates/175_world_scripts.sql b/sql/updates/175_world_scripts.sql new file mode 100644 index 00000000000..dc46a67737f --- /dev/null +++ b/sql/updates/175_world_scripts.sql @@ -0,0 +1,2 @@ +UPDATE `creature_template` SET `ScriptName`='npc_defias_traitor' WHERE `entry`='467'; + diff --git a/sql/updates/176_world.sql b/sql/updates/176_world.sql new file mode 100644 index 00000000000..2cb80bd25a2 --- /dev/null +++ b/sql/updates/176_world.sql @@ -0,0 +1,33 @@ +ALTER TABLE `npc_option` + CHANGE COLUMN `id` `id` mediumint(8) unsigned NOT NULL default '0', + CHANGE COLUMN `gossip_id` `gossip_id` mediumint(8) unsigned NOT NULL default '0', + CHANGE COLUMN `action` `action` mediumint(8) unsigned NOT NULL default '0', + ADD COLUMN `box_money` int(10) unsigned NOT NULL default '0' AFTER `action`, + ADD COLUMN `coded` tinyint(3) unsigned NOT NULL default '0' AFTER `box_money`, + ADD COLUMN `box_text` text AFTER `option_text`; + +CREATE TABLE `locales_npc_option` ( + `entry` mediumint(8) unsigned NOT NULL default '0', + `option_text_loc1` text, + `option_text_loc2` text, + `option_text_loc3` text, + `option_text_loc4` text, + `option_text_loc5` text, + `option_text_loc6` text, + `option_text_loc7` text, + `option_text_loc8` text, + `box_text_loc1` text, + `box_text_loc2` text, + `box_text_loc3` text, + `box_text_loc4` text, + `box_text_loc5` text, + `box_text_loc6` text, + `box_text_loc7` text, + `box_text_loc8` text, + PRIMARY KEY (`entry`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + +ALTER TABLE `creature_template` + CHANGE COLUMN `flags` `unit_flags` int(10) unsigned NOT NULL default '0', + CHANGE COLUMN `flag1` `type_flags` int(10) unsigned NOT NULL default '0'; + diff --git a/sql/updates/182_world.sql b/sql/updates/182_world.sql new file mode 100644 index 00000000000..70c200b5144 --- /dev/null +++ b/sql/updates/182_world.sql @@ -0,0 +1,5 @@ +DELETE FROM `command` WHERE name IN ('possess', 'unpossess'); +INSERT INTO `command` (name,security,help) VALUES +('possess',3,'Syntax: .possess\r\n\r\nPossesses indefinitely the selected creature.'), +('unpossess',3,'Syntax: .unpossess\r\n\r\nIf you are possessed, unpossesses yourself; otherwise unpossesses current possessed target.'); + diff --git a/sql/updates/212_world_scripts.sql b/sql/updates/212_world_scripts.sql new file mode 100644 index 00000000000..b1c6a4cad0e --- /dev/null +++ b/sql/updates/212_world_scripts.sql @@ -0,0 +1,6 @@ +UPDATE `creature_template` SET `ScriptName`='npc_clintar_dreamwalker' WHERE `entry`=22834; +UPDATE `creature_template` SET `ScriptName`='npc_clintar_spirit' WHERE `entry` = 22916; +UPDATE `creature_template` SET `ScriptName`='mob_sparrowhawk' WHERE `entry`=22979; +UPDATE `creature_template` SET `ScriptName`='mob_rizzle_sprysprocket' WHERE `entry`=23002; +UPDATE `creature_template` SET `ScriptName`='mob_depth_charge' WHERE `entry`=23025; + diff --git a/sql/updates/220_characters.sql b/sql/updates/220_characters.sql new file mode 100644 index 00000000000..5075f2e3b54 --- /dev/null +++ b/sql/updates/220_characters.sql @@ -0,0 +1,3 @@ +ALTER TABLE `characters` + ADD `latency` int(11) unsigned NOT NULL default '0' AFTER `taxi_path`; + diff --git a/sql/updates/230_world.sql b/sql/updates/230_world.sql new file mode 100644 index 00000000000..edb46971753 --- /dev/null +++ b/sql/updates/230_world.sql @@ -0,0 +1,3 @@ +UPDATE `spell_proc_event` SET `procFlags` = '8396800' WHERE `entry` =14774; +UPDATE `spell_proc_event` SET `procFlags` = '8396800' WHERE `entry` =14531; + diff --git a/sql/updates/230_world_blacktemple.sql b/sql/updates/230_world_blacktemple.sql new file mode 100644 index 00000000000..20823b188f6 --- /dev/null +++ b/sql/updates/230_world_blacktemple.sql @@ -0,0 +1,26 @@ +DELETE FROM spell_linked_spell WHERE `spell_trigger` IN (39992, 39835, 42052, -41914, -41917, 41126, -41376, 39908); +-- INSERT INTO spell_linked_spell (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES (39992, 39835, 1, 'Needle Spine'); +INSERT INTO spell_linked_spell (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES (39835, 39968, 1, 'Needle Spine'); +INSERT INTO spell_linked_spell (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES (-41376, 41377, 0, 'Spite'); +INSERT INTO spell_linked_spell (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES (41126, 41131, 1, 'Flame Crash'); +INSERT INTO spell_linked_spell (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES (-41914, 41915, 0, 'Summon Parasitic Shadowfiend'); +INSERT INTO spell_linked_spell (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES (-41917, 41915, 0, 'Summon Parasitic Shadowfiend'); +INSERT INTO spell_linked_spell (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES (39908, 40017, 1, 'Eye Blast'); + +-- spine +update gameobject_template set scriptname = 'go_najentus_spine' where entry = 185584; +-- molten_flame +UPDATE creature_template SET spell1 = 40980, flags_extra = 128, speed = 1.0, scriptname = 'molten_flame' WHERE entry = 23095; +-- volcano +UPDATE creature_template SET spell1 = 40117, flags_extra = 128, scriptname = '' WHERE entry = 23085; +-- flame crash +update creature_template set spell1 = 40836, flags_extra = 128, scriptname = '' where entry = 23336; +-- blaze +update creature_template set spell1 = 40610, flags_extra = 128, scriptname = '' where entry = 23259; +-- glaive +update creature_template set scriptname = 'mob_blade_of_azzinoth' where entry = 22996; +-- parasitic shadowfiend +update creature_template set scriptname = 'mob_parasitic_shadowfiend' where entry = 23498; +-- Maiev +update creature_template set minlevel = 73, maxlevel = 73, minhealth = 500000, maxhealth = 500000, mindmg = 3000, maxdmg = 4000 where entry = 23197; + diff --git a/sql/updates/230_world_scripts.sql b/sql/updates/230_world_scripts.sql new file mode 100644 index 00000000000..a188fd28580 --- /dev/null +++ b/sql/updates/230_world_scripts.sql @@ -0,0 +1,2 @@ +update gameobject_template set scriptname = 'go_gilded_brazier' where entry = 181956; + diff --git a/sql/updates/230_world_serpent_shrine.sql b/sql/updates/230_world_serpent_shrine.sql new file mode 100644 index 00000000000..c957af10acc --- /dev/null +++ b/sql/updates/230_world_serpent_shrine.sql @@ -0,0 +1,14 @@ +UPDATE creature_template SET ScriptName = 'boss_leotheras_the_blind' WHERE entry = '21215'; +UPDATE creature_template SET ScriptName = 'boss_leotheras_the_blind_demonform' WHERE entry = '21875'; +UPDATE creature_template SET ScriptName = 'mob_greyheart_spellbinder' WHERE entry = '21806'; +UPDATE creature_template SET ScriptName = 'mob_inner_demon' WHERE entry = '21857'; + +UPDATE creature_template SET ScriptName = 'mob_toxic_sporebat', speed = '1' WHERE entry = '22140'; +UPDATE creature_template SET modelid_A = '11686', modelid_H = '11686', flags_extra = '128' WHERE entry = '22207'; + +-- lurker +UPDATE creature_model_info SET bounding_radius = '13', combat_reach = '20' WHERE modelid = '20216'; +UPDATE creature_template SET InhabitType = '3', ScriptName = 'boss_the_lurker_below' WHERE entry = '21217'; +UPDATE creature_template SET ScriptName = 'mob_coilfang_ambusher' WHERE entry = '21865'; +UPDATE creature_template SET ScriptName = 'mob_coilfang_guardian' WHERE entry = '21873'; + diff --git a/sql/updates/231_world_scripts.sql b/sql/updates/231_world_scripts.sql new file mode 100644 index 00000000000..35d58244e43 --- /dev/null +++ b/sql/updates/231_world_scripts.sql @@ -0,0 +1,4 @@ +UPDATE `creature_template` SET `ScriptName`='boss_pathaleon_the_calculator' WHERE `entry`=19220; +UPDATE `creature_template` SET `ScriptName`='mob_nether_wraith' WHERE `entry`=21062; +UPDATE `instance_template` SET `script`='instance_mechanar' WHERE `map`=554; + diff --git a/sql/updates/233_world.sql b/sql/updates/233_world.sql new file mode 100644 index 00000000000..8d29b83a4fa --- /dev/null +++ b/sql/updates/233_world.sql @@ -0,0 +1,2 @@ +UPDATE `spell_proc_event` SET `SchoolMask` = '1' WHERE `entry` = '41434'; + diff --git a/sql/updates/238_world.sql b/sql/updates/238_world.sql new file mode 100644 index 00000000000..1b70eeaf0ac --- /dev/null +++ b/sql/updates/238_world.sql @@ -0,0 +1,2 @@ +DELETE FROM trinity_string WHERE entry IN (453); + diff --git a/sql/updates/240_world.sql b/sql/updates/240_world.sql new file mode 100644 index 00000000000..44e7c518e83 --- /dev/null +++ b/sql/updates/240_world.sql @@ -0,0 +1,6 @@ +delete from `command` where `name` IN ('senditems','sendmail'); +insert into `command` (`name`, `security`, `help`) values +('senditems',3,'Syntax: .senditems #playername "#subject" "#text" itemid1[:count1] itemid2[:count2] ... itemidN[:countN]\r\n\r\nSend a mail to a player. Subject and mail text must be in "". If for itemid not provided related count values then expected 1, if count > max items in stack then items will be send in required amount stacks. All stacks amount in mail limited to 12.'), +('sendmail',1,'Syntax: .sendmail #playername "#subject" "#text"\r\n\r\nSend a mail to a player. Subject and mail text must be in "".'); + + diff --git a/sql/updates/241_world.sql b/sql/updates/241_world.sql new file mode 100644 index 00000000000..4aa3ae99b94 --- /dev/null +++ b/sql/updates/241_world.sql @@ -0,0 +1,5 @@ +DELETE FROM `command` WHERE name IN ('bindsight', 'unbindsight'); +INSERT INTO `command` (name,security,help) VALUES +('bindsight',3,'Syntax: .bindsight\r\n\r\nBinds vision to the selected unit indefinitely. Cannot be used while currently possessing a target.'), +('unbindsight',3,'Syntax: .unbindsight\r\n\r\nRemoves bound vision. Cannot be used while currently possessing a target.'); + diff --git a/sql/updates/247_world.sql b/sql/updates/247_world.sql new file mode 100644 index 00000000000..95a087d1a20 --- /dev/null +++ b/sql/updates/247_world.sql @@ -0,0 +1,30 @@ +ALTER TABLE `spell_linked_spell` DROP PRIMARY KEY; + +UPDATE creature_template SET scriptname = 'boss_kalecgos' WHERE entry = 24850; +UPDATE creature_template SET scriptname = 'boss_sathrovarr' WHERE entry = 24892; +UPDATE creature_template SET scriptname = 'boss_kalec' WHERE entry = 24891; +UPDATE creature_template SET minhealth = 2018275, maxhealth = minhealth = 2018275 WHERE entry = 24892; +UPDATE creature_template SET minlevel = 73, maxlevel = 73, minhealth = 828555, maxhealth = 828555, armor = 5000, mindmg = 1000, maxdmg = 2000 WHERE entry = 24891; +UPDATE gameobject_template SET scriptname = 'kalocegos_teleporter' WHERE entry = 187055; + +INSERT INTO creature_template_addon (entry) SELECT 24891 FROM creature_template_addon WHERE NOT EXISTS(SELECT * FROM creature_template_addon WHERE entry = 24891) LIMIT 1; +INSERT INTO creature_template_addon (entry) SELECT 24892 FROM creature_template_addon WHERE NOT EXISTS(SELECT * FROM creature_template_addon WHERE entry = 24892) LIMIT 1; +UPDATE creature_template_addon SET auras = '45769 0 45769 1' WHERE entry = 24850; +UPDATE creature_template_addon SET auras = '45769 0 45769 1 44801 0 44801 1 44801 2' WHERE entry = 24891; +UPDATE creature_template_addon SET auras = '45769 0 45769 1 44801 0 44801 1 44801 2 44800 0' WHERE entry = 24892; + +DELETE FROM spell_linked_spell WHERE `spell_trigger` IN (44869, 46648, 46019, 46021, -46021, 46020); +INSERT INTO spell_linked_spell (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES (44869, 44866, 1, 'Spectral Blast Portal'); +-- 46648 will cause severe lag if your video card is not good enough +-- INSERT INTO spell_linked_spell (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES (44869, 46648, 1, 'Spectral Blast Visual'); +INSERT INTO spell_linked_spell (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES (44869, 46019, 1, 'Spectral Blast Teleport'); +INSERT INTO spell_linked_spell (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES (46019, 46021, 1, 'Spectral Realm Aura'); +-- 44852 makes boss friendly to you, weird +-- INSERT INTO spell_linked_spell (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES (46021, 44852, 1, 'Spectral Realm Aura'); +INSERT INTO spell_linked_spell (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES (-46021, 46020, 0, 'Teleport: Normal Realm'); +INSERT INTO spell_linked_spell (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES (46020, 44867, 1, 'Spectral Exhaustion'); + +DELETE FROM spell_target_position WHERE `id` IN (46019, 46020); +INSERT INTO spell_target_position () VALUES (46019, 580, 1704.34, 928.17, -74.558, 0); +INSERT INTO spell_target_position () VALUES (46020, 580, 1704.34, 928.17, 53.079, 0); + diff --git a/sql/updates/262_characters.sql b/sql/updates/262_characters.sql new file mode 100644 index 00000000000..093078d148d --- /dev/null +++ b/sql/updates/262_characters.sql @@ -0,0 +1,6 @@ +ALTER TABLE `guild_bank_tab` + CHANGE COLUMN `TabText` `TabText` text; + +ALTER TABLE `character_aura` ADD `stackcount` INT NOT NULL DEFAULT '1' AFTER `effect_index` ; +ALTER TABLE `pet_aura` ADD `stackcount` INT NOT NULL DEFAULT '1' AFTER `effect_index`; + diff --git a/sql/updates/262_realmd.sql b/sql/updates/262_realmd.sql new file mode 100644 index 00000000000..28dc64111c1 --- /dev/null +++ b/sql/updates/262_realmd.sql @@ -0,0 +1,3 @@ +ALTER TABLE `account` + CHANGE COLUMN `email` `email` text; + diff --git a/sql/updates/262_world.sql b/sql/updates/262_world.sql new file mode 100644 index 00000000000..cd90a3df696 --- /dev/null +++ b/sql/updates/262_world.sql @@ -0,0 +1,102 @@ +DELETE FROM trinity_string WHERE entry IN (1119,1120,1121); + +INSERT INTO trinity_string VALUES +(1119,'You must use male or female as gender.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(1120,'You change gender of %s to %s.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(1121,'Your gender changed to %s by %s.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); + + +DELETE FROM command WHERE name IN ('modify gender'); + +INSERT INTO command VALUES +('modify gender',2,'Syntax: .modify gender male/female\r\n\r\nChange gender of selected player.'); + + +delete from `command` where `name` IN ('senditems','sendmail'); +insert into `command` (`name`, `security`, `help`) values +('senditems',3,'Syntax: .senditems #playername "#subject" "#text" itemid1[:count1] itemid2[:count2] ... itemidN[:countN]\r\n\r\nSend a mail to a player. Subject and mail text must be in "". If for itemid not provided related count values then expected 1, if count > max items in stack then items will be send in required amount stacks. All stacks amount in mail limited to 12.'), +('sendmail',1,'Syntax: .sendmail #playername "#subject" "#text"\r\n\r\nSend a mail to a player. Subject and mail text must be in "".'); + + +delete from `command` where `name` = 'sendmoney'; +insert into `command` (`name`, `security`, `help`) values +('sendmoney',3,'Syntax: .sendmoney #playername "#subject" "#text" #money\r\n\r\nSend mail with money to a player. Subject and mail text must be in "".'); + + +DELETE FROM trinity_string WHERE entry IN (453); + + +DROP TABLE IF EXISTS `db_script_string`; +CREATE TABLE `db_script_string` ( + `entry` int(11) unsigned NOT NULL default '0', + `content_default` text NOT NULL, + `content_loc1` text, + `content_loc2` text, + `content_loc3` text, + `content_loc4` text, + `content_loc5` text, + `content_loc6` text, + `content_loc7` text, + `content_loc8` text, + PRIMARY KEY (`entry`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + + +DELETE FROM `command` WHERE `name` IN ( + 'server exit', + 'server idleshutdown', + 'server idleshutdown cancel', + 'server idlerestart', + 'server idlerestart cancel', + 'server restart', + 'server restart cancel', + 'server shutdown', + 'server shutdown cancel' +); + +INSERT INTO `command` (`name`, `security`, `help`) VALUES +('server exit',4,'Syntax: .server exit\r\n\r\nTerminate trinity-core NOW. Exit code 0.'), +('server idleshutdown',3,'Syntax: .server idleshutdown #delay [#exist_code]\r\n\r\nShut the server down after #delay seconds if no active connections are present (no players). Use #exist_code or 0 as program exist code.'), +('server idleshutdown cancel',3,'Syntax: .server idleshutdown cancel\r\n\r\nCancel the restart/shutdown timer if any.'), +('server idlerestart',3,'Syntax: .server idlerestart #delay\r\n\r\nRestart the server after #delay seconds if no active connections are present (no players). Use #exist_code or 2 as program exist code.'), +('server idlerestart cancel',3,'Syntax: .server idlerestart cancel\r\n\r\nCancel the restart/shutdown timer if any.'), +('server restart',3,'Syntax: .server restart #delay\r\n\r\nRestart the server after #delay seconds. Use #exist_code or 2 as program exist code.'), +('server restart cancel',3,'Syntax: .server restart cancel\r\n\r\nCancel the restart/shutdown timer if any.'), +('server shutdown',3,'Syntax: .server shutdown #delay [#exist_code]\r\n\r\nShut the server down after #delay seconds. Use #exist_code or 0 as program exist code.'), +('server shutdown cancel',3,'Syntax: .server shutdown cancel\r\n\r\nCancel the restart/shutdown timer if any.'); + +DELETE FROM trinity_string WHERE entry IN (251); +INSERT INTO trinity_string VALUES +(251,'Text%d (ID: %i): %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); +ALTER TABLE event_scripts + DROP datatext, + ADD COLUMN dataint int(11) NOT NULL default '0' AFTER datalong2; + +ALTER TABLE gameobject_scripts + DROP datatext, + ADD COLUMN dataint int(11) NOT NULL default '0' AFTER datalong2; + +ALTER TABLE quest_end_scripts + DROP datatext, + ADD COLUMN dataint int(11) NOT NULL default '0' AFTER datalong2; + +ALTER TABLE quest_start_scripts + DROP datatext, + ADD COLUMN dataint int(11) NOT NULL default '0' AFTER datalong2; + +ALTER TABLE spell_scripts + DROP datatext, + ADD COLUMN dataint int(11) NOT NULL default '0' AFTER datalong2; + +ALTER TABLE creature_movement + DROP `text1`, + DROP `text2`, + DROP `text3`, + DROP `text4`, + DROP `text5`, + ADD COLUMN textid1 int(11) NOT NULL default '0' AFTER waittime, + ADD COLUMN textid2 int(11) NOT NULL default '0' AFTER textid1, + ADD COLUMN textid3 int(11) NOT NULL default '0' AFTER textid2, + ADD COLUMN textid4 int(11) NOT NULL default '0' AFTER textid3, + ADD COLUMN textid5 int(11) NOT NULL default '0' AFTER textid4; + diff --git a/sql/updates/273_world_scripts.sql b/sql/updates/273_world_scripts.sql new file mode 100644 index 00000000000..800f181f882 --- /dev/null +++ b/sql/updates/273_world_scripts.sql @@ -0,0 +1,4 @@ +UPDATE `creature_template` SET `ScriptName`='npc_wounded_blood_elf' WHERE `entry`='16993'; +UPDATE `creature_template` SET `ScriptName` = 'mob_phase_hunter' WHERE `entry` = '18879'; + + diff --git a/sql/updates/285_world.sql b/sql/updates/285_world.sql new file mode 100644 index 00000000000..ab9c26ebccb --- /dev/null +++ b/sql/updates/285_world.sql @@ -0,0 +1,40 @@ +-- `trinity_string` Language.h entries + +DELETE FROM `trinity_string` WHERE `entry` > 716 AND `entry` < 750; +INSERT INTO `trinity_string` VALUES +(717,'Alliance',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(718,'Horde',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(719,'%s was destroyed by the %s!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(720,'The %s is under attack! If left unchecked, the %s will destroy it!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(721,'The %s was taken by the %s!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(722,'The %s was taken by the %s!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(723,'The %s was taken by the %s!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(724,'The %s is under attack! If left unchecked, the %s will capture it!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(725,'The %s has taken the %s! Its supplies will now be used for reinforcements!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(726,'Irondeep Mine',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(727,'Coldtooth Mine',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(728,'Stormpike Aid Station',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(729,'Dun Baldar South Bunker',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(730,'Dun Baldar North Bunker',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(731,'Stormpike Graveyard',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(732,'Icewing Bunker',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(733,'Stonehearth Graveyard',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(734,'Stonehearth Bunker',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(735,'Snowfall Graveyard',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(736,'Iceblood Tower',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(737,'Iceblood Graveyard',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(738,'Tower Point',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(739,'Frostwolf Graveyard',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(740,'East Frostwolf Tower',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(741,'West Frostwolf Tower',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(742,'Frostwolf Relief Hut',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(743,'The Battle for Alterac Valley begins in 1 minute.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(744,'The Battle for Alterac Valley begins in 30 seconds. Prepare yourselves!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(745,'The Battle for Alterac Valley has begun!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(746,'The Alliance Team is running out of reinforcements!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(747,'The Horde Team is running out of reinforcements!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(748,'The Frostwolf General is Dead!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(749,'The Stormpike General is Dead!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL) +; + + diff --git a/sql/updates/287_world_scripts.sql b/sql/updates/287_world_scripts.sql new file mode 100644 index 00000000000..f761f897e9d --- /dev/null +++ b/sql/updates/287_world_scripts.sql @@ -0,0 +1,4 @@ +UPDATE `creature_template` SET `ScriptName` = 'npc_steam_tonk' WHERE `entry` = '19405'; +UPDATE `creature_template` SET `ScriptName` = 'npc_tonk_mine' WHERE `entry` = '15368'; + + diff --git a/sql/updates/329_world.sql b/sql/updates/329_world.sql new file mode 100644 index 00000000000..42dd8012cb2 --- /dev/null +++ b/sql/updates/329_world.sql @@ -0,0 +1,586 @@ +DROP TABLE IF EXISTS `spell_proc_event`; + +SET FOREIGN_KEY_CHECKS=0; +-- ---------------------------- +-- Table structure for spell_proc_event +-- ---------------------------- +CREATE TABLE `spell_proc_event` ( + `entry` smallint(6) unsigned NOT NULL default '0', + `SchoolMask` tinyint(4) NOT NULL default '0', + `SpellFamilyName` smallint(6) unsigned NOT NULL default '0', + `SpellFamilyMask` bigint(40) unsigned NOT NULL default '0', + `procFlags` int(10) unsigned NOT NULL default '0', + `procEx` int(10) unsigned NOT NULL default '0', + `ppmRate` float NOT NULL default '0', + `CustomChance` float NOT NULL default '0', + `Cooldown` int(10) unsigned NOT NULL default '0', + PRIMARY KEY (`entry`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + +-- ---------------------------- +-- Records +-- ---------------------------- +INSERT INTO `spell_proc_event` VALUES ('9452', '0', '0', '0', '0', '0', '3', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('34917', '32', '6', '0', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('34916', '32', '6', '0', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('34914', '32', '6', '0', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('29076', '20', '3', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('29075', '20', '3', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('29074', '20', '3', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('12704', '0', '0', '0', '0', '0', '1.6626', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('12289', '0', '4', '2', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('12311', '0', '4', '2048', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('28849', '0', '11', '128', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('28847', '0', '7', '32', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('28823', '0', '11', '192', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('28809', '0', '6', '4096', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('28719', '0', '7', '32', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('12668', '0', '4', '2', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('12703', '0', '0', '0', '0', '0', '1.33008', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('12702', '0', '0', '0', '0', '0', '0.99756', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('12701', '0', '0', '0', '0', '0', '0.66504', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('12284', '0', '0', '0', '0', '0', '0.33252', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('12797', '0', '4', '1024', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('12799', '0', '4', '1024', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('12800', '0', '4', '1024', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('28595', '16', '3', '0', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('28594', '16', '3', '0', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('28593', '16', '3', '0', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('12958', '0', '4', '2048', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('13754', '0', '8', '16', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('13867', '0', '8', '16', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('14186', '0', '8', '1082131720', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('14190', '0', '8', '9672066312', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('14193', '0', '8', '9672066312', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('14194', '0', '8', '9672066312', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('14195', '0', '8', '9672066312', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('28592', '16', '3', '0', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('23721', '0', '9', '2048', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('15277', '0', '0', '0', '0', '0', '6', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('23572', '0', '11', '192', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('23551', '0', '11', '192', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('20235', '0', '10', '32768', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('20234', '0', '10', '32768', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('19415', '0', '9', '512', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('15346', '0', '0', '0', '0', '0', '6', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('19414', '0', '9', '512', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('19413', '0', '9', '512', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('15600', '0', '0', '0', '0', '0', '1', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('19412', '0', '9', '512', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('16850', '0', '7', '4', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('16864', '0', '0', '0', '0', '0', '2', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('16923', '0', '7', '4', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('16924', '0', '7', '4', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('16952', '0', '7', '4398046744576', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('16954', '0', '7', '4398046744576', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('19407', '0', '9', '512', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('18096', '0', '5', '549755813984', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('18073', '0', '5', '549755813984', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('17793', '0', '5', '1', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('17796', '0', '5', '1', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('17801', '0', '5', '1', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('18095', '0', '5', '10', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('18094', '0', '5', '10', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('17802', '0', '5', '1', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('18119', '0', '5', '18416819766245', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('18120', '0', '5', '18416819766245', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('18121', '0', '5', '18416819766245', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('18122', '0', '5', '18416819766245', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('18123', '0', '5', '18416819766245', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('19228', '0', '0', '64', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('19232', '0', '9', '64', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('19233', '0', '9', '64', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('17803', '0', '5', '1', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('16164', '0', '11', '2416967683', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('15363', '0', '6', '17448312320', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('15362', '0', '6', '17448312320', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('15326', '0', '6', '8691163136', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('20164', '0', '0', '0', '0', '0', '5', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('20165', '0', '0', '0', '0', '0', '20', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('20166', '0', '0', '0', '0', '0', '20', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('20215', '0', '10', '3223322624', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('20214', '0', '10', '3223322624', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('20213', '0', '10', '3223322624', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('20212', '0', '10', '3223322624', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('20210', '0', '10', '3223322624', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('15325', '0', '6', '8691163136', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('15324', '0', '6', '8691163136', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('20347', '0', '0', '0', '0', '0', '20', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('20348', '0', '0', '0', '0', '0', '20', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('20349', '0', '0', '0', '0', '0', '20', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('20356', '0', '0', '0', '0', '0', '20', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('20357', '0', '0', '0', '0', '0', '20', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('20375', '0', '0', '0', '0', '0', '7', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('20500', '0', '4', '268435456', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('20501', '0', '4', '268435456', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('20915', '0', '0', '0', '0', '0', '7', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('20918', '0', '0', '0', '0', '0', '7', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('20919', '0', '0', '0', '0', '0', '7', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('20920', '0', '0', '0', '0', '0', '7', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('21890', '0', '4', '3763103747823', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('15323', '0', '6', '8691163136', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('15286', '32', '6', '0', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('23578', '0', '0', '0', '0', '0', '2', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('23581', '0', '0', '0', '0', '0', '2', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('23686', '0', '0', '0', '0', '0', '2', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('23689', '0', '0', '0', '0', '0', '4', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('23695', '0', '4', '2', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('15268', '0', '6', '8691163136', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('25669', '0', '0', '0', '0', '0', '1', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('26016', '0', '0', '0', '0', '0', '2', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('26021', '0', '0', '0', '0', '0', '2', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('26119', '0', '10', '2416967683', '0', '65536', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('26480', '0', '0', '0', '0', '0', '3', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('27160', '0', '0', '0', '0', '0', '20', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('27166', '0', '0', '0', '0', '0', '20', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('27170', '0', '0', '0', '0', '0', '7', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('27419', '0', '0', '0', '0', '0', '3', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('27498', '0', '0', '0', '0', '0', '3', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('27656', '0', '0', '0', '0', '0', '3', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('27787', '0', '0', '0', '0', '0', '3', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('14892', '0', '6', '17448312320', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('12848', '4', '3', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('12847', '4', '3', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('12846', '4', '3', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('11255', '0', '3', '16384', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('28789', '0', '10', '3221225472', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('12360', '4', '3', '0', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('28816', '0', '0', '0', '0', '0', '3', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('12359', '4', '3', '0', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('12358', '4', '3', '0', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('12357', '4', '3', '0', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('12598', '0', '3', '16384', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('11180', '16', '3', '0', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('11129', '0', '3', '274890489879', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('29150', '0', '0', '0', '0', '0', '3', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('29501', '0', '0', '0', '0', '0', '3', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('29624', '0', '0', '0', '0', '0', '3', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('29625', '0', '0', '0', '0', '0', '3', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('29626', '0', '0', '0', '0', '0', '3', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('29632', '0', '0', '0', '0', '0', '3', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('29633', '0', '0', '0', '0', '0', '3', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('29634', '0', '0', '0', '0', '0', '3', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('29635', '0', '0', '0', '0', '0', '3', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('29636', '0', '0', '0', '0', '0', '3', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('29637', '0', '0', '0', '0', '0', '3', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('30299', '36', '0', '0', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('30675', '0', '11', '3', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('30678', '0', '11', '3', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('30679', '0', '11', '3', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('30680', '0', '11', '3', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('30681', '0', '11', '3', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('31801', '0', '0', '0', '0', '0', '20', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('31833', '0', '10', '2147483648', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('31835', '0', '10', '2147483648', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('31836', '0', '10', '2147483648', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('30302', '36', '0', '0', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('30301', '36', '0', '0', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('32385', '0', '5', '73014445058', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('32387', '0', '5', '73014445058', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('32392', '0', '5', '73014445058', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('32393', '0', '5', '73014445058', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('32394', '0', '5', '73014445058', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('11120', '4', '3', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('11119', '4', '3', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('11103', '4', '3', '0', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('37195', '0', '10', '8388608', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('37377', '32', '0', '0', '0', '65536', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('39437', '4', '5', '824633725796', '0', '65536', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('33191', '0', '6', '4398054932480', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('33192', '0', '6', '4398054932480', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('33193', '0', '6', '4398054932480', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('33194', '0', '6', '4398054932480', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('33195', '0', '6', '4398054932480', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('40475', '0', '0', '0', '0', '0', '3', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('41434', '0', '0', '0', '0', '0', '2', '0', '45'); +INSERT INTO `spell_proc_event` VALUES ('37523', '0', '0', '0', '0', '64', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('30293', '0', '5', '824633721729', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('30295', '0', '5', '824633721729', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('30296', '0', '5', '824633721729', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('40407', '0', '0', '0', '0', '0', '6', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('31895', '0', '0', '0', '0', '0', '5', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('37247', '8', '0', '0', '0', '65536', '0', '0', '45'); +INSERT INTO `spell_proc_event` VALUES ('33510', '0', '0', '0', '0', '0', '5', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('16624', '0', '0', '0', '0', '64', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('28752', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('16176', '0', '11', '448', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('16235', '0', '11', '448', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('16240', '0', '11', '448', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('23920', '0', '0', '0', '0', '2048', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('27811', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('27815', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('27816', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('33142', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('33145', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('33146', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('16487', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('16489', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('16492', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('26605', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('16550', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('22648', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('34320', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('29977', '0', '3', '274890489879', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('37443', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('38350', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('38347', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('12834', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('12849', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('12867', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('30160', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('29179', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('29180', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('12317', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('13045', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('13046', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('13047', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('13048', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('34500', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('34502', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('34503', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('9799', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('25988', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('29062', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('29064', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('29065', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('15088', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('12319', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('16256', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('12971', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('16281', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('12972', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('16282', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('12973', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('16283', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('12974', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('16284', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('42083', '0', '0', '0', '0', '2', '0', '0', '45'); +INSERT INTO `spell_proc_event` VALUES ('34950', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('34954', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('28812', '0', '8', '33554438', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('37227', '0', '11', '448', '0', '2', '0', '0', '60'); +INSERT INTO `spell_proc_event` VALUES ('32885', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('21882', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('34258', '0', '10', '34359739392', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('37237', '0', '11', '1', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('37657', '0', '0', '0', '0', '2', '0', '0', '3'); +INSERT INTO `spell_proc_event` VALUES ('40482', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('37213', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('14531', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('14774', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('16880', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('35121', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('20705', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('16958', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('16961', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('33648', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('37189', '0', '10', '3221225472', '0', '2', '0', '0', '60'); +INSERT INTO `spell_proc_event` VALUES ('43338', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('33150', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('33154', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('34497', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('34498', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('34499', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('30802', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('30808', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('30809', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('30810', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('30811', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('20049', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('20056', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('20057', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('20058', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('20059', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('37519', '0', '0', '0', '0', '48', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('26107', '0', '7', '549764202496', '0', '116', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('23548', '0', '0', '0', '0', '64', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('37514', '0', '0', '0', '0', '32', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('40444', '0', '0', '0', '0', '64', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('20911', '0', '0', '0', '0', '64', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('20912', '0', '0', '0', '0', '64', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('20913', '0', '0', '0', '0', '64', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('20914', '0', '0', '0', '0', '64', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('27168', '0', '0', '0', '0', '64', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('17495', '0', '0', '0', '0', '64', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('22618', '0', '0', '0', '0', '64', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('25899', '0', '0', '0', '0', '64', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('27169', '0', '0', '0', '0', '64', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('31904', '0', '0', '0', '0', '64', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('32777', '0', '0', '0', '0', '64', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('20925', '0', '0', '0', '0', '64', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('20927', '0', '0', '0', '0', '64', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('20928', '0', '0', '0', '0', '64', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('27179', '0', '0', '0', '0', '64', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('12298', '0', '0', '0', '0', '64', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('12724', '0', '0', '0', '0', '64', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('12725', '0', '0', '0', '0', '64', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('12726', '0', '0', '0', '0', '64', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('12727', '0', '0', '0', '0', '64', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('32642', '0', '0', '0', '0', '64', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('33089', '0', '0', '0', '0', '64', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('26128', '0', '0', '0', '0', '8', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('29441', '0', '0', '0', '0', '8', '0', '0', '1'); +INSERT INTO `spell_proc_event` VALUES ('29444', '0', '0', '0', '0', '8', '0', '0', '1'); +INSERT INTO `spell_proc_event` VALUES ('29445', '0', '0', '0', '0', '8', '0', '0', '1'); +INSERT INTO `spell_proc_event` VALUES ('29446', '0', '0', '0', '0', '8', '0', '0', '1'); +INSERT INTO `spell_proc_event` VALUES ('29447', '0', '0', '0', '0', '8', '0', '0', '1'); +INSERT INTO `spell_proc_event` VALUES ('34749', '0', '0', '0', '0', '8', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('13983', '0', '0', '0', '0', '24', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('14070', '0', '0', '0', '0', '24', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('14071', '0', '0', '0', '0', '24', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('41034', '0', '0', '0', '0', '1024', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('32734', '0', '0', '0', '0', '0', '0', '0', '3'); +INSERT INTO `spell_proc_event` VALUES ('974', '0', '0', '0', '0', '0', '0', '0', '3'); +INSERT INTO `spell_proc_event` VALUES ('32593', '0', '0', '0', '0', '0', '0', '0', '3'); +INSERT INTO `spell_proc_event` VALUES ('32594', '0', '0', '0', '0', '0', '0', '0', '3'); +INSERT INTO `spell_proc_event` VALUES ('40899', '0', '0', '0', '0', '0', '0', '0', '3'); +INSERT INTO `spell_proc_event` VALUES ('324', '0', '0', '0', '0', '0', '0', '0', '3'); +INSERT INTO `spell_proc_event` VALUES ('325', '0', '0', '0', '0', '0', '0', '0', '3'); +INSERT INTO `spell_proc_event` VALUES ('905', '0', '0', '0', '0', '0', '0', '0', '3'); +INSERT INTO `spell_proc_event` VALUES ('945', '0', '0', '0', '0', '0', '0', '0', '3'); +INSERT INTO `spell_proc_event` VALUES ('8134', '0', '0', '0', '0', '0', '0', '0', '3'); +INSERT INTO `spell_proc_event` VALUES ('10431', '0', '0', '0', '0', '0', '0', '0', '3'); +INSERT INTO `spell_proc_event` VALUES ('10432', '0', '0', '0', '0', '0', '0', '0', '3'); +INSERT INTO `spell_proc_event` VALUES ('25469', '0', '0', '0', '0', '0', '0', '0', '3'); +INSERT INTO `spell_proc_event` VALUES ('25472', '0', '0', '0', '0', '0', '0', '0', '3'); +INSERT INTO `spell_proc_event` VALUES ('34355', '0', '0', '0', '0', '0', '0', '0', '3'); +INSERT INTO `spell_proc_event` VALUES ('39027', '0', '0', '0', '0', '0', '0', '0', '3'); +INSERT INTO `spell_proc_event` VALUES ('34827', '0', '0', '0', '0', '0', '0', '0', '3'); +INSERT INTO `spell_proc_event` VALUES ('24398', '0', '0', '0', '0', '0', '0', '0', '3'); +INSERT INTO `spell_proc_event` VALUES ('33736', '0', '0', '0', '0', '0', '0', '0', '3'); +INSERT INTO `spell_proc_event` VALUES ('41260', '0', '0', '0', '0', '0', '0', '0', '10'); +INSERT INTO `spell_proc_event` VALUES ('41262', '0', '0', '0', '0', '0', '0', '0', '10'); +INSERT INTO `spell_proc_event` VALUES ('34935', '0', '0', '0', '0', '0', '0', '0', '8'); +INSERT INTO `spell_proc_event` VALUES ('34938', '0', '0', '0', '0', '0', '0', '0', '8'); +INSERT INTO `spell_proc_event` VALUES ('34939', '0', '0', '0', '0', '0', '0', '0', '8'); +INSERT INTO `spell_proc_event` VALUES ('33746', '0', '0', '0', '0', '0', '0', '0', '10'); +INSERT INTO `spell_proc_event` VALUES ('33759', '0', '0', '0', '0', '0', '0', '0', '10'); +INSERT INTO `spell_proc_event` VALUES ('16620', '0', '0', '0', '0', '0', '0', '0', '30'); +INSERT INTO `spell_proc_event` VALUES ('21185', '0', '0', '0', '0', '0', '0', '0', '10'); +INSERT INTO `spell_proc_event` VALUES ('29801', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('30030', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('30033', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('30701', '28', '0', '0', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('30705', '28', '0', '0', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('43748', '0', '11', '2416967680', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('43750', '0', '11', '1', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('42370', '0', '11', '64', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('30881', '0', '0', '0', '0', '0', '0', '0', '5'); +INSERT INTO `spell_proc_event` VALUES ('30883', '0', '0', '0', '0', '0', '0', '0', '5'); +INSERT INTO `spell_proc_event` VALUES ('30884', '0', '0', '0', '0', '0', '0', '0', '5'); +INSERT INTO `spell_proc_event` VALUES ('30885', '0', '0', '0', '0', '0', '0', '0', '5'); +INSERT INTO `spell_proc_event` VALUES ('30886', '0', '0', '0', '0', '0', '0', '0', '5'); +INSERT INTO `spell_proc_event` VALUES ('34138', '0', '11', '128', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('43728', '0', '11', '128', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('26135', '0', '10', '8388608', '0', '65536', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('43745', '0', '10', '2199023255552', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('34139', '0', '10', '1073741824', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('43741', '0', '10', '2147483648', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('42368', '0', '10', '1073741824', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('34262', '0', '10', '8388608', '0', '65536', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('41469', '0', '0', '0', '0', '0', '7', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('33127', '0', '0', '0', '0', '0', '7', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('29385', '0', '0', '0', '0', '0', '7', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('43726', '0', '10', '1073741824', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('35100', '0', '9', '1', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('35102', '0', '9', '1', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('35103', '0', '9', '1', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('40485', '0', '9', '4294967296', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('31124', '0', '8', '536870926', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('31126', '0', '8', '536870926', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('31233', '0', '8', '38658768896', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('31239', '0', '8', '38658768896', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('31240', '0', '8', '38658768896', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('31241', '0', '8', '38658768896', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('31242', '0', '8', '38658768896', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('37168', '0', '8', '38658768896', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('37170', '0', '0', '0', '0', '0', '1', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('37165', '0', '8', '2098176', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('31244', '0', '8', '38658768896', '0', '4', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('31245', '0', '8', '38658768896', '0', '4', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('41393', '0', '0', '0', '0', '32', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('14156', '0', '8', '4063232', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('14160', '0', '8', '4063232', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('14161', '0', '8', '4063232', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('38326', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('17106', '0', '7', '524288', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('17107', '0', '7', '524288', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('17108', '0', '7', '524288', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('43739', '0', '7', '2', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('43737', '0', '7', '4672924418048', '0', '0', '0', '0', '10'); +INSERT INTO `spell_proc_event` VALUES ('39372', '48', '0', '0', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('37568', '0', '6', '2048', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('37594', '0', '6', '4096', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('34753', '0', '6', '17179875328', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('34859', '0', '6', '17179875328', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('34860', '0', '6', '17179875328', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('37603', '0', '6', '32768', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('38394', '0', '5', '6', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('37384', '0', '5', '1', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('40478', '0', '5', '2', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('37528', '0', '4', '4', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('37516', '0', '4', '1024', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('40458', '0', '4', '6601398288384', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('22007', '0', '3', '2097185', '0', '65536', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('3232', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('17364', '8', '0', '0', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('30937', '32', '0', '0', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('15128', '4', '0', '0', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('37193', '0', '0', '0', '0', '64', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('32776', '0', '0', '0', '0', '64', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('20132', '0', '0', '0', '0', '64', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('20131', '0', '0', '0', '0', '64', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('20128', '0', '0', '0', '0', '64', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('17794', '32', '0', '0', '0', '1', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('31394', '32', '0', '0', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('25050', '4', '0', '0', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('24353', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('20134', '0', '0', '0', '0', '64', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('17797', '32', '0', '0', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('17798', '32', '0', '0', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('24389', '0', '3', '274890489879', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('20133', '0', '0', '0', '0', '64', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('36111', '0', '0', '0', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('29455', '0', '0', '0', '0', '64', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('34774', '0', '0', '0', '0', '0', '1.5', '0', '20'); +INSERT INTO `spell_proc_event` VALUES ('9784', '0', '0', '0', '0', '64', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('31785', '0', '0', '0', '34816', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('9782', '0', '0', '0', '0', '64', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('24932', '0', '0', '0', '0', '2', '0', '0', '6'); +INSERT INTO `spell_proc_event` VALUES ('33776', '0', '0', '0', '34816', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('34586', '0', '0', '0', '0', '0', '1.5', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('2565', '0', '0', '0', '0', '64', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('12169', '0', '0', '0', '0', '64', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('32587', '0', '0', '0', '0', '64', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('38031', '0', '0', '0', '0', '64', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('34080', '0', '0', '0', '0', '8', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('42136', '0', '0', '0', '0', '0', '0', '0', '90'); +INSERT INTO `spell_proc_event` VALUES ('42135', '0', '0', '0', '0', '0', '0', '0', '90'); +INSERT INTO `spell_proc_event` VALUES ('23547', '0', '0', '0', '0', '32', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('32837', '0', '0', '0', '0', '65536', '0', '0', '45'); +INSERT INTO `spell_proc_event` VALUES ('17799', '32', '0', '0', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('17800', '32', '0', '0', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('37197', '0', '0', '0', '0', '65536', '0', '0', '45'); +INSERT INTO `spell_proc_event` VALUES ('23688', '0', '0', '0', '0', '65536', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('34783', '0', '0', '0', '0', '2048', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('27521', '0', '0', '0', '0', '65536', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('27774', '0', '0', '0', '0', '65536', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('28802', '0', '0', '0', '0', '65536', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('37600', '0', '0', '0', '0', '65536', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('19184', '0', '9', '35184372088852', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('19387', '0', '9', '35184372088852', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('19388', '0', '9', '35184372088852', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('37655', '0', '0', '0', '0', '0', '0', '0', '60'); +INSERT INTO `spell_proc_event` VALUES ('38334', '0', '0', '0', '0', '0', '0', '0', '60'); +INSERT INTO `spell_proc_event` VALUES ('12966', '0', '0', '0', '0', '65536', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('12967', '0', '0', '0', '0', '65536', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('12968', '0', '0', '0', '0', '65536', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('12969', '0', '0', '0', '0', '65536', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('12970', '0', '0', '0', '0', '65536', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('16257', '0', '0', '0', '0', '65536', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('16277', '0', '0', '0', '0', '65536', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('16278', '0', '0', '0', '0', '65536', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('16279', '0', '0', '0', '0', '65536', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('16280', '0', '0', '0', '0', '65536', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('36096', '0', '0', '0', '0', '2048', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('43443', '0', '0', '0', '0', '2048', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('30003', '0', '0', '0', '0', '2048', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('27181', '1', '0', '0', '0', '256', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('41381', '0', '0', '0', '0', '256', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('38026', '1', '0', '0', '0', '256', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('31569', '0', '3', '65536', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('31570', '0', '3', '65536', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('7383', '1', '0', '0', '0', '256', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('39530', '0', '0', '0', '0', '65536', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('33299', '0', '0', '0', '0', '65536', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('37214', '0', '0', '0', '0', '65536', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('31794', '0', '0', '0', '0', '65536', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('18820', '0', '0', '0', '0', '65536', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('37601', '0', '0', '0', '0', '65536', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('43819', '0', '0', '0', '0', '65536', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('6346', '0', '0', '0', '0', '256', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('23552', '0', '0', '0', '0', '0', '0', '0', '3'); +INSERT INTO `spell_proc_event` VALUES ('46025', '0', '0', '0', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('40442', '0', '7', '4672924418068', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('40470', '0', '10', '3229614080', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('40438', '0', '6', '32832', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('40463', '0', '11', '68719476865', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('12322', '0', '0', '0', '0', '0', '2', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('12999', '0', '0', '0', '0', '0', '4', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('13000', '0', '0', '0', '0', '0', '6', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('13001', '0', '0', '0', '0', '0', '8', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('13002', '0', '0', '0', '0', '0', '10', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('14318', '0', '9', '1', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('13165', '0', '9', '1', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('14319', '0', '9', '1', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('14320', '0', '9', '1', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('14321', '0', '9', '1', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('14322', '0', '9', '1', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('25296', '0', '9', '1', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('27044', '0', '9', '1', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('39443', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('39442', '0', '0', '0', '0', '1', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('35080', '0', '0', '0', '0', '0', '1', '0', '60'); +INSERT INTO `spell_proc_event` VALUES ('35077', '0', '0', '0', '0', '0', '0', '0', '60'); +INSERT INTO `spell_proc_event` VALUES ('35086', '0', '0', '0', '0', '0', '0', '0', '60'); +INSERT INTO `spell_proc_event` VALUES ('35083', '0', '0', '0', '0', '0', '0', '0', '60'); +INSERT INTO `spell_proc_event` VALUES ('18137', '0', '0', '0', '0', '0', '0', '0', '3'); +INSERT INTO `spell_proc_event` VALUES ('19308', '0', '0', '0', '0', '0', '0', '0', '3'); +INSERT INTO `spell_proc_event` VALUES ('19309', '0', '0', '0', '0', '0', '0', '0', '3'); +INSERT INTO `spell_proc_event` VALUES ('19310', '0', '0', '0', '0', '0', '0', '0', '3'); +INSERT INTO `spell_proc_event` VALUES ('19311', '0', '0', '0', '0', '0', '0', '0', '3'); +INSERT INTO `spell_proc_event` VALUES ('19312', '0', '0', '0', '0', '0', '0', '0', '3'); +INSERT INTO `spell_proc_event` VALUES ('25477', '0', '0', '0', '0', '0', '0', '0', '3'); +INSERT INTO `spell_proc_event` VALUES ('38327', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('33881', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('33882', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('33883', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('33719', '0', '0', '0', '0', '2048', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('29834', '0', '0', '0', '0', '65536', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('29838', '0', '0', '0', '0', '65536', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('39958', '0', '0', '0', '0', '0', '0.7', '0', '40'); +INSERT INTO `spell_proc_event` VALUES ('1463', '0', '0', '0', '0', '1024', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('8494', '0', '0', '0', '0', '1024', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('8495', '0', '0', '0', '0', '1024', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('10191', '0', '0', '0', '0', '1024', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('10192', '0', '0', '0', '0', '1024', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('10193', '0', '0', '0', '0', '1024', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('27131', '0', '0', '0', '0', '1024', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('32844', '0', '0', '0', '0', '0', '2', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('33076', '0', '0', '0', '656040', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('46662', '0', '0', '0', '0', '0', '0', '0', '20'); +INSERT INTO `spell_proc_event` VALUES ('38857', '0', '0', '0', '0', '65536', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('8178', '0', '0', '0', '0', '65536', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('41635', '0', '0', '0', '656040', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('30823', '0', '0', '0', '0', '0', '10.5', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('24905', '0', '0', '0', '0', '0', '15', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('46098', '0', '11', '128', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('46092', '0', '10', '1073741824', '0', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('38290', '0', '0', '0', '0', '0', '1.6', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('45234', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('45243', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('45244', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('23602', '0', '0', '0', '0', '64', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('45483', '0', '0', '0', '0', '0', '0', '0', '45'); +INSERT INTO `spell_proc_event` VALUES ('45482', '0', '0', '0', '0', '0', '0', '0', '45'); +INSERT INTO `spell_proc_event` VALUES ('45484', '0', '0', '0', '16384', '0', '0', '0', '45'); +INSERT INTO `spell_proc_event` VALUES ('46569', '0', '0', '0', '0', '0', '0', '0', '45'); +INSERT INTO `spell_proc_event` VALUES ('45481', '0', '0', '0', '0', '0', '0', '0', '45'); +INSERT INTO `spell_proc_event` VALUES ('32748', '0', '8', '4294967296', '320', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('24658', '0', '0', '0', '82192', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('44835', '0', '7', '549755813888', '16', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('46832', '0', '7', '1', '0', '65536', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('45057', '0', '0', '0', '0', '0', '0', '0', '30'); +INSERT INTO `spell_proc_event` VALUES ('37173', '0', '8', '1126031951256', '0', '0', '0', '0', '30'); +INSERT INTO `spell_proc_event` VALUES ('45054', '0', '0', '0', '0', '0', '0', '0', '15'); +INSERT INTO `spell_proc_event` VALUES ('45354', '0', '0', '0', '0', '0', '0', '0', '45'); +INSERT INTO `spell_proc_event` VALUES ('41989', '0', '0', '0', '0', '0', '0.5', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('11185', '0', '3', '128', '327680', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('12487', '0', '3', '128', '327680', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('19572', '0', '9', '8388608', '16384', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('28716', '0', '7', '16', '294912', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('28744', '0', '7', '64', '278528', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('12488', '0', '3', '128', '327680', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('19573', '0', '9', '8388608', '16384', '0', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('33757', '0', '0', '0', '0', '0', '0', '0', '3'); + diff --git a/sql/updates/332_world.sql b/sql/updates/332_world.sql new file mode 100644 index 00000000000..c1864d6c03a --- /dev/null +++ b/sql/updates/332_world.sql @@ -0,0 +1,4 @@ +DELETE FROM `spell_script_target` WHERE `entry` in (30659); +INSERT INTO `spell_script_target` VALUES (30659, 1, 17281); + + diff --git a/sql/updates/333_world.sql b/sql/updates/333_world.sql new file mode 100644 index 00000000000..77c2b476700 --- /dev/null +++ b/sql/updates/333_world.sql @@ -0,0 +1,12 @@ +DELETE FROM `spell_proc_event` WHERE `entry` IN (42083, 33727, 33754, 33755, 33756, 8516, 10608, 10610, 25583, 25584); +INSERT INTO `spell_proc_event` VALUES ('42083', '0', '0', '0', '0', '2', '0', '0', '0'); +INSERT INTO `spell_proc_event` VALUES ('33727', '0', '0', '0', '0', '0', '0', '0', '3'); +INSERT INTO `spell_proc_event` VALUES ('33754', '0', '0', '0', '0', '0', '0', '0', '3'); +INSERT INTO `spell_proc_event` VALUES ('33755', '0', '0', '0', '0', '0', '0', '0', '3'); +INSERT INTO `spell_proc_event` VALUES ('33756', '0', '0', '0', '0', '0', '0', '0', '3'); +INSERT INTO `spell_proc_event` VALUES ('8516', '0', '0', '0', '0', '0', '0', '0', '3'); +INSERT INTO `spell_proc_event` VALUES ('10608', '0', '0', '0', '0', '0', '0', '0', '3'); +INSERT INTO `spell_proc_event` VALUES ('10610', '0', '0', '0', '0', '0', '0', '0', '3'); +INSERT INTO `spell_proc_event` VALUES ('25583', '0', '0', '0', '0', '0', '0', '0', '3'); +INSERT INTO `spell_proc_event` VALUES ('25584', '0', '0', '0', '0', '0', '0', '0', '3'); + diff --git a/sql/updates/334_world.sql b/sql/updates/334_world.sql new file mode 100644 index 00000000000..e7e1c4b328f --- /dev/null +++ b/sql/updates/334_world.sql @@ -0,0 +1,21 @@ +DELETE FROM `trinity_string` WHERE `entry` BETWEEN 770 AND 787; +INSERT INTO `trinity_string` (`entry`,`content_default`,`content_loc1`,`content_loc2`,`content_loc3`,`content_loc4`,`content_loc5`,`content_loc6`,`content_loc7`,`content_loc8`) VALUES +(770,'Your group has members not in your arena team. Please regroup to join.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(771,'Your group does not have enough players to join this match.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(772,'The Gold Team wins!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(773,'The Green Team wins!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(774,'There aren\'t enough players in this battleground. It will end soon unless some more players join to balance the fight.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(775,'Your group has an offline member. Please remove him before joining.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(776,'Your group has players from the opposing faction. You can\'t join the battleground as a group.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(777,'Your group has players from different battleground brakets. You can\'t join as group.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(778,'Someone in your party is already in this battleground queue. (S)he must leave it before joining as group.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(779,'Someone in your party is Deserter. You can\'t join as group.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(780,'Someone in your party is already in three battleground queues. You cannot join as group.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(781,'You cannot teleport to a battleground or arena map.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(782,'You cannot summon players to a battleground or arena map.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(783,'You must be in GM mode to teleport to a player in a battleground.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(784,'You cannot teleport to a battleground from another battleground. Please leave the current battleground first.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(785,'Arena testing turned %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(786,'|cffff0000[Automatic]:|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(787,'|cffffff00[|c1f40af20Announce by|r |cffff0000%s|cffffff00]:|r %s|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); + diff --git a/sql/updates/341_world.sql b/sql/updates/341_world.sql new file mode 100644 index 00000000000..ba02fe06468 --- /dev/null +++ b/sql/updates/341_world.sql @@ -0,0 +1,2 @@ +TRUNCATE TABLE playercreateinfo_item; + diff --git a/sql/updates/356_world.sql b/sql/updates/356_world.sql new file mode 100644 index 00000000000..b7fc8258b7e --- /dev/null +++ b/sql/updates/356_world.sql @@ -0,0 +1,3 @@ +DELETE FROM `spell_elixir` WHERE `entry` = 45373; +INSERT INTO `spell_elixir` VALUES (45373,0x1); + diff --git a/sql/updates/373_world_scripts.sql b/sql/updates/373_world_scripts.sql new file mode 100644 index 00000000000..92623b3ec1b --- /dev/null +++ b/sql/updates/373_world_scripts.sql @@ -0,0 +1,4 @@ +UPDATE `creature_template` SET `ScriptName`='boss_warchief_kargath_bladefist' WHERE `entry`=16808; +UPDATE `instance_template` SET `script`='instance_deadmines' WHERE `map`=36; +UPDATE `item_template` SET `ScriptName`='item_defias_gunpowder' WHERE `entry`=5397; + diff --git a/sql/updates/377_world_scripts.sql b/sql/updates/377_world_scripts.sql new file mode 100644 index 00000000000..c7d5bf98e52 --- /dev/null +++ b/sql/updates/377_world_scripts.sql @@ -0,0 +1,11 @@ +UPDATE `creature_template` SET `ScriptName`='npc_second_trial_paladin' WHERE `entry` IN (17809,17810,17811,17812); +UPDATE `creature_template` SET `ScriptName`='npc_second_trial_controller' WHERE `entry` IN (17807); +UPDATE `gameobject_template` SET `ScriptName`='go_second_trial' WHERE `entry` IN (182052); + +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1645009 AND -1645006; +INSERT INTO `script_texts` (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`, `sound`, `type`, `language`, `comment`) VALUES +(-1645006,'Let the trial begin, Bloodwrath, attack!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,'master_kelerun_bloodmourn YELL_PHASE'), +(-1645007,'Champion Lightrend, make me proud!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,'master_kelerun_bloodmourn YELL_PHASE'), +(-1645008,'Show this upstart how a real Blood Knight fights, Swiftblade!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,'master_kelerun_bloodmourn YELL_PHASE'), +(-1645009,'Show $N the meaning of pain, Sunstriker!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,'master_kelerun_bloodmourn YELL_PHASE'); + diff --git a/sql/updates/389_world.sql b/sql/updates/389_world.sql new file mode 100644 index 00000000000..9e199c37726 --- /dev/null +++ b/sql/updates/389_world.sql @@ -0,0 +1,10 @@ +DELETE FROM spell_linked_spell WHERE `spell_trigger` IN (-19386, -24132, -24133, -27068, -49011, -49012); +INSERT INTO spell_linked_spell (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES (-19386, 24131, 0, 'Wyvern Sting'); +INSERT INTO spell_linked_spell (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES (-24132, 24134, 0, 'Wyvern Sting'); +INSERT INTO spell_linked_spell (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES (-24133, 24135, 0, 'Wyvern Sting'); +INSERT INTO spell_linked_spell (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES (-27068, 27069, 0, 'Wyvern Sting'); +-- Rank 5 (not available till wotlk) +-- INSERT INTO spell_linked_spell (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES (-49011, 49009, 0, 'Wyvern Sting'); +-- Rank 6 (not available till wotlk) +-- INSERT INTO spell_linked_spell (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES (-49012, 49010, 0, 'Wyvern Sting'); + diff --git a/sql/updates/400_world.sql b/sql/updates/400_world.sql new file mode 100644 index 00000000000..25a1d1a74e7 --- /dev/null +++ b/sql/updates/400_world.sql @@ -0,0 +1,11 @@ +DELETE FROM `spell_script_target` WHERE `entry` IN (34186, 42492, 33831, 5628, 45109, 45149); +INSERT INTO `spell_script_target` VALUES (34186, 1, 16938); +INSERT INTO `spell_script_target` VALUES (42492, 1, 0); +INSERT INTO `spell_script_target` VALUES (33831, 1, 0); +INSERT INTO `spell_script_target` VALUES (5628, 1, 2011); +INSERT INTO `spell_script_target` VALUES (5628, 1, 2012); +INSERT INTO `spell_script_target` VALUES (5628, 1, 2013); +INSERT INTO `spell_script_target` VALUES (5628, 1, 2014); +INSERT INTO `spell_script_target` VALUES (45109, 1, 25084); +INSERT INTO `spell_script_target` VALUES (45149, 0, 300154); + diff --git a/sql/updates/410_characters.sql b/sql/updates/410_characters.sql new file mode 100644 index 00000000000..96bf01135d4 --- /dev/null +++ b/sql/updates/410_characters.sql @@ -0,0 +1,3 @@ +ALTER TABLE `guild_member` DROP INDEX `guid_key` , +ADD UNIQUE `guid_key` ( `guid` ); + diff --git a/sql/updates/426_world_scripts.sql b/sql/updates/426_world_scripts.sql new file mode 100644 index 00000000000..d7cec0efd7d --- /dev/null +++ b/sql/updates/426_world_scripts.sql @@ -0,0 +1,14 @@ +UPDATE `gameobject_template` SET `ScriptName`='go_altar_of_the_keepers' WHERE `entry`=130511; +UPDATE `gameobject_template` SET `ScriptName`='go_altar_of_archaedas' WHERE `entry`=133234; + +UPDATE `instance_template` SET `script`='instance_uldaman' WHERE `map`=70; + +-- Archaedas +UPDATE `creature_template` SET `ScriptName`='boss_archaedas' WHERE `entry`=2748; + +-- Archaedas' minions +UPDATE `creature_template` SET `ScriptName`='mob_archaedas_minions' WHERE `entry` IN ('7309', '7077', '7076', '10120'); + +-- Stone keepers +UPDATE `creature_template` SET `ScriptName`='mob_stonekeepers' WHERE `entry`=4857; + diff --git a/sql/updates/427_world_scripts.sql b/sql/updates/427_world_scripts.sql new file mode 100644 index 00000000000..abcff54ade6 --- /dev/null +++ b/sql/updates/427_world_scripts.sql @@ -0,0 +1,58 @@ +UPDATE `instance_template` SET `script`='instance_scarlet_monastery' WHERE `map`='189'; +UPDATE `gameobject_template` SET `ScriptName`='go_loosely_turned_soil' WHERE `entry`='186314'; + +UPDATE `creature_template` SET `ScriptName`='boss_headless_horseman', +`minlevel`=70, `maxlevel`=70, `minhealth`=67068, `maxhealth`=67068, +`minmana`=3155, `maxmana`=3155, `type`=6 + WHERE `entry` = 23682; + +UPDATE `creature_template` SET `ScriptName`='mob_head', + `minlevel`=70, `maxlevel`=70, `type`=6, `modelid_h`=21908, +`minhealth`=24300, `maxhealth`=24300, +`faction_A`=14, `faction_H`=14 +WHERE `entry` = 23775; + +UPDATE `creature_template` SET `ScriptName`='mob_pulsing_pumpkin', +`faction_A`=14, `faction_H`=14, `type`=6, +`minlevel`=70, `maxlevel`=70, +`minhealth`=9781, `maxhealth`=9781, +`minmana`=3155, `maxmana`=3155 +WHERE `entry` = 23694; + +-- helper +UPDATE `creature_template` SET `ScriptName`='mob_wisp_invis', +`faction_A`=35, `faction_H`=35, +`unit_flags`='33554434' WHERE `entry`='23686'; + +-- pumpkin fiend +UPDATE `creature_template` SET + `minlevel`=70, `maxlevel`=70, +`faction_A`=14, `faction_H`=14, +`type`=6 +WHERE `entry`='23545'; + +-- wisp +UPDATE `creature_template` SET `ScriptName`='mob_wisp_invis', +`modelid_a`=21342, `modelid_h`=21342, +`faction_A`=35, `faction_H`=35, `unit_flags`='33554434' +WHERE `entry`='24034'; + +UPDATE `creature_template` SET `equipment_id`=23682 WHERE `entry` = 23682; +replace into`creature_equip_template` (`entry`, `equipmodel1`, `equipmodel2`, `equipmodel3`, `equipinfo1`, `equipinfo2`, `equipinfo3`, `equipslot1`, `equipslot2`, `equipslot3`) +VALUES (23682, 50495, 0, 0, 33490690, 0, 0, 781, 0, 0); + +REPLACE INTO `script_texts` VALUES +(-1189001, 'It is over, your search is done! Let fate choose now, the righteous one',0,0,0,0,0,0,0,0,11961,1,0,'Headless Horseman SAY_ENTRANCE'), + +(-1189002, 'Here\'s my body, fit and pure! Now, your blackened souls I\'ll cure!',0,0,0,0,0,0,0,0,12567,1,0,'Headless Horseman SAY_REJOINED'), + +(-1189003, 'Over here, you idiot!',0,0,0,0,0,0,0,0,12569,1,0,'Headless Horseman SAY_LOST_HEAD'), + +(-1189004, 'Harken, cur! Tis you I spurn! Now, $N, feel the burn!',0,0,0,0,0,0,0,0,12573,1,0,'Headless Horseman SAY_CONFLAGRATION'), + +(-1189005, 'Soldiers arise, stand and fight! Bring victory at last to this fallen knight!',0,0,0,0,0,0,0,0,11963,1,0,'Headless Horseman SAY_SPROUTING_PUMPKINS'), + +(-1189006, 'Your body lies beaten, battered and broken. Let my curse be your own, fate has spoken',0,0,0,0,0,0,0,0,11962,0,0,'Headless Horseman SAY_PLAYER_DEATH'), + +(-1189007, 'This end have I reached before. What new adventure lies in store?',0,0,0,0,0,0,0,0,11964,0,0,'Headless Horseman SAY_DEATH'); + diff --git a/sql/updates/444_world.sql b/sql/updates/444_world.sql new file mode 100644 index 00000000000..b5d588c39fa --- /dev/null +++ b/sql/updates/444_world.sql @@ -0,0 +1,37 @@ +DROP TABLE IF EXISTS `waypoint_data`; + +CREATE TABLE `waypoint_data` ( + `id` int(10) unsigned NOT NULL default '0' COMMENT 'Creature GUID', + `point` mediumint(8) unsigned NOT NULL default '0', + `position_x` float NOT NULL default '0', + `position_y` float NOT NULL default '0', + `position_z` float NOT NULL default '0', + `delay` int(10) unsigned NOT NULL default '0', + `move_flag` tinyint(1) NOT NULL default '0', + `action` int(11) NOT NULL default '0', + `action_chance` smallint(3) NOT NULL default '100', + `wpguid` int(11) NOT NULL default '0' +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + +DROP TABLE IF EXISTS `waypoint_scripts`; + +CREATE TABLE `waypoint_scripts` ( + `id` int(11) unsigned NOT NULL default '0', + `delay` int(11) unsigned NOT NULL default '0', + `command` int(11) unsigned NOT NULL default '0', + `datalong` int(11) unsigned NOT NULL default '0', + `datalong2` int(11) unsigned NOT NULL default '0', + `dataint` int(11) unsigned NOT NULL default '0', + `x` float NOT NULL default '0', + `y` float NOT NULL default '0', + `z` float NOT NULL default '0', + `o` float NOT NULL default '0', + `guid` int(11) NOT NULL default '0', + PRIMARY KEY (`guid`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + +ALTER TABLE `creature_addon` + ADD `path_id` int(11) unsigned NOT NULL default '0' AFTER `guid`; +ALTER TABLE `creature_template_addon` + ADD `path_id` int(11) unsigned NOT NULL default '0' AFTER `entry`; + diff --git a/sql/updates/452_world.sql b/sql/updates/452_world.sql new file mode 100644 index 00000000000..dbc7589e46f --- /dev/null +++ b/sql/updates/452_world.sql @@ -0,0 +1,10 @@ +-- link gift of the wild to mark of the wild + +DELETE FROM `spell_chain` WHERE `spell_id` = 21849; +DELETE FROM `spell_chain` WHERE `spell_id` = 21850; +DELETE FROM `spell_chain` WHERE `spell_id` = 26991; + +INSERT INTO `spell_chain` (spell_id,prev_spell,first_spell,rank,req_spell) VALUES (21849,0,1126,1,0); +INSERT INTO `spell_chain` (spell_id,prev_spell,first_spell,rank,req_spell) VALUES (21850,21849,1126,2,0); +INSERT INTO `spell_chain` (spell_id,prev_spell,first_spell,rank,req_spell) VALUES (26991,21850,1126,3,0); + diff --git a/sql/updates/455_world.sql b/sql/updates/455_world.sql new file mode 100644 index 00000000000..5dec728d539 --- /dev/null +++ b/sql/updates/455_world.sql @@ -0,0 +1,15 @@ +-- demon fire +UPDATE `creature_template` SET spell1 = 40029, flags_extra = 128, ScriptName = '' WHERE entry = 23069; +-- pillar of fire +UPDATE `creature_template` SET spell1 = 43218, flags_extra = 128, ScriptName = '' WHERE entry = 24187; +-- Broggok Poison Cloud +UPDATE `creature_template` SET spell1 = 30914, flags_extra = 128, ScriptName = '' WHERE entry = 17662; + +DELETE FROM `spell_linked_spell` WHERE `spell_trigger` IN (43468, 43648, 43658, 43658, 43658, 43658, 43658); +INSERT INTO spell_linked_spell (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES (43648, 44007, 1, 'Storm Eye Safe Zone'); +INSERT INTO spell_linked_spell (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES (43658, 43653, 0, 'Electrical Arc Visual'); +INSERT INTO spell_linked_spell (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES (43658, 43654, 0, 'Electrical Arc Visual'); +INSERT INTO spell_linked_spell (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES (43658, 43655, 0, 'Electrical Arc Visual'); +INSERT INTO spell_linked_spell (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES (43658, 43656, 0, 'Electrical Arc Visual'); +INSERT INTO spell_linked_spell (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES (43658, 43659, 0, 'Electrical Arc Visual'); + diff --git a/sql/updates/45_characters.sql b/sql/updates/45_characters.sql new file mode 100644 index 00000000000..99ef0dd5c9d --- /dev/null +++ b/sql/updates/45_characters.sql @@ -0,0 +1,14 @@ +CREATE TABLE `game_event_save` ( + `event_id` mediumint(8) unsigned NOT NULL, + `state` tinyint(3) unsigned NOT NULL default '1', + `next_start` timestamp NOT NULL default '0000-00-00 00:00:00', + PRIMARY KEY (`event_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +CREATE TABLE `game_event_condition_save` ( + `event_id` mediumint(8) unsigned NOT NULL, + `condition_id` mediumint(8) unsigned NOT NULL default '0', + `done` float default '0', + PRIMARY KEY (`event_id`,`condition_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + diff --git a/sql/updates/471_world.sql b/sql/updates/471_world.sql new file mode 100644 index 00000000000..c21757e2910 --- /dev/null +++ b/sql/updates/471_world.sql @@ -0,0 +1,3 @@ +UPDATE `gameobject_template` SET `faction`=1375 WHERE `entry` IN (184203, 184204, 184205); +UPDATE `gameobject_template` SET `Scriptname`='go_bridge_console' WHERE entry=184568; + diff --git a/sql/updates/480_world_scripts.sql b/sql/updates/480_world_scripts.sql new file mode 100644 index 00000000000..7eeaeb61fbf --- /dev/null +++ b/sql/updates/480_world_scripts.sql @@ -0,0 +1,3 @@ +UPDATE `creature_template` SET `ScriptName`='npc_winter_reveler' WHERE `entry`=15760; +UPDATE `creature_template` SET `ScriptName`='npc_brewfest_reveler' WHERE `entry`=24484; + diff --git a/sql/updates/488_world_scripts.sql b/sql/updates/488_world_scripts.sql new file mode 100644 index 00000000000..8aab8c464ed --- /dev/null +++ b/sql/updates/488_world_scripts.sql @@ -0,0 +1,736 @@ +UPDATE `creature_template` SET `ScriptName`='npc_defias_traitor' WHERE `entry`=467; +UPDATE `creature_template` SET `ScriptName`='npc_torek' WHERE `entry`=12858; +UPDATE `creature_template` SET `ScriptName`='npc_magwin' WHERE `entry`=17312; +UPDATE `creature_template` SET `ScriptName`='npc_wounded_blood_elf' WHERE `entry`=16993; +UPDATE `creature_template` SET `ScriptName`='mob_abyssal' WHERE `entry`=17454; +UPDATE `creature_template` SET `ScriptName`='mob_scarlet_trainee' WHERE `entry`=6575; +UPDATE `instance_template` SET `script`='instance_scarlet_monastery' WHERE `map`=189; +UPDATE `creature_template` SET `ScriptName`='mob_phoenix_tk' WHERE `entry`=21362; +UPDATE `creature_template` SET `ScriptName`='mob_phoenix_egg_tk' WHERE `entry`=21364; +UPDATE `creature_template` SET `ScriptName`='npc_highlord_demitrian' WHERE `entry`=14347; +UPDATE `gameobject_template` SET `ScriptName`='go_gauntlet_gate' WHERE `entry`=175357; +UPDATE `creature_template` SET `ScriptName`='' WHERE `entry`=11197; +UPDATE `creature_template` SET `ScriptName`='' WHERE `entry`=10399; +UPDATE `gameobject_template` SET `ScriptName`='go_barrel_old_hillsbrad' WHERE `entry`=182589; +UPDATE `instance_template` SET `script`='instance_deadmines' WHERE `map`=36; +UPDATE `gameobject_template` SET `ScriptName`='go_defias_cannon' WHERE `entry`=16398; +UPDATE `gameobject_template` SET `ScriptName`='go_door_lever_dm' WHERE `entry`=101833; +UPDATE `gameobject_template` SET `ScriptName`='go_main_chambers_access_panel' WHERE `entry` IN (184125,184126); +UPDATE `creature_template` SET `ScriptName`='npc_twiggy_flathead' WHERE `entry`=6248; +DELETE FROM `areatrigger_scripts` WHERE `entry`=522; +INSERT INTO `areatrigger_scripts` VALUES (522,'at_twiggy_flathead');DELETE FROM `script_texts` WHERE `entry` BETWEEN -1565019 AND -1565000; + +-- text +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1565000,'Gronn are the real power in outland.',11367,1,0,'maulgar SAY_AGGRO'), +(-1565001,'You will not defeat the hand of Gruul!',11368,1,0,'maulgar SAY_ENRAGE'), +(-1565002,'You won\'t kill next one so easy!',11369,1,0,'maulgar SAY_OGRE_DEATH1'), +(-1565003,'Pah! Does not prove anything!',11370,1,0,'maulgar SAY_OGRE_DEATH2'), +(-1565004,'I\'m not afraid of you.',11371,1,0,'maulgar SAY_OGRE_DEATH3'), +(-1565005,'Good, now you fight me!',11372,1,0,'maulgar SAY_OGRE_DEATH4'), +(-1565006,'You not so tough afterall!',11373,1,0,'maulgar SAY_SLAY1'), +(-1565007,'Aha-ha ha ha!',11374,1,0,'maulgar SAY_SLAY2'), +(-1565008,'Mulgar is king!',11375,1,0,'maulgar SAY_SLAY3'), +(-1565009,'Gruul... will crush you...',11376,1,0,'maulgar SAY_DEATH'), +(-1565010,'Come... and die.',11355,1,0,'gruul SAY_AGGRO'), +(-1565011,'Scurry',11356,1,0,'gruul SAY_SLAM1'), +(-1565012,'No escape',11357,1,0,'gruul SAY_SLAM2'), +(-1565013,'Stay',11358,1,0,'gruul SAY_SHATTER1'), +(-1565014,'Beg... for life',11359,1,0,'gruul SAY_SHATTER2'), +(-1565015,'No more',11360,1,0,'gruul SAY_SLAY1'), +(-1565016,'Unworthy',11361,1,0,'gruul SAY_SLAY2'), +(-1565017,'Die',11362,1,0,'gruul SAY_SLAY3'), +(-1565018,'Aaargh...',11363,1,0,'gruul SAY_DEATH'), +(-1565019,'grows in size!',0,2,0,'gruul EMOTE_GROW'); + +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1532102 AND -1532000; +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1532000,'Well done Midnight!',9173,1,0,'attumen SAY_MIDNIGHT_KILL'), +(-1532001,'Cowards! Wretches!',9167,1,0,'attumen SAY_APPEAR1'), +(-1532002,'Who dares attack the steed of the Huntsman?',9298,1,0,'attumen SAY_APPEAR2'), +(-1532003,'Perhaps you would rather test yourselves against a more formidable opponent?!',9299,1,0,'attumen SAY_APPEAR3'), +(-1532004,'Come, Midnight, let\'s disperse this petty rabble!',9168,1,0,'attumen SAY_MOUNT'), +(-1532005,'It was... inevitable.',9169,1,0,'attumen SAY_KILL1'), +(-1532006,'Another trophy to add to my collection!',9300,1,0,'attumen SAY_KILL2'), +(-1532007,'Weapons are merely a convenience for a warrior of my skill!',9166,1,0,'attumen SAY_DISARMED'), +(-1532008,'I always knew... someday I would become... the hunted.',9165,1,0,'attumen SAY_DEATH'), +(-1532009,'Such easy sport.',9170,1,0,'attumen SAY_RANDOM1'), +(-1532010,'Amateurs! Do not think you can best me! I kill for a living.',9304,1,0,'attumen SAY_RANDOM2'), +(-1532011,'Hmm, unannounced visitors? Preparations must be made.',9211,1,0,'moroes SAY_AGGRO'), +(-1532012,'Now, where was I? Oh yes...',9215,1,0,'moroes SAY_SPECIAL_1'), +(-1532013,'You rang?',9316,1,0,'moroes SAY_SPECIAL_2'), +(-1532014,'One more for dinner this evening.',9214,1,0,'moroes SAY_KILL_1'), +(-1532015,'Time... Never enough time.',9314,1,0,'moroes SAY_KILL_2'), +(-1532016,'I\'ve gone and made a mess.',9315,1,0,'moroes SAY_KILL_3'), +(-1532017,'How terribly clumsy of me...',9213,1,0,'moroes SAY_DEATH'), +(-1532018,'Your behavior will not be tolerated!',9204,1,0,'maiden SAY_AGGRO'), +(-1532019,'Ah ah ah...',9207,1,0,'maiden SAY_SLAY1'), +(-1532020,'This is for the best.',9312,1,0,'maiden SAY_SLAY2'), +(-1532021,'Impure thoughts lead to profane actions.',9311,1,0,'maiden SAY_SLAY3'), +(-1532022,'Cast out your corrupt thoughts.',9313,1,0,'maiden SAY_REPENTANCE1'), +(-1532023,'Your impurity must be cleansed.',9208,1,0,'maiden SAY_REPENTANCE2'), +(-1532024,'Death comes. Will your conscience be clear?',9206,1,0,'maiden SAY_DEATH'), +(-1532025,'Oh at last, at last. I can go home.',9190,1,0,'dorothee SAY_DOROTHEE_DEATH'), +(-1532026,'Don\'t let them hurt us, Tito! Oh, you won\'t, will you?',9191,1,0,'dorothee SAY_DOROTHEE_SUMMON'), +(-1532027,'Tito, oh Tito, no!',9192,1,0,'dorothee SAY_DOROTHEE_TITO_DEATH'), +(-1532028,'Oh dear, we simply must find a way home! The old wizard could be our only hope! Strawman, Roar, Tinhead, will you... wait! Oh golly, look! We have visitors!',9195,1,0,'dorothee SAY_DOROTHEE_AGGRO'), +(-1532029,'Wanna fight? Huh? Do ya? C\'mon, I\'ll fight you with both claws behind my back!',9227,1,0,'roar SAY_ROAR_AGGRO'), +(-1532030,'You didn\'t have to go and do that.',9229,1,0,'roar SAY_ROAR_DEATH'), +(-1532031,'I think I\'m going to go take fourty winks.',9230,1,0,'roar SAY_ROAR_SLAY'), +(-1532032,'Now what should I do with you? I simply can\'t make up my mind.',9254,1,0,'strawman SAY_STRAWMAN_AGGRO'), +(-1532033,'Don\'t let them make a mattress... out of me.',9256,1,0,'strawman SAY_STRAWMAN_DEATH'), +(-1532034,'I guess I\'m not a failure after all.',9257,1,0,'strawman SAY_STRAWMAN_SLAY'), +(-1532035,'I could really use a heart. Say, can I have yours?',9268,1,0,'tinhead SAY_TINHEAD_AGGRO'), +(-1532036,'Back to being an old rustbucket.',9270,1,0,'tinhead SAY_TINHEAD_DEATH'), +(-1532037,'Guess I\'m not so rusty, after all.',9271,1,0,'tinhead SAY_TINHEAD_SLAY'), +(-1532038,'begins to rust.',0,2,0,'tinhead EMOTE_RUST'), +(-1532039,'Woe to each and every one of you my pretties! <cackles>',9179,1,0,'crone SAY_CRONE_AGGRO'), +(-1532040,'It will all be over soon! <cackles>',9307,1,0,'crone SAY_CRONE_AGGRO2'), +(-1532041,'How could you? What a cruel, cruel world!',9178,1,0,'crone SAY_CRONE_DEATH'), +(-1532042,'Fixed you, didn\'t I? <cackles>',9180,1,0,'crone SAY_CRONE_SLAY'), +(-1532043,'All the better to own you with!',9276,1,0,'wolf SAY_WOLF_AGGRO'), +(-1532044,'Mmmm... delicious.',9277,1,0,'wolf SAY_WOLF_SLAY'), +(-1532045,'Run away little girl, run away!',9278,1,0,'wolf SAY_WOLF_HOOD'), +(-1532046,'What devil art thou, that dost torment me thus?',9196,1,0,'julianne SAY_JULIANNE_AGGRO'), +(-1532047,'Where is my lord? Where is my Romulo?',9199,1,0,'julianne SAY_JULIANNE_ENTER'), +(-1532048,'Romulo, I come! Oh... this do I drink to thee!',9198,1,0,'julianne SAY_JULIANNE_DEATH01'), +(-1532049,'Where is my Lord? Where is my Romulo? Ohh, happy dagger! This is thy sheath! There rust, and let me die!',9310,1,0,'julianne SAY_JULIANNE_DEATH02'), +(-1532050,'Come, gentle night; and give me back my Romulo!',9200,1,0,'julianne SAY_JULIANNE_RESURRECT'), +(-1532051,'Parting is such sweet sorrow.',9201,1,0,'julianne SAY_JULIANNE_SLAY'), +(-1532052,'Wilt thou provoke me? Then have at thee, boy!',9233,1,0,'romulo SAY_ROMULO_AGGRO'), +(-1532053,'Thou smilest... upon the stroke that... murders me.',9235,1,0,'romulo SAY_ROMULO_DEATH'), +(-1532054,'This day\'s black fate on more days doth depend. This but begins the woe. Others must end.',9236,1,0,'romulo SAY_ROMULO_ENTER'), +(-1532055,'Thou detestable maw, thou womb of death; I enforce thy rotten jaws to open!',9237,1,0,'romulo SAY_ROMULO_RESURRECT'), +(-1532056,'How well my comfort is revived by this!',9238,1,0,'romulo SAY_ROMULO_SLAY'), +(-1532057,'The Menagerie is for guests only.',9183,1,0,'curator SAY_AGGRO'), +(-1532058,'Gallery rules will be strictly enforced.',9188,1,0,'curator SAY_SUMMON1'), +(-1532059,'This curator is equipped for gallery protection.',9309,1,0,'curator SAY_SUMMON2'), +(-1532060,'Your request cannot be processed.',9186,1,0,'curator SAY_EVOCATE'), +(-1532061,'Failure to comply will result in offensive action.',9185,1,0,'curator SAY_ENRAGE'), +(-1532062,'Do not touch the displays.',9187,1,0,'curator SAY_KILL1'), +(-1532063,'You are not a guest.',9308,1,0,'curator SAY_KILL2'), +(-1532064,'This Curator is no longer op... er... ation... al.',9184,1,0,'curator SAY_DEATH'), +(-1532065,'Your blood will anoint my circle.',9264,1,0,'terestian SAY_SLAY1'), +(-1532066,'The great one will be pleased.',9329,1,0,'terestian SAY_SLAY2'), +(-1532067,'My life, is yours. Oh great one.',9262,1,0,'terestian SAY_DEATH'), +(-1532068,'Ah, you\'re just in time. The rituals are about to begin.',9260,1,0,'terestian SAY_AGGRO'), +(-1532069,'Please, accept this humble offering, oh great one.',9263,1,0,'terestian SAY_SACRIFICE1'), +(-1532070,'Let the sacrifice serve his testament to my fealty.',9330,1,0,'terestian SAY_SACRIFICE2'), +(-1532071,'Come, you dwellers in the dark. Rally to my call!',9265,1,0,'terestian SAY_SUMMON1'), +(-1532072,'Gather, my pets. There is plenty for all.',9331,1,0,'terestian SAY_SUMMON2'), +(-1532073,'Please, no more. My son... he\'s gone mad!',9241,1,0,'aran SAY_AGGRO1'), +(-1532074,'I\'ll not be tortured again!',9323,1,0,'aran SAY_AGGRO2'), +(-1532075,'Who are you? What do you want? Stay away from me!',9324,1,0,'aran SAY_AGGRO3'), +(-1532076,'I\'ll show you this beaten dog still has some teeth!',9245,1,0,'aran SAY_FLAMEWREATH1'), +(-1532077,'Burn you hellish fiends!',9326,1,0,'aran SAY_FLAMEWREATH2'), +(-1532078,'I\'ll freeze you all!',9246,1,0,'aran SAY_BLIZZARD1'), +(-1532079,'Back to the cold dark with you!',9327,1,0,'aran SAY_BLIZZARD2'), +(-1532080,'Yes, yes, my son is quite powerful... but I have powers of my own!',9242,1,0,'aran SAY_EXPLOSION1'), +(-1532081,'I am not some simple jester! I am Nielas Aran!',9325,1,0,'aran SAY_EXPLOSION2'), +(-1532082,'Surely you would not deny an old man a replenishing drink? No, no I thought not.',9248,1,0,'aran SAY_DRINK'), +(-1532083,'I\'m not finished yet! No, I have a few more tricks up me sleeve.',9251,1,0,'aran SAY_ELEMENTALS'), +(-1532084,'I want this nightmare to be over!',9250,1,0,'aran SAY_KILL1'), +(-1532085,'Torment me no more!',9328,1,0,'aran SAY_KILL2'), +(-1532086,'You\'ve wasted enough of my time. Let these games be finished!',9247,1,0,'aran SAY_TIMEOVER'), +(-1532087,'At last... The nightmare is.. over...',9244,1,0,'aran SAY_DEATH'), +(-1532088,'Where did you get that?! Did HE send you?!',9249,1,0,'aran SAY_ATIESH'), +(-1532089,'cries out in withdrawal, opening gates to the warp.',0,2,0,'netherspite EMOTE_PHASE_PORTAL'), +(-1532090,'goes into a nether-fed rage!',0,2,0,'netherspite EMOTE_PHASE_BANISH'), +(-1532091,'Madness has brought you here to me. I shall be your undoing!',9218,1,0,'malchezaar SAY_AGGRO'), +(-1532092,'Simple fools! Time is the fire in which you\'ll burn!',9220,1,0,'malchezaar SAY_AXE_TOSS1'), +(-1532093,'I see the subtlety of conception is beyond primitives such as you.',9317,1,0,'malchezaar SAY_AXE_TOSS2'), +(-1532094,'Who knows what secrets hide in the dark.',9223,1,0,'malchezaar SAY_SPECIAL1'), +(-1532095,'The cerestial forces are mine to manipulate.',9320,1,0,'malchezaar SAY_SPECIAL2'), +(-1532096,'How can you hope to withstand against such overwhelming power?',9321,1,0,'malchezaar SAY_SPECIAL3'), +(-1532097,'Surely you did not think you could win.',9222,1,0,'malchezaar SAY_SLAY1'), +(-1532098,'Your greed, your foolishness has brought you to this end.',9318,1,0,'malchezaar SAY_SLAY2'), +(-1532099,'You are, but a plaything, unfit even to amuse.',9319,1,0,'malchezaar SAY_SLAY3'), +(-1532100,'All realities, all dimensions are open to me!',9224,1,0,'malchezaar SAY_SUMMON1'), +(-1532101,'You face not Malchezaar alone, but the legions I command!',9322,1,0,'malchezaar SAY_SUMMON2'), +(-1532102,'I refuse to concede defeat. I am a prince of the Eredar! I am...',9221,1,0,'malchezaar SAY_DEATH'); +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1550043 AND -1550000; +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1550000,'Alert, you are marked for extermination!',11213,1,0,'voidreaver SAY_AGGRO'), +(-1550001,'Extermination, successful.',11215,1,0,'voidreaver SAY_SLAY1'), +(-1550002,'Imbecile life form, no longer functional.',11216,1,0,'voidreaver SAY_SLAY2'), +(-1550003,'Threat neutralized.',11217,1,0,'voidreaver SAY_SLAY3'), +(-1550004,'Systems... shutting... down...',11214,1,0,'voidreaver SAY_DEATH'), +(-1550005,'Alternative measure commencing...',11218,1,0,'voidreaver SAY_POUNDING1'), +(-1550006,'Calculating force parameters...',11219,1,0,'voidreaver SAY_POUNDING2'), +(-1550007,'Tal anu\'men no Sin\'dorei!',11134,1,0,'solarian SAY_AGGRO'), +(-1550008,'Ha ha ha! You are hopelessly outmatched!',11139,1,0,'solarian SAY_SUMMON1'), +(-1550009,'I will crush your delusions of grandeur!',11140,1,0,'solarian SAY_SUMMON2'), +(-1550010,'Your soul belongs to the Abyss!',11136,1,0,'solarian SAY_KILL1'), +(-1550011,'By the blood of the Highborne!',11137,1,0,'solarian SAY_KILL2'), +(-1550012,'For the Sunwell!',11138,1,0,'solarian SAY_KILL3'), +(-1550013,'The warmth of the sun... awaits.',11135,1,0,'solarian SAY_DEATH'), +(-1550014,'Enough of this! Now I call upon the fury of the cosmos itself.',0,1,0,'solarian SAY_VOIDA'), +(-1550015,'I become ONE... with the VOID!',0,1,0,'solarian SAY_VOIDB'), +(-1550016,'Energy. Power. My people are addicted to it... a dependence made manifest after the Sunwell was destroyed. Welcome... to the future. A pity you are too late to stop it. No one can stop me now! Selama ashal\'anore!',11256,1,0,'kaelthas SAY_INTRO'), +(-1550017,'Capernian will see to it that your stay here is a short one.',11257,1,0,'kaelthas SAY_INTRO_CAPERNIAN'), +(-1550018,'Well done, you have proven worthy to test your skills against my master engineer, Telonicus.',11258,1,0,'kaelthas SAY_INTRO_TELONICUS'), +(-1550019,'Let us see how your nerves hold up against the Darkener, Thaladred.',11259,1,0,'kaelthas SAY_INTRO_THALADRED'), +(-1550020,'You have persevered against some of my best advisors... but none can withstand the might of the Blood Hammer. Behold, Lord Sanguinar!',11260,1,0,'kaelthas SAY_INTRO_SANGUINAR'), +(-1550021,'As you see, I have many weapons in my arsenal...',11261,1,0,'kaelthas SAY_PHASE2_WEAPON'), +(-1550022,'Perhaps I underestimated you. It would be unfair to make you fight all four advisors at once, but... fair treatment was never shown to my people. I\'m just returning the favor.',11262,1,0,'kaelthas SAY_PHASE3_ADVANCE'), +(-1550023,'Alas, sometimes one must take matters into one\'s own hands. Balamore shanal!',11263,1,0,'kaelthas SAY_PHASE4_INTRO2'), +(-1550024,'I have not come this far to be stopped! The future I have planned will not be jeopardized! Now you will taste true power!!',11273,1,0,'kaelthas SAY_PHASE5_NUTS'), +(-1550025,'You will not prevail.',11270,1,0,'kaelthas SAY_SLAY1'), +(-1550026,'You gambled...and lost.',11271,1,0,'kaelthas SAY_SLAY2'), +(-1550027,'This was Child\'s play.',11272,1,0,'kaelthas SAY_SLAY3'), +(-1550028,'Obey me.',11268,1,0,'kaelthas SAY_MINDCONTROL1'), +(-1550029,'Bow to my will.',11269,1,0,'kaelthas SAY_MINDCONTROL2'), +(-1550030,'Let us see how you fare when your world is turned upside down.',11264,1,0,'kaelthas SAY_GRAVITYLAPSE1'), +(-1550031,'Having trouble staying grounded?',11265,1,0,'kaelthas SAY_GRAVITYLAPSE2'), +(-1550032,'Anara\'nel belore!',11267,1,0,'kaelthas SAY_SUMMON_PHOENIX1'), +(-1550033,'By the power of the sun!',11266,1,0,'kaelthas SAY_SUMMON_PHOENIX2'), +(-1550034,'For...Quel...thalas!',11274,1,0,'kaelthas SAY_DEATH'), +(-1550035,'Prepare yourselves!',11203,1,0,'thaladred SAY_THALADRED_AGGRO'), +(-1550036,'Forgive me, my prince! I have... failed.',11204,1,0,'thaladred SAY_THALADRED_DEATH'), +(-1550037,'sets his gaze on $N!',0,2,0,'thaladred EMOTE_THALADRED_GAZE'), +(-1550038,'Blood for blood!',11152,1,0,'sanguinar SAY_SANGUINAR_AGGRO'), +(-1550039,'NO! I ...will... not...',11153,1,0,'sanguinar SAY_SANGUINAR_DEATH'), +(-1550040,'The sin\'dore reign supreme!',11117,1,0,'capernian SAY_CAPERNIAN_AGGRO'), +(-1550041,'This is not over!',11118,1,0,'capernian SAY_CAPERNIAN_DEATH'), +(-1550042,'Anar\'alah belore!',11157,1,0,'telonicus SAY_TELONICUS_AGGRO'), +(-1550043,'More perils... await',11158,1,0,'telonicus SAY_TELONICUS_DEATH'); + +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1553012 AND -1553000; +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1553000,'What are you doing? These specimens are very delicate!',11144,1,0,'freywinn SAY_AGGRO'), +(-1553001,'Your life cycle is now concluded!',11145,1,0,'freywinn SAY_KILL_1'), +(-1553002,'You will feed the worms.',11146,1,0,'freywinn SAY_KILL_2'), +(-1553003,'Endorel aluminor!',11147,1,0,'freywinn SAY_TREE_1'), +(-1553004,'Nature bends to my will!',11148,1,0,'freywinn SAY_TREE_2'), +(-1553005,'The specimens...must be preserved.',11149,1,0,'freywinn SAY_DEATH'), +(-1553006,'emits a strange noise.',0,2,0,'laj EMOTE_SUMMON'), +(-1553007,'Who disturbs this sanctuary?',11230,1,0,'warp SAY_AGGRO'), +(-1553008,'You must die! But wait: this does not--No, no... you must die!',11231,1,0,'warp SAY_SLAY_1'), +(-1553009,'What am I doing? Why do I...',11232,1,0,'warp SAY_SLAY_2'), +(-1553010,'Children, come to me!',11233,1,0,'warp SAY_SUMMON_1'), +(-1553011,'Maybe this is not--No, we fight! Come to my aid.',11234,1,0,'warp SAY_SUMMON_2'), +(-1553012,'So... confused. Do not... belong here!',11235,1,0,'warp SAY_DEATH'); + +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1554027 AND -1554000; +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1554000,'I predict a painful death.',11101,1,0,'gyro SAY_AGGRO'), +(-1554001,'Measure twice; cut once!',11104,1,0,'gyro SAY_SAW_ATTACK1'), +(-1554002,'If my division is correct, you should be quite dead.',11105,1,0,'gyro SAY_SAW_ATTACK2'), +(-1554003,'Your strategy was flawed!',11102,1,0,'gyro SAY_SLAY1'), +(-1554004,'Yes, the only logical outcome.',11103,1,0,'gyro SAY_SLAY2'), +(-1554005,'An unforseen... contingency',11106,1,0,'gyro SAY_DEATH'), +(-1554006,'You have approximately five seconds to live.',11109,1,0,'ironhand SAY_AGGRO_1'), +(-1554007,'With the precise angle and velocity...',11112,1,0,'ironhand SAY_HAMMER_1'), +(-1554008,'Low tech yet quiet effective!',11113,1,0,'ironhand SAY_HAMMER_2'), +(-1554009,'A foregone conclusion.',11110,1,0,'ironhand SAY_SLAY_1'), +(-1554010,'The processing will continue a schedule!',11111,1,0,'ironhand SAY_SLAY_2'), +(-1554011,'My calculations did not...',11114,1,0,'ironhand SAY_DEATH_1'), +(-1554012,'raises his hammer menacingly...',0,3,0,'ironhand EMOTE_HAMMER'), +(-1554013,'Don\'t value your life very much, do you?',11186,1,0,'sepethrea SAY_AGGRO'), +(-1554014,'I am not alone.',11191,1,0,'sepethrea SAY_SUMMON'), +(-1554015,'Think you can take the heat?',11189,1,0,'sepethrea SAY_DRAGONS_BREATH_1'), +(-1554016,'Anar\'endal dracon!',11190,1,0,'sepethrea SAY_DRAGONS_BREATH_2'), +(-1554017,'And don\'t come back!',11187,1,0,'sepethrea SAY_SLAY1'), +(-1554018,'En\'dala finel el\'dal',11188,1,0,'sepethrea SAY_SLAY2'), +(-1554019,'Anu... bala belore...alon.',11192,1,0,'sepethrea SAY_DEATH'), +(-1554020,'We are on a strict timetable. You will not interfere!',11193,1,0,'pathaleon SAY_AGGRO'), +(-1554021,'I\'m looking for a team player...',11197,1,0,'pathaleon SAY_DOMINATION_1'), +(-1554022,'You work for me now!',11198,1,0,'pathaleon SAY_DOMINATION_2'), +(-1554023,'Time to supplement my work force.',11196,1,0,'pathaleon SAY_SUMMON'), +(-1554024,'I prefeer to be hands-on...',11199,1,0,'pathaleon SAY_ENRAGE'), +(-1554025,'A minor inconvenience.',11194,1,0,'pathaleon SAY_SLAY_1'), +(-1554026,'Looks like you lose.',11195,1,0,'pathaleon SAY_SLAY_2'), +(-1554027,'The project will... continue.',11200,1,0,'pathaleon SAY_DEATH'); +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1585029 AND -1585000; +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1585000,'You only waste my time!',12378,1,0,'selin SAY_AGGRO'), +(-1585001,'My hunger knows no bounds!',12381,1,0,'selin SAY_ENERGY'), +(-1585002,'Yes! I am a god!',12382,1,0,'selin SAY_EMPOWERED'), +(-1585003,'Enough distractions!',12388,1,0,'selin SAY_KILL_1'), +(-1585004,'I am invincible!',12385,1,0,'selin SAY_KILL_2'), +(-1585005,'No! More... I must have more!',12383,1,0,'selin SAY_DEATH'), +(-1585006,'begins to channel from the nearby Fel Crystal...',0,3,0,'selin EMOTE_CRYSTAL'), +(-1585007,'Drain...life!',12389,1,0,'vexallus SAY_AGGRO'), +(-1585008,'Un...con...tainable.',12392,1,0,'vexallus SAY_ENERGY'), +(-1585009,'Un...leash...',12390,1,0,'vexallus SAY_OVERLOAD'), +(-1585010,'Con...sume.',12393,1,0,'vexallus SAY_KILL'), +(-1585011,'discharges pure energy!',0,3,0,'vexallus EMOTE_DISCHARGE_ENERGY'), +(-1585012,'Annihilate them!',12395,1,0,'delrissa SAY_AGGRO'), +(-1585013,'Oh, the horror.',12398,1,0,'delrissa LackeyDeath1'), +(-1585014,'Well, aren\'t you lucky?',12400,1,0,'delrissa LackeyDeath2'), +(-1585015,'Now I\'m getting annoyed.',12401,1,0,'delrissa LackeyDeath3'), +(-1585016,'Lackies be damned! I\'ll finish you myself!',12403,1,0,'delrissa LackeyDeath4'), +(-1585017,'I call that a good start.',12405,1,0,'delrissa PlayerDeath1'), +(-1585018,'I could have sworn there were more of you.',12407,1,0,'delrissa PlayerDeath2'), +(-1585019,'Not really much of a group, anymore, is it?',12409,1,0,'delrissa PlayerDeath3'), +(-1585020,'One is such a lonely number.',12410,1,0,'delrissa PlayerDeath4'), +(-1585021,'It\'s been a kick, really.',12411,1,0,'delrissa PlayerDeath5'), +(-1585022,'Not what I had... planned...',12397,1,0,'delrissa SAY_DEATH'), +(-1585023,'Don\'t look so smug! I know what you\'re thinking, but Tempest Keep was merely a set back. Did you honestly believe I would trust the future to some blind, half-night elf mongrel? Oh no, he was merely an instrument, a stepping stone to a much larger plan! It has all led to this, and this time, you will not interfere!',12413,1,0,'kaelthas MT SAY_AGGRO'), +(-1585024,'Vengeance burns!',12415,1,0,'kaelthas MT SAY_PHOENIX'), +(-1585025,'Felomin ashal!',12417,1,0,'kaelthas MT SAY_FLAMESTRIKE'), +(-1585026,'I\'ll turn your world... upside... down...',12418,1,0,'kaelthas MT SAY_GRAVITY_LAPSE'), +(-1585027,'Master... grant me strength.',12419,1,0,'kaelthas MT SAY_TIRED'), +(-1585028,'Do not... get too comfortable.',12420,1,0,'kaelthas MT SAY_RECAST_GRAVITY'), +(-1585029,'My demise accomplishes nothing! The Master will have you! You will drown in your own blood! This world shall burn! Aaaghh!',12421,1,0,'kaelthas MT SAY_DEATH'); +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1580035 AND -1580000; +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1580000,'Aggh! No longer will I be a slave to Malygos! Challenge me and you will be destroyed!',12422,1,0,'kalecgos SAY_EVIL_AGGRO'), +(-1580001,'I will purge you!',12423,1,0,'kalecgos SAY_EVIL_SPELL1'), +(-1580002,'Your pain has only begun!',12424,1,0,'kalecgos SAY_EVIL_SPELL2'), +(-1580003,'In the name of Kil\'jaeden!',12425,1,0,'kalecgos SAY_EVIL_SLAY1'), +(-1580004,'You were warned!',12426,1,0,'kalecgos SAY_EVIL_SLAY2'), +(-1580005,'My awakening is complete! You shall all perish!',12427,1,0,'kalecgos SAY_EVIL_ENRAGE'), +(-1580006,'I need... your help... Cannot... resist him... much longer...',12428,1,0,'kalecgos humanoid SAY_GOOD_AGGRO'), +(-1580007,'Aaahhh! Help me, before I lose my mind!',12429,1,0,'kalecgos humanoid SAY_GOOD_NEAR_DEATH'), +(-1580008,'Hurry! There is not much of me left!',12430,1,0,'kalecgos humanoid SAY_GOOD_NEAR_DEATH2'), +(-1580009,'I am forever in your debt. Once we have triumphed over Kil\'jaeden, this entire world will be in your debt as well.',12431,1,0,'kalecgos humanoid SAY_GOOD_PLRWIN'), +(-1580010,'There will be no reprieve. My work here is nearly finished.',12451,1,0,'sathrovarr SAY_SATH_AGGRO'), +(-1580011,'I\'m... never on... the losing... side...',12452,1,0,'sathrovarr SAY_SATH_DEATH'), +(-1580012,'Your misery is my delight!',12453,1,0,'sathrovarr SAY_SATH_SPELL1'), +(-1580013,'I will watch you bleed!',12454,1,0,'sathrovarr SAY_SATH_SPELL2'), +(-1580014,'Pitious mortal!',12455,1,0,'sathrovarr SAY_SATH_SLAY1'), +(-1580015,'Haven\'t you heard? I always win!',12456,1,0,'sathrovarr SAY_SATH_SLAY2'), +(-1580016,'I have toyed with you long enough!',12457,1,0,'sathrovarr SAY_SATH_ENRAGE'), +(-1580017,'Puny lizard! Death is the only answer you\'ll find here!',12458,1,0,'brutallus YELL_INTRO'), +(-1580018,'Grah! Your magic is weak!',12459,1,0,'brutallus YELL_INTRO_BREAK_ICE'), +(-1580019,'I will crush you!',12460,1,0,'brutallus YELL_INTRO_CHARGE'), +(-1580020,'That was fun.',12461,1,0,'brutallus YELL_INTRO_KILL_MADRIGOSA'), +(-1580021,'Come, try your luck!',12462,1,0,'brutallus YELL_INTRO_TAUNT'), +(-1580022,'Ahh! More lambs to the slaughter!',12463,1,0,'brutallus YELL_AGGRO'), +(-1580023,'Perish, insect!',12464,1,0,'brutallus YELL_KILL1'), +(-1580024,'You are meat!',12465,1,0,'brutallus YELL_KILL2'), +(-1580025,'Too easy!',12466,1,0,'brutallus YELL_KILL3'), +(-1580026,'Bring the fight to me!',12467,1,0,'brutallus YELL_LOVE1'), +(-1580027,'Another day, another glorious battle!',12468,1,0,'brutallus YELL_LOVE2'), +(-1580028,'I live for this!',12469,1,0,'brutallus YELL_LOVE3'), +(-1580029,'So much for a real challenge... Die!',12470,1,0,'brutallus YELL_BERSERK'), +(-1580030,'Gah! Well done... Now... this gets... interesting...',12471,1,0,'brutallus YELL_DEATH'), +(-1580031,'Hold, friends! There is information to be had before this devil meets his fate!',12472,1,0,'madrigosa YELL_MADR_ICE_BARRIER'), +(-1580032,'Where is Anveena, demon? What has become of Kalec?',12473,1,0,'madrigosa YELL_MADR_INTRO'), +(-1580033,'You will tell me where they are!',12474,1,0,'madrigosa YELL_MADR_ICE_BLOCK'), +(-1580034,'Speak, I grow weary of asking!',12475,1,0,'madrigosa YELL_MADR_TRAP'), +(-1580035,'Malygos, my lord! I did my best!',12476,1,0,'madrigosa YELL_MADR_DEATH'); +DELETE FROM `script_texts` WHERE `entry`=-1033000; +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1033000,'Thanks for freeing me, I\'ll open this door for you, then I will get out of here.',0,0,0,'shadowfang_prisoner SAY_FREE'); +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1309023 AND -1309000; +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1309000,'Let the coils of hate unfurl!',8421,1,0,'venoxis SAY_TRANSFORM'), +(-1309001,'Ssserenity..at lassst!',0,1,0,'venoxis SAY_DEATH'), +(-1309002,'Lord Hir\'eek, grant me wings of vengance!',8417,1,0,'jeklik SAY_AGGRO'), +(-1309003,'I command you to rain fire down upon these invaders!',0,1,0,'jeklik SAY_RAIN_FIRE'), +(-1309004,'Finally ...death. Curse you Hakkar! Curse you!',8422,1,0,'jeklik SAY_DEATH'), +(-1309005,'Draw me to your web mistress Shadra. Unleash your venom!',8418,1,0,'marli SAY_AGGRO'), +(-1309006,'Shadra, make of me your avatar!',0,1,0,'marli SAY_TRANSFORM'), +(-1309007,'Aid me my brood!',0,1,0,'marli SAY_SPIDER_SPAWN'), +(-1309008,'Bless you mortal for this release. Hakkar controls me no longer...',8423,1,0,'marli SAY_DEATH'), +(-1309009,'Shirvallah, fill me with your RAGE!',8419,1,0,'thekal SAY_AGGRO'), +(-1309010,'Hakkar binds me no more! Peace at last!',8424,1,0,'thekal SAY_DEATH'), +(-1309011,'Bethekk, your priestess calls upon your might!',8416,1,0,'arlokk SAY_AGGRO'), +(-1309012,'Feast on $n, my pretties!',0,1,0,'arlokk SAY_FEAST_PANTHER'), +(-1309013,'At last, I am free of the Soulflayer!',8412,1,0,'arlokk SAY_DEATH'), +(-1309014,'Welcome to da great show friends! Step right up to die!',8425,1,0,'jindo SAY_AGGRO'), +(-1309015,'I\'ll feed your souls to Hakkar himself!',8413,1,0,'mandokir SAY_AGGRO'), +(-1309016,'DING!',0,1,0,'mandokir SAY_DING_KILL'), +(-1309017,'GRATS!',0,1,0,'mandokir SAY_GRATS_JINDO'), +(-1309018,'I\'m keeping my eye on you, $N!',0,1,0,'mandokir SAY_WATCH'), +(-1309019,'Don\'t make me angry. You won\'t like it when I\'m angry.',0,1,0,'mandokir SAY_WATCH_WHISPER'), +(-1309020,'PRIDE HERALDS THE END OF YOUR WORLD. COME, MORTALS! FACE THE WRATH OF THE SOULFLAYER!',8414,1,0,'hakkar SAY_AGGRO'), +(-1309021,'Fleeing will do you no good, mortals!',0,1,0,'hakkar SAY_FLEEING'), +(-1309022,'You dare set foot upon Hakkari holy ground? Minions of Hakkar, destroy the infidels!',0,1,0,'hakkar SAY_MINION_DESTROY'), +(-1309023,'Minions of Hakkar, hear your God. The sanctity of this temple has been compromised. Invaders encroach upon holy ground! The Altar of Blood must be protected. Kill them all!',0,1,0,'hakkar SAY_PROTECT_ALTAR'); +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1568023 AND -1568000; +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1568000,'Spirits of da wind be your doom!',12031,1,0,'janalai SAY_AGGRO'), +(-1568001,'I burn ya now!',12032,1,0,'janalai SAY_FIRE_BOMBS'), +(-1568002,'Where ma hatcha? Get to work on dem eggs!',12033,1,0,'janalai SAY_SUMMON_HATCHER'), +(-1568003,'I show you strength... in numbers.',12034,1,0,'janalai SAY_ALL_EGGS'), +(-1568004,'You done run outta time!',12035,1,0,'janalai SAY_BERSERK'), +(-1568005,'It all be over now, mon!',12036,1,0,'janalai SAY_SLAY_1'), +(-1568006,'Tazaga-choo!',12037,1,0,'janalai SAY_SLAY_2'), +(-1568007,'Zul\'jin... got a surprise for you...',12038,1,0,'janalai SAY_DEATH'), +(-1568008,'Come, strangers. The spirit of the dragonhawk hot be hungry for worthy souls.',12039,1,0,'janalai SAY_EVENT_STRANGERS'), +(-1568009,'Come, friends. Your bodies gonna feed ma hatchlings, and your souls are going to feed me with power!',12040,1,0,'janalai SAY_EVENT_FRIENDS'), +(-1568010,'Get da move on, guards! It be killin\' time!',12066,1,0,'nalorakk SAY_WAVE1_AGGRO'), +(-1568011,'Guards, go already! Who you more afraid of, dem... or me?',12067,1,0,'nalorakk SAY_WAVE2_STAIR1'), +(-1568012,'Ride now! Ride out dere and bring me back some heads!',12068,1,0,'nalorakk SAY_WAVE3_STAIR2'), +(-1568013,'I be losin\' me patience! Go on: make dem wish dey was never born!',12069,1,0,'nalorakk SAY_WAVE4_PLATFORM'), +(-1568014,'What could be better than servin\' da bear spirit for eternity? Come closer now. Bring your souls to me!',12078,1,0,'nalorakk SAY_EVENT1_SACRIFICE'), +(-1568015,'Don\'t be delayin\' your fate. Come to me now. I make your sacrifice quick.',12079,1,0,'nalorakk SAY_EVENT2_SACRIFICE'), +(-1568016,'You be dead soon enough!',12070,1,0,'nalorakk SAY_AGGRO'), +(-1568017,'I bring da pain!',12071,1,0,'nalorakk SAY_SURGE'), +(-1568018,'You call on da beast, you gonna get more dan you bargain for!',12072,1,0,'nalorakk SAY_TOBEAR'), +(-1568019,'Make way for Nalorakk!',12073,1,0,'nalorakk SAY_TOTROLL'), +(-1568020,'You had your chance, now it be too late!',12074,1,0,'nalorakk SAY_BERSERK'), +(-1568021,'Mua-ha-ha! Now whatchoo got to say?',12075,1,0,'nalorakk SAY_SLAY1'), +(-1568022,'Da Amani gonna rule again!',12076,1,0,'nalorakk SAY_SLAY2'), +(-1568023,'I... be waitin\' on da udda side....',12077,1,0,'nalorakk SAY_DEATH'); +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1509027 AND -1509000; +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1509000,'senses your fear.',0,2,0,'moam EMOTE_AGGRO'), +(-1509001,'bristles with energy!',0,2,0,'moan EMOTE_MANA_FULL'), +(-1509002,'sets eyes on $N!',0,2,0,'buru EMOTE_TARGET'), +(-1509003,'They come now. Try not to get yourself killed, young blood.',0,1,0,'andorov SAY_ANDOROV_INTRO'), +(-1509004,'Remember, Rajaxx, when I said I\'d kill you last? I lied...',0,1,0,'andorov SAY_ANDOROV_ATTACK'), +(-1509005,'The time of our retribution is at hand! Let darkness reign in the hearts of our enemies!',8612,1,0,'rajaxx SAY_WAVE3'), +(-1509006,'No longer will we wait behind barred doors and walls of stone! No longer will our vengeance be denied! The dragons themselves will tremble before our wrath!',8610,1,0,'rajaxx SAY_WAVE4'), +(-1509007,'Fear is for the enemy! Fear and death!',8608,1,0,'rajaxx SAY_WAVE5'), +(-1509008,'Staghelm will whimper and beg for his life, just as his whelp of a son did! One thousand years of injustice will end this day!',8611,1,0,'rajaxx SAY_WAVE6'), +(-1509009,'Fandral! Your time has come! Go and hide in the Emerald Dream and pray we never find you!',8607,1,0,'rajaxx SAY_WAVE7'), +(-1509010,'Impudent fool! I will kill you myself!',8609,1,0,'rajaxx SAY_INTRO'), +(-1509011,'Attack and make them pay dearly!',8603,1,0,'rajaxx SAY_UNK1'), +(-1509012,'Crush them! Drive them out!',8605,1,0,'rajaxx SAY_UNK2'), +(-1509013,'Do not hesitate! Destroy them!',8606,1,0,'rajaxx SAY_UNK3'), +(-1509014,'Warriors! Captains! Continue the fight!',8613,1,0,'rajaxx SAY_UNK4'), +(-1509015,'You are not worth my time $N!',8614,1,0,'rajaxx SAY_DEAGGRO'), +(-1509016,'Breath your last!',8604,1,0,'rajaxx SAY_KILLS_ANDOROV'), +(-1509017,'Soon you will know the price of your meddling, mortals... The master is nearly whole... And when he rises, your world will be cease!',0,1,0,'rajaxx SAY_COMPLETE_QUEST'), +(-1509018,'I am rejuvinated!',8593,1,0,'ossirian SAY_SURPREME1'), +(-1509019,'My powers are renewed!',8595,1,0,'ossirian SAY_SURPREME2'), +(-1509020,'My powers return!',8596,1,0,'ossirian SAY_SURPREME3'), +(-1509021,'Protect the city at all costs!',8597,1,0,'ossirian SAY_RAND_INTRO1'), +(-1509022,'The walls have been breached!',8599,1,0,'ossirian SAY_RAND_INTRO2'), +(-1509023,'To your posts. Defend the city.',8600,1,0,'ossirian SAY_RAND_INTRO3'), +(-1509024,'Tresspassers will be terminated.',8601,1,0,'ossirian SAY_RAND_INTRO4'), +(-1509025,'Sands of the desert rise and block out the sun!',8598,1,0,'ossirian SAY_AGGRO'), +(-1509026,'You are terminated.',8602,1,0,'ossirian SAY_SLAY'), +(-1509027,'I...have...failed.',8594,1,0,'ossirian SAY_DEATH'); + +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1531011 AND -1531000; +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1531000,'Are you so eager to die? I would be happy to accomodate you.',8615,1,0,'skeram SAY_AGGRO1'), +(-1531001,'Cower mortals! The age of darkness is at hand.',8616,1,0,'skeram SAY_AGGRO2'), +(-1531002,'Tremble! The end is upon you.',8621,1,0,'skeram SAY_AGGRO3'), +(-1531003,'Let your death serve as an example!',8617,1,0,'skeram SAY_SLAY1'), +(-1531004,'Spineless wretches! You will drown in rivers of blood!',8619,1,0,'skeram SAY_SLAY2'), +(-1531005,'The screams of the dying will fill the air. A symphony of terror is about to begin!',8620,1,0,'skeram SAY_SLAY3'), +(-1531006,'Prepare for the return of the ancient ones!',8618,1,0,'skeram SAY_SPLIT'), +(-1531007,'You only delay... the inevetable.',8622,1,0,'skeram SAY_DEATH'), +(-1531008,'You will be judged for defiling these sacred grounds! The laws of the Ancients will not be challenged! Trespassers will be annihilated!',8646,1,0,'sartura SAY_AGGRO'), +(-1531009,'I sentence you to death!',8647,1,0,'sartura SAY_SLAY'), +(-1531010,'I serve to the last!',8648,1,0,'sartura SAY_DEATH'), +(-1531011,'is weakened!',0,2,0,'cthun EMOTE_WEAKENED'); +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1509027 AND -1509018; +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1509018,'I am rejuvinated!',8593,1,0,'ossirian SAY_SURPREME1'), +(-1509019,'My powers are renewed!',8595,1,0,'ossirian SAY_SURPREME2'), +(-1509020,'My powers return!',8596,1,0,'ossirian SAY_SURPREME3'), +(-1509021,'Protect the city at all costs!',8597,1,0,'ossirian SAY_RAND_INTRO1'), +(-1509022,'The walls have been breached!',8599,1,0,'ossirian SAY_RAND_INTRO2'), +(-1509023,'To your posts. Defend the city.',8600,1,0,'ossirian SAY_RAND_INTRO3'), +(-1509024,'Tresspassers will be terminated.',8601,1,0,'ossirian SAY_RAND_INTRO4'), +(-1509025,'Sands of the desert rise and block out the sun!',8598,1,0,'ossirian SAY_AGGRO'), +(-1509026,'You are terminated.',8602,1,0,'ossirian SAY_SLAY'), +(-1509027,'I...have...failed.',8594,1,0,'ossirian SAY_DEATH'); +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1564096 AND -1564000; +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1564000,'You will die in the name of Lady Vashj!',11450,1,0,'SAY_AGGRO'), +(-1564001,'Stick around!',11451,1,0,'SAY_NEEDLE1'), +(-1564002,'I\'ll deal with you later!',11452,1,0,'SAY_NEEDLE2'), +(-1564003,'Your success was short lived!',11455,1,0,'SAY_SLAY1'), +(-1564004,'Time for you to go!',11456,1,0,'SAY_SLAY2'), +(-1564005,'Bel\'anen dal\'lorei!',11453,1,0,'SAY_SPECIAL1'), +(-1564006,'Blood will flow!',11454,1,0,'SAY_SPECIAL2'), +(-1564007,'Bal\'amer ch\'itah!',11457,1,0,'SAY_ENRAGE1'), +(-1564008,'My patience has ran out! Die, DIE!',11458,1,0,'SAY_ENRAGE2'), +(-1564009,'Lord Illidan will... crush you.',11459,1,0,'SAY_DEATH'), +(-1564010,'%s acquires a new target!',0,3,0,'supremus EMOTE_NEW_TARGET'), +(-1564011,'%s punches the ground in anger!',0,3,0,'supremus EMOTE_PUNCH_GROUND'), +(-1564012,'The ground begins to crack open!',0,3,0,'supremus EMOTE_GROUND_CRACK'), +(-1564013,'No! Not yet...',11385,1,0,'akama shade SAY_LOW_HEALTH'), +(-1564014,'I will not last much longer...',11386,1,0,'akama shade SAY_DEATH'), +(-1564015,'Come out from the shadows! I\'ve returned to lead you against our true enemy! Shed your chains and raise your weapons against your Illidari masters!',0,1,0,'akama shade SAY_FREE'), +(-1564016,'Hail our leader! Hail Akama!',0,1,0,'akama shade broken SAY_BROKEN_FREE_01'), +(-1564017,'Hail Akama!',0,1,0,'akama shade broken SAY_BROKEN_FREE_02'), +(-1564018,'You play, you pay.',11501,1,0,'shahraz SAY_TAUNT1'), +(-1564019,'I\'m not impressed.',11502,1,0,'shahraz SAY_TAUNT2'), +(-1564020,'Enjoying yourselves?',11503,1,0,'shahraz SAY_TAUNT3'), +(-1564021,'So... business or pleasure?',11504,1,0,'shahraz SAY_AGGRO'), +(-1564022,'You seem a little tense.',11505,1,0,'shahraz SAY_SPELL1'), +(-1564023,'Don\'t be shy.',11506,1,0,'shahraz SAY_SPELL2'), +(-1564024,'I\'m all... yours.',11507,1,0,'shahraz SAY_SPELL3'), +(-1564025,'Easy come, easy go.',11508,1,0,'shahraz SAY_SLAY1'), +(-1564026,'So much for a happy ending.',11509,1,0,'shahraz SAY_SLAY2'), +(-1564027,'Stop toying with my emotions!',11510,1,0,'shahraz SAY_ENRAGE'), +(-1564028,'I wasn\'t... finished.',11511,1,0,'shahraz SAY_DEATH'), +(-1564029,'Horde will... crush you.',11432,1,0,'bloodboil SOUND_AGGRO'), +(-1564030,'Time to feast!',11433,1,0,'bloodboil SAY_SLAY1'), +(-1564031,'More! I want more!',11434,1,0,'bloodboil SAY_SLAY2'), +(-1564032,'Drink your blood! Eat your flesh!',11435,1,0,'bloodboil SAY_SPECIAL1'), +(-1564033,'I hunger!',11436,1,0,'bloodboil SAY_SPECIAL2'), +(-1564034,'<babbling>',11437,1,0,'bloodboil SAY_ENRAGE1'), +(-1564035,'I\'ll rip the meat from your bones!',11438,1,0,'bloodboil SAY_ENRAGE2'), +(-1564036,'Aaaahrg...',11439,1,0,'bloodboil SAY_DEATH'), +(-1564037,'I was the first, you know. For me, the wheel of death has spun many times. <laughs> So much time has passed. I have a lot of catching up to do...',11512,1,0,'teron SAY_INTRO'), +(-1564038,'Vengeance is mine!',11513,1,0,'teron SAY_AGGRO'), +(-1564039,'I have use for you!',11514,1,0,'teron SAY_SLAY1'), +(-1564040,'It gets worse...',11515,1,0,'teron SAY_SLAY2'), +(-1564041,'What are you afraid of?',11517,1,0,'teron SAY_SPELL1'), +(-1564042,'Death... really isn\'t so bad.',11516,1,0,'teron SAY_SPELL2'), +(-1564043,'Give in!',11518,1,0,'teron SAY_SPECIAL1'), +(-1564044,'I have something for you...',11519,1,0,'teron SAY_SPECIAL2'), +(-1564045,'YOU WILL SHOW THE PROPER RESPECT!',11520,1,0,'teron SAY_ENRAGE'), +(-1564046,'The wheel...spins...again....',11521,1,0,'teron SAY_DEATH'), +(-1564047,'Pain and suffering are all that await you!',11415,1,0,'essence SUFF_SAY_FREED'), +(-1564048,'Don\'t leave me alone!',11416,1,0,'essence SUFF_SAY_AGGRO'), +(-1564049,'Look at what you make me do!',11417,1,0,'essence SUFF_SAY_SLAY1'), +(-1564050,'I didn\'t ask for this!',11418,1,0,'essence SUFF_SAY_SLAY2'), +(-1564051,'The pain is only beginning!',11419,1,0,'essence SUFF_SAY_SLAY3'), +(-1564052,'I don\'t want to go back!',11420,1,0,'essence SUFF_SAY_RECAP'), +(-1564053,'Now what do I do?',11421,1,0,'essence SUFF_SAY_AFTER'), +(-1564054,'%s becomes enraged!',0,3,0,'essence SUFF_EMOTE_ENRAGE'), +(-1564055,'You can have anything you desire... for a price.',11408,1,0,'essence DESI_SAY_FREED'), +(-1564056,'Fulfilment is at hand!',11409,1,0,'essence DESI_SAY_SLAY1'), +(-1564057,'Yes... you\'ll stay with us now...',11410,1,0,'essence DESI_SAY_SLAY2'), +(-1564058,'Your reach exceeds your grasp.',11412,1,0,'essence DESI_SAY_SLAY3'), +(-1564059,'Be careful what you wish for...',11411,1,0,'essence DESI_SAY_SPEC'), +(-1564060,'I\'ll be waiting...',11413,1,0,'essence DESI_SAY_RECAP'), +(-1564061,'I won\'t be far...',11414,1,0,'essence DESI_SAY_AFTER'), +(-1564062,'Beware: I live!',11399,1,0,'essence ANGER_SAY_FREED'), +(-1564063,'So... foolish.',11400,1,0,'essence ANGER_SAY_FREED2'), +(-1564064,'<maniacal cackle>',11401,1,0,'essence ANGER_SAY_SLAY1'), +(-1564065,'Enough. No more.',11402,1,0,'essence ANGER_SAY_SLAY2'), +(-1564066,'On your knees!',11403,1,0,'essence ANGER_SAY_SPEC'), +(-1564067,'Beware, coward.',11405,1,0,'essence ANGER_SAY_BEFORE'), +(-1564068,'I won\'t... be... ignored.',11404,1,0,'essence ANGER_SAY_DEATH'), +(-1564069,'You wish to test me?',11524,1,0,'council vera AGGRO'), +(-1564070,'I have better things to do...',11422,1,0,'council gath AGGRO'), +(-1564071,'Flee or die!',11482,1,0,'council mala AGGRO'), +(-1564072,'Common... such a crude language. Bandal!',11440,1,0,'council zere AGGRO'), +(-1564073,'Enough games!',11428,1,0,'council gath ENRAGE'), +(-1564074,'You wish to kill me? Hahaha, you first!',11530,1,0,'council vera ENRAGE'), +(-1564075,'For Quel\'Thalas! For the Sunwell!',11488,1,0,'council mala ENRAGE'), +(-1564076,'Sha\'amoor sine menoor!',11446,1,0,'council zere ENRAGE'), +(-1564077,'Enjoy your final moments!',11426,1,0,'council gath SPECIAL1'), +(-1564078,'You\'re not caught up for this!',11528,1,0,'council vera SPECIAL1'), +(-1564079,'No second chances!',11486,1,0,'council mala SPECIAL1'), +(-1564080,'Diel fin\'al',11444,1,0,'council zere SPECIAL1'), +(-1564081,'You are mine!',11427,1,0,'council gath SPECIAL2'), +(-1564082,'Anar\'alah belore!',11529,1,0,'council vera SPECIAL2'), +(-1564083,'I\'m full of surprises!',11487,1,0,'council mala SPECIAL2'), +(-1564084,'Sha\'amoor ara mashal?',11445,1,0,'council zere SPECIAL2'), +(-1564085,'Selama am\'oronor!',11423,1,0,'council gath SLAY'), +(-1564086,'Valiant effort!',11525,1,0,'council vera SLAY'), +(-1564087,'My work is done.',11483,1,0,'council mala SLAY'), +(-1564088,'Shorel\'aran.',11441,1,0,'council zere SLAY'), +(-1564089,'Well done!',11424,1,0,'council gath SLAY_COMT'), +(-1564090,'A glorious kill!',11526,1,0,'council vera SLAY_COMT'), +(-1564091,'As it should be!',11484,1,0,'council mala SLAY_COMT'), +(-1564092,'Belesa menoor!',11442,1,0,'council zere SLAY_COMT'), +(-1564093,'Lord Illidan... I...',11425,1,0,'council gath DEATH'), +(-1564094,'You got lucky!',11527,1,0,'council vera DEATH'), +(-1564095,'Destiny... awaits.',11485,1,0,'council mala DEATH'), +(-1564096,'Diel ma\'ahn... oreindel\'o',11443,1,0,'council zere DEATH'); +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1409018 AND -1409000; +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1409000,'performs one last service for Ragnaros.',0,2,0,'geddon EMOTE_SERVICE'), +(-1409001,'goes into a killing frenzy!',0,2,0,'magmadar EMOTE_FRENZY'), +(-1409002,'refuses to die while its master is in trouble.',0,2,0,'core rager EMOTE_AEGIS'), +(-1409003,'Reckless mortals, none may challenge the sons of the living flame!',8035,1,0,'majordomo SAY_AGGRO'), +(-1409004,'The runes of warding have been destroyed! Hunt down the infedels my bretheren.',8039,1,0,'majordomo SAY_SPAWN'), +(-1409005,'Ashes to Ashes!',8037,1,0,'majordomo SAY_SLAY'), +(-1409006,'Burn mortals! Burn for this transgression!',8036,1,0,'majordomo SAY_SPECIAL'), +(-1409007,'Impossible! Stay your attack mortals! I submitt! I submitt! Brashly you have come to rest the secrets of the living flame. You will soon regret the recklessness of your quest. I go now to summon the lord whos house this is. Should you seek an audiance with him your paltry lives will surly be forfit. Nevertheless seek out his lair if you dare!',8038,1,0,'majordomo SAY_DEFEAT'), +(-1409008,'Behold Ragnaros, the Firelord! He who was ancient when this world was young! Bow before him, mortals! Bow before your ending!',8040,1,0,'ragnaros SAY_SUMMON_MAJ'), +(-1409009,'TOO SOON! YOU HAVE AWAKENED ME TOO SOON, EXECUTUS! WHAT IS THE MEANING OF THIS INTRUSION?',8043,1,0,'ragnaros SAY_ARRIVAL1_RAG'), +(-1409010,'These mortal infidels, my lord! They have invaded your sanctum, and seek to steal your secrets!',8041,1,0,'ragnaros SAY_ARRIVAL2_MAJ'), +(-1409011,'FOOL! YOU ALLOWED THESE INSECTS TO RUN RAMPANT THROUGH THE HALLOWED CORE, AND NOW YOU LEAD THEM TO MY VERY LAIR? YOU HAVE FAILED ME, EXECUTUS! JUSTICE SHALL BE MET, INDEED!',8044,1,0,'ragnaros SAY_ARRIVAL3_RAG'), +(-1409012,'NOW FOR YOU, INSECTS. BOLDLY YOU SAUGHT THE POWER OF RAGNAROS NOW YOU SHALL SEE IT FIRST HAND.',8045,1,0,'ragnaros SAY_ARRIVAL5_RAG'), +(-1409013,'COME FORTH, MY SERVANTS! DEFEND YOUR MASTER!',8049,1,0,'ragnaros SAY_REINFORCEMENTS1'), +(-1409014,'YOU CANNOT DEFEAT THE LIVING FLAME! COME YOU MINIONS OF FIRE! COME FORTH YOU CREATURES OF HATE! YOUR MASTER CALLS!',8050,1,0,'ragnaros SAY_REINFORCEMENTS2'), +(-1409015,'BY FIRE BE PURGED!',8046,1,0,'ragnaros SAY_HAND'), +(-1409016,'TASTE THE FLAMES OF SULFURON!',8047,1,0,'ragnaros SAY_WRATH'), +(-1409017,'DIE INSECT!',8051,1,0,'ragnaros SAY_KILL'), +(-1409018,'MY PATIENCE IS DWINDILING! COME NATS TO YOUR DEATH!',8048,1,0,'ragnaros SAY_MAGMABURST'); +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1552030 AND -1552000; +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1552000,'It is a small matter to control the mind of the weak... for I bear allegiance to powers untouched by time, unmoved by fate. No force on this world or beyond harbors the strength to bend our knee... not even the mighty Legion!',11122,1,0,'skyriss SAY_INTRO'), +(-1552001,'Bear witness to the agent of your demise!',11123,1,0,'skyriss SAY_AGGRO'), +(-1552002,'Your fate is written!',11124,1,0,'skyriss SAY_KILL_1'), +(-1552003,'The chaos I have sown here is but a taste...',11125,1,0,'skyriss SAY_KILL_2'), +(-1552004,'You will do my bidding, weakling.',11127,1,0,'skyriss SAY_MIND_1'), +(-1552005,'Your will is no longer your own.',11128,1,0,'skyriss SAY_MIND_2'), +(-1552006,'Flee in terror!',11129,1,0,'skyriss SAY_FEAR_1'), +(-1552007,'I will show you horrors undreamed of!',11130,1,0,'skyriss SAY_FEAR_2'), +(-1552008,'We span the universe, as countless as the stars!',11131,1,0,'skyriss SAY_IMAGE'), +(-1552009,'I am merely one of... infinite multitudes.',11126,1,0,'skyriss SAY_DEATH'), +(-1552010,'Where in Bonzo\'s brass buttons am I? And who are-- yaaghh, that\'s one mother of a headache!',11171,1,0,'millhouse SAY_INTRO_1'), +(-1552011,'\"Lowly\"? I don\'t care who you are friend, no one refers to the mighty Millhouse Manastorm as \"Lowly\"! I have no idea what goes on here, but I will gladly join your fight against this impudent imbecile! Prepare to defend yourself, cretin!',11172,1,0,'millhouse SAY_INTRO_2'), +(-1552012,'I just need to get some things ready first. You guys go ahead and get started. I need to summon up some water...',11173,1,0,'millhouse SAY_WATER'), +(-1552013,'Fantastic! Next, some protective spells. Yes! Now we\'re cookin\'',11174,1,0,'millhouse SAY_BUFFS'), +(-1552014,'And of course i\'ll need some mana. You guys are gonna love this, just wait.',11175,1,0,'millhouse SAY_DRINK'), +(-1552015,'Aaalllriiiight!! Who ordered up an extra large can of whoop-ass?',11176,1,0,'millhouse SAY_READY'), +(-1552016,'I didn\'t even break a sweat on that one.',11177,1,0,'millhouse SAY_KILL_1'), +(-1552017,'You guys, feel free to jump in anytime.',11178,1,0,'millhouse SAY_KILL_2'), +(-1552018,'I\'m gonna light you up, sweet cheeks!',11179,1,0,'millhouse SAY_PYRO'), +(-1552019,'Ice, ice, baby!',11180,1,0,'millhouse SAY_ICEBLOCK'), +(-1552020,'Heal me! Oh, for the love of all that is holy, HEAL me! I\'m dying!',11181,1,0,'millhouse SAY_LOWHP'), +(-1552021,'You\'ll be hearing from my lawyer...',11182,1,0,'millhouse SAY_DEATH'), +(-1552022,'Who\'s bad? Who\'s bad? That\'s right: we bad!',11183,1,0,'millhouse SAY_COMPLETE'), +(-1552023,'I knew the prince would be angry but, I... I have not been myself. I had to let them out! The great one speaks to me, you see. Wait--outsiders. Kael\'thas did not send you! Good... I\'ll just tell the prince you released the prisoners!',11222,1,0,'mellichar YELL_INTRO1'), +(-1552024,'The naaru kept some of the most dangerous beings in existence here in these cells. Let me introduce you to another...',11223,1,0,'mellichar YELL_INTRO2'), +(-1552025,'Yes, yes... another! Your will is mine!',11224,1,0,'mellichar YELL_RELEASE1'), +(-1552026,'Behold another terrifying creature of incomprehensible power!',11225,1,0,'mellichar YELL_RELEASE2A'), +(-1552027,'What is this? A lowly gnome? I will do better, O\'great one.',11226,1,0,'mellichar YELL_RELEASE2B'), +(-1552028,'Anarchy! Bedlam! Oh, you are so wise! Yes, I see it now, of course!',11227,1,0,'mellichar YELL_RELEASE3'), +(-1552029,'One final cell remains. Yes, O\'great one, right away!',11228,1,0,'mellichar YELL_RELEASE4'), +(-1552030,'Welcome, O\'great one. I am your humble servant.',11229,1,0,'mellichar YELL_WELCOME'); + +DELETE FROM `script_texts` WHERE `entry`=-1000100; +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1000100,'Come, little ones. Face me!',0,1,0,'azuregos SAY_TELEPORT'); + +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1249004 AND -1249000; +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1249000,'How fortuitous. Usually, I must leave my lair to feed.',0,1,0,'onyxia SAY_AGGRO'), +(-1249001,'Learn your place mortal!',0,1,0,'onyxia SAY_KILL'), +(-1249002,'This meaningless exertion bores me. I\'ll incinerate you all from above!',0,1,0,'onyxia SAY_PHASE_2_TRANS'), +(-1249003,'It seems you\'ll need another lesson, mortals!',0,1,0,'onyxia SAY_PHASE_3_TRANS'), +(-1249004,'takes in a deep breath...',0,1,0,'onyxia EMOTE_BREATH'); + +DELETE FROM `script_texts` WHERE `entry`=-1469031; +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1469031,'goes into a frenzy!',0,2,0,'flamegor EMOTE_FRENZY'); +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000105 AND -1000101; +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1000101,'Follow me, $N. I\'ll take you to the Defias hideout. But you better protect me or I am as good as dead',0,0,7,'defias traitor SAY_START'), +(-1000102,'The entrance is hidden here in Moonbrook. Keep your eyes peeled for thieves. They want me dead.',0,0,7,'defias traitor SAY_PROGRESS'), +(-1000103,'You can go tell Stoutmantle this is where the Defias Gang is holed up, $N.',0,0,7,'defias traitor SAY_END'), +(-1000104,'%s coming in fast! Prepare to fight!',0,0,7,'defias traitor SAY_AGGRO_1'), +(-1000105,'Help!',0,0,7,'defias traitor SAY_AGGRO_2'); +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000110 AND -1000106; +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1000106,'Everyone ready?',0,0,1,'torek SAY_READY'), +(-1000107,'Ok, Lets move out!',0,0,1,'torek SAY_MOVE'), +(-1000108,'Prepare yourselves. Silverwing is just around the bend.',0,0,1,'torek SAY_PREPARE'), +(-1000109,'Silverwing is ours!',0,0,1,'torek SAY_WIN'), +(-1000110,'Go report that the outpost is taken. We will remain here.',0,0,1,'torek SAY_END'); +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000116 AND -1000111; +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1000111, 'Our house is this way, through the thicket.', 0, 0, 7, 'magwin SAY_START'), +(-1000112, 'Help me!', 0, 0, 7, 'magwin SAY_AGGRO'), +(-1000113, 'My poor family. Everything has been destroyed.', 0, 0, 7, 'magwin SAY_PROGRESS'), +(-1000114, 'Father! Father! You\'re alive!', 0, 0, 7, 'magwin SAY_END1'), +(-1000115, 'You can thank $N for getting me back here safely, father.', 0, 0, 7, 'magwin SAY_END2'), +(-1000116, 'hugs her father.', 0, 2, 7, 'magwin EMOTE_HUG'); +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1560048 AND -1560023; +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1560023,'Very well then. Let\'s go!',10465,1,0,'thrall hillsbrad SAY_TH_START_EVENT_PART1'), +(-1560024,'As long as we\'re going with a new plan, I may aswell pick up a weapon and some armor.',0,0,0,'thrall hillsbrad SAY_TH_ARMORY'), +(-1560025,'A rider approaches!',10466,0,0,'thrall hillsbrad SAY_TH_SKARLOC_MEET'), +(-1560026,'I\'ll never be chained again!',10467,1,0,'thrall hillsbrad SAY_TH_SKARLOC_TAUNT'), +(-1560027,'Very well. Tarren Mill lies just west of here. Since time is of the essence...',10468,1,0,'thrall hillsbrad SAY_TH_START_EVENT_PART2'), +(-1560028,'Let\'s ride!',10469,0,0,'thrall hillsbrad SAY_TH_MOUNTS_UP'), +(-1560029,'Taretha must be in the inn. Let\'s go.',0,0,0,'thrall hillsbrad SAY_TH_CHURCH_END'), +(-1560030,'Taretha! What foul magic is this?',0,0,0,'thrall hillsbrad SAY_TH_MEET_TARETHA'), +(-1560031,'Who or what was that?',10470,1,0,'thrall hillsbrad SAY_TH_EPOCH_WONDER'), +(-1560032,'No!',10471,1,0,'thrall hillsbrad SAY_TH_EPOCH_KILL_TARETHA'), +(-1560033,'Goodbye, Taretha. I will never forget your kindness.',10472,1,0,'thrall hillsbrad SAY_TH_EVENT_COMPLETE'), +(-1560034,'Things are looking grim...',10458,1,0,'thrall hillsbrad SAY_TH_RANDOM_LOW_HP1'), +(-1560035,'I will fight to the last!',10459,1,0,'thrall hillsbrad SAY_TH_RANDOM_LOW_HP2'), +(-1560036,'Taretha...',10460,1,0,'thrall hillsbrad SAY_TH_RANDOM_DIE1'), +(-1560037,'A good day...to die...',10461,1,0,'thrall hillsbrad SAY_TH_RANDOM_DIE2'), +(-1560038,'I have earned my freedom!',10448,1,0,'thrall hillsbrad SAY_TH_RANDOM_AGGRO1'), +(-1560039,'This day is long overdue. Out of my way!',10449,1,0,'thrall hillsbrad SAY_TH_RANDOM_AGGRO2'), +(-1560040,'I am a slave no longer!',10450,1,0,'thrall hillsbrad SAY_TH_RANDOM_AGGRO3'), +(-1560041,'Blackmoore has much to answer for!',10451,1,0,'thrall hillsbrad SAY_TH_RANDOM_AGGRO4'), +(-1560042,'You have forced my hand!',10452,1,0,'thrall hillsbrad SAY_TH_RANDOM_KILL1'), +(-1560043,'It should not have come to this!',10453,1,0,'thrall hillsbrad SAY_TH_RANDOM_KILL2'), +(-1560044,'I did not ask for this!',10454,1,0,'thrall hillsbrad SAY_TH_RANDOM_KILL3'), +(-1560045,'I am truly in your debt, strangers.',10455,1,0,'thrall hillsbrad SAY_TH_LEAVE_COMBAT1'), +(-1560046,'Thank you, strangers. You have given me hope.',10456,1,0,'thrall hillsbrad SAY_TH_LEAVE_COMBAT2'), +(-1560047,'I will not waste this chance. I will seek out my destiny.',10457,1,0,'thrall hillsbrad SAY_TH_LEAVE_COMBAT3'), +(-1560048,'I\'m free! Thank you all!',0,0,0,'taretha SAY_TA_FREE'); +DELETE FROM `script_texts` WHERE `entry`=-1560049; +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1560049,'Thrall, you escaped!',0,0,0,'taretha SAY_TA_ESCAPED'); +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1534017 AND -1534000; +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1534000,'I\'m in jeopardy, help me if you can!',11007,1,0,'jaina hyjal ATTACKED 1'), +(-1534001,'They\'ve broken through!',11049,1,0,'jaina hyjal ATTACKED 2'), +(-1534002,'Stay alert! Another wave approaches.',11008,1,0,'jaina hyjal INCOMING'), +(-1534003,'Don\'t give up! We must prevail!',11006,1,0,'jaina hyjal BEGIN'), +(-1534004,'Hold them back as long as possible.',11050,1,0,'jaina hyjal RALLY 1'), +(-1534005,'We must hold strong!',11051,1,0,'jaina hyjal RALLY 2'), +(-1534006,'We are lost. Fall back!',11009,1,0,'jaina hyjal FAILURE'), +(-1534007,'We have won valuable time. Now we must pull back!',11011,1,0,'jaina hyjal SUCCESS'), +(-1534008,'I did... my best.',11010,1,0,'jaina hyjal DEATH'), +(-1534009,'I will lie down for no one!',11031,1,0,'thrall hyjal ATTACKED 1'), +(-1534010,'Bring the fight to me and pay with your lives!',11061,1,0,'thrall hyjal ATTACKED 2'), +(-1534011,'Make ready for another wave! LOK-TAR OGAR!',11032,1,0,'thrall hyjal INCOMING'), +(-1534012,'Hold them back! Do not falter!',11030,1,0,'thrall hyjal BEGIN'), +(-1534013,'Victory or death!',11059,1,0,'thrall hyjal RALLY 1'), +(-1534014,'Do not give an inch of ground!',11060,1,0,'thrall hyjal RALLY 2'), +(-1534015,'It is over. Withdraw! We have failed.',11033,1,0,'thrall hyjal FAILURE'), +(-1534016,'We have played our part and done well. It is up to the others now.',11035,1,0,'thrall hyjal SUCCESS'), +(-1534017,'Uraaa...',11034,1,0,'thrall hyjal DEATH'); +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1534030 AND -1534018; +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1534018,'All of your efforts have been in vain, for the draining of the World Tree has already begun. Soon the heart of your world will beat no more.',10986,1,0,'archimonde SAY_PRE_EVENTS_COMPLETE'), +(-1534019,'Your resistance is insignificant.',10987,1,0,'archimonde SAY_AGGRO'), +(-1534020,'This world will burn!',10990,1,0,'archimonde SAY_DOOMFIRE1'), +(-1534021,'Manach sheek-thrish!',11041,1,0,'archimonde SAY_DOOMFIRE2'), +(-1534022,'A-kreesh!',10989,1,0,'archimonde SAY_AIR_BURST1'), +(-1534023,'Away vermin!',11043,1,0,'archimonde SAY_AIR_BURST2'), +(-1534024,'All creation will be devoured!',11044,1,0,'archimonde SAY_SLAY1'), +(-1534025,'Your soul will languish for eternity.',10991,1,0,'archimonde SAY_SLAY2'), +(-1534026,'I am the coming of the end!',11045,1,0,'archimonde SAY_SLAY3'), +(-1534027,'At last it is here. Mourn and lament the passing of all you have ever known and all that would have been! Akmin-kurai!',10993,1,0,'archimonde SAY_ENRAGE'), +(-1534028,'No, it cannot be! Nooo!',10992,1,0,'archimonde SAY_DEATH'), +(-1534029,'You are mine now.',10988,1,0,'archimonde SAY_SOUL_CHARGE1'), +(-1534030,'Bow to my will.',11042,1,0,'archimonde SAY_SOUL_CHARGE2'); +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000117 AND -1000122; +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1000117, 'Thank you for agreeing to help. Now, let\'s get out of here $N.', 0, 0, 1, 'wounded elf SAY_ELF_START'), +(-1000118, 'Over there! They\'re following us!', 0, 0, 1, 'wounded elf SAY_ELF_SUMMON1'), +(-1000119, 'Allow me a moment to rest. The journey taxes what little strength I have.', 0, 0, 1, 'wounded elf SAY_ELF_RESTING'), +(-1000120, 'Did you hear something?', 0, 0, 1, 'wounded elf SAY_ELF_SUMMON2'), +(-1000121, 'Falcon Watch, at last! Now, where\'s my... Oh no! My pack, it\'s missing! Where has -', 0, 0, 1, 'wounded elf SAY_ELF_COMPLETE'), +(-1000122, 'You won\'t keep me from getting to Falcon Watch!', 0, 0, 1, 'wounded elf SAY_ELF_AGGRO'); +DELETE FROM `script_texts` WHERE `entry`=-1544015; +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1544015,'breaks free!',0,2,0,'magtheridon EMOTE_FREED'); + +UPDATE `script_texts` SET `type`=3 WHERE `entry`=-1544013; +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1189004 AND -1189000; +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1189000,'Ah, I have been waiting for a real challenge!',5830,1,0,'herod SAY_AGGRO'), +(-1189001,'Blades of Light!',5832,1,0,'herod SAY_WHIRLWIND'), +(-1189002,'Light, give me strength!',5833,1,0,'herod SAY_ENRAGE'), +(-1189003,'Hah, is that all?',5831,1,0,'herod SAY_KILL'), +(-1189004,'becomes enraged!',0,2,0,'herod EMOTE_ENRAGE'); +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1189010 AND -1189005; +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1189005,'Infidels! They must be purified!',5835,1,0,'mograine SAY_MO_AGGRO'), +(-1189006,'Unworthy!',5836,1,0,'mograine SAY_MO_KILL'), +(-1189007,'At your side, milady!',5837,1,0,'mograine SAY_MO_RESSURECTED'), +(-1189008,'What, Mograine has fallen? You shall pay for this treachery!',5838,1,0,'whitemane SAY_WH_INTRO'), +(-1189009,'The Light has spoken!',5839,1,0,'whitemane SAY_WH_KILL'), +(-1189010,'Arise, my champion!',5840,1,0,'whitemane SAY_WH_RESSURECT'); +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1532114 AND -1532103; +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1532103,'Welcome Ladies and Gentlemen, to this evening\'s presentation!',9174,1,0,'barnes OZ1'), +(-1532104,'Tonight we plumb the depths of the human soul as we join a lost, lonely girl trying desperately -- with the help of her loyal companions -- to find her way home!',9338,1,0,'barnes OZ2'), +(-1532105,'But she is pursued... by a wicked malevolent crone!',9339,1,0,'barnes OZ3'), +(-1532106,'Will she survive? Will she prevail? Only time will tell. And now ... on with the show!',9340,1,0,'barnes OZ4'), +(-1532107,'Good evening, Ladies and Gentlemen! Welcome to this evening\'s presentation!',9175,1,0,'barnes HOOD1'), +(-1532108,'Tonight, things are not what they seem. For tonight, your eyes may not be trusted',9335,1,0,'barnes HOOD2'), +(-1532109,'Take for instance, this quiet, elderly woman, waiting for a visit from her granddaughter. Surely there is nothing to fear from this sweet, grey-haired, old lady.',9336,1,0,'barnes HOOD3'), +(-1532110,'But don\'t let me pull the wool over your eyes. See for yourself what lies beneath those covers! And now... on with the show!',9337,1,0,'barnes HOOD4'), +(-1532111,'Welcome, Ladies and Gentlemen, to this evening\'s presentation!',9176,1,0,'barnes RAJ1'), +(-1532112,'Tonight, we explore a tale of forbidden love!',9341,1,0,'barnes RAJ2'), +(-1532113,'But beware, for not all love stories end happily, as you may find out. Sometimes, love pricks like a thorn.',9342,1,0,'barnes RAJ3'), +(-1532114,'But don\'t take it from me, see for yourself what tragedy lies ahead when the paths of star-crossed lovers meet. And now...on with the show!',9343,1,0,'barnes RAJ4'); +DELETE FROM `script_texts` WHERE `entry` IN (-1036000,-1036001); +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1036000,'You there, check out that noise!',5775,1,7,'smite INST_SAY_ALARM1'), +(-1036001,'We\'re under attack! A vast, ye swabs! Repel the invaders!',5777,1,7,'smite INST_SAY_ALARM2'); +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000127 AND -1000123; +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1000123, 'Ready when you are, $c.', 0, 0, 0, 'big will SAY_BIG_WILL_READY'), +(-1000124, 'The Affray has begun. $n, get ready to fight!', 0, 0, 0, 'twiggy SAY_TWIGGY_BEGIN'), +(-1000125, 'You! Enter the fray!', 0, 0, 0, 'twiggy SAY_TWIGGY_FRAY'), +(-1000126, 'Challenger is down!', 0, 0, 0, 'twiggy SAY_TWIGGY_DOWN'), +(-1000127, 'The Affray is over.', 0, 0, 0, 'twiggy SAY_TWIGGY_OVER'); + diff --git a/sql/updates/502_world_scripts.sql b/sql/updates/502_world_scripts.sql new file mode 100644 index 00000000000..6f0cc47bf63 --- /dev/null +++ b/sql/updates/502_world_scripts.sql @@ -0,0 +1,7 @@ +UPDATE `creature_template` SET `minhealth`=2655000, `maxhealth`=2655000, `ScriptName` = 'boss_the_lurker_below', `InhabitType` = '3' WHERE `entry` = '21217'; + +UPDATE `creature_template` SET `ScriptName` = 'mob_coilfang_ambusher' WHERE `entry` = '21865'; +UPDATE `creature_template` SET `ScriptName` = 'mob_coilfang_guardian' WHERE `entry` = '21873'; + +UPDATE `creature_model_info` SET `bounding_radius` = '13', `combat_reach` = '20' WHERE `modelid` = '20216'; + diff --git a/sql/updates/505_world.sql b/sql/updates/505_world.sql new file mode 100644 index 00000000000..26812d4d3fb --- /dev/null +++ b/sql/updates/505_world.sql @@ -0,0 +1,10 @@ +DROP TABLE IF EXISTS `creature_formations`; + +CREATE TABLE `creature_formations` ( + `leader` int(11) unsigned NOT NULL, + `follower` int(11) unsigned NOT NULL, + `dist` float unsigned NOT NULL, + `angle` float unsigned NOT NULL, + `groupAI` int(11) unsigned NOT NULL, + PRIMARY KEY (`follower`)); + diff --git a/sql/updates/506_world.sql b/sql/updates/506_world.sql new file mode 100644 index 00000000000..634aa33735f --- /dev/null +++ b/sql/updates/506_world.sql @@ -0,0 +1,84 @@ +-- added missing entry for 3rd rank of gift of the wild + +DELETE FROM spell_chain WHERE spell_id = 21849; +DELETE FROM spell_chain WHERE spell_id = 21850; +DELETE FROM spell_chain WHERE spell_id = 26991; + +INSERT INTO spell_chain (spell_id,prev_spell,first_spell,rank,req_spell) VALUES (21849,0,21849,1,0); +INSERT INTO spell_chain (spell_id,prev_spell,first_spell,rank,req_spell) VALUES (21850,21849,21849,2,0); +INSERT INTO spell_chain (spell_id,prev_spell,first_spell,rank,req_spell) VALUES (26991,21850,21849,3,0); + +-- weaponsmith and armorsmith as blacksmith req spells + +DELETE FROM spell_chain WHERE spell_id = 9787; +DELETE FROM spell_chain WHERE spell_id = 9788; + +INSERT INTO spell_chain (spell_id,prev_spell,first_spell,rank,req_spell) VALUES (9787,0,9787,1,9785); +INSERT INTO spell_chain (spell_id,prev_spell,first_spell,rank,req_spell) VALUES (9788,0,9788,1,9785); + +-- axe/sword/hammer smith req weaponsmith + +DELETE FROM spell_chain WHERE spell_id = 17039; +DELETE FROM spell_chain WHERE spell_id = 17040; +DELETE FROM spell_chain WHERE spell_id = 17041; + +INSERT INTO spell_chain (spell_id,prev_spell,first_spell,rank,req_spell) VALUES (17039,0,17039,1,9787); +INSERT INTO spell_chain (spell_id,prev_spell,first_spell,rank,req_spell) VALUES (17040,0,17040,1,9787); +INSERT INTO spell_chain (spell_id,prev_spell,first_spell,rank,req_spell) VALUES (17041,0,17041,1,9787); + +-- letherworking specs req spells + +DELETE FROM spell_chain WHERE spell_id = 10660; +DELETE FROM spell_chain WHERE spell_id = 10658; +DELETE FROM spell_chain WHERE spell_id = 10656; + +INSERT INTO spell_chain (spell_id,prev_spell,first_spell,rank,req_spell) VALUES (10660,0,10660,1,10662); +INSERT INTO spell_chain (spell_id,prev_spell,first_spell,rank,req_spell) VALUES (10658,0,10658,1,10662); +INSERT INTO spell_chain (spell_id,prev_spell,first_spell,rank,req_spell) VALUES (10656,0,10656,1,10662); + +-- alchemy specs req spells + +DELETE FROM spell_chain WHERE spell_id = 28672; +DELETE FROM spell_chain WHERE spell_id = 28675; +DELETE FROM spell_chain WHERE spell_id = 28677; + +INSERT INTO spell_chain (spell_id,prev_spell,first_spell,rank,req_spell) VALUES (28672,0,28672,1,28596); +INSERT INTO spell_chain (spell_id,prev_spell,first_spell,rank,req_spell) VALUES (28675,0,28675,1,28596); +INSERT INTO spell_chain (spell_id,prev_spell,first_spell,rank,req_spell) VALUES (28677,0,28677,1,28596); + +-- tailoring specs req spells + +DELETE FROM spell_chain WHERE spell_id = 26801; +DELETE FROM spell_chain WHERE spell_id = 26798; +DELETE FROM spell_chain WHERE spell_id = 26797; + +INSERT INTO spell_chain (spell_id,prev_spell,first_spell,rank,req_spell) VALUES (26801,0,26801,1,26790); +INSERT INTO spell_chain (spell_id,prev_spell,first_spell,rank,req_spell) VALUES (26798,0,26798,1,26790); +INSERT INTO spell_chain (spell_id,prev_spell,first_spell,rank,req_spell) VALUES (26797,0,26797,1,26790); + +-- engineering specs req spells + +DELETE FROM spell_chain WHERE spell_id = 20222; +DELETE FROM spell_chain WHERE spell_id = 20219; + +INSERT INTO spell_chain (spell_id,prev_spell,first_spell,rank,req_spell) VALUES (20222,0,20222,1,12656); +INSERT INTO spell_chain (spell_id,prev_spell,first_spell,rank,req_spell) VALUES (20219,0,20219,1,12656); + +-- divine spirit req spells + +DELETE FROM spell_chain WHERE spell_id = 27681; +DELETE FROM spell_chain WHERE spell_id = 32999; + +INSERT INTO spell_chain (spell_id,prev_spell,first_spell,rank,req_spell) VALUES (27681,0,27681,1,14752); +INSERT INTO spell_chain (spell_id,prev_spell,first_spell,rank,req_spell) VALUES (32999,27681,27681,2,0); + +-- judgement of justice req seal of justice(dunno what is this for) + +DELETE FROM spell_chain WHERE spell_id = 20184; +DELETE FROM spell_chain WHERE spell_id = 31896; + +INSERT INTO spell_chain (spell_id,prev_spell,first_spell,rank,req_spell) VALUES (20184,0,20184,1,20164); +INSERT INTO spell_chain (spell_id,prev_spell,first_spell,rank,req_spell) VALUES (31896,20184,20184,2,0); + +ALTER TABLE spell_chain DROP COLUMN prev_spell; + diff --git a/sql/updates/513_world_scripts.sql b/sql/updates/513_world_scripts.sql new file mode 100644 index 00000000000..8714057904f --- /dev/null +++ b/sql/updates/513_world_scripts.sql @@ -0,0 +1,20 @@ +UPDATE `instance_template` SET `script`='instance_dark_portal' WHERE `map`=269; +UPDATE `creature_template` SET `ScriptName`='npc_medivh_bm' WHERE `entry`=15608; +UPDATE `creature_template` SET `ScriptName`='npc_time_rift' WHERE `entry`=17838; +UPDATE `creature_template` SET `ScriptName`='npc_saat' WHERE `entry`=20201; + + +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1269028 AND -1269018; +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1269018,'goes into a frenzy!',0,2,0,'aeonus EMOTE_FRENZY'), +(-1269019,'Stop! Do not go further, mortals. You are ill-prepared to face the forces of the Infinite Dragonflight. Come, let me help you.',0,0,0,'saat SAY_SAAT_WELCOME'), +(-1269020,'The time has come! Gul\'dan, order your warlocks to double their efforts! Moments from now the gateway will open, and your Horde will be released upon this ripe, unsuspecting world!',10435,1,0,'medivh SAY_ENTER'), +(-1269021,'What is this? Champions, coming to my aid? I sense the hand of the dark one in this. Truly this sacred event bears his blessing?',10436,1,0,'medivh SAY_INTRO'), +(-1269022,'Champions, my shield grows weak!',10437,1,0,'medivh SAY_WEAK75'), +(-1269023,'My powers must be concentrated on the portal! I do not have time to hold the shield!',10438,1,0,'medivh SAY_WEAK50'), +(-1269024,'The shield is nearly gone! All that I have worked for is in danger!',10439,1,0,'medivh SAY_WEAK25'), +(-1269025,'No... damn this feeble mortal coil...',10441,1,0,'medivh SAY_DEATH'), +(-1269026,'I am grateful for your aid, champions. Now, Gul\'dan\'s Horde will sweep across this world, like a locust swarm, and all my designs, all my carefully laid plans will at last fall into place.',10440,1,0,'medivh SAY_WIN'), +(-1269027,'Orcs of the Horde! This portalis the gateway to your new destiny! Azeroth lies before you, ripe for the taking!',0,1,0,'medivh SAY_ORCS_ENTER'), +(-1269028,'Gul\'dan speaks the truth! We should return at once to tell our brothers of the news! Retreat back trought the portal!',0,1,0,'medivh SAY_ORCS_ANSWER'); + diff --git a/sql/updates/519_world.sql b/sql/updates/519_world.sql new file mode 100644 index 00000000000..deddf74b42e --- /dev/null +++ b/sql/updates/519_world.sql @@ -0,0 +1,3 @@ +ALTER TABLE `creature_formations` CHANGE `leader` `leaderGUID` int(11) unsigned NOT NULL default '0'; +ALTER TABLE `creature_formations` CHANGE `follower` `memberGUID` int(11) unsigned NOT NULL default '0'; + diff --git a/sql/updates/537_world.sql b/sql/updates/537_world.sql new file mode 100644 index 00000000000..7929f4dbc52 --- /dev/null +++ b/sql/updates/537_world.sql @@ -0,0 +1,3 @@ +-- Removing the now unused creature_movement table +DROP TABLE IF EXISTS `creature_movement`; + diff --git a/sql/updates/541_characters.sql b/sql/updates/541_characters.sql new file mode 100644 index 00000000000..cddfb33519c --- /dev/null +++ b/sql/updates/541_characters.sql @@ -0,0 +1,9 @@ +DROP TABLE IF EXISTS `saved_variables`; +CREATE TABLE `saved_variables` ( + `NextArenaPointDistributionTime` bigint(40) UNSIGNED NOT NULL DEFAULT '0' +) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Variable Saves'; + +ALTER TABLE `arena_team_member` DROP COLUMN `points_to_add`; +ALTER TABLE `arena_team_member` ADD COLUMN `personal_rating` int(10) UNSIGNED NOT NULL DEFAULT '0'; +ALTER TABLE `characters` ADD COLUMN `arena_pending_points` int(10) UNSIGNED NOT NULL default '0' AFTER `taxi_path`; + diff --git a/sql/updates/541_world.sql b/sql/updates/541_world.sql new file mode 100644 index 00000000000..676f9138bac --- /dev/null +++ b/sql/updates/541_world.sql @@ -0,0 +1,27 @@ +DELETE FROM `command` WHERE `name` = "flusharenapoints"; +INSERT INTO `command` (`name`, `security`, `help`) VALUES +('flusharenapoints','3','Syntax: .flusharenapoints\r\n\r\nUse it to distribute arena points based on arena team ratings, and start a new week.'); + +DELETE FROM trinity_string WHERE entry BETWEEN 1122 AND 1138; + +INSERT INTO trinity_string (entry, content_default) VALUES + (1122,'Your group is too large for this battleground. Please regroup to join.'), + (1123,'Your group is too large for this arena. Please regroup to join.'), + (1124,'Your group has members not in your arena team. Please regroup to join.'), + (1125,'Your group does not have enough players to join this match.'), + (1126,'The Gold Team wins!'), + (1127,'The Green Team wins!'), + (1128, 'There aren\'t enough players in this battleground. It will end soon unless some more players join to balance the fight.'), + (1129, 'Your group has an offline member. Please remove him before joining.'), + (1130, 'Your group has players from the opposing faction. You can\'t join the battleground as a group.'), + (1131, 'Your group has players from different battleground brakets. You can\'t join as group.'), + (1132, 'Someone in your party is already in this battleground queue. (S)he must leave it before joining as group.'), + (1133, 'Someone in your party is Deserter. You can\'t join as group.'), + (1134, 'Someone in your party is already in three battleground queues. You cannot join as group.'), + (1135, 'You cannot teleport to a battleground or arena map.'), + (1136, 'You cannot summon players to a battleground or arena map.'), + (1137, 'You must be in GM mode to teleport to a player in a battleground.'), + (1138, 'You cannot teleport to a battleground from another battleground. Please leave the current battleground first.'); + +DELETE FROM trinity_string WHERE entry = 714 OR entry = 716; + diff --git a/sql/updates/542_characters.sql b/sql/updates/542_characters.sql new file mode 100644 index 00000000000..9af0975e07f --- /dev/null +++ b/sql/updates/542_characters.sql @@ -0,0 +1,75 @@ +UPDATE + `arena_team_member` AS `a`, + (SELECT + `attq1`.`guid` AS `b_guid`, + `atid`, `atpr` + FROM + (SELECT + `guid`, + `name`, + SUBSTRING_INDEX(SUBSTRING_INDEX(`data`,' ',1545),' ',-1) AS `atid`, + SUBSTRING_INDEX(SUBSTRING_INDEX(`data`,' ',1550),' ',-1) AS `atpr` + FROM + `characters`) AS `attq1` + INNER JOIN + `arena_team_member` ON `arenateamid` = `atid` AND + `arena_team_member`.`guid` = `attq1`.`guid` + WHERE + `atid` <> 0) + AS `b` +SET + `a`.`personal_rating` = `b`.`atpr` +WHERE + `a`.`arenateamid` = `b`.`atid` AND + `a`.`guid` = `b`.`b_guid`; + +UPDATE + `arena_team_member` AS `a`, + (SELECT + `attq1`.`guid` AS `b_guid`, + `atid`, `atpr` + FROM + (SELECT + `guid`, + `name`, + SUBSTRING_INDEX(SUBSTRING_INDEX(`data`,' ',1551),' ',-1) AS `atid`, + SUBSTRING_INDEX(SUBSTRING_INDEX(`data`,' ',1556),' ',-1) AS `atpr` + FROM + `characters`) AS `attq1` + INNER JOIN + `arena_team_member` ON `arenateamid` = `atid` AND + `arena_team_member`.`guid` = `attq1`.`guid` + WHERE + `atid` <> 0) + AS `b` +SET + `a`.`personal_rating` = `b`.`atpr` +WHERE + `a`.`arenateamid` = `b`.`atid` AND + `a`.`guid` = `b`.`b_guid`; + +UPDATE + `arena_team_member` AS `a`, + (SELECT + `attq1`.`guid` AS `b_guid`, + `atid`, `atpr` + FROM + (SELECT + `guid`, + `name`, + SUBSTRING_INDEX(SUBSTRING_INDEX(`data`,' ',1557),' ',-1) AS `atid`, + SUBSTRING_INDEX(SUBSTRING_INDEX(`data`,' ',1562),' ',-1) AS `atpr` + FROM + `characters`) AS `attq1` + INNER JOIN + `arena_team_member` ON `arenateamid` = `atid` AND + `arena_team_member`.`guid` = `attq1`.`guid` + WHERE + `atid` <> 0) + AS `b` +SET + `a`.`personal_rating` = `b`.`atpr` +WHERE + `a`.`arenateamid` = `b`.`atid` AND + `a`.`guid` = `b`.`b_guid`; + diff --git a/sql/updates/54_world.sql b/sql/updates/54_world.sql new file mode 100644 index 00000000000..761149b53af --- /dev/null +++ b/sql/updates/54_world.sql @@ -0,0 +1,6 @@ +CREATE TABLE `game_event_battleground_holiday` ( + `event` int(10) unsigned NOT NULL, + `bgflag` int(10) unsigned NOT NULL default '0', + PRIMARY KEY (`event`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + diff --git a/sql/updates/551_world.sql b/sql/updates/551_world.sql new file mode 100644 index 00000000000..c064a8e990c --- /dev/null +++ b/sql/updates/551_world.sql @@ -0,0 +1,23 @@ +DELETE FROM `spell_linked_spell` WHERE `spell_trigger` = '36574'; +INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES ('36574', '36650', '0', 'Apply Phase Slip Vulnerability'); + +UPDATE `creature_template` SET `ScriptName`='' WHERE `entry`=21807; +DELETE FROM `areatrigger_scripts` WHERE `entry`=4560; +INSERT INTO `areatrigger_scripts` VALUES (4560,'at_legion_teleporter'); +UPDATE `creature_template` SET `ScriptName`='npc_commander_dawnforge' WHERE `entry`=19831; +DELETE FROM `areatrigger_scripts` WHERE `entry`=4497; +INSERT INTO `areatrigger_scripts` VALUES (4497,'at_commander_dawnforge'); + +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000137 AND -1000128; +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1000128, 'We need you to send reinforcements to Manaforge Duro, Ardonis. This is not a request, it\'s an order.', 0, 0, 0, 'dawnforge SAY_COMMANDER_DAWNFORGE_1'), +(-1000129, 'You cannot be serious! We are severely understaffed and can barely keep this manaforge functional!', 0, 0, 0, 'dawnforge SAY_ARCANIST_ARDONIS_1'), +(-1000130, 'You will do as ordered. Manaforge Duro has come under heavy attack by mana creatures and the situation is out of control. Failure to comply will not be tolerated!', 0, 0, 0, 'dawnforge SAY_COMMANDER_DAWNFORGE_2'), +(-1000131, 'Indeed, it is not a request.', 0, 0, 0, 'dawnforge SAY_PATHALEON_CULATOR_IMAGE_1'), +(-1000132, 'My lord!', 0, 0, 0, 'dawnforge SAY_COMMANDER_DAWNFORGE_3'), +(-1000133, 'Duro will be reinforced! Ultris was a complete disaster. I will NOT have that mistake repeated!', 0, 0, 0, 'dawnforge PATHALEON_CULATOR_IMAGE_2'), +(-1000134, 'We\'ve had too many setbacks along the way: Hellfire Citadel, Fallen Sky Ridge, Firewing Point... Prince Kael\'thas will tolerate no further delays. I will tolerate nothing other than complete success!', 0, 0, 0, 'dawnforge PATHALEON_CULATOR_IMAGE_2_1'), +(-1000135, 'I am returning to Tempest Keep. See to it that I do not have reason to return!', 0, 0, 0, 'dawnforge PATHALEON_CULATOR_IMAGE_2_2' ), +(-1000136, 'Yes, my lord.', 0, 0, 0, 'dawnforge COMMANDER_DAWNFORGE_4 SAY_ARCANIST_ARDONIS_2'), +(-1000137, 'See to it, Ardonis!', 0, 0, 0, 'dawnforge COMMANDER_DAWNFORGE_5'); + diff --git a/sql/updates/566_world.sql b/sql/updates/566_world.sql new file mode 100644 index 00000000000..6ff3126aac0 --- /dev/null +++ b/sql/updates/566_world.sql @@ -0,0 +1,25 @@ +INSERT INTO spell_script_target VALUES +(8913,1,1200), +(9095,1,6492), +(33655,0,183351), +(33655,0,183350), +(34526,1,19723), +(34526,1,19724), +(36904,0,21511), +(38738,0,185193), +(38738,0,185195), +(38738,0,185196), +(38738,0,185197), +(38738,0,185198), +(39844,0,185549), +(42391,0,300152), +(12613,1,5843), +(34019,2,16873), +(34019,2,16871), +(34019,2,19422), +(34019,2,16907), +(38015,1,21216), +(39011,1,20885), +(40106,1,22883), +(40105,1,22883); + diff --git a/sql/updates/571_world.sql b/sql/updates/571_world.sql new file mode 100644 index 00000000000..2bd76e45769 --- /dev/null +++ b/sql/updates/571_world.sql @@ -0,0 +1,6 @@ +ALTER TABLE spell_chain DROP COLUMN first_spell; +ALTER TABLE spell_chain DROP COLUMN rank; +ALTER TABLE spell_chain RENAME TO spell_required; +DELETE FROM spell_required WHERE req_spell=0; + + diff --git a/sql/updates/572_world.sql b/sql/updates/572_world.sql new file mode 100644 index 00000000000..033548f0367 --- /dev/null +++ b/sql/updates/572_world.sql @@ -0,0 +1,8 @@ +UPDATE `creature_template` SET `ScriptName`='npc_aeranas' WHERE `entry`=17085; +UPDATE `gameobject_template` SET `ScriptName`='go_haaleshi_altar' WHERE `entry`=181606; + +DELETE FROM `script_texts` WHERE `entry` IN (-1000138,-1000139); +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1000138, 'Avruu\'s magic... it still controls me. You must fight me, mortal. It\'s the only way to break the spell!', 0, 0, 0, 'aeranas SAY_SUMMON'), +(-1000139, 'Avruu\'s magic is broken! I\'m free once again!', 0, 0, 0, 'aeranas SAY_FREE'); + diff --git a/sql/updates/575_world_scripts.sql b/sql/updates/575_world_scripts.sql new file mode 100644 index 00000000000..b084d2eac8b --- /dev/null +++ b/sql/updates/575_world_scripts.sql @@ -0,0 +1,2 @@ +UPDATE `item_template` SET `ScriptName` = "item_only_for_flight" WHERE `entry` IN (34475, 34489, 24538); + diff --git a/sql/updates/57_world_scripts.sql b/sql/updates/57_world_scripts.sql new file mode 100644 index 00000000000..b87c607a14c --- /dev/null +++ b/sql/updates/57_world_scripts.sql @@ -0,0 +1,40 @@ +/*sql for zulaman*/ +UPDATE `creature_template` SET `ScriptName` = 'boss_nalorakk' WHERE `entry` = 23576; +UPDATE `creature_template` SET `flags_extra` = 33 WHERE `entry` = 23576; /*no crush*/ + +UPDATE `creature_template` set `ScriptName` = 'boss_akilzon' where entry = 23574; +UPDATE `creature_template` set `ScriptName` = 'mob_akilzon_eagle' where `entry`=24858; /*default is event ai*/ + +UPDATE `creature_template` SET `ScriptName` = 'boss_halazzi' WHERE `entry` = '23577'; +UPDATE `creature_template` SET `ScriptName` = 'mob_halazzi_lynx' WHERE `entry` = '24143'; +UPDATE `creature_template` SET `ScriptName` = '' WHERE `entry` = '24224'; /*totem default `spell1` = '43301' should be in DB*/ + +UPDATE `creature_template` SET `ScriptName` = 'boss_janalai' WHERE `entry` = '23578'; +UPDATE `creature_template` SET `ScriptName` = 'mob_janalai_hatcher' WHERE `entry` = '23818'; +UPDATE `creature_template` SET `ScriptName` = 'mob_janalai_hatchling' WHERE `entry` = '23598'; +UPDATE `creature_template` SET `ScriptName` = 'mob_janalai_egg' WHERE `entry` = '23817'; +UPDATE `creature_template` SET `ScriptName` = 'mob_janalai_firebomb' WHERE `entry` = '23920'; + +UPDATE `creature_template` SET `ScriptName` = 'boss_hexlord_malacrass' WHERE `entry` =24239; +UPDATE `creature_template` SET `ScriptName` = 'boss_alyson_antille' WHERE `entry` =24240; +UPDATE `creature_template` SET `ScriptName` = 'boss_thurg' WHERE `entry` =24241; +UPDATE `creature_template` SET `ScriptName` = 'boss_slither' WHERE `entry` =24242; +UPDATE `creature_template` SET `ScriptName` = 'boss_lord_raadan' WHERE `entry` =24243; +UPDATE `creature_template` SET `ScriptName` = 'boss_gazakroth' WHERE `entry` =24244; +UPDATE `creature_template` SET `ScriptName` = 'boss_fenstalker' WHERE `entry` =24245; +UPDATE `creature_template` SET `ScriptName` = 'boss_darkheart' WHERE `entry` =24246; +UPDATE `creature_template` SET `ScriptName` = 'boss_koragg' WHERE `entry` =24247; +UPDATE `creature` SET `position_x` = '117.8827',`position_y` = '921.2795',`position_z` = '33.8883',`orientation` = '1.5696' WHERE `id` = '24239' LIMIT 1; +UPDATE `creature_template` SET `faction_A` = '1890', `faction_H` = '1890' WHERE `entry` in ('24240', '24241', '24242', '24243', '24244', '24245', '24246', '24247'); + +UPDATE `creature_template` SET `ScriptName` = 'boss_zuljin' WHERE `entry` =23863; +UPDATE `creature_template` SET `ScriptName` = 'do_nothing' WHERE `entry` = '24187'; +UPDATE `creature_template` SET `ScriptName` = 'mob_zuljin_vortex' WHERE `entry` = '24136'; +UPDATE `creature_template` SET `minlevel` = '73', `maxlevel` = '73' WHERE `entry` IN (24187, 24136); +DELETE FROM `spell_proc_event` WHERE `entry` = 43983; +INSERT INTO `spell_proc_event` VALUES ('43983', '0', '0', '0', '0', '0', '16384', '0', '0'); +DELETE FROM `spell_script_target` WHERE `entry` = 42577; +INSERT INTO `spell_script_target` VALUES ('42577', '1', '24136'); + +UPDATE `creature_template` SET `ScriptName` = 'npc_zulaman_hostage' WHERE `entry` IN (23790, 23999, 24024, 24001); + diff --git a/sql/updates/583_world_scripts.sql b/sql/updates/583_world_scripts.sql new file mode 100644 index 00000000000..3ef0a2399af --- /dev/null +++ b/sql/updates/583_world_scripts.sql @@ -0,0 +1,2 @@ +UPDATE creature_template SET Scriptname='npc_ranger_lilatha' WHERE entry=16295; + diff --git a/sql/updates/586_world_scripts.sql b/sql/updates/586_world_scripts.sql new file mode 100644 index 00000000000..d4102fdfef6 --- /dev/null +++ b/sql/updates/586_world_scripts.sql @@ -0,0 +1,3 @@ +UPDATE `gameobject_template` SET `ScriptName` = 'go_mausoleum_trigger' WHERE `entry` = 104593; +UPDATE `gameobject_template` SET `ScriptName` = 'go_mausoleum_door' WHERE `entry` = 176594; + diff --git a/sql/updates/588_world.sql b/sql/updates/588_world.sql new file mode 100644 index 00000000000..346101bdc0a --- /dev/null +++ b/sql/updates/588_world.sql @@ -0,0 +1,8 @@ +DELETE FROM `trinity_string`WHERE `entry` in ('6613', '6614', '6615'); +INSERT INTO `trinity_string` (`entry`,`content_default`) VALUES ('6613','|cfff00000[GM Announcement]: %s|r'); +INSERT INTO `trinity_string` (`entry`,`content_default`) VALUES ('6614','Notification to GM\'s - '); +INSERT INTO `trinity_string` (`entry`,`content_default`) VALUES ('6615','|cffffff00[|c1f40af20GM Announce by|r |cffff0000%s|cffffff00]:|r %s|r'); +INSERT INTO `command` (`name`,`security`,`help`) VALUES ('gmnotify', 2, 'Syntax: .gmnotify $notification\r\nDisplays a notification on the screen of all online GM\'s.'); +INSERT INTO `command` (`name`,`security`,`help`) VALUES ('gmnameannounce', 2, 'Syntax: .gmnameannounce $announcement.\r\nSend an announcement to all online GM\'s, displaying the name of the sender.'); +INSERT INTO `command` (`name`,`security`,`help`) VALUES ('gmannounce', 4, 'Syntax: .gmannounce $announcement\r\nSend an announcement to online Gamemasters.'); + diff --git a/sql/updates/608_world.sql b/sql/updates/608_world.sql new file mode 100644 index 00000000000..6cb9665f394 --- /dev/null +++ b/sql/updates/608_world.sql @@ -0,0 +1,167 @@ +INSERT INTO `spell_script_target` VALUES +(3730,1,15263), +(6955,1,4946), +(7022,1,4945), +(7277,1,5409), +(9457,1,3701), +(11893,1,8156), +(12134,2,5270), +(12134,2,5271), +(12134,2,5273), +(12134,2,8313), +(12134,2,5256), +(12134,2,5259), +(13489,1,9178), +(15658,1,8929), -- It's up to script to implement SpellHit() for Moira Bronze beard +(16032,1,6557), -- Dummy effect should be implemented in core i think +(16337,1,10339), +(16337,1,10429), -- per spells description, it buffs two npc's. +(16637,1,10447), +(17748,1,10556), +(18969,1,12126), +(19749,1,12352), -- used by creature script to check if all troopers are presents, NYI +(19773,1,12018), -- used by Ragnaros to kill Majordomo +(21556,1,13378), -- no longer in game, but still could be used for some FUN-so why not fix it ? ;) +(21566,1,13416), +(22710,1,14349), +(23168,1,14020), +(24062,1,15010), +(24217,1,15069), +(24323,1,14834), +(24804,1,14888), +(25896,1,15299), +(28096,1,15929), +(28111,1,15930), +(28353,2,16390), +(28392,1,16420), +(28697,1,3976), +(28861,1,16592), +(29172,0,181605), +(29456,1,17060), +(29457,1,17060), +(29459,1,17060), -- Those are spells Arch Mage Xintor casts at training dummies near him. +(29531,0,181605), +(29831,0,181288), +(30221,1,620), +(30232,1,15691), +(30460,1,17404), +(30951,1,17533), +(31326,1,15608), +(31611,1,17979), +(31727,1,17536), +(32301,1,18371), +(32396,1,18358), +(32890,1,18764), +(33111,1,17400), +(33111,1,18894), +(33644,1,19279), +(33644,1,19328), +(33644,1,19278), +(33644,1,19329), +(33644,1,19326), +(33644,1,19277), +(33644,1,19276), -- All legion antennas. +(33742,1,17400), +(33742,1,18894), +(33742,1,19279), +(33742,1,19328), +(33742,1,19278), +(33742,1,19329), +(33742,1,19326), +(33742,1,19277), +(33742,1,19276), -- All legion antennas, another spell. +(33783,1,18732), +(34254,1,19554), +(34350,1,19554), +(34662,1,17827), +(35596,1,20794), +(36174,1,20885), +(37465,1,17469), +(37465,1,21747), +(37465,1,21750), +(37465,1,21748), +(37469,1,21664), +(37469,1,21682), +(37469,1,21683), +(37469,1,17211), +(37626,1,15689), -- Netherspite's beam +(37853,1,15608), +(37868,1,21909), +(37893,1,21909), +(37895,1,21909), +(38003,1,21949), +(38044,1,21212), +(38121,1,21949), +(38123,1,21949), +(38126,1,21949), +(38128,1,21949), +(38130,1,21949), +(38250,0,185125), +(38508,1,17270), +(38508,1,16873), +(38508,1,17269), +(38508,1,16871), +(38508,1,19422), +(38508,1,16907), +(38508,1,17478), +(38508,1,19424), +(38629,0,185214), +(38722,1,21506), +(38966,1,22293), +(38968,1,38968), +(39124,0,184738), +(39126,1,19557), +(39221,1,23116), +(39364,1,19732), +(39601,1,22916), +(39974,0,300127), +(39978,1,21851), +(39993,1,23382), +(40359,1,23382), +(40454,1,22181), +(40547,1,22911), +(40828,1,23327), +(40828,1,23322), +(41128,1,23164), +(41362,1,22956), +(41362,1,22964), +(41975,1,23191), +(42317,1,22844), +(42317,1,23319), +(42317,1,23421), +(42317,1,23216), +(42317,1,23523), +(42317,1,22849), +(42317,1,22845), +(42317,1,22847), +(42317,1,23318), +(42317,1,23215), +(42317,1,23524), +(42317,1,23374), +(42317,1,22846), +(42318,1,22844), +(42318,1,23319), +(42318,1,23421), +(42318,1,23216), +(42318,1,23523), +(42318,1,22849), +(42318,1,22845), +(42318,1,22847), +(42318,1,23318), +(42318,1,23215), +(42318,1,23524), +(42318,1,23374), +(42318,1,22846), +(42405,1,23775), +(42410,1,23775), +(42517,1,23864), +(42734,1,4974), +(44864,1,24955), +(45201,1,24882), +(46809,1,26239), -- Make Ahune's Ghost Burst +(46818,1,25840), +(46852,0,181605), -- Ribbon Pole Music +(46896,0,181605), +(47104,1,26401), +(49058,1,24968); -- Rocket Bot Attack + diff --git a/sql/updates/615_world.sql b/sql/updates/615_world.sql new file mode 100644 index 00000000000..99ccb0cdaa3 --- /dev/null +++ b/sql/updates/615_world.sql @@ -0,0 +1,8 @@ +-- Wyvern Sting rank 5 and 6 not avail. till wotlk +DELETE FROM spell_linked_spell WHERE `spell_trigger` IN (-49011, -49012); + +-- typo +DELETE FROM `spell_linked_spell` WHERE `spell_trigger` IN (43468, 43648); +INSERT INTO spell_linked_spell (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES (43648, 44007, 1, 'Storm Eye Safe Zone'); + + diff --git a/sql/updates/636_world_scripts.sql b/sql/updates/636_world_scripts.sql new file mode 100644 index 00000000000..e8a0fec45b1 --- /dev/null +++ b/sql/updates/636_world_scripts.sql @@ -0,0 +1,10 @@ +-- event script for Medivh's Journal +delete from event_scripts where id = 10951; +insert into event_scripts values +(10951,0,10,17651, 300000, 0,-11159,-1907.22,91.48,0); + +-- remove every Image from Medivh (should not be spawned by db) +delete from creature where id = 17651; +-- add script +update creature_template set scriptname = 'npc_image_of_medivh' where entry = 17651; + diff --git a/sql/updates/640_world.sql b/sql/updates/640_world.sql new file mode 100644 index 00000000000..b32ee6819bb --- /dev/null +++ b/sql/updates/640_world.sql @@ -0,0 +1,6 @@ +DELETE FROM `spell_script_target` WHERE entry IN (33655, 33633, 44374); +INSERT INTO `spell_script_target` VALUES +(33655,0,183350), +(33633,0,183351), +(44374,1,24722); + diff --git a/sql/updates/645_world_scripts.sql b/sql/updates/645_world_scripts.sql new file mode 100644 index 00000000000..834efb390bc --- /dev/null +++ b/sql/updates/645_world_scripts.sql @@ -0,0 +1,6 @@ +delete from creature where id=17318; +update creature_template set scriptname='npc_geezle' where entry=17318; +delete from event_scripts where id=10675; +insert into event_scripts () VALUES (10675, 0, 10, 17318, 120000, 0, -5134.3, -11250.3, 5.29568, 6.23554), +(10675, 72, 7, 9531, 0, 0, 0, 0, 0, 0); + diff --git a/sql/updates/667_world_scripts.sql b/sql/updates/667_world_scripts.sql new file mode 100644 index 00000000000..4b2930cd74f --- /dev/null +++ b/sql/updates/667_world_scripts.sql @@ -0,0 +1,2 @@ +update creature_template set scriptname='npc_professor_dabiri' where entry=20907; + diff --git a/sql/updates/66_world_scripts.sql b/sql/updates/66_world_scripts.sql new file mode 100644 index 00000000000..fcdf65e4620 --- /dev/null +++ b/sql/updates/66_world_scripts.sql @@ -0,0 +1,19 @@ +update instance_template set script = 'instance_sunwell_plateau' where map = 580; +UPDATE creature_template SET ScriptName = 'boss_brutallus' WHERE entry = 24882; +UPDATE `creature_template` SET `ScriptName` = 'boss_felmyst' WHERE `entry` = 25038; +UPDATE `creature_template` SET `ScriptName` = 'mob_felmyst_vapor' WHERE `entry` = 25265; +UPDATE `creature_template` SET `ScriptName` = 'mob_felmyst_trail' WHERE `entry` = 25267; +update creature_template set scriptname = 'boss_sacrolash' where entry = 25165; +update creature_template set scriptname = 'boss_alythess' where entry = 25166; +update creature_template set scriptname = 'mob_shadow_image' where entry = 25214; +REPLACE INTO `gameobject_template` VALUES (187366, 6, 4251, 'Blaze', '', 14, 0, 1, 0, 73, 2, 45246, 0, 1, 0, 3, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ''); +UPDATE creature_template SET faction_H = 14, faction_A = 14, minlevel = 73, maxlevel = 73,rank = 3, flags = 33554434, flag1 = 0 WHERE entry = 25214; +UPDATE `creature_template` SET `minlevel` = '70', `maxlevel` = '70',`faction_A` = '14', `faction_H` = '14' WHERE `entry` in (25265,25267,25268); +UPDATE `creature_template` SET `mindmg` = '1500', `maxdmg` = '2500', `minhealth` = '40000', `maxhealth` = '40000', `baseattacktime` = '2000' WHERE `entry` = 25268; +DELETE FROM `spell_script_target` WHERE `entry` in (44885,45388,45389,46350,45714); +INSERT INTO `spell_script_target` VALUES ('45388', '1', '25038'); +INSERT INTO `spell_script_target` VALUES ('45389', '1', '25265'); +INSERT INTO `spell_script_target` VALUES ('44885', '1', '25160'); +INSERT INTO `spell_script_target` VALUES ('46350', '1', '25160'); +INSERT INTO `spell_script_target` VALUES ('45714', '1', '25038'); + diff --git a/sql/updates/676_world.sql b/sql/updates/676_world.sql new file mode 100644 index 00000000000..b023e01f0a6 --- /dev/null +++ b/sql/updates/676_world.sql @@ -0,0 +1,3 @@ +UPDATE `trinity_string` SET `content_default`='Player |cffff0000%s|r kicked by |cffff0000%s|r. Reason: |cffff0000%s|r.' WHERE (`entry`='282'); +UPDATE `command` SET `help`='Syntax: .kick [$charactername] [$reason]\r\n\r\nKick the given character name from the world with or without reason. If no character name is provided then the selected player (except for yourself) will be kicked. If no reason is provided, default is \"No Reason\".' WHERE (`name`='kick'); + diff --git a/sql/updates/679_world_scripts.sql b/sql/updates/679_world_scripts.sql new file mode 100644 index 00000000000..0d725f85003 --- /dev/null +++ b/sql/updates/679_world_scripts.sql @@ -0,0 +1,2 @@ +update creature_template set scriptname='npc_deathstalker_erland' where entry=1978; + diff --git a/sql/updates/683_world_scripts.sql b/sql/updates/683_world_scripts.sql new file mode 100644 index 00000000000..50ca23c380e --- /dev/null +++ b/sql/updates/683_world_scripts.sql @@ -0,0 +1,3 @@ +update quest_template set specialflags=2 where entry=665; +update creature_template set scriptname='npc_professor_phizzlethorpe' where entry=2768; + diff --git a/sql/updates/686_world_scripts.sql b/sql/updates/686_world_scripts.sql new file mode 100644 index 00000000000..f2b17d21173 --- /dev/null +++ b/sql/updates/686_world_scripts.sql @@ -0,0 +1,16 @@ +UPDATE `creature_template` SET `Scriptname`='npc_willix' WHERE entry=4508; + +DELETE FROM script_texts WHERE entry BETWEEN -1047000 and -1047010; +INSERT INTO script_texts (entry, content_default, sound, type, language, comment) VALUES +(-1047000, 'Phew! Finally,out here. However, it will not become easy. Detain your eyes after annoyance.', 0, 0, 0, 'Willix'), +(-1047001, 'There on top resides Charlga Razorflank. The damned old Crone.', 0, 0, 0, 'Willix'), +(-1047002, 'Help! Get this Raging Agam\'ar from me!', 0, 0, 0, 'Willix'), +(-1047003, 'In this ditch there are Blueleaf Tuber! As if the gold waited only to be dug out, I say it you!', 0, 0, 0, 'Willix'), +(-1047004, 'Danger is behind every corner.', 0, 0, 0, 'Willix'), +(-1047005, 'I do not understand how these disgusting animals can live at such a place.... puh as this stinks!', 0, 0, 0, 'Willix'), +(-1047006, 'I think, I see a way how we come out of this damned thorn tangle.', 0, 0, 0, 'Willix'), +(-1047007, 'I am glad that we are out again from this damned ditch. However, up here it is not much better!', 0, 0, 0, 'Willix'), +(-1047008, 'Finally! I am glad that I come, finally out here.', 0, 0, 0, 'Willix'), +(-1047009, 'I will rather rest a moment and come again to breath, before I return to Ratchet.', 0, 0, 0, 'Willix'), +(-1047010, 'Many thanks for your help.', 0, 0, 0, 'Willix'); + diff --git a/sql/updates/68_world.sql b/sql/updates/68_world.sql new file mode 100644 index 00000000000..40678a4a5b0 --- /dev/null +++ b/sql/updates/68_world.sql @@ -0,0 +1,17 @@ +-- add lang strings +DELETE FROM trinity_string WHERE entry BETWEEN 1000 AND 1006; +INSERT INTO trinity_string VALUES +(1000,'You froze player %s.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(1001,'It might be amusing but no... you cant freeze yourself!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(1002,'Invalid input check the name of target.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(1003,'You unfroze player %s.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(1004,'There are no frozen players.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(1005,'Following players are frozen on the server:',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(1006,'- %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); + +-- add commands +DELETE FROM `command` WHERE `name` = 'freeze' or `name` = 'unfreeze' or name = 'listfreeze'; +INSERT INTO `command` (`name`,`security`,`help`) VALUES ('freeze','2','Syntax: .freeze (#player)\r\n\"Freezes\" #player and disables his chat. When using this without #name it will freeze your target.'); +INSERT INTO `command` (`name`,`security`,`help`) VALUES ('unfreeze','2','Syntax: .unfreeze (#player)\r\n\"Unfreezes\" #player and enables his chat again. When using this without #name it will unfreeze your target.'); +INSERT INTO `command` (`name`,`security`,`help`) VALUES ('listfreeze','1','Syntax: .listfreeze\r\n\r\nSearch and output all frozen players.'); + diff --git a/sql/updates/691_world_scripts.sql b/sql/updates/691_world_scripts.sql new file mode 100644 index 00000000000..47037e5e091 --- /dev/null +++ b/sql/updates/691_world_scripts.sql @@ -0,0 +1,2 @@ +update creature_template set scriptname='npc_earthmender_wilda' where entry=21027; + diff --git a/sql/updates/692_world.sql b/sql/updates/692_world.sql new file mode 100644 index 00000000000..5879d754ff7 --- /dev/null +++ b/sql/updates/692_world.sql @@ -0,0 +1,8 @@ +DELETE FROM `spell_proc_event` WHERE `entry` IN ('14144','14148'); +INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES +('14144','0','0','0','2','0','0','0','0'), +('14148','0','0','0','2','0','0','0','0'); +DELETE FROM `spell_proc_event` WHERE entry = 38164; +INSERT INTO `spell_proc_event` (`entry`,`SchoolMask`,`SpellFamilyName`,`SpellFamilyMask`,`procFlags`,`procEx`,`ppmRate`,`CustomChance`,`Cooldown`) VALUES + (38164,0,0,0,0,1,0,0,60); + diff --git a/sql/updates/708_world_scripts.sql b/sql/updates/708_world_scripts.sql new file mode 100644 index 00000000000..c218f610b31 --- /dev/null +++ b/sql/updates/708_world_scripts.sql @@ -0,0 +1,3 @@ +UPDATE `creature_template` SET `ScriptName` = 'boss_shirrak_the_dead_watcher' WHERE `entry` = '18371'; +UPDATE `creature_template` SET `ScriptName` = 'mob_focus_fire', `unit_flags` = '33554434' WHERE `entry` = '18374'; + diff --git a/sql/updates/70_world_scripts.sql b/sql/updates/70_world_scripts.sql new file mode 100644 index 00000000000..893edc00a5f --- /dev/null +++ b/sql/updates/70_world_scripts.sql @@ -0,0 +1,28 @@ +UPDATE `creature_template` SET +`minlevel` = '60', +`maxlevel` = '60', +`minhealth` = '6900', +`maxhealth` = '7200', +`minmana` = '9476', +`maxmana` = '9736', +`armor` = '4000', +`speed` = '1.7', +`rank` = '1', +`mindmg` = '600', +`maxdmg` = '1500', +`attackpower` = '1200', +`family` = '16', +`minrangedmg` = '0', +`maxrangedmg` = '0', +`rangedattackpower` = '0', +`resistance1` = '15', +`resistance2` = '15', +`resistance3` = '15', +`resistance4` = '15', +`resistance5` = '15', +`resistance6` = '15', +`ScriptName` = 'npc_kservant' WHERE `entry` = '19685'; + +DELETE FROM `quest_start_scripts` WHERE `id`='10211'; +UPDATE `quest_template` SET `StartScript`='0' WHERE entry=10211; + diff --git a/sql/updates/722_world_script_texts.sql b/sql/updates/722_world_script_texts.sql new file mode 100644 index 00000000000..49788912023 --- /dev/null +++ b/sql/updates/722_world_script_texts.sql @@ -0,0 +1,10 @@ +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000146 AND -1000140; +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1000140,'Let\'s go.',0,0,1,'lilatha SAY_START'), +(-1000141,'$N, let\'s use the antechamber to the right.',0,0,1,'lilatha SAY_PROGRESS1'), +(-1000142,'I can see the light at the end of the tunnel!',0,0,1,'lilatha SAY_PROGRESS2'), +(-1000143,'There\'s Farstrider Enclave now, $C. Not far to go... Look out! Troll ambush!!',0,0,1,'lilatha SAY_PROGRESS3'), +(-1000144,'Thank you for saving my life and bringing me back to safety, $N',0,0,1,'lilatha SAY_END1'), +(-1000145,'Captain Helios, I\'ve been rescued from the Amani Catacombs. Reporting for duty, sir!',0,0,1,'lilatha SAY_END2'), +(-1000146,'Liatha, get someone to look at those injuries. Thank you for bringing her back safely.',0,0,1,'lilatha CAPTAIN_ANSWER'); + diff --git a/sql/updates/724_world.sql b/sql/updates/724_world.sql new file mode 100644 index 00000000000..c3850bc114d --- /dev/null +++ b/sql/updates/724_world.sql @@ -0,0 +1,4 @@ +ALTER TABLE custom_texts ADD COLUMN emote tinyint(3) UNSIGNED DEFAULT '0' NOT NULL AFTER language; +ALTER TABLE eventai_texts ADD COLUMN emote tinyint(3) UNSIGNED DEFAULT '0' NOT NULL AFTER language; +ALTER TABLE script_texts ADD COLUMN emote tinyint(3) UNSIGNED DEFAULT '0' NOT NULL AFTER language; + diff --git a/sql/updates/725_characters.sql b/sql/updates/725_characters.sql new file mode 100644 index 00000000000..193868e906a --- /dev/null +++ b/sql/updates/725_characters.sql @@ -0,0 +1,6 @@ +ALTER TABLE `character_ticket` RENAME TO `gm_tickets`; +ALTER TABLE gm_tickets CHANGE `guid` `playerGuid` int(11) unsigned NOT NULL default '0'; +ALTER TABLE gm_tickets CHANGE `ticket_id` `guid` int(11) unsigned NOT NULL default '0'; +ALTER TABLE gm_tickets CHANGE `ticket_text` `message` text(0) NOT NULL; +ALTER TABLE gm_tickets CHANGE `ticket_lastchange` `timestamp` int(10) NOT NULL default '0'; + diff --git a/sql/updates/725_world.sql b/sql/updates/725_world.sql new file mode 100644 index 00000000000..3141da90872 --- /dev/null +++ b/sql/updates/725_world.sql @@ -0,0 +1,31 @@ +DELETE FROM `trinity_string` WHERE (`entry`='290'); +DELETE FROM `trinity_string` WHERE (`entry`='296'); +DELETE FROM `trinity_string` WHERE (`entry`='289'); +INSERT INTO trinity_string (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`) VALUES (2000, '|cff00ff00New ticket from|r|cffff00ff %s.|r |cff00ff00Ticket entry:|r|cffff00ff %d.|r', '', '', '', '', '', '', '', ''); +INSERT INTO trinity_string (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`) VALUES (2001, '|cff00ff00Character|r|cffff00ff %s |r|cff00ff00edited his/her ticket:|r|cffff00ff %d.|r', '', '', '', '', '', '', '', ''); +INSERT INTO trinity_string (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`) VALUES (2002, '|cff00ff00Character|r|cffff00ff %s |r|cff00ff00abandoned ticket entry:|r|cffff00ff %d.|r', '', '', '', '', '', '', '', ''); +INSERT INTO trinity_string (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`) VALUES (2003, '|cffff00ff %s|r |cff00ff00closed ticket|r |cffff00ff %d.|r', '', '', '', '', '', '', '', ''); +INSERT INTO trinity_string (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`) VALUES (2004, 'Ticket %d permanently deleted by %s.', '', '', '', '', '', '', '', ''); +INSERT INTO trinity_string (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`) VALUES (2005, 'Ticket not found.', '', '', '', '', '', '', '', ''); +INSERT INTO trinity_string (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`) VALUES (2007, 'Please close ticket before deleting it permanently.', '', '', '', '', '', '', '', ''); +INSERT INTO trinity_string (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`) VALUES (2008, 'Ticket %d is already assigned to GM %s.', '', '', '', '', '', '', '', ''); +INSERT INTO trinity_string (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`) VALUES (2009, '%u Tickets succesfully reloaded from the database.', '', '', '', '', '', '', '', ''); +INSERT INTO trinity_string (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`) VALUES (2010, 'Showing list of open tickets.', '', '', '', '', '', '', '', ''); +INSERT INTO trinity_string (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`) VALUES (2011, 'Showing list of open tickets whose creator is online.', '', '', '', '', '', '', '', ''); +INSERT INTO trinity_string (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`) VALUES (2012, 'Invalid name specified. Name should be that of an online Gamemaster.', '', '', '', '', '', '', '', ''); +INSERT INTO trinity_string (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`) VALUES (2013, 'This ticket is already assigned to yourself. To unassign use .ticket unassign %d and then reassign.', '', '', '', '', '', '', '', ''); +INSERT INTO trinity_string (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`) VALUES (2014, 'Ticket %d is not assigned, you cannot unassign it.', '', '', '', '', '', '', '', ''); +INSERT INTO trinity_string (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`) VALUES (2015, 'You cannot unassign tickets from staffmembers with a higher security level than yourself.', '', '', '', '', '', '', '', ''); +INSERT INTO trinity_string (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`) VALUES (2016, 'Cannot close ticket %d, it is assigned to another GM.', '', '', '', '', '', '', '', ''); +DELETE FROM `command` WHERE (`name` LIKE '%ticket%'); +INSERT INTO `command` (`name`,`security`,`help`) VALUES ('.ticket list','1','Displays a list of open GM tickets.'); +INSERT INTO `command` (`name`,`security`,`help`) VALUES ('.ticket onlinelist','1','Displays a list of open GM tickets whose owner is online.'); +INSERT INTO `command` (`name`,`security`,`help`) VALUES ('.ticket viewname','1','Usage: .ticket viewname $creatorname. \r\nReturns details about specified ticket. Ticket must be open and not deleted.'); +INSERT INTO `command` (`name`,`security`,`help`) VALUES ('.ticket viewid','1','Usage: .ticket viewid $ticketid.\r\nReturns details about specified ticket. Ticket must be open and not deleted.'); +INSERT INTO `command` (`name`,`security`,`help`) VALUES ('.ticket close','2','Usage: .ticket close $ticketid.\r\nCloses the specified ticket. Does not delete permanently.'); +INSERT INTO `command` (`name`,`security`,`help`) VALUES ('.ticket delete','3','Usage: .ticket delete $ticketid.\r\nDeletes the specified ticket permanently. Ticket must be closed first.'); +INSERT INTO `command` (`name`,`security`,`help`) VALUES ('.ticket assign','3','Usage: .ticket assign $ticketid $gmname.\r\nAssigns the specified ticket to the specified Game Master.'); +INSERT INTO `command` (`name`,`security`,`help`) VALUES ('.ticket unassign','3','Usage: .ticket unassign $ticketid.\r\nUnassigns the specified ticket from the current assigned Game Master.'); +INSERT INTO `command` (`name`,`security`,`help`) VALUES ('.ticket comment','2','Usage: .ticket comment $ticketid $comment.\r\nAllows the adding or modifying of a comment to the specified ticket.'); +INSERT INTO `command` (`name`,`security`,`help`) VALUES ('.reload tickets','4','Usage: .reload tickets.\r\nReloads GM Tickets from the database and re-caches them into memory.'); + diff --git a/sql/updates/728_world_scripts.sql b/sql/updates/728_world_scripts.sql new file mode 100644 index 00000000000..027af8ede16 --- /dev/null +++ b/sql/updates/728_world_scripts.sql @@ -0,0 +1,2 @@ +update creature_template set scriptname='npc_apprentice_mirveda' where entry=15402; + diff --git a/sql/updates/733_characters.sql b/sql/updates/733_characters.sql new file mode 100644 index 00000000000..d966b131d5f --- /dev/null +++ b/sql/updates/733_characters.sql @@ -0,0 +1,2 @@ +ALTER TABLE gm_tickets ADD `name` varchar(15) NOT NULL AFTER `playerGuid`; + diff --git a/sql/updates/739_characters.sql b/sql/updates/739_characters.sql new file mode 100644 index 00000000000..96c5c597a84 --- /dev/null +++ b/sql/updates/739_characters.sql @@ -0,0 +1,2 @@ +ALTER TABLE gm_tickets ADD `comment` text(0) NOT NULL; + diff --git a/sql/updates/741_characters.sql b/sql/updates/741_characters.sql new file mode 100644 index 00000000000..b7862c4f261 --- /dev/null +++ b/sql/updates/741_characters.sql @@ -0,0 +1,4 @@ +ALTER TABLE `gm_tickets` ADD `closed` tinyint(1) NOT NULL default '0' AFTER `timestamp`; +ALTER TABLE `gm_tickets` ADD `assignedto` int(10) NOT NULL default '0' AFTER `timestamp`; + + diff --git a/sql/updates/741_world.sql b/sql/updates/741_world.sql new file mode 100644 index 00000000000..da59a6d3633 --- /dev/null +++ b/sql/updates/741_world.sql @@ -0,0 +1,11 @@ +REPLACE INTO `command` (`name`,`security`,`help`) VALUES ('ticket list','1','Displays a list of open GM tickets.'); +REPLACE INTO `command` (`name`,`security`,`help`) VALUES ('ticket onlinelist','1','Displays a list of open GM tickets whose owner is online.'); +REPLACE INTO `command` (`name`,`security`,`help`) VALUES ('ticket viewname','1','Usage: .ticket viewname $creatorname. \r\nReturns details about specified ticket. Ticket must be open and not deleted.'); +REPLACE INTO `command` (`name`,`security`,`help`) VALUES ('ticket viewid','1','Usage: .ticket viewid $ticketid.\r\nReturns details about specified ticket. Ticket must be open and not deleted.'); +REPLACE INTO `command` (`name`,`security`,`help`) VALUES ('ticket close','2','Usage: .ticket close $ticketid.\r\nCloses the specified ticket. Does not delete permanently.'); +REPLACE INTO `command` (`name`,`security`,`help`) VALUES ('ticket delete','3','Usage: .ticket delete $ticketid.\r\nDeletes the specified ticket permanently. Ticket must be closed first.'); +REPLACE INTO `command` (`name`,`security`,`help`) VALUES ('ticket assign','3','Usage: .ticket assign $ticketid $gmname.\r\nAssigns the specified ticket to the specified Game Master.'); +REPLACE INTO `command` (`name`,`security`,`help`) VALUES ('ticket unassign','3','Usage: .ticket unassign $ticketid.\r\nUnassigns the specified ticket from the current assigned Game Master.'); +REPLACE INTO `command` (`name`,`security`,`help`) VALUES ('ticket comment','2','Usage: .ticket comment $ticketid $comment.\r\nAllows the adding or modifying of a comment to the specified ticket.'); +REPLACE INTO `command` (`name`,`security`,`help`) VALUES ('reload tickets','4','Usage: .reload tickets.\r\nReloads GM Tickets from the database and re-caches them into memory.'); + diff --git a/sql/updates/747_world.sql b/sql/updates/747_world.sql new file mode 100644 index 00000000000..561f0adf91d --- /dev/null +++ b/sql/updates/747_world.sql @@ -0,0 +1,2 @@ +UPDATE `trinity_string` SET `content_default`='Ticket %d is already assigned.' WHERE (`entry`='2008'); + diff --git a/sql/updates/748_world_scripts.sql b/sql/updates/748_world_scripts.sql new file mode 100644 index 00000000000..a9e079ec9e9 --- /dev/null +++ b/sql/updates/748_world_scripts.sql @@ -0,0 +1,3 @@ +update creature_template set scriptname='npc_infused_crystal', flags_extra=0 where entry=16364; +delete from creature where id=17086; + diff --git a/sql/updates/758_world_scripts.sql b/sql/updates/758_world_scripts.sql new file mode 100644 index 00000000000..cbb2a783264 --- /dev/null +++ b/sql/updates/758_world_scripts.sql @@ -0,0 +1,6 @@ +delete from creature_template_addon where entry = 17225; +update creature_template set scriptname = 'boss_nightbane', unit_flags=0 where entry = 17225; +delete from event_scripts where id = 10951; +insert into event_scripts values +(10951,0,10,17651,180000,0,-11159,-1907.22,91.48,0); + diff --git a/sql/updates/762_world.sql b/sql/updates/762_world.sql new file mode 100644 index 00000000000..7aaacedc464 --- /dev/null +++ b/sql/updates/762_world.sql @@ -0,0 +1,7 @@ +DROP TABLE IF EXISTS `transport_events`; +CREATE TABLE `transport_events` ( + `entry` int(11) unsigned NOT NULL default '0', + `waypoint_id` int(11) unsigned NOT NULL default '0', + `event_id` int(11) unsigned NOT NULL default '0' +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + diff --git a/sql/updates/764_world_scripts.sql b/sql/updates/764_world_scripts.sql new file mode 100644 index 00000000000..fb1d3a924c8 --- /dev/null +++ b/sql/updates/764_world_scripts.sql @@ -0,0 +1,124 @@ +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1533039 AND -1533000; +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1533000,'Ahh... welcome to my parlor.',8788,1,0,'anubrekhan SAY_GREET'), + (-1533001,'Just a little taste...',8785,1,0,'anubrekhan SAY_AGGRO1'), + (-1533002,'There is no way out.',8786,1,0,'anubrekhan SAY_AGGRO2'), + (-1533003,'Yes, Run! It makes the blood pump faster!',8787,1,0,'anubrekhan SAY_AGGRO3'), + (-1533004,'I hear little hearts beating. Yesss... beating faster now. Soon the beating will stop.',8790,1,0,'anubrekhan SAY_TAUNT1'), + (-1533005,'Where to go? What to do? So many choices that all end in pain, end in death.',8791,1,0,'anubrekhan SAY_TAUNT2'), + (-1533006,'Which one shall I eat first? So difficult to choose... the all smell so delicious.',8792,1,0,'anubrekhan SAY_TAUNT3'), + (-1533007,'Closer now... tasty morsels. I\'ve been too long without food. Without blood to drink.',8793,1,0,'anubrekhan SAY_TAUNT4'), + (-1533008,'Shh... it will all be over soon.',8789,1,0,'anubrekhan SAY_SLAY'), + (-1533009,'Your old lives, your mortal desires, mean nothing. You are acolytes of the master now, and you will serve the cause without question! The greatest glory is to die in the master\'s service!',8799,1,0,'faerlina SAY_GREET'), + (-1533010,'Slay them in the master\'s name!',8794,1,0,'faerlina SAY_AGGRO1'), + (-1533011,'You cannot hide from me!',8795,1,0,'faerlina SAY_AGGRO2'), + (-1533012,'Kneel before me, worm!',8796,1,0,'faerlina SAY_AGGRO3'), + (-1533013,'Run while you still can!',8797,1,0,'faerlina SAY_AGGRO4'), + (-1533014,'You have failed!',8800,1,0,'faerlina SAY_SLAY1'), + (-1533015,'Pathetic wretch!',8801,1,0,'faerlina SAY_SLAY2'), + (-1533016,'The master... will avenge me!',8798,1,0,'faerlina SAY_DEATH'), + (-1533017,'Patchwerk want to play!',8909,1,0,'patchwerk SAY_AGGRO1'), + (-1533018,'Kel\'Thuzad make Patchwerk his Avatar of War!',8910,1,0,'patchwerk SAY_AGGRO2'), + (-1533019,'No more play?',8912,1,0,'patchwerk SAY_SLAY'), + (-1533020,'What happened to... Patch...',8911,1,0,'patchwerk SAY_DEATH'), + (-1533021,'goes into a berserker rage!',0,2,0,'patchwerk EMOTE_BERSERK'), + (-1533022,'becomes enraged!',0,2,0,'patchwerk EMOTE_ENRAGE'), + (-1533023,'Stalagg crush you!',8864,1,0,'stalagg SAY_STAL_AGGRO'), + (-1533024,'Stalagg kill!',8866,1,0,'stalagg SAY_STAL_SLAY'), + (-1533025,'Master save me...',8865,1,0,'stalagg SAY_STAL_DEATH'), + (-1533026,'Feed you to master!',8802,1,0,'feugen SAY_FEUG_AGGRO'), + (-1533027,'Feugen make master happy!',8804,1,0,'feugen SAY_FEUG_SLAY'), + (-1533028,'No... more... Feugen...',8803,1,0,'feugen SAY_FEUG_DEATH'), + (-1533029,'You are too late... I... must... OBEY!',8872,1,0,'thaddius SAY_GREET'), + (-1533030,'KILL!',8867,1,0,'thaddius SAY_AGGRO1'), + (-1533031,'EAT YOUR BONES!',8868,1,0,'thaddius SAY_AGGRO2'), + (-1533032,'BREAK YOU!',8869,1,0,'thaddius SAY_AGGRO3'), + (-1533033,'You die now!',8877,1,0,'thaddius SAY_SLAY'), + (-1533034,'Now YOU feel pain!',8871,1,0,'thaddius SAY_ELECT'), + (-1533035,'Thank... you...',8870,1,0,'thaddius SAY_DEATH'), + (-1533036,'Pleeease!',8873,1,0,'thaddius SAY_SCREAM1'), + (-1533037,'Stop, make it stop!',8874,1,0,'thaddius SAY_SCREAM2'), + (-1533038,'Help me! Save me!',8875,1,0,'thaddius SAY_SCREAM3'), + (-1533039,'Please, nooo!',8876,1,0,'thaddius SAY_SCREAM4'); + +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1533074 AND -1533040; + INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES + (-1533040,'Foolishly you have sought your own demise. Brazenly you have disregarded powers beyond your understanding. You have fought hard to invade the realm of the harvester. Now there is only one way out - to walk the lonely path of the damned.',8807,1,0,'gothik SAY_SPEECH'), + (-1533041,'Death is the only escape.',8806,1,0,'gothik SAY_KILL'), + (-1533042,'I... am... undone!',8805,1,0,'gothik SAY_DEATH'), + (-1533043,'I have waited long enough! Now, you face the harvester of souls!',8808,1,0,'gothik SAY_TELEPORT'), + (-1533044,'Defend youself!',8892,1,0,'blaumeux SAY_BLAU_AGGRO'), + (-1533045,'Come, Zeliek, do not drive them out. Not before we\'ve had our fun.',8896,1,0,'blaumeux SAY_BLAU_TAUNT1'), + (-1533046,'I do hope they stay alive long enough for me to... introduce myself.',8897,1,0,'blaumeux SAY_BLAU_TAUNT2'), + (-1533047,'The first kill goes to me! Anyone care to wager?',8898,1,0,'blaumeux SAY_BLAU_TAUNT3'), + (-1533048,'Your life is mine!',8895,1,0,'blaumeux SAY_BLAU_SPECIAL'), + (-1533049,'Who\'s next?',8894,1,0,'blaumeux SAY_BLAU_SLAY'), + (-1533050,'Tou... che!',8893,1,0,'blaumeux SAY_BLAU_DEATH'), + (-1533051,'Come out and fight, ye wee ninny!',8899,1,0,'korthazz SAY_KORT_AGGRO'), + (-1533052,'To arms, ye roustabouts! We\'ve got company!',8903,1,0,'korthazz SAY_KORT_TAUNT1'), + (-1533053,'I heard about enough of yer sniveling. Shut yer fly trap \'afore I shut it for ye!',8904,1,0,'korthazz SAY_KORT_TAUNT2'), + (-1533054,'I\'m gonna enjoy killin\' these slack-jawed daffodils!',8905,1,0,'korthazz SAY_KORT_TAUNT3'), + (-1533055,'I like my meat extra crispy!',8901,1,0,'korthazz SAY_KORT_SPECIAl'), + (-1533056,'Next time, bring more friends!',8902,1,0,'korthazz SAY_KORT_SLAY'), + (-1533057,'What a bloody waste this is!',8900,1,0,'korthazz SAY_KORT_DEATH'), + (-1533058,'Flee, before it\'s too late!',8913,1,0,'zeliek SAY_ZELI_AGGRO'), + (-1533059,'Invaders, cease this foolish venture at once! Turn away while you still can!',8917,1,0,'zeliek SAY_ZELI_TAUNT1'), + (-1533060,'Perhaps they will come to their senses, and run away as fast as they can!',8918,1,0,'zeliek SAY_ZELI_TAUNT2'), + (-1533061,'Do not continue! Turn back while there\'s still time!',8919,1,0,'zeliek SAY_ZELI_TAUNT3'), + (-1533062,'I- I have no choice but to obey!',8916,1,0,'zeliek SAY_ZELI_SPECIAL'), + (-1533063,'Forgive me!',8915,1,0,'zeliek SAY_ZELI_SLAY'), + (-1533064,'It is... as it should be.',8914,1,0,'zeliek SAY_ZELI_DEATH'), + (-1533065,'You seek death?',14571,1,0,'rivendare_naxx SAY_RIVE_AGGRO1'), + (-1533066,'None shall pass!',14572,1,0,'rivendare_naxx SAY_RIVE_AGGRO2'), + (-1533067,'Be still!',14573,1,0,'rivendare_naxx SAY_RIVE_AGGRO3'), + (-1533068,'You will find no peace in death.',14574,1,0,'rivendare_naxx SAY_RIVE_SLAY1'), + (-1533069,'The master\'s will is done.',14575,1,0,'rivendare_naxx SAY_RIVE_SLAY2'), + (-1533070,'Bow to the might of the scourge!',14576,1,0,'rivendare_naxx SAY_RIVE_SPECIAL'), + (-1533071,'Enough prattling. Let them come! We shall grind their bones to dust.',14577,1,0,'rivendare_naxx SAY_RIVE_TAUNT1'), + (-1533072,'Conserve your anger! Harness your rage! You will all have outlets for your frustration soon enough.',14578,1,0,'rivendare_naxx SAY_RIVE_TAUNT2'), + (-1533073,'Life is meaningless. It is in death that we are truly tested.',14579,1,0,'rivendare_naxx SAY_RIVE_TAUNT3'), + (-1533074,'Death... will not stop me...',14580,1,0,'rivendare_naxx SAY_RIVE_DEATH'); + +UPDATE `creature_template` SET `ScriptName`='' WHERE `entry`=16062; +UPDATE `creature_template` SET `ScriptName`='boss_rivendare_naxx' WHERE `entry`=30549; + +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1533108 AND -1533075; + INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES + (-1533075,'Glory to the master!',8845,1,0,'noth SAY_AGGRO1'), + (-1533076,'Your life is forfeit!',8846,1,0,'noth SAY_AGGRO2'), + (-1533077,'Die, trespasser!',8847,1,0,'noth SAY_AGGRO3'), + (-1533078,'Rise, my soldiers! Rise and fight once more!',8851,1,0,'noth SAY_SUMMON'), + (-1533079,'My task is done!',8849,1,0,'noth SAY_SLAY1'), + (-1533080,'Breathe no more!',8850,1,0,'noth SAY_SLAY2'), + (-1533081,'I will serve the master... in... death!',8848,1,0,'noth SAY_DEATH'), + (-1533082,'takes in a deep breath...',0,2,0,'sapphiron EMOTE_BREATH'), + (-1533083,'enrages!',0,2,0,'sapphiron EMOTE_ENRAGE'), + (-1533084,'Our preparations continue as planned, master.',14467,1,0,'kelthuzad SAY_SAPP_DIALOG1'), + (-1533085,'It is good that you serve me so faithfully. Soon, all will serve the Lich King and in the end, you shall be rewarded...so long as you do not falter.',8881,1,0,'kelthuzad SAY_SAPP_DIALOG2_LICH'), + (-1533086,'I see no complications... Wait... What is this?',14468,1,0,'kelthuzad SAY_SAPP_DIALOG3'), + (-1533087,'Your security measures have failed! See to this interruption immediately!',8882,1,0,'kelthuzad SAY_SAPP_DIALOG4_LICH'), + (-1533088,'Yes, master!',14469,1,0,'kelthuzad SAY_SAPP_DIALOG5'), + (-1533089,'No!!! A curse upon you, interlopers! The armies of the Lich King will hunt you down. You will not escape your fate...',14484,1,0,'kelthuzad SAY_CAT_DIED'), + (-1533090,'Who dares violate the sanctity of my domain? Be warned, all who trespass here are doomed.',14463,1,0,'kelthuzad SAY_TAUNT1'), + (-1533091,'Fools, you think yourselves triumphant? You have only taken one step closer to the abyss! ',14464,1,0,'kelthuzad SAY_TAUNT2'), + (-1533092,'I grow tired of these games. Proceed, and I will banish your souls to oblivion!',14465,1,0,'kelthuzad SAY_TAUNT3'), + (-1533093,'You have no idea what horrors lie ahead. You have seen nothing! The frozen heart of Naxxramas awaits you!',14466,1,0,'kelthuzad SAY_TAUNT4'), + (-1533094,'Pray for mercy!',14475,1,0,'kelthuzad SAY_AGGRO1'), + (-1533095,'Scream your dying breath!',14476,1,0,'kelthuzad SAY_AGGRO2'), + (-1533096,'The end is upon you!',14477,1,0,'kelthuzad SAY_AGGRO3'), + (-1533097,'The dark void awaits you!',14478,1,0,'kelthuzad SAY_SLAY1'), + (-1533098,'<Kel\'Thuzad cackles maniacally!>',14479,1,0,'kelthuzad SAY_SLAY2'), + (-1533099,'AAAAGHHH!... Do not rejoice... your victory is a hollow one... for I shall return with powers beyond your imagining!',14480,1,0,'kelthuzad SAY_DEATH'), + (-1533100,'Your soul, is bound to me now!',14472,1,0,'kelthuzad SAY_CHAIN1'), + (-1533101,'There will be no escape!',14473,1,0,'kelthuzad SAY_CHAIN2'), + (-1533102,'I will freeze the blood in your veins!',14474,1,0,'kelthuzad SAY_FROST_BLAST'), + (-1533103,'Master! I require aid! ',14470,1,0,'kelthuzad SAY_REQUEST_AID'), + (-1533104,'Very well... warriors of the frozen wastes, rise up! I command you to fight, kill, and die for your master. Let none survive...',0,1,0,'kelthuzad SAY_ANSWER_REQUEST'), + (-1533105,'Minions, servants, soldiers of the cold dark, obey the call of Kel\'Thuzad!',14471,1,0,'kelthuzad SAY_SUMMON_MINIONS'), + (-1533106,'Your petty magics are no challenge to the might of the Scourge! ',14481,1,0,'kelthuzad SAY_SPECIAL1_MANA_DET'), + (-1533107,'Enough! I grow tired of these distractions! ',14483,1,0,'kelthuzad SAY_SPECIAL3_MANA_DET'), + (-1533108,'Fools, you have spread your powers too thin. Be free, my minions!',14482,1,0,'kelthuzad SAY_SPECIAL2_DISPELL'); + + UPDATE `script_texts` SET `sound`=8902 WHERE `entry`=-1533055; + UPDATE `script_texts` SET `sound`=8901 WHERE `entry`=-1533056; + diff --git a/sql/updates/765_world_scripts.sql b/sql/updates/765_world_scripts.sql new file mode 100644 index 00000000000..2cd56fa71a2 --- /dev/null +++ b/sql/updates/765_world_scripts.sql @@ -0,0 +1,20 @@ +UPDATE `creature_template` SET `flags_extra` = 0 WHERE `entry` = 20129; + +-- Insert English and French dialogs in database +DELETE FROM `script_texts` WHERE entry BETWEEN -1000150 and -1000163; +INSERT INTO `script_texts` (`entry`, `content_default`, `content_loc2`, `type`, `language`, `comment`) VALUES +(-1000150, 'Greetings, $N. I will guide you through the cavern. Please try and keep up.', 'Salutations, $N. Je vais vous guider à travers cette grotte. Veuillez me suivre.', 4, 0, 'WHISPER_CUSTODIAN_1'), +(-1000151, 'We do not know if the Caverns of Time have always been accessible to mortals. Truly, it is impossible to tell as the Timeless One is in perpetual motion, changing our timeways as he sees fit. What you see now may very well not exist tomorrow. You may wake up and have no memory of this place.', 'Nous ne savons pas si les Grottes du Temps ont toujours été accessibles aux mortels. Vraiment, c\'est impossible à dire étant donné que l\'Intemporel est en mouvement perpétuel, changeant nos spirales temporelles comme bon lui semble. Ce que vous voyez aujourd\'hui peut très bien ne plus exister demain. Vous pourriez vous réveiller sans aucun souvenir de cet endroit.', 4, 0, 'WHISPER_CUSTODIAN_2'), +(-1000152, 'It is strange, I know... Most mortals cannot actually comprehend what they see here, as often, what they see is not anchored within their own perception of reality.', 'C\'est étrange, je sais... La plupart des mortels ne peuvent pas réellement comprendre ce qu\ils voient ici, comme souvent, ce qu\'ils voient n\'est pas ancré dans leur propre perception de la réalité.', 4, 0, 'WHISPER_CUSTODIAN_3'), +(-1000153, 'Follow me, please.', 'Veuillez me suivre.', 4, 0, 'WHISPER_CUSTODIAN_4'), +(-1000154, 'There are only two truths to be found here: First, that time is chaotic, always in flux, and completely malleable and second, perception does not dictate reality.', 'Il n\'y a que deux vérités qui peuvent être trouvées ici : premièrement, ce temps est chaotique, toujours en mouvement, et complètement malléable, et ensuite, la perception ne détermine pas la réalité.', 4, 0, 'WHISPER_CUSTODIAN_5'), +(-1000155, 'As custodians of time, we watch over and care for Nozdormu\'s realm. The master is away at the moment, which means that attempts are being made to dramatically alter time. The master never meddles in the affairs of mortals but instead corrects the alterations made to time by others. He is reactionary in this regard.', 'En tant que protecteurs du temps, nous observons et veillons sur le royaume de Nozdormu. Le maître est absent en ce moment, ce qui signifie que des tentatives sont faites pour altérer fortement le temps. Le maître ne se mêle jamais des affaires des mortels mais il corrige les altérations faites au temps par d\'autres. Il est réactionnaire à cet égard.', 4, 0, 'WHISPER_CUSTODIAN_6'), +(-1000156, 'For normal maintenance of time, the Keepers of Time are sufficient caretakers. We are able to deal with most ordinary disturbances. I speak of little things, such as rogue mages changing something in the past to elevate their status or wealth in the present.', 'Pour le maintien normal du temps, les Gardiens du temps suffisent à la tâche. Nous sommes capables de gérer les perturbations les plus ordinaires. Je parle de petites choses, comme des mages voleurs qui changent quelque chose dans le passé pour élever leur statut ou leur richesse dans le présent.', 4, 0, 'WHISPER_CUSTODIAN_7'), +(-1000157, 'These tunnels that you see are called timeways. They are infinite in number. The ones that currently exist in your reality are what the master has deemed as \'trouble spots.\' These trouble spots may differ completely in theme but they always share a cause. That is, their existence is a result of the same temporal disturbance. Remember that should you venture inside one...', 'Ces tunnels que vous voyez sont appelés Voies Temporelles. Leur nombre est infini. Ceux qui existent actuellement dans votre réalité sont ceux que le maître a considérés comme \'points sensibles\'. Ces points sensibles peuvent différer complètement de part leur thème, mais partagent toujours une cause. C\'est-à-dire, leur existence est le résultat des mêmes perturbations temporelles. Rappelez-vous en si vous osez vous aventurer dans l\'un d\'eux...', 4, 0, 'WHISPER_CUSTODIAN_8'), +(-1000158, 'This timeway is in great disarray! We have agents inside right now attempting to restore order. What information I have indicates that Thrall\'s freedom is in jeopardy. A malevolent organization known as the Infinite Dragonflight is trying to prevent his escape. I fear without outside assistance, all will be lost.', 'Cette voie temporelle est en grand désarroi ! Nous avons actuellement des agents à l\intérieur qui tentent de restaurer l\'ordre. Les informations que j\'ai indiquent que la liberté de Thrall est en péril. Une organisation malveillante connue sous le nom de Vol du Dragon Infini essaye d\'empêcher son évasion. J\'ai peur que sans assistance extérieure, tout soit perdu.', 4, 0, 'WHISPER_CUSTODIAN_9'), +(-1000159, 'We have very little information on this timeway. Sa\'at has been dispatched and is currently inside. The data we have gathered from his correspondence is that the Infinite Dragonflight are once again attempting to alter time. Could it be that the opening of the Dark Portal is being targeted for sabotage? Let us hope not...', 'Nous avons très peu d\'informations sur cette voie. Sa\'at a été envoyé et est actuellement sur place. Les données que nous avons recueillies de sa correspondance est que le Vol du Dragon Infini tente une fois de plus d\'altérer le temps. Se pourrait-il que l\'ouverture de la Porte des Ténèbres soit la cible d\'un sabotage. Espérons que non...', 4, 0, 'WHISPER_CUSTODIAN_10'), +(-1000160, 'This timeway is currently collapsing. What that may hold for the past, present and future is currently unknown...', 'Cette voie est en train de s\'effondrer. Ce qu\'elle peut avoir contenu dans le passé, le présent et le futur nous est actuellement inconnu...', 4, 0, 'WHISPER_CUSTODIAN_11'), +(-1000161, 'The timeways are currently ranked in order from least catastrophic to most catastrophic. Note that they are all classified as catastrophic, meaning that any single one of these timeways collapsing would mean that your world would end. We only classify them in such a way so that the heroes and adventurers that are sent here know which timeway best suits their abilities.', 'Les voies sont pour le moment classées de la moins catastrophique à la plus catastrophique, ce qui veut dire que la moindre de celles-ci qui s\'effondre signifierait la fin de votre monde. Nous les classons seulement de cette façon pour que les héros et aventuriers qui y sont envoyés sachent quelle voie est la plus adaptée à leurs compétences.', 4, 0, 'WHISPER_CUSTODIAN_12'), +(-1000162, 'All we know of this timeway is that it leads to Mount Hyjal. The Infinite Dragonflight have gone to great lengths to prevent our involvement. We know next to nothing, mortal. Soridormi is currently attempting to break through the timeway\'s defenses but has thus far been unsuccessful. You might be our only hope of breaking through and resolving the conflict.', 'Tout ce que nous savons sur cette voie temporelle est qu\'elle mène au Mont Hyjal. Le Vol du Dragon Infini s\'est donné beaucoup de peine pour empêcher notre participation. Soridormi est actuellement en train de tenter de briser les défenses de cette voie, mais ses efforts ont été vain jusqu\'ici. Vous pourriez être notre seul espoir de les briser et de résoudre le conflit.', 4, 0, 'WHISPER_CUSTODIAN_13'), +(-1000163, 'Our time is at an end $N. I would wish you luck, if such a thing existed.', 'Notre entretien touche à sa fin, $N. Je vous souhaite bonne chance, si tant est qu\'une telle chose a jamais existé.', 4, 0, 'WHISPER_CUSTODIAN_14'); + diff --git a/sql/updates/773_world_scripts.sql b/sql/updates/773_world_scripts.sql new file mode 100644 index 00000000000..962905c0f65 --- /dev/null +++ b/sql/updates/773_world_scripts.sql @@ -0,0 +1,10 @@ +Update quest_template set SpecialFlags=2 where entry=4770; +UPDATE `creature_template` SET `ScriptName` = 'npc_swiftmountain' WHERE `entry` = 10427; +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000149 AND -1000147; +INSERT INTO script_texts + (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`, `sound`, `type`, `language`, `comment`) +VALUES + (-1000147, 'Lets go $N. I am ready to start to Whitereach Post.', NULL, NULL, 'Gehen wir $N.Ich bin bereit,mich zum Weissgipfelposten aufzumachen.', NULL, NULL, NULL, NULL, NULL, 0, 0, 0, NULL), + (-1000148, 'This seems to me trusted. If we move to the east, we are probably... Aah! Wyvern attack !', NULL, NULL, 'Das kommt mir vertraut vor.Wenn wir nach Osten ziehen,können wir wahrscheinlich...Aah!Flügeldrachen im Angriff!', NULL, NULL, NULL, NULL, NULL, 0, 0, 0, NULL), + (-1000149, 'Thanks so much... From here I find the way back to the Whitereach Post. Speak with Motega Firemane, maybe you can persuade him to send me home.', NULL, NULL, 'Tausend Dank...Von hier aus finde ich den Rückweg zum Weissgipfelposten.Sprecht unbedingt mit Motega Feuermähne,vielleicht könnt ihr ihn überreden,mich nach Hause zu schicken.', NULL, NULL, NULL, NULL, NULL, 0, 0, 0, NULL); + diff --git a/sql/updates/780_characters.sql b/sql/updates/780_characters.sql new file mode 100644 index 00000000000..40c4d3cdce4 --- /dev/null +++ b/sql/updates/780_characters.sql @@ -0,0 +1,3 @@ +ALTER TABLE `gm_tickets` CHANGE `guid` `guid` int(10) NOT NULL AUTO_INCREMENT; +ALTER TABLE `gm_tickets` CHANGE `closed` `closed` int(10) NOT NULL; + diff --git a/sql/updates/783_world.sql b/sql/updates/783_world.sql new file mode 100644 index 00000000000..f78f35e2951 --- /dev/null +++ b/sql/updates/783_world.sql @@ -0,0 +1,5 @@ +DELETE FROM trinity_string where entry IN (10056, 10057); +INSERT INTO trinity_string (entry, content_default) VALUES +(10056, 'You must be a member of the Horde to enter the Hall of Legends.'), +(10057, 'You must be a member of the Alliance to enter the Champion\'s Hall.'); + diff --git a/sql/updates/785_world.sql b/sql/updates/785_world.sql new file mode 100644 index 00000000000..b4c11653a25 --- /dev/null +++ b/sql/updates/785_world.sql @@ -0,0 +1,5 @@ +delete from command where name in ('gobject addtemp', 'npc addtemp'); +insert into command (name, security, help) values +('gobject addtemp','2','Adds a temporary gameobject that is not saved to DB.'), +('npc addtemp','2','Adds temporary NPC, not saved to database.'); + diff --git a/sql/updates/789_world.sql b/sql/updates/789_world.sql new file mode 100644 index 00000000000..43e6bdc42d2 --- /dev/null +++ b/sql/updates/789_world.sql @@ -0,0 +1,2 @@ +ALTER TABLE eventai_texts DROP COLUMN emote; + diff --git a/sql/updates/78_world.sql b/sql/updates/78_world.sql new file mode 100644 index 00000000000..4a9cbd3846d --- /dev/null +++ b/sql/updates/78_world.sql @@ -0,0 +1,24 @@ +DELETE FROM spell_affect WHERE entry IN (30017,30280,44373) AND effectId = 0; +INSERT INTO spell_affect (entry, effectId, SpellFamilyMask) VALUES +(30017,0,0x0000000000000000), +(30280,0,0x0000000000000000), +(44373,0,0x0000000000000000); + +DELETE FROM spell_affect WHERE entry IN (34520,37508) AND effectId = 1; +INSERT INTO spell_affect (entry, effectId, SpellFamilyMask) VALUES +(34520,1,0x0000000000000000), +(37508,1,0x0000000000000000); + +DELETE FROM spell_proc_event WHERE entry IN (34139,42368,43726,46092); +INSERT INTO spell_proc_event (entry, SchoolMask, Category, SkillID, SpellFamilyName, SpellFamilyMask, procFlags, ppmRate, cooldown) VALUES +(34139,0,0,0,10,0x0000000040000000,0x08000000,0,0), +(42368,0,0,0,10,0x0000000040000000,0x08000000,0,0), +(43726,0,0,0,10,0x0000000040000000,0x08000000,0,0), +(46092,0,0,0,10,0x0000000040000000,0x08000000,0,0); + +DELETE FROM spell_proc_event where entry IN (34598, 34584, 36488); +INSERT INTO spell_proc_event (entry, SchoolMask, Category, SkillID, SpellFamilyName, SpellFamilyMask, procFlags, ppmRate, cooldown) VALUES +(34598,0,0,0,0,0x0000000000000000,0x00020000,0,45), +(36488,0,0,0,0,0x0000000000000000,0x08000000,0,0), +(34584,0,0,0,0,0x0000000000000000,0x00004000,0,30); + diff --git a/sql/updates/79_characters.sql b/sql/updates/79_characters.sql new file mode 100644 index 00000000000..c7b76549e74 --- /dev/null +++ b/sql/updates/79_characters.sql @@ -0,0 +1,3 @@ +ALTER TABLE characters + CHANGE COLUMN gmstate extra_flags int(11) unsigned NOT NULL default '0'; + diff --git a/sql/updates/79_world.sql b/sql/updates/79_world.sql new file mode 100644 index 00000000000..1b5be949cf2 --- /dev/null +++ b/sql/updates/79_world.sql @@ -0,0 +1,4 @@ +DELETE FROM spell_proc_event where entry = 42083; +INSERT INTO spell_proc_event (entry, SchoolMask, Category, SkillID, SpellFamilyName, SpellFamilyMask, procFlags, ppmRate, cooldown) VALUES +(42083,0,0,0,0,0x0000000000000000,0x00401000,0,45); + diff --git a/sql/updates/807_world_scripts.sql b/sql/updates/807_world_scripts.sql new file mode 100644 index 00000000000..ee512619ee1 --- /dev/null +++ b/sql/updates/807_world_scripts.sql @@ -0,0 +1,2 @@ +update creature_template set scriptname='npc_isla_starmane' where entry=18760; + diff --git a/sql/updates/817_world_scripts.sql b/sql/updates/817_world_scripts.sql new file mode 100644 index 00000000000..071fb2989ff --- /dev/null +++ b/sql/updates/817_world_scripts.sql @@ -0,0 +1,14 @@ +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000205 AND -1000200; +INSERT INTO script_texts + (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`, `sound`, `type`, `language`, `emote`, `comment`) +VALUES + (-1000200, 'A-Me good.Good A-me.Follow...A-ME follow.Home.A-ME go home.', NULL, NULL, 'A-ME gut.Gut A-Me.Folgen...Heim.A-ME geht heim.', NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, NULL), + (-1000201, 'Bad Un´Goro Stomper.Stomper evil.', NULL, NULL, 'Böser Stampfer von Un´Goro. Stampfer von Un´Goro böse.', NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, NULL), + (-1000202, 'Good..good,A-ME. Home. Search way.', NULL, NULL, 'Gut...gut.A-ME.A-ME gut.Heim.Heim suchen.', NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, NULL), + (-1000203, 'A-Me home.A-ME go home!Tar Lord dont disturb A-ME.', NULL, NULL, 'A-ME daheim.A-ME geht heim!Teerfürst A-ME nicht aufhalten.', NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, NULL), + (-1000204, 'Tar Lord A-ME no hurt.A-ME good.', NULL, NULL, 'Teerfürst A-ME nicht wehtun.A-ME gut.', NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, NULL), + (-1000205, 'A-ME at home!A-ME good!Good A-ME.At home.Home.Home', NULL, NULL, 'A-ME daheim!A-ME gut!Gute A-ME.Daheim.Daheim.Daheim', NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, NULL); +UPDATE `quest_template` SET `QuestFlags` = 2, `SpecialFlags` = 2 WHERE `entry` = 4245; + +UPDATE `creature_template` SET `ScriptName` = 'npc_ame' WHERE `entry` = 9623; + diff --git a/sql/updates/822_world_scripts.sql b/sql/updates/822_world_scripts.sql new file mode 100644 index 00000000000..117971d18a7 --- /dev/null +++ b/sql/updates/822_world_scripts.sql @@ -0,0 +1,4 @@ +update creature_template set scriptname='npc_kayra_longmane' where entry=17969; +delete from creature_template_addon where entry=17969; +update quest_template set specialflags=2 where entry=9752; + diff --git a/sql/updates/826_world_scripts.sql b/sql/updates/826_world_scripts.sql new file mode 100644 index 00000000000..7dc2cf77afa --- /dev/null +++ b/sql/updates/826_world_scripts.sql @@ -0,0 +1,2 @@ +UPDATE `creature_template` SET `ScriptName` = 'npc_ruul_snowhoof' WHERE `entry` = 12818; + diff --git a/sql/updates/82_world_scripts.sql b/sql/updates/82_world_scripts.sql new file mode 100644 index 00000000000..276a3385ed6 --- /dev/null +++ b/sql/updates/82_world_scripts.sql @@ -0,0 +1,2 @@ +UPDATE `creature_template` SET `ScriptName` = 'npc_twiggy_flathead' WHERE `entry` =6248; + diff --git a/sql/updates/833_world_scripts.sql b/sql/updates/833_world_scripts.sql new file mode 100644 index 00000000000..b8aed954f43 --- /dev/null +++ b/sql/updates/833_world_scripts.sql @@ -0,0 +1,3 @@ +update creature_template set scriptname='npc_dirty_larry', unit_flags=0, flags_extra=0 where entry=19720; +update creature_template set unit_flags=0, flags_extra=0 where entry in (19726, 19725); + diff --git a/sql/updates/834_world_scripts.sql b/sql/updates/834_world_scripts.sql new file mode 100644 index 00000000000..0b34f8be52f --- /dev/null +++ b/sql/updates/834_world_scripts.sql @@ -0,0 +1,2 @@ +UPDATE `creature_template` SET `ScriptName`='npc_ishanah' WHERE `entry`=18538; + diff --git a/sql/updates/837_world_scripts.sql b/sql/updates/837_world_scripts.sql new file mode 100644 index 00000000000..810bd3510e0 --- /dev/null +++ b/sql/updates/837_world_scripts.sql @@ -0,0 +1,2 @@ +update creature_template set scriptname='npc_khadgar' where entry=18166; + diff --git a/sql/updates/838_world_scripts.sql b/sql/updates/838_world_scripts.sql new file mode 100644 index 00000000000..1ff400dc8c5 --- /dev/null +++ b/sql/updates/838_world_scripts.sql @@ -0,0 +1,5 @@ +delete from spell_script_target where entry=42222; +insert into `spell_script_target` values +('42222','1','23616'); +update `creature_template` set `scriptname`='npc_kyle_frenzied' where `entry`='23616'; + diff --git a/sql/updates/839_world_scripts.sql b/sql/updates/839_world_scripts.sql new file mode 100644 index 00000000000..448cd44ca1e --- /dev/null +++ b/sql/updates/839_world_scripts.sql @@ -0,0 +1,2 @@ +update creature_template set scriptname='npc_wizzlecrank_shredder' where entry=3439; + diff --git a/sql/updates/83_realmd.sql b/sql/updates/83_realmd.sql new file mode 100644 index 00000000000..5c47beaabc8 --- /dev/null +++ b/sql/updates/83_realmd.sql @@ -0,0 +1,3 @@ +ALTER TABLE account + CHANGE COLUMN tbc expansion tinyint(3) unsigned NOT NULL default '0'; + diff --git a/sql/updates/840_world_scripts.sql b/sql/updates/840_world_scripts.sql new file mode 100644 index 00000000000..8a334a578e1 --- /dev/null +++ b/sql/updates/840_world_scripts.sql @@ -0,0 +1,2 @@ +UPDATE `creature_template` SET `spell1` = 0, `flags_extra` = 0, `ScriptName` = 'npc_volcano' WHERE `entry` = 23085; + diff --git a/sql/updates/841_world_scripts.sql b/sql/updates/841_world_scripts.sql new file mode 100644 index 00000000000..dac0cbd9857 --- /dev/null +++ b/sql/updates/841_world_scripts.sql @@ -0,0 +1,2 @@ +update creature_template set scriptname='npc_greengill_slave' where entry=25084; + diff --git a/sql/updates/842_world.sql b/sql/updates/842_world.sql new file mode 100644 index 00000000000..9f40ed71751 --- /dev/null +++ b/sql/updates/842_world.sql @@ -0,0 +1,6 @@ +ALTER TABLE `areatrigger_teleport` +ADD `heroic_required_quest_done` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT 0 AFTER `heroic_key2`, +ADD `heroic_required_failed_quest_text` TEXT NULL DEFAULT NULL AFTER `heroic_required_quest_done`; + +UPDATE `areatrigger_teleport` SET `heroic_required_quest_done` = 11492, `heroic_required_failed_quest_text` = 'Heroic Difficulty requires completion of the "Hard to Kill" quest.' WHERE `id` = 4887; + diff --git a/sql/updates/84_world.sql b/sql/updates/84_world.sql new file mode 100644 index 00000000000..2dd20fd44bf --- /dev/null +++ b/sql/updates/84_world.sql @@ -0,0 +1,4 @@ +DELETE FROM command WHERE name = 'reload all_locales'; +INSERT INTO `command` VALUES +('reload all_locales',3,'Syntax: .reload all_locales\r\n\r\nReload all `locales_*` tables with reload support added and that can be _safe_ reloaded.'); + diff --git a/sql/updates/850_world_scripts.sql b/sql/updates/850_world_scripts.sql new file mode 100644 index 00000000000..e830d53f933 --- /dev/null +++ b/sql/updates/850_world_scripts.sql @@ -0,0 +1,2 @@ +UPDATE creature_template SET ScriptName = 'npc_bessy' WHERE entry = 20415; + diff --git a/sql/updates/852_world_scripts.sql b/sql/updates/852_world_scripts.sql new file mode 100644 index 00000000000..3fcdfc1f3c9 --- /dev/null +++ b/sql/updates/852_world_scripts.sql @@ -0,0 +1,3 @@ +update creature_template set scriptname='mob_nestlewood_owlkin' where entry=16518; +update item_template set scriptname='item_inoculating_crystal' where entry=22962; + diff --git a/sql/updates/857_world_scripts.sql b/sql/updates/857_world_scripts.sql new file mode 100644 index 00000000000..78452693d44 --- /dev/null +++ b/sql/updates/857_world_scripts.sql @@ -0,0 +1,2 @@ +update creature_template set scriptname='npc_kaya_flathoof' where entry=11856; + diff --git a/sql/updates/863_world_scripts.sql b/sql/updates/863_world_scripts.sql new file mode 100644 index 00000000000..1c760bd5bb8 --- /dev/null +++ b/sql/updates/863_world_scripts.sql @@ -0,0 +1,13 @@ +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1060005 AND -1060000; +INSERT INTO script_texts + (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`, `sound`, `type`, `language`, `emote`, `comment`) +VALUES + (-1060000, 'Emergency power activated! Initializing ambulatory motor! CLUCK!', NULL, NULL, 'Notfallenergie aktiviert! Ambulatorenantrieb wird gestartet! GLUCK!', NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, NULL), + (-1060001, 'Physical threat detected! Evasive action! CLUCK!', NULL, NULL, 'Körperliche Bedrohung entdeckt! Ausweichmanöver! GLUCK!', NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, NULL), + (-1060002, 'Threat analyzed! Activating combat plan beta! CLUCK!', NULL, NULL, 'Bedrohung analysiert! Gefechtsplan Beta wird aktiviert! GLUCK!', NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, NULL), + (-1060003, 'CLUCK! Sensors detect spatial anomaly -- danger imminent! CLUCK', NULL, NULL, 'GLUCK! Sensoren haben räumliche Anomalie entdeckt - Gefahr im Verzug! GLUCK!', NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, NULL), + (-1060004, 'No one challenges the wastevander nomads -- not even robotic chickens! ATTACK!', NULL, NULL, 'Niemand fordert die Wüsenläufernomaden heraus - auch keine Robothühner! ANGRIFF!', NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, NULL), + (-1060005, 'Cloaking systems online! CLUCK! Engaging cloak for transport to Booty Bay!', NULL, NULL, 'Tarnsysteme online! GLUCK! Tarnung für Transport nach Beutebucht wird aktiviert.', NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, NULL); + +UPDATE `creature_template` SET `ScriptName` = 'npc_OOX17' WHERE `entry` = 7784; + diff --git a/sql/updates/86_world_scripts.sql b/sql/updates/86_world_scripts.sql new file mode 100644 index 00000000000..d3c17926ac7 --- /dev/null +++ b/sql/updates/86_world_scripts.sql @@ -0,0 +1,7 @@ +update `creature_template` set `ScriptName`='boss_alar' where `entry`='19514'; +update `creature_template` set `ScriptName`='mob_ember_of_alar' where `entry`='19551'; +update `creature_template` set `ScriptName`='mob_flame_patch_alar' where `entry`='20602'; + +update gameobject_template set scriptname = "go_manticron_cube" where entry = 181713; +update creature_template set scriptname = "mob_abyssal" where entry = 17454; + diff --git a/sql/updates/871_world.sql b/sql/updates/871_world.sql new file mode 100644 index 00000000000..0f4fa4245e7 --- /dev/null +++ b/sql/updates/871_world.sql @@ -0,0 +1,32 @@ +DELETE FROM `trinity_string` WHERE `entry` BETWEEN '288' AND '295'; +DELETE FROM `trinity_string` WHERE `entry` BETWEEN '2000' AND '2029'; +INSERT INTO trinity_string (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`) VALUES +(2000, '|cff00ff00New ticket from|r|cffff00ff %s.|r |cff00ff00Ticket entry:|r|cffff00ff %d.|r', '', '', '', '', '', '', '', ''), +(2001, '|cff00ff00Character|r|cffff00ff %s |r|cff00ff00edited his/her ticket:|r|cffff00ff %d.|r', '', '', '', '', '', '', '', ''), +(2002, '|cff00ff00Character|r|cffff00ff %s |r|cff00ff00abandoned ticket entry:|r|cffff00ff %d.|r', '', '', '', '', '', '', '', ''), +(2003, '|cff00ff00Closed by|r:|cff00ccff %s|r ', '', '', '', '', '', '', '', ''), +(2004, '|cff00ff00Deleted by|r:|cff00ccff %s|r ', '', '', '', '', '', '', '', ''), +(2005, 'Ticket not found.', '', '', '', '', '', '', '', ''), +(2006, 'Please close ticket before deleting it permanently.', '', '', '', '', '', '', '', ''), +(2007, 'Ticket %d is already assigned.', '', '', '', '', '', '', '', ''), +(2008, '%u Tickets succesfully reloaded from the database.', '', '', '', '', '', '', '', ''), +(2009, 'Showing list of open tickets.', '', '', '', '', '', '', '', ''), +(2010, 'Showing list of open tickets whose creator is online.', '', '', '', '', '', '', '', ''), +(2011, 'Showing list of closed tickets.', '', '', '', '', '', '', '', ''), +(2012, 'Invalid name specified. Name should be that of an online Gamemaster.', '', '', '', '', '', '', '', ''), +(2013, 'This ticket is already assigned to yourself. To unassign use .ticket unassign %d and then reassign.', '', '', '', '', '', '', '', ''), +(2014, 'Ticket %d is not assigned, you cannot unassign it.', '', '', '', '', '', '', '', ''), +(2015, 'You cannot unassign tickets from staffmembers with a higher security level than yourself.', '', '', '', '', '', '', '', ''), +(2016, 'Cannot close ticket %d, it is assigned to another GM.', '', '', '', '', '', '', '', ''), +(2017, '|cff00ff00Ticket|r:|cff00ccff %d.|r ', '', '', '', '', '', '', '', ''), +(2018, '|cff00ff00Created by|r:|cff00ccff %s|r ', '', '', '', '', '', '', '', ''), +(2019, '|cff00ff00Last change|r:|cff00ccff %s ago|r ', '', '', '', '', '', '', '', ''), +(2020, '|cff00ff00Assigned to|r:|cff00ccff %s|r ', '', '', '', '', '', '', '', ''), +(2021, '|cff00ff00Unassigned by|r:|cff00ccff %s|r ', '', '', '', '', '', '', '', ''), +(2022, '\n|cff00ff00Message|r: \"%s\"|r ', '', '', '', '', '', '', '', ''), +(2023, '\n|cff00ff00Comment|r: \"%s\"|r ', '', '', '', '', '', '', '', ''), +(2024, '\n|cff00ccff%s|r |cff00ff00Added comment|r: \"%s\"|r ', '', '', '', '', '', '', '', ''); + +DELETE FROM `command` WHERE (`name` LIKE '%ticket closedlist%'); +INSERT INTO `command` (`name`,`security`,`help`) VALUES ('.ticket closedlist','1','Displays a list of closed GM tickets.'); + diff --git a/sql/updates/884_world.sql b/sql/updates/884_world.sql new file mode 100644 index 00000000000..cbcf89192bb --- /dev/null +++ b/sql/updates/884_world.sql @@ -0,0 +1,5 @@ +delete from command where name in ('gobject tempadd','npc tempadd'); +insert into command (name, security, help) values +('gobject addtemp','2','Adds a temporary gameobject that is not saved to DB.'), +('npc addtemp','2','Adds temporary NPC, not saved to database.'); + diff --git a/sql/updates/905_world_scripts.sql b/sql/updates/905_world_scripts.sql new file mode 100644 index 00000000000..aa52204e643 --- /dev/null +++ b/sql/updates/905_world_scripts.sql @@ -0,0 +1,11 @@ +UPDATE `creature_template` SET `ScriptName`='npc_grimstone' WHERE `entry`=10096; +UPDATE `creature_template` SET `ScriptName`='mob_phalanx' WHERE `entry`=9502; +UPDATE `creature_template` SET `ScriptName`='npc_rocknot' WHERE `entry`=9503; + +DELETE FROM `areatrigger_scripts` WHERE `entry`=1526; +INSERT INTO `areatrigger_scripts` VALUES (1526,'at_ring_of_law'); + +DELETE FROM `script_texts` WHERE `entry`=-1230000; +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +(-1230000,'Ah, hits the spot!',0,0,0,'rocknot SAY_GOT_BEER'); + diff --git a/sql/updates/90_world.sql b/sql/updates/90_world.sql new file mode 100644 index 00000000000..529de4f712e --- /dev/null +++ b/sql/updates/90_world.sql @@ -0,0 +1,8 @@ +DROP TABLE IF EXISTS `spell_disabled`; +CREATE TABLE `spell_disabled` ( + `entry` int(11) unsigned NOT NULL default '0' COMMENT 'Spell entry', + `disable_mask` int(8) unsigned NOT NULL default '0', + `comment` varchar(64) NOT NULL default '', + PRIMARY KEY (`entry`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Disabled Spell System'; + diff --git a/sql/updates/917_world.sql b/sql/updates/917_world.sql new file mode 100644 index 00000000000..556276fa012 --- /dev/null +++ b/sql/updates/917_world.sql @@ -0,0 +1,9 @@ +CREATE TABLE `version` ( + `core_version` varchar(120) default NULL COMMENT 'Core revision dumped at startup.', + `db_version` varchar(120) default NULL COMMENT 'Version of world DB.', + `script_version` varchar(120) default NULL COMMENT 'Version of scripts DB.' +) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Version Notes'; +INSERT INTO version (core_version, db_version, script_version) VALUES ("",(SELECT version FROM db_version),(SELECT version FROM script_db_version)); +DROP TABLE IF EXISTS db_version; +DROP TABLE IF EXISTS script_db_version; + diff --git a/sql/updates/919_world.sql b/sql/updates/919_world.sql new file mode 100644 index 00000000000..5febe1ebdfc --- /dev/null +++ b/sql/updates/919_world.sql @@ -0,0 +1,3 @@ +ALTER TABLE version + ADD `core_revision` BIGINT UNSIGNED AFTER `core_version`; + diff --git a/sql/updates/927_characters.sql b/sql/updates/927_characters.sql new file mode 100644 index 00000000000..c3a0df39b8d --- /dev/null +++ b/sql/updates/927_characters.sql @@ -0,0 +1,2 @@ +ALTER TABLE `gm_tickets` CHANGE `closed` `closed` int(10) NOT NULL default '0'; + diff --git a/sql/updates/930_characters.sql b/sql/updates/930_characters.sql new file mode 100644 index 00000000000..303bda03235 --- /dev/null +++ b/sql/updates/930_characters.sql @@ -0,0 +1,57 @@ +-- +-- Table structure for table `auctionhousebot` +-- + +CREATE TABLE IF NOT EXISTS `auctionhousebot` ( + `auctionhouse` int(11) NOT NULL default '0' COMMENT 'mapID of the auctionhouse.', + `name` char(25) default NULL COMMENT 'Text name of the auctionhouse.', + `minitems` int(11) default '0' COMMENT 'This is the minimum number of items you want to keep in the auction house. a 0 here will make it the same as the maximum.', + `maxitems` int(11) default '0' COMMENT 'This is the number of items you want to keep in the auction house.', + `mintime` int(11) default '8' COMMENT 'Sets the minimum number of hours for an auction.', + `maxtime` int(11) default '24' COMMENT 'Sets the maximum number of hours for an auction.', + `percentwhitetradegoods` int(11) default '27' COMMENT 'Sets the percentage of the White Trade Goods auction items', + `percentgreentradegoods` int(11) default '12' COMMENT 'Sets the percentage of the Green Trade Goods auction items', + `percentbluetradegoods` int(11) default '10' COMMENT 'Sets the percentage of the Blue Trade Goods auction items', + `percentpurpletradegoods` int(11) default '1' COMMENT 'Sets the percentage of the Purple Trade Goods auction items', + `percentwhiteitems` int(11) default '10' COMMENT 'Sets the percentage of the non trade White auction items', + `percentgreenitems` int(11) default '30' COMMENT 'Sets the percentage of the non trade Green auction items', + `percentblueitems` int(11) default '8' COMMENT 'Sets the percentage of the non trade Blue auction items', + `percentpurpleitems` int(11) default '2' COMMENT 'Sets the percentage of the non trade Purple auction items', + `minpricewhite` int(11) default '150' COMMENT 'Minimum price of White items (percentage).', + `maxpricewhite` int(11) default '250' COMMENT 'Maximum price of White items (percentage).', + `minpricegreen` int(11) default '800' COMMENT 'Minimum price of Green items (percentage).', + `maxpricegreen` int(11) default '1400' COMMENT 'Maximum price of Green items (percentage).', + `minpriceblue` int(11) default '1250' COMMENT 'Minimum price of Blue items (percentage).', + `maxpriceblue` int(11) default '1750' COMMENT 'Maximum price of Blue items (percentage).', + `minpricepurple` int(11) default '2250' COMMENT 'Minimum price of Purple items (percentage).', + `maxpricepurple` int(11) default '4550' COMMENT 'Maximum price of Purple items (percentage).', + `minbidpricewhite` int(11) default '70' COMMENT 'Starting bid price of White items as a percentage of the randomly chosen buyout price. Default: 100 (Bid and buyout price the same)', + `maxbidpricewhite` int(11) default '100' COMMENT 'Starting bid price of White items as a percentage of the randomly chosen buyout price. Default: 100 (Bid and buyout price the same)', + `minbidpricegreen` int(11) default '80' COMMENT 'Starting bid price of Green items as a percentage of the randomly chosen buyout price. Default: 100 (Bid and buyout price the same)', + `maxbidpricegreen` int(11) default '100' COMMENT 'Starting bid price of Green items as a percentage of the randomly chosen buyout price. Default: 100 (Bid and buyout price the same)', + `minbidpriceblue` int(11) default '75' COMMENT 'Starting bid price of Blue items as a percentage of the randomly chosen buyout price. Default: 100 (Bid and buyout price the same)', + `maxbidpriceblue` int(11) default '100' COMMENT 'Starting bid price of Blue items as a percentage of the randomly chosen buyout price. Default: 100 (Bid and buyout price the same)', + `minbidpricepurple` int(11) default '80' COMMENT 'Starting bid price of Purple items as a percentage of the randomly chosen buyout price. Default: 100 (Bid and buyout price the same)', + `maxbidpricepurple` int(11) default '100' COMMENT 'Starting bid price of Purple items as a percentage of the randomly chosen buyout price. Default: 100 (Bid and buyout price the same)', + `maxstackwhite` int(11) default '0' COMMENT 'Stack size limits for item qualities - a value of 0 will disable a maximum stack size for that quality, which will allow the bot to create items in stack as large as the item allows.', + `maxstackgreen` int(11) default '3' COMMENT 'Stack size limits for item qualities - a value of 0 will disable a maximum stack size for that quality, which will allow the bot to create items in stack as large as the item allows.', + `maxstackblue` int(11) default '2' COMMENT 'Stack size limits for item qualities - a value of 0 will disable a maximum stack size for that quality, which will allow the bot to create items in stack as large as the item allows.', + `maxstackpurple` int(11) default '1' COMMENT 'Stack size limits for item qualities - a value of 0 will disable a maximum stack size for that quality, which will allow the bot to create items in stack as large as the item allows.', + `buyerpricegrey` int(11) default '1' COMMENT 'Multiplier to vendorprice when buying grey items from auctionhouse', + `buyerpricewhite` int(11) default '1' COMMENT 'Multiplier to vendorprice when buying white items from auctionhouse', + `buyerpricegreen` int(11) default '5' COMMENT 'Multiplier to vendorprice when buying green items from auctionhouse', + `buyerpriceblue` int(11) default '12' COMMENT 'Multiplier to vendorprice when buying blue items from auctionhouse', + `buyerpricepurple` int(11) default '15' COMMENT 'Multiplier to vendorprice when buying purple items from auctionhouse', + `buyerbiddinginterval` int(11) default '1' COMMENT 'Interval how frequently AHB bids on each AH. Time in minutes', + `buyerbidsperinterval` int(11) default '1' COMMENT 'number of bids to put in per bidding interval', + PRIMARY KEY (`auctionhouse`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +-- +-- Data for table `auctionhousebot` +-- +insert into `auctionhousebot` (`auctionhouse`,`name`,`minitems`,`maxitems`,`mintime`,`maxtime`,`percentwhitetradegoods`,`percentgreentradegoods`,`percentbluetradegoods`,`percentpurpletradegoods`,`percentwhiteitems`,`percentgreenitems`,`percentblueitems`,`percentpurpleitems`,`minpricewhite`,`maxpricewhite`,`minpricegreen`,`maxpricegreen`,`minpriceblue`,`maxpriceblue`,`minpricepurple`,`maxpricepurple`,`minbidpricewhite`,`maxbidpricewhite`,`minbidpricegreen`,`maxbidpricegreen`,`minbidpriceblue`,`maxbidpriceblue`,`minbidpricepurple`,`maxbidpricepurple`,`maxstackwhite`,`maxstackgreen`,`maxstackblue`,`maxstackpurple`,`buyerpricegrey`,`buyerpricewhite`,`buyerpricegreen`,`buyerpriceblue`,`buyerpricepurple`,`buyerbiddinginterval`,`buyerbidsperinterval`) values +(2,'Alliance',0,0,8,24,27,12,10,1,10,30,8,2,150,250,800,1400,1250,1750,2250,4550,70,100,80,100,75,100,80,100,0,3,2,1,1,1,5,12,15,1,1), +(6,'Horde',0,0,8,24,27,12,10,1,10,30,8,2,150,250,800,1400,1250,1750,2250,4550,70,100,80,100,75,100,80,100,0,3,2,1,1,1,5,12,15,1,1), +(7,'Neutral',0,0,8,24,27,12,10,1,10,30,8,2,150,250,800,1400,1250,1750,2250,4550,70,100,80,100,75,100,80,100,0,3,2,1,1,1,5,12,15,1,1); + diff --git a/sql/updates/933_world_scripts.sql b/sql/updates/933_world_scripts.sql new file mode 100644 index 00000000000..0918e8f1e9e --- /dev/null +++ b/sql/updates/933_world_scripts.sql @@ -0,0 +1,2 @@ +update creature_template set scriptname='npc_snake_trap_serpents' where entry in (19921, 19833); + diff --git a/sql/updates/935_world_scripts.sql b/sql/updates/935_world_scripts.sql new file mode 100644 index 00000000000..5027cafa234 --- /dev/null +++ b/sql/updates/935_world_scripts.sql @@ -0,0 +1,7 @@ +DELETE FROM `creature` WHERE `id` = '17653'; + +UPDATE `gameobject_template` SET `flags` = '4' WHERE `entry` IN ('181766','181823'); +UPDATE `gameobject` SET `SpawnMask` = '3',`state` = '1' WHERE `id` IN ('181766','181823'); + +UPDATE `instance_template` SET `script` = 'instance_blood_furnace' WHERE `map` = '542'; + diff --git a/sql/updates/940_world_scripts.sql b/sql/updates/940_world_scripts.sql new file mode 100644 index 00000000000..a7f78170c35 --- /dev/null +++ b/sql/updates/940_world_scripts.sql @@ -0,0 +1,3 @@ +ALTER TABLE custom_texts CHANGE COLUMN emote emote smallint(5) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE script_texts CHANGE COLUMN emote emote smallint(5) unsigned NOT NULL DEFAULT '0'; + diff --git a/sql/updates/945_world_scripts.sql b/sql/updates/945_world_scripts.sql new file mode 100644 index 00000000000..0831d5c0e6f --- /dev/null +++ b/sql/updates/945_world_scripts.sql @@ -0,0 +1,42 @@ +update creature_template set scriptname='' where entry=22083; +update creature_template set scriptname='npc_overlord_morghor' where entry=23139; +update creature_template set scriptname='' where entry=23141; +DELETE FROM script_texts WHERE entry BETWEEN -1000221 and -1000206; +INSERT INTO script_texts (entry, content_default, type, emote, comment) VALUES +(-1000206, 'Come, $N. Lord Stormrage awaits.', 0, 1, 'OVERLORD_SAY_1'), +(-1000207, 'Lord Illidan will be here shortly.', 0, 1, 'OVERLORD_SAY_2'), +(-1000208, 'Lord Illidan, this is the Dragonmaw that I, and others, have told you about. He will lead us to victory!', 0, 1, 'OVERLORD_SAY_3'), +(-1000209, 'But... My lord, I do not understand. $N... He is the orc that has...', 0, 1, 'OVERLORD_SAY_4'), +(-1000210, 'It will be done, my lord.', 0, 1, 'OVERLORD_SAY_5'), +(-1000211, 'So you thought to make a fool of Mor\'ghor, eh? Before you are delivered to Lord Illidan, you will feel pain that you could not know to exist. I will take pleasure in exacting my own vengeance.', 0, 25, 'OVERLORD_SAY_6'), +(-1000212, 'Warriors of Dragonmaw, gather \'round! One among you has attained the rank of highlord! Bow your heads in reverence! Show your respect and allegiance to Highlord $N!', 1, 22, 'OVERLORD_YELL_1'), +(-1000213, 'All hail Lord Illidan!', 1, 66, 'OVERLORD_YELL_2'), +(-1000214, 'What is the meaning of this, Mor\'ghor?', 0, 1, 'LORD_ILLIDAN_SAY_1'), +(-1000215, 'SILENCE!', 0, 22, 'LORD_ILLIDAN_SAY_2'), +(-1000216, 'Blathering idiot. You incomprehensibly incompetent buffoon...', 0, 1, 'LORD_ILLIDAN_SAY_3'), +(-1000217, 'THIS is your hero?', 0, 6, 'LORD_ILLIDAN_SAY_4'), +(-1000218, 'You have been deceived, imbecile.', 0, 1, 'LORD_ILLIDAN_SAY_5'), +(-1000219, 'This... whole... operation... HAS BEEN COMPROMISED!', 0, 22, 'LORD_ILLIDAN_SAY_6'), +(-1000220, 'I expect to see this insect\'s carcass in pieces in my lair within the hour. Fail and you will suffer a fate so much worse than death.', 0, 1, 'LORD_ILLIDAN_SAY_7'), +(-1000221, 'You will not harm the boy, Mor\'ghor! Quickly, $N, climb on my back!', 0, 22, 'YARZILL_THE_MERC_SAY'); + +DELETE FROM script_texts WHERE entry='-1000222'; +INSERT INTO script_texts (entry, content_default, type, language, emote, comment) VALUES +(-1000222, 'Thank you, mortal.', 0, 11, 1, 'SAY_JUST_EATEN'); + +DELETE FROM script_texts WHERE entry BETWEEN -1000234 and -1000223; +INSERT INTO script_texts (entry, content_default, emote, comment) VALUES +(-1000223, 'I sense the tortured spirits, $N. They are this way, come quickly!', 1, 'SAY_START'), +(-1000224, 'Watch out!', 0, 'SAY_AGGRO1'), +(-1000225, 'Naga attackers! Defend yourself!', 0, 'SAY_AGGRO2'), +(-1000226, 'Kill them all!', 0, 'ASSASSIN_SAY_AGGRO1'), +(-1000227, 'You will never essscape Coilssskarrr...', 0, 'ASSASSIN_SAY_AGGRO2'), +(-1000228, 'Grant me protection $N, i must break trough their foul magic!', 0, 'SAY_PROGRESS1'), +(-1000229, 'The naga of Coilskar are exceptionally cruel to their prisoners. It is a miracle that I survived inside that watery prison for as long as I did. Earthmother be praised.', 0, 'SAY_PROGRESS2'), +(-1000230, 'Now we must find the exit.', 0, 'SAY_PROGRESS3'), +(-1000231, 'Lady Vashj must answer for these atrocities. She must be brought to justice!', 0, 'SAY_PROGRESS4'), +(-1000232, 'The tumultuous nature of the great waterways of Azeroth and Draenor are a direct result of tormented water spirits.', 0, 'SAY_PROGRESS5'), +(-1000233, 'It shouldn\'t be much further, $N. The exit is just up ahead.', 0, 'SAY_PROGRESS6'), +(-1000234, 'Thank you, $N. Please return to my brethren at the Altar of Damnation, near the Hand of Gul\'dan, and tell them that Wilda is safe. May the Earthmother watch over you...', 0, 'SAY_END'); + + diff --git a/sql/updates/947_world_scripts.sql b/sql/updates/947_world_scripts.sql new file mode 100644 index 00000000000..9e81f39a8c3 --- /dev/null +++ b/sql/updates/947_world_scripts.sql @@ -0,0 +1,13 @@ +DELETE FROM script_texts WHERE entry BETWEEN -1000244 and -1000235; +INSERT INTO script_texts (entry, content_default, type, emote, comment) VALUES +(-1000235, 'Ok, $N. Follow me to the cave where I\'ll attempt to harness the power of the rune stone into these goggles.', 0, 1, 'phizzlethorpe - SAY_PROGRESS_1'), +(-1000236, 'I discovered this cave on our first day here. I believe the energy in the stone can be used to our advantage.', 0, 1, 'phizzlethorpe - SAY_PROGRESS_2'), +(-1000237, 'I\'ll begin drawing energy from the stone. Your job, $N, is to defend me. This place is cursed... trust me.', 0, 1, 'phizzlethorpe - SAY_PROGRESS_3'), +(-1000238, 'begins tinkering with the goggles before the stone.', 2, 0, 'phizzlethorpe - EMOTE_PROGRESS_4'), +(-1000239, 'Help!!! Get these things off me so I can get my work done!', 0, 0, 'SAY_AGGRO'), +(-1000240, 'Almost done! Just a little longer!', 0, 1, 'phizzlethorpe - SAY_PROGRESS_5'), +(-1000241, 'I\'ve done it! I have harnessed the power of the stone into the goggles! Let\'s get out of here!', 0, 1, 'phizzlethorpe - SAY_PROGRESS_6'), +(-1000242, 'Phew! Glad to be back from that creepy cave.', 0, 1, 'phizzlethorpe - SAY_PROGRESS_7'), +(-1000243, 'hands one glowing goggles over to Doctor Draxlegauge.', 2, 0, 'phizzlethorpe - EMOTE_PROGRESS_8'), +(-1000244, 'Doctor Draxlegauge will give you further instructions, $N. Many thanks for your help!', 0, 1, 'phizzlethorpe - SAY_PROGRESS_9'); + diff --git a/sql/updates/948_world_scripts.sql b/sql/updates/948_world_scripts.sql new file mode 100644 index 00000000000..9270e5d994a --- /dev/null +++ b/sql/updates/948_world_scripts.sql @@ -0,0 +1,6 @@ +DELETE FROM script_texts WHERE entry BETWEEN -1000247 and -1000245; +INSERT INTO script_texts (entry, content_default, type, comment) VALUES +(-1000245, 'You, there! Hand over that moonstone and nobody gets hurt!', 1, 'SAY_RIZZLE_START'), +(-1000246, 'Just chill!', 4, 'SAY_RIZZLE_GRENADE'), +(-1000247, 'All right, you win! I surrender! Just don\'t hurt me!', 1, 'SAY_RIZZLE_FINAL'); + diff --git a/sql/updates/950_world_scripts.sql b/sql/updates/950_world_scripts.sql new file mode 100644 index 00000000000..c1058f4b9ee --- /dev/null +++ b/sql/updates/950_world_scripts.sql @@ -0,0 +1,24 @@ +DELETE FROM script_texts WHERE entry BETWEEN -1000266 and -1000248; +INSERT INTO script_texts (entry, content_default, type, emote, comment) VALUES +(-1000248, 'The last thing I remember is the ship falling and us getting into the pods. I\'ll go see how I can help. Thank you!', 0, 0, 'draenei survivor - HEAL1'), +(-1000249, '$C, Where am I? Who are you? Oh no! What happened to the ship?.', 0, 0, 'draenei survivor - HEAL2'), +(-1000250, '$C You saved me! I owe you a debt that I can never repay. I\'ll go see if I can help the others.', 0, 0, 'draenei survivor - HEAL3'), +(-1000251, 'Ugh... what is this place? Is that all that\'s left of the ship over there?', 0, 0, 'draenei survivor - HEAL4'), +(-1000252, 'Oh, the pain...', 0, 0, 'draenei survivor - HELP1'), +(-1000253, 'Everything hurts, Please make it stop...', 0, 0, 'draenei survivor - HELP2'), +(-1000254, 'Ughhh... I hurt. Can you help me?', 0, 0, 'draenei survivor - HELP3'), +(-1000255, 'I don\'t know if I can make it, please help me...', 0, 0, 'draenei survivor - HELP4'), + +(-1000256, 'Yes Master, all goes along as planned.', 0, 1, 'overgrind - SAY_TEXT'), +(-1000257, 'puts the shell to his ear.', 2, 0, 'overgrind - SAY_EMOTE'), +(-1000258, 'Now I cut you!', 1, 0, 'overgrind - YELL_ATTACK'), + +(-1000259, 'What\'s the big idea, Spark?', 0, 0, 'geezle - GEEZLE_SAY_1'), +(-1000260, 'What\'s the big idea? You nearly blew my cover, idiot! I told you to put the compass and navigation maps somewhere safe - not out in the open for any fool to discover.', 0, 0, 'geezle - SPARK_SAY_2'), +(-1000261, 'The Master has gone to great lengths to secure information about the whereabouts of the Exodar. You could have blown the entire operation, including the cover of our spy on the inside.', 0, 0, 'geezle - SPARK_SAY_3'), +(-1000262, 'Relax, Spark! I have it all under control. We\'ll strip mine the Exodar right out from under \'em - making both you and I very, very rich in the process.', 0, 0, 'geezle - GEEZLE_SAY_4'), +(-1000263, 'Relax? Do you know what Kael\'thas does to those that fail him, Geezle? Eternal suffering and pain... Do NOT screw this up, fool.', 0, 0, 'geezle - SPARK_SAY_5'), +(-1000264, 'Our Bloodmyst scouts have located our contact. The fool, Velen, will soon leave himself open and defenseless -- long enough for us to strike! Now get out of my sight before I vaporize you...', 0, 0, 'geezle - SPARK_SAY_6'), +(-1000265, 'Yes, sir. It won\'t happen again...', 0, 0, 'geezle - GEEZLE_SAY_7'), +(-1000266, 'picks up the naga flag.', 2, 0, 'geezle - EMOTE_SPARK'); + diff --git a/sql/updates/951_world_scripts.sql b/sql/updates/951_world_scripts.sql new file mode 100644 index 00000000000..93f877bdb55 --- /dev/null +++ b/sql/updates/951_world_scripts.sql @@ -0,0 +1,17 @@ +DELETE FROM script_texts WHERE entry BETWEEN -1000279 and -1000267; +INSERT INTO script_texts (entry, content_default, type, comment) VALUES +(-1000267, 'Ready when you are, warrior.', 1, 'flathead - SAY_BIG_WILL_READY'), +(-1000268, 'The Affray has begun, get ready to fight!', 1, 'flathead - SAY_TWIGGY_FLATHEAD_BEGIN'), +(-1000269, 'You! Enter the fray!', 1, 'flathead - SAY_TWIGGY_FLATHEAD_FRAY'), +(-1000270, 'Challenger is down!', 1, 'flathead - SAY_TWIGGY_FLATHEAD_DOWN'), +(-1000271, 'The Affray is over.', 1, 'flathead - SAY_TWIGGY_FLATHEAD_OVER'), + +(-1000272, 'Alright, alright I think I can figure out how to operate this thing...', 0, 'shredder - SAY_PROGRESS_1'), +(-1000273, 'Arrrgh! This isn\'t right!', 0, 'shredder - SAY_PROGRESS_2'), +(-1000274, 'Okay, I think I\'ve got it, now. Follow me, $N!', 0, 'shredder - SAY_PROGRESS_3'), +(-1000275, 'There\'s the stolen shredder! Stop it or Lugwizzle will have our hides!', 1, 'shredder - SAY_MERCENARY_4'), +(-1000276, 'Looks like we\'re out of woods, eh? Wonder what this does...', 0, 'shredder - SAY_PROGRESS_5'), +(-1000277, 'Come on, don\'t break down on me now!', 0, 'shredder - SAY_PROGRESS_6'), +(-1000278, 'That was a close one! Well, let\'s get going, it\'s still a ways to Ratchet!', 0, 'shredder - SAY_PROGRESS_7'), +(-1000279, 'Hmm... I don\'t think this blinking red light is a good thing...', 0, 'shredder - SAY_PROGRESS_8'); + diff --git a/sql/updates/952_world_scripts.sql b/sql/updates/952_world_scripts.sql new file mode 100644 index 00000000000..25a19a6972f --- /dev/null +++ b/sql/updates/952_world_scripts.sql @@ -0,0 +1,11 @@ +DELETE FROM script_texts where entry BETWEEN -1000285 and -1000280; +INSERT INTO script_texts (entry, content_default, type, language, comment) VALUES +(-1000280, 'Thank you, dear Paladin, you just saved my life.', 0, 7, 'faulk - SAY_HEAL'), + +(-1000281, 'Very well. Let\'s see what you have to show me, $N.', 0, 0, 'anvilvard - SAY_PR_1'), +(-1000282, 'What manner of trick is this, $R? If you seek to ambush me, I warn you I will not go down quietly!', 0, 0, 'anvilvard - SAY_PR_2'), +(-1000283, 'releases the last of its energies into the nerarby runestone, succesfully reactivating it.', 2, 0, 'crystal - EMOTE'), + +(-1000284, 'Deployment sucessful. Trespassers will be neutralized.', 0, 0, 'sentry - SAY_CONVERTED_1'), +(-1000285, 'Objective acquired. Initiating security routines.', 0, 0, 'sentry - SAY_CONVERTED_1'); + diff --git a/sql/updates/953_world_scripts.sql b/sql/updates/953_world_scripts.sql new file mode 100644 index 00000000000..b90eb732658 --- /dev/null +++ b/sql/updates/953_world_scripts.sql @@ -0,0 +1,10 @@ +DELETE FROM script_texts where entry BETWEEN -1000292 and -1000286; +INSERT INTO script_texts (entry, content_default, type, emote, comment) VALUES +(-1000286, 'A shadowy, sinister presence has invader the Emerald Dream. Its power is poised to spill over into our world, $N. We must oppose it! That\'s why I cannot accompany you in person.', 0, 0, 'clintar_spirit'), +(-1000287, 'The Emerald Dream will never be yours!', 0, 0, 'clintar_spirit'), +(-1000288, 'Begone from this place!', 0, 0, 'clintar_spirit'), +(-1000289, 'That\'s the first relic, but there are still two more. Follow me, $N.', 0, 0, 'clintar_spirit'), +(-1000290, 'I\'ve recovered the second relic. Take a moment to rest, and then we\'ll continue to the last reliquary.', 0, 0, 'clintar_spirit'), +(-1000291, 'We have all three of the relics, but my energy is rapidly fading. We must make our way back to Dreamwarden Lurosa! He will let you know what to do next.', 0, 0, 'clintar_spirit'), +(-1000292, 'Lurosa, I am entrusting the Relics of Aviana to $N, who will take them to Morthis Whisperwing. I must return completely to the Emerald Dream now. Do not let $N fail!', 0, 0, 'clintar_spirit'); + diff --git a/sql/updates/954_world_scripts.sql b/sql/updates/954_world_scripts.sql new file mode 100644 index 00000000000..11c52b109ad --- /dev/null +++ b/sql/updates/954_world_scripts.sql @@ -0,0 +1,20 @@ +DELETE FROM script_texts WHERE entry BETWEEN -1000305 and -1000293; +INSERT INTO script_texts (entry, content_default, type, comment) VALUES +(-1000293, 'In Nagrand, food hunt ogre!', 0, 'LUMP_SAY0'), +(-1000294, 'You taste good with maybe a little salt and pepper.', 0, 'LUMP_SAY1'), +(-1000295, 'OK, OK! Lump give up!', 0, 'LUMP_DEFEAT'), + +(-1000296, 'Warning! Emergency shutdown process initiated by $N. Shutdown will complete in two minutes.', 2, 'npc_manaforge_control_console - EMOTE_START'), +(-1000297, 'Emergency shutdown will complete in one minute.', 2, 'npc_manaforge_control_console - EMOTE_60'), +(-1000298, 'Emergency shutdown will complete in thirty seconds.', 2, 'npc_manaforge_control_console - EMOTE_30'), +(-1000299, 'Emergency shutdown will complete in ten seconds.', 2, 'npc_manaforge_control_console - EMOTE_10'), +(-1000300, 'Emergency shutdown complete.', 2, 'npc_manaforge_control_console - EMOTE_COMPLETE'), +(-1000301, 'Emergency shutdown aborted.', 2, 'npc_manaforge_control_console - EMOTE_ABORT'), + +(-1000302, 'Saeed is currently engaged or awaiting orders to engage. You may check directly east of me and see if Saeed is ready for you. If he is not present then he is off fighting another battle. I recommend that you wait for him to return before attacking Dimensius.', 4, 'npc_professor_dabiri - WHISPER_DABIRI'), + +(-1000303, 'is very weak', 2, 'mob_phase_hunter - EMOTE_WEAK'), + +(-1000304, 'Bessy, is that you?', 0, 'npc_bessy- SAY_THADELL_1'), +(-1000305, 'Thank you for bringing back my Bessy, $N. I couldn\'t live without her!', 0, 'npc_bessy- SAY_THADELL_2'); + diff --git a/sql/updates/955_world_scripts.sql b/sql/updates/955_world_scripts.sql new file mode 100644 index 00000000000..1afcd46cb07 --- /dev/null +++ b/sql/updates/955_world_scripts.sql @@ -0,0 +1,60 @@ +DELETE FROM script_texts WHERE entry BETWEEN -1000333 and -1000306; +INSERT INTO script_texts (entry, content_default, type, comment) VALUES +(-1000306, 'Follow me, stranger. This won\'t take long.', 0, 'npc_kservant - SAY1'), +(-1000307, 'Shattrath was once the draenei capital of this world. Its name means \"dwelling of light.\"', 4, 'npc_kservant - WHISP1'), +(-1000308, 'When the Burning Legion turned the orcs against the draenei, the fiercest battle was fought here. The draenei fought tooth and nail, but in the end the city fell.', 4, 'npc_kservant - WHISP2'), +(-1000309, 'The city was left in ruins and darkness... until the Sha\'tar arrived.', 4, 'npc_kservant - WHISP3'), +(-1000310, 'Let us go into the Lower City. I will warn you that as one of the only safe havens in Outland, Shattrath has attracted droves of refugees from all wars, current and past.', 4, 'npc_kservant - WHISP4'), +(-1000311, 'The Sha\'tar, or \"born from light\" are the naaru that came to Outland to fight the demons of the Burning Legion.', 4, 'npc_kservant - WHISP5'), +(-1000312, 'They were drawn to the ruins of Shattrath City where a small remnant of the draenei priesthood conducted its rites inside a ruined temple on this very spot.', 4, 'npc_kservant - WHISP6'), +(-1000313, 'The priesthood, known as the Aldor, quickly regained its strength as word spread that the naaru had returned and reconstruction soon began. The ruined temple is now used as an infirmary for injured refugees.', 4, 'npc_kservant - WHISP7'), +(-1000314, 'It wouldn\'t be long, however, before the city came under attack once again. This time, the attack came from Illidan\'s armies. A large regiment of blood elves had been sent by Illidan\'s ally, Kael\'thas Sunstrider, to lay waste to the city.', 4, 'npc_kservant - WHISP8'), +(-1000315, 'As the regiment of blood elves crossed this very bridge, the Aldor\'s exarchs and vindicators lined up to defend the Terrace of Light. But then the unexpected happened.', 4, 'npc_kservant - WHISP9'), +(-1000316, 'The blood elves laid down their weapons in front of the city\'s defenders; their leader, a blood elf elder known as Voren\'thal, stormed into the Terrace of Light and demanded to speak to A\'dal.', 4, 'npc_kservant - WHISP10'), +(-1000317, 'As the naaru approached him, Voren\'thal kneeled before him and uttered the following words: \"I\'ve seen you in a vision, naaru. My race\'s only hope for survival lies with you. My followers and I are here to serve you.\"', 4, 'npc_kservant - WHISP11'), +(-1000318, 'The defection of Voren\'thal and his followers was the largest loss ever incurred by Kael\'s forces. And these weren\'t just any blood elves. Many of the best and brightest amongst Kael\'s scholars and magisters had been swayed by Voren\'thal\'s influence.', 4, 'npc_kservant - WHISP12'), +(-1000319, 'The naaru accepted the defectors, who would become known as the Scryers; their dwelling lies in the platform above. Only those initiated with the Scryers are allowed there.', 4, 'npc_kservant - WHISP13'), +(-1000320, 'The Aldor are followers of the Light and forgiveness and redemption are values they understand. However, they found hard to forget the deeds of the blood elves while under Kael\'s command.', 4, 'npc_kservant - WHISP14'), +(-1000321, 'Many of the priesthood had been slain by the same magisters who now vowed to serve the naaru. They were not happy to share the city with their former enemies.', 4, 'npc_kservant - WHISP15'), +(-1000322, 'The Aldor\'s most holy temple and its surrounding dwellings lie on the terrace above. As a holy site, only the initiated are welcome inside.', 4, 'npc_kservant - WHISP16'), +(-1000323, 'The attacks against Shattrath continued, but the city did not fall, as you can see. On the contrary, the naaru known as Xi\'ri led a successful incursion into Shadowmoon Valley - Illidan\'s doorstep.', 4, 'npc_kservant - WHISP17'), +(-1000324, 'There he continues to wage war on Illidan with the assistance of the Aldor and the Scryers. The two factions have not given up on their old feuds, though.', 4, 'npc_kservant - WHISP18'), +(-1000325, 'Such is their animosity that they vie for the honor of being sent to assist the naaru there. Each day, that decision is made here by A\'dal. The armies gather here to receive A\'dal\'s blessing before heading to Shadowmoon.', 4, 'npc_kservant - WHISP19'), +(-1000326, 'Khadgar should be ready to see you again. Just remember that to serve the Sha\'tar you will most likely have to ally with the Aldor or the Scryers. And seeking the favor of one group will cause the others\' dislike.', 4, 'npc_kservant - WHISP20'), +(-1000327, 'Good luck stranger, and welcome to Shattrath City.', 4, 'npc_kservant - WHISP21'), + + +(-1000328, 'Time to teach you a lesson in manners, little boy!', 0, ''), +(-1000329, 'Now I\'m gonna give you to the count of \'3\' to get out of here before I sick the dogs on you.', 0, ''), +(-1000330, '1...', 0, ''), +(-1000331, '2...', 0, ''), +(-1000332, 'Time to meet your maker!', 0, ''), +(-1000333, 'Alright, we give up! Don\'t hurt us!', 0, ''); + +DELETE FROM script_texts WHERE entry=-1000334; +INSERT INTO script_texts (entry, content_default, type, language, comment) VALUES +(-1000334, 'Thank you, dear Paladin, you just saved my life.', 0, 10, 'stillblade - SAY_HEAL'); + +DELETE FROM script_texts WHERE entry BETWEEN -1000349 and -1000335; +INSERT INTO script_texts (entry, content_default, type, comment) VALUES +(-1000335, 'Let\'s get to the others, and keep an eye open for those wolves cutside...', 0, 'npc_deathstalker_erland +- SAY_QUESTACCEPT'), +(-1000336, 'Be careful, $N. Those wolves like to hide among the trees.', 0, 'npc_deathstalker_erland - SAY_START'), +(-1000337, 'A $C attacks!', 0, 'npc_deathstalker_erland - SAY_AGGRO_1'), +(-1000338, 'Beware! I am under attack!', 0, 'npc_deathstalker_erland - SAY_AGGRO_2'), +(-1000339, 'We\'re almost there!', 0, 'npc_deathstalker_erland - SAY_LAST'), +(-1000340, 'We made it! Thanks, $N. I couldn\'t have gotten without you.', 0, 'npc_deathstalker_erland - +SAY_THANKS'), +(-1000341, 'It\'s good to see you again, Erland. What is your report?', 0, 'npc_deathstalker_erland - SAY_RANE'), +(-1000342, 'Masses of wolves are to the east, and whoever lived at Malden\'s Orchard is gone.', 0, +'npc_deathstalker_erland - SAY_ANSWER'), +(-1000343, 'If I am excused, then I\'d like to check on Quinn...', 0, 'npc_deathstalker_erland - SAY_MOVE_QUINN'), +(-1000344, 'Hello, Quinn. How are you faring?', 0, 'npc_deathstalker_erland - SAY_GREETINGS'), +(-1000345, 'I\'ve been better. Ivar the Foul got the better of me...', 0, 'npc_deathstalker_erland - SAY_QUINN'), +(-1000346, 'Try to take better care of yourself, Quinn. You were lucky this time.', 0, 'npc_deathstalker_erland - +SAY_ON_BYE'), + +(-1000347, 'Let\'s go before they find out I\'m free!', 0, 'npc_kaya_flathoof - SAY_START'), +(-1000348, 'Look out! We\'re under attack!', 0, 'npc_kaya_flathoof - SAY_AMBUSH'), +(-1000349, 'Thank you for helping me. I know my way back from here.', 0, 'npc_kaya_flathoof - SAY_END'); + diff --git a/sql/updates/956_world_scripts.sql b/sql/updates/956_world_scripts.sql new file mode 100644 index 00000000000..1e9b5b6d2d5 --- /dev/null +++ b/sql/updates/956_world_scripts.sql @@ -0,0 +1,27 @@ +DELETE FROM script_texts WHERE entry BETWEEN -1000365 and -1000350; +INSERT INTO script_texts (entry, content_default, type, comment) VALUES +(-1000350, 'Who dares awaken Aquementas?', 1, 'mob_aquementas - AGGRO_YELL_AQUE'), + +(-1000351, 'I give up! Please don\'t kill me!', 0, 'mob_unkor_the_ruthless - SAY_SUBMIT'), + +(-1000352, 'I choose the third option: KILLING YOU!', 0, 'npc_floon - SAY_FLOON_ATTACK'), + +(-1000353, 'Ok let\'s get out of here!', 0, 'npc_isla_starmane - SAY_PROGRESS_1'), +(-1000354, 'You sure you\'re ready? Take a moment.', 0, 'npc_isla_starmane - SAY_PROGRESS_2'), +(-1000355, 'Alright, let\'s do this!', 0, 'npc_isla_starmane - SAY_PROGRESS_3'), +(-1000356, 'Ok, I think I can make it on my own from here. Thank you so much for breaking me out of there!', 0, + +'npc_isla_starmane - SAY_PROGRESS_4'), + +(-1000357, 'Belore...', 0, 'npc_lady_sylvanas_windrunner - SAY_LAMENT_END'), +(-1000358, 'kneels down and pick up the amulet.', 2, 'npc_lady_sylvanas_windrunner - EMOTE_LAMENT_END'), + +(-1000359, 'You have my blessing', 0, 'npcs_ashyen_and_keleth - GOSSIP_REWARD_BLESS'), + +(-1000360, 'Is the way clear? Let\'s get out while we can, $N.', 0, 'npc_kayra_longmane - SAY_PROGRESS_1'), +(-1000361, 'Looks like we won\'t get away so easy. Get ready!', 0, 'npc_kayra_longmane - SAY_PROGRESS_2'), +(-1000362, 'Let\'s keep moving. We\'re not safe here!', 0, 'npc_kayra_longmane - SAY_PROGRESS_3'), +(-1000363, 'Look out, $N! Enemies ahead!', 0, 'npc_kayra_longmane - SAY_PROGRESS_4'), +(-1000364, 'We\'re almost to the refuge! Let\'s go.', 0, 'npc_kayra_longmane - SAY_PROGRESS_5'), +(-1000365, 'I can see my fellow druids from here. Thank you, $N. I\'m sure Ysiel will reward you for your actions!', 0, 'npc_kayra_longmane - SAY_PROGRESS_6'); + diff --git a/sql/updates/957_world_scripts.sql b/sql/updates/957_world_scripts.sql new file mode 100644 index 00000000000..9ebc7b73b66 --- /dev/null +++ b/sql/updates/957_world_scripts.sql @@ -0,0 +1,37 @@ +-- Liquid Fire +UPDATE `gameobject_template` SET `data2`='5',`data11`='1' WHERE `entry` IN ('180125','182533'); + +-- Scripts & Stats +UPDATE `creature_template` SET `ScriptName`='boss_vazruden_the_herald' WHERE `entry` = '17307'; +UPDATE `creature_template` SET `ScriptName`='boss_vazruden',`heroic_entry`='18434' WHERE `entry` = '17537'; +UPDATE `creature_template` SET `ScriptName`='boss_nazan' WHERE `entry` = '17536'; +UPDATE `creature_template` SET `ScriptName`='mob_hellfire_sentry' WHERE `entry` = '17517'; +UPDATE `creature_template` SET `equipment_id`='2183',`mechanic_immune_mask`='805306367' WHERE `entry` = '18434'; + +-- Reinforced Fel Iron Chest +DELETE FROM `gameobject` WHERE `id` IN ('185168','185169'); + +-- Script Texts +DELETE FROM `script_texts` WHERE `entry` BETWEEN '-1543025' AND '-1543017'; +INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES +('-1543017','You have faced many challenges, pity they were all in vain. Soon your people will kneel to my lord!',10292,1,0,'vazruden SAY_INTRO'), +('-1543018','Is there no one left to test me?',10293,1,0,'vazruden SAY_WIPE'), +('-1543019','Your time is running out!',10294,1,0,'vazruden SAY_AGGRO_1'), +('-1543020','You are nothing, I answer a higher call!',10295,1,0,'vazruden SAY_AGGRO_2'), +('-1543021','The Dark Lord laughs at you!',10296,1,0,'vazruden SAY_AGGRO_3'), +('-1543022','It is over. Finished!',10297,1,0,'vazruden SAY_KILL_1'), +('-1543023','Your days are done!',10298,1,0,'vazruden SAY_KILL_2'), +('-1543024','My lord will be the end you all...',10299,1,0,'vazruden SAY_DIE'), +('-1543025','descends from the sky',0,3,0,'vazruden EMOTE'); + +-- Waypoint Movement +DELETE FROM `waypoint_data` WHERE `id` = '2081'; +INSERT INTO `waypoint_data`(`id`,`point`,`position_x`,`position_y`,`position_z`) VALUES +('2081','1','-1412.2','1784','112'), +('2081','2','-1447.9','1760.9','112'), +('2081','3','-1454.2','1729.3','112'), +('2081','4','-1430','1705','112'), +('2081','5','-1393.5','1705.5','112'), +('2081','6','-1369.8','1724.5','112'), +('2081','7','-1377','1760','112'); + diff --git a/sql/updates/963_world_scripts.sql b/sql/updates/963_world_scripts.sql new file mode 100644 index 00000000000..ab46bba981c --- /dev/null +++ b/sql/updates/963_world_scripts.sql @@ -0,0 +1,22 @@ +UPDATE creature_template set ScriptName='mob_illidari_spawn' WHERE entry IN (22075,22074,19797); +UPDATE `creature_template` SET `ScriptName`='mob_torloth_the_magnificent' WHERE `entry`='22076'; +UPDATE creature_template SET ScriptName='npc_lord_illidan_stormrage' WHERE entry=22083; +delete from creature where id=22083; +INSERT INTO creature (id, map, spawnMask, modelid, equipment_id, position_x, position_y, position_z, orientation, spawntimesecs, spawndist, currentwaypoint, curhealth, curmana, DeathState, MovementType) + VALUES (22083, 530, 1, 0, 0, -4635.75, 1386.32, 137.34, 5.72398, 25,0, 0, 9955, 6774, 0, 0); +update gameobject_template set scriptname='go_crystal_prison' where entry=185126; + +DELETE FROM script_texts WHERE entry BETWEEN -1000374 and -1000366; +INSERT INTO script_texts (entry, content_default, type, comment) VALUES +(-1000366, 'So you have defeated the Crimson Sigil. You now seek to challenge my rule? Not even Arthas could defeat me, yet you dare to even harbor such thoughts? Then I say to you, come! Come $N! The Black Temple awaits...', 1, 'Quest: Battle of the crimson watch - END_TEXT'), + +(-1000367, 'At your command, my liege...', 0, 'TorlothAnim - First'), +(-1000368, 'Destroy them, Torloth. Let lose their blood like a river upon this hallowed ground.', 0, 'Quest: Battle of the crimson watch TorlothAnim - Second'), +(-1000369, 'As you desire, Lord Illidan.', 0, 'Quest: Battle of the crimson watch TorlothAnim - Third'), +(-1000370, 'Yes, Lord Illidan, I would sacrifice to you this magnificent physique. On this day you will fall - another victim of Torloth...', 0, 'Quest: Battle of the crimson watch TorlothAnim - Fourth'), + +(-1000371, 'What manner of fool dares stand before Illidan Stormrage? Soldiers, destroy these insects!', 1, 'Quest: Battle of the crimson watch WavesInfo - First'), +(-1000372, 'You are no challenge for the Crimson Sigil. Mind breakers, end this nonsense.', 1, 'Quest: Battle of the crimson watch WavesInfo - Second'), +(-1000373, 'Run while you still can. The highlords come soon...', 1, 'Quest: Battle of the crimson watch WavesInfo - Third'), +(-1000374, 'Torloth your master calls!', 1, 'Quest: Battle of the crimson watch WavesInfo - Fourth'); + diff --git a/sql/updates/965_world_scripts.sql b/sql/updates/965_world_scripts.sql new file mode 100644 index 00000000000..51ea41b94e5 --- /dev/null +++ b/sql/updates/965_world_scripts.sql @@ -0,0 +1,18 @@ +REPLACE INTO `spell_script_target` VALUES +(33655,0,183350), +(33655,0,183351), +(44374,1,24722), +(31538,1,17895), +(29967,1,16524), +(39887,1,23002), +(31617,1,17899), +(31624,1,17899), +(31625,1,17899), +(34019,1,19422), +(34946,1,20040), +(34946,1,20041), +(21934,1,21934), +(43144,1,23817), +(12613,1,5843), +(9095,1,1200); + diff --git a/sql/updates/966_world_scripts.sql b/sql/updates/966_world_scripts.sql new file mode 100644 index 00000000000..78ecaa6eb73 --- /dev/null +++ b/sql/updates/966_world_scripts.sql @@ -0,0 +1,25 @@ +DELETE FROM script_texts WHERE entry BETWEEN -1000395 AND -1000375; +INSERT INTO script_texts (entry,content_default,sound,type,language,emote,comment) VALUES +(-1000375 ,'I remember well the sting of defeat at the conclusion of the Third War. I have waited far too long for my revenge. Now the shadow of the Legion falls over this world. It is only a matter of time until all of your failed creation... is undone.',11332,1,0,0,'kazzak SAY_INTRO'), +(-1000376,'The Legion will conquer all!',11333,1,0,0,'kazzak SAY_AGGRO1'), +(-1000377,'All mortals will perish!',11334,1,0,0,'kazzak SAY_AGGRO2'), +(-1000378,'All life must be eradicated!',11335,1,0,0,'kazzak SAY_SURPREME1'), +(-1000379,'I\'ll rip the flesh from your bones!',11336,1,0,0,'kazzak SAY_SURPREME2'), +(-1000380,'Kirel Narak!',11337,1,0,0,'kazzak SAY_KILL1'), +(-1000381,'Contemptible wretch!',11338,1,0,0,'kazzak SAY_KILL2'), +(-1000382,'The universe will be remade.',11339,1,0,0,'kazzak SAY_KILL3'), +(-1000383,'The Legion... will never... fall.',11340,1,0,0,'kazzak SAY_DEATH'), +(-1000384,'%s goes into a frenzy!',0,2,0,0,'kazzak EMOTE_FRENZY'), +(-1000385,'Invaders, you dangle upon the precipice of oblivion! The Burning Legion comes and with it comes your end.',0,1,0,0,'kazzak SAY_RAND1'), +(-1000386,'Impudent whelps, you only delay the inevitable. Where one has fallen, ten shall rise. Such is the will of Kazzak...',0,1,0,0,'kazzak SAY_RAND2'), + +(-1000387,'Do not proceed. You will be eliminated!',11344,1,0,0,'doomwalker SAY_AGGRO'), +(-1000388,'Tectonic disruption commencing.',11345,1,0,0,'doomwalker SAY_EARTHQUAKE_1'), +(-1000389,'Magnitude set. Release.',11346,1,0,0,'doomwalker SAY_EARTHQUAKE_2'), +(-1000390,'Trajectory locked.',11347,1,0,0,'doomwalker SAY_OVERRUN_1'), +(-1000391,'Engage maximum speed.',11348,1,0,0,'doomwalker SAY_OVERRUN_2'), +(-1000392,'Threat level zero.',11349,1,0,0,'doomwalker SAY_SLAY_1'), +(-1000393,'Directive accomplished.',11350,1,0,0,'doomwalker SAY_SLAY_2'), +(-1000394,'Target exterminated.',11351,1,0,0,'doomwalker SAY_SLAY_3'), +(-1000395,'System failure in five, f-o-u-r...',11352,1,0,0,'doomwalker SAY_DEATH'); + diff --git a/sql/updates/970_world_scripts.sql b/sql/updates/970_world_scripts.sql new file mode 100644 index 00000000000..6105fc5ccbe --- /dev/null +++ b/sql/updates/970_world_scripts.sql @@ -0,0 +1,10 @@ +DELETE FROM script_texts WHERE entry BETWEEN -1000401 AND -1000396; +INSERT INTO script_texts (entry, content_default, type, language, comment) VALUES +(-1000396, 'Muahahahaha! You fool! You\'ve released me from my banishment in the interstices between space and time!', 0, 0, 'mobs_nether_drake - SAY_NIHIL_1'), +(-1000397, 'All of Draenor shall quick beneath my feet! I will destroy this world and reshape it in my image!', 0, 0, 'mobs_nether_drake - SAY_NIHIL_2'), +(-1000398, 'Where shall I begin? I cannot bother myself with a worm such as yourself. There is a world to be conquered!', 0, 0, 'mobs_nether_Drake - SAY_NIHIL_3'), +(-1000399, 'No doubt the fools that banished me are long dead. I shall take wing survey my demense. Pray to whatever gods you hold dear that we do not meet again.', 0, 0, 'mobs_nether_drake - SAY_NIHIL_4'), +(-1000400, 'NOOOOooooooo!', 1, 0, 'mobs_nether_drake - SAY_NIHIL_INTERRUPT'), + +(-1000401, 'Good $N, you are under the spell\'s influence. I must analyze it quickly, then we can talk.', 0, 7, 'npc_daranelle - SAY_DARANELLE'); + diff --git a/sql/updates/973_world_scripts.sql b/sql/updates/973_world_scripts.sql new file mode 100644 index 00000000000..35261fc7b02 --- /dev/null +++ b/sql/updates/973_world_scripts.sql @@ -0,0 +1,2 @@ +update creature_template set scriptname = 'npc_enraged_spirit' where entry in (21050, 21061, 21060, 21059); + diff --git a/sql/world.sql b/sql/world.sql index c32d83aa3fd..8663a34e60d 100644 --- a/sql/world.sql +++ b/sql/world.sql @@ -13783,3 +13783,4 @@ UNLOCK TABLES; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; -- Dump completed on 2008-03-30 15:34:54 + diff --git a/sql/world_scripts_full.sql b/sql/world_scripts_full.sql index 5fcab34fca8..b9239812d73 100644 --- a/sql/world_scripts_full.sql +++ b/sql/world_scripts_full.sql @@ -579,7 +579,8 @@ UPDATE `creature_template` SET `ScriptName`='npc_clintar_spirit' WHERE `entry`=2 /* MULGORE */ UPDATE `creature_template` SET `ScriptName`='npc_skorn_whitecloud' WHERE `entry`=3052; -UPDATE `creature_template` SET `ScriptName`='npc_kyle_frenzied' where `entry`=23616; +UPDATE `creature_template` SET `ScriptName`='npc_kyle_frenzied' WHERE `entry`='23616'; +UPDATE `creature_template` SET `ScriptName`='npc_plains_vision' WHERE `entry`='2983'; /* NAGRAND */ UPDATE `creature_template` SET `ScriptName`='mob_lump' WHERE `entry`=18351; @@ -874,6 +875,7 @@ UPDATE `creature_template` SET `ScriptName`='npc_isla_starmane' WHERE `entry`=18 /* THOUSAND NEEDLES */ UPDATE `creature_template` SET `ScriptName`='npc_swiftmountain' WHERE `entry`=10427; +UPDATE `creature_template` SET `ScriptName` = 'npc_plucky' WHERE `entry` = '6626'; /* THUNDER BLUFF */ UPDATE `creature_template` SET `ScriptName`='npc_cairne_bloodhoof' WHERE `entry`=3057; @@ -980,4 +982,5 @@ UPDATE `creature_template` SET `ScriptName`='mob_spawn_of_marli' WHERE `entry`=1 UPDATE `creature_template` SET `ScriptName`='mob_batrider' WHERE `entry`=14965; UPDATE `creature_template` SET `ScriptName`='mob_shade_of_jindo' WHERE `entry`=14986; -/* EOF */
\ No newline at end of file +/* EOF */ + diff --git a/sql/world_scripts_structure.sql b/sql/world_scripts_structure.sql index 3d4ae9911cb..57556ff5910 100644 --- a/sql/world_scripts_structure.sql +++ b/sql/world_scripts_structure.sql @@ -102,4 +102,5 @@ DROP TABLE IF EXISTS `sd2_db_version`; DROP TABLE IF EXISTS `script_db_version`; CREATE TABLE `script_db_version` ( `version` varchar(255) NOT NULL default '' COMMENT 'Database version string' -) ENGINE=MyISAM DEFAULT CHARSET=utf8;
\ No newline at end of file +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + diff --git a/sql/world_spell_full.sql b/sql/world_spell_full.sql index 1c71285a593..cfaa310a166 100644 --- a/sql/world_spell_full.sql +++ b/sql/world_spell_full.sql @@ -367,3 +367,4 @@ REPLACE INTO `spell_script_target` (`entry`, `type`, `targetEntry`) VALUES DELETE FROM spell_target_position WHERE `id` IN (46019, 46020); INSERT INTO spell_target_position () VALUES (46019, 580, 1704.34, 928.17, -74.558, 0); INSERT INTO spell_target_position () VALUES (46020, 580, 1704.34, 928.17, 53.079, 0); + diff --git a/src/bindings/interface/ScriptMgr.cpp b/src/bindings/interface/ScriptMgr.cpp index abbde65c51a..81e017685d6 100644 --- a/src/bindings/interface/ScriptMgr.cpp +++ b/src/bindings/interface/ScriptMgr.cpp @@ -320,3 +320,4 @@ void ScriptedAI::DoGoHome() m_creature->GetMotionMaster()->MoveTargetedHome(); } */ + diff --git a/src/bindings/interface/ScriptMgr.h b/src/bindings/interface/ScriptMgr.h index 2296d2247de..3954616d382 100644 --- a/src/bindings/interface/ScriptMgr.h +++ b/src/bindings/interface/ScriptMgr.h @@ -159,3 +159,4 @@ struct TRINITY_DLL_DECL ScriptedAI : public CreatureAI }; #endif + diff --git a/src/bindings/interface/Scripts/sc_default.cpp b/src/bindings/interface/Scripts/sc_default.cpp index f6c8386579f..56ec01c4205 100644 --- a/src/bindings/interface/Scripts/sc_default.cpp +++ b/src/bindings/interface/Scripts/sc_default.cpp @@ -119,3 +119,4 @@ void AddSC_default() m_scripts[nrscripts++] = newscript; } + diff --git a/src/bindings/interface/Scripts/sc_defines.cpp b/src/bindings/interface/Scripts/sc_defines.cpp index 45456a1d5e2..922beebfc46 100644 --- a/src/bindings/interface/Scripts/sc_defines.cpp +++ b/src/bindings/interface/Scripts/sc_defines.cpp @@ -152,3 +152,4 @@ uint32 GetSkillLevel(Player *player,uint32 trskill) return TRADESKILL_LEVEL_NONE; } + diff --git a/src/bindings/interface/Scripts/sc_defines.h b/src/bindings/interface/Scripts/sc_defines.h index ecd55aa7282..f9bac67683c 100644 --- a/src/bindings/interface/Scripts/sc_defines.h +++ b/src/bindings/interface/Scripts/sc_defines.h @@ -96,3 +96,4 @@ extern uint32 GetSkillLevel(Player *player,uint32 skill); // ----------------------------------- #endif + diff --git a/src/bindings/interface/config.h b/src/bindings/interface/config.h index ab312d7d3f4..3899d7892a1 100644 --- a/src/bindings/interface/config.h +++ b/src/bindings/interface/config.h @@ -31,3 +31,4 @@ #else #define TRINITY_DLL_EXPORT extern "C" export #endif + diff --git a/src/bindings/interface/system.cpp b/src/bindings/interface/system.cpp index 20eaf9ce64c..05e932ca3ae 100644 --- a/src/bindings/interface/system.cpp +++ b/src/bindings/interface/system.cpp @@ -25,3 +25,4 @@ BOOL APIENTRY DllMain( HANDLE /*hModule*/, DWORD /*ul_reason_for_call*/, LPVOID return true; } #endif + diff --git a/src/bindings/scripts/ScriptMgr.cpp b/src/bindings/scripts/ScriptMgr.cpp index b59f07f8846..2ab7c3c29a3 100644 --- a/src/bindings/scripts/ScriptMgr.cpp +++ b/src/bindings/scripts/ScriptMgr.cpp @@ -2136,3 +2136,4 @@ InstanceData* CreateInstanceData(Map *map) return tmpscript->GetInstanceData(map); } + diff --git a/src/bindings/scripts/ScriptMgr.h b/src/bindings/scripts/ScriptMgr.h index ebc102f32d9..5f9ab9b8ae1 100644 --- a/src/bindings/scripts/ScriptMgr.h +++ b/src/bindings/scripts/ScriptMgr.h @@ -82,3 +82,4 @@ void DoScriptText(int32 textEntry, WorldObject* pSource, Unit* target = NULL); #endif #endif + diff --git a/src/bindings/scripts/include/precompiled.cpp b/src/bindings/scripts/include/precompiled.cpp index faeca72cd2b..75bfae9e1c4 100644 --- a/src/bindings/scripts/include/precompiled.cpp +++ b/src/bindings/scripts/include/precompiled.cpp @@ -3,3 +3,4 @@ * Please see the included DOCS/LICENSE.TXT for more information */ #include "precompiled.h" + diff --git a/src/bindings/scripts/include/precompiled.h b/src/bindings/scripts/include/precompiled.h index ea771653483..28b37a98349 100644 --- a/src/bindings/scripts/include/precompiled.h +++ b/src/bindings/scripts/include/precompiled.h @@ -28,3 +28,4 @@ LPVOID lpReserved #endif #endif + diff --git a/src/bindings/scripts/include/sc_creature.cpp b/src/bindings/scripts/include/sc_creature.cpp index 2d767815dad..04ea6271d9d 100644 --- a/src/bindings/scripts/include/sc_creature.cpp +++ b/src/bindings/scripts/include/sc_creature.cpp @@ -843,7 +843,7 @@ void LoadOverridenSQLData() // Sunwell Plateau : Kalecgos : Spectral Rift goInfo = const_cast<GameObjectInfo*>(GetGameObjectInfo(187055)); if(goInfo && goInfo->type == GAMEOBJECT_TYPE_GOOBER) - goInfo->type = GAMEOBJECT_TYPE_SPELLCASTER; + goInfo->goober.lockId = 57; // need LOCKTYPE_QUICK_OPEN } void LoadOverridenDBCData() @@ -855,3 +855,4 @@ void LoadOverridenDBCData() if(spellInfo) spellInfo->EffectApplyAuraName[0] = 4; // proc debuff, and summon infinite fiends } + diff --git a/src/bindings/scripts/include/sc_creature.h b/src/bindings/scripts/include/sc_creature.h index 30769927501..5639ad0f1ff 100644 --- a/src/bindings/scripts/include/sc_creature.h +++ b/src/bindings/scripts/include/sc_creature.h @@ -205,3 +205,4 @@ struct TRINITY_DLL_DECL NullCreatureAI : public ScriptedAI }; #endif + diff --git a/src/bindings/scripts/include/sc_gossip.h b/src/bindings/scripts/include/sc_gossip.h index 1bb984f8962..4f3188104eb 100644 --- a/src/bindings/scripts/include/sc_gossip.h +++ b/src/bindings/scripts/include/sc_gossip.h @@ -189,3 +189,4 @@ extern uint32 GetSkillLevel(Player *player,uint32 skill); #define QUEST_DIALOG_STATUS(a,b,c) GetSession()->getDialogStatus(a,b,c) #endif + diff --git a/src/bindings/scripts/include/sc_instance.h b/src/bindings/scripts/include/sc_instance.h index 25be77f876c..2f1cd3a16a6 100644 --- a/src/bindings/scripts/include/sc_instance.h +++ b/src/bindings/scripts/include/sc_instance.h @@ -43,3 +43,4 @@ class TRINITY_DLL_DECL ScriptedInstance : public InstanceData }; #endif + diff --git a/src/bindings/scripts/scripts/areatrigger/areatrigger_scripts.cpp b/src/bindings/scripts/scripts/areatrigger/areatrigger_scripts.cpp index 9208672c01f..1c1b7312cb3 100644 --- a/src/bindings/scripts/scripts/areatrigger/areatrigger_scripts.cpp +++ b/src/bindings/scripts/scripts/areatrigger/areatrigger_scripts.cpp @@ -64,3 +64,4 @@ void AddSC_areatrigger_scripts() newscript->pAreaTrigger = &AreaTrigger_at_legion_teleporter; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/boss/boss_emeriss.cpp b/src/bindings/scripts/scripts/boss/boss_emeriss.cpp index 5f857730d9a..15a813cd455 100644 --- a/src/bindings/scripts/scripts/boss/boss_emeriss.cpp +++ b/src/bindings/scripts/scripts/boss/boss_emeriss.cpp @@ -154,3 +154,4 @@ void AddSC_boss_emeriss() newscript->GetAI = &GetAI_boss_emeriss; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/boss/boss_lethon.cpp b/src/bindings/scripts/scripts/boss/boss_lethon.cpp index 612fcf596f7..e387891efed 100644 --- a/src/bindings/scripts/scripts/boss/boss_lethon.cpp +++ b/src/bindings/scripts/scripts/boss/boss_lethon.cpp @@ -22,3 +22,4 @@ SDCategory: Bosses EndScriptData */ #include "precompiled.h" + diff --git a/src/bindings/scripts/scripts/boss/boss_taerar.cpp b/src/bindings/scripts/scripts/boss/boss_taerar.cpp index cbe1cffa6b7..0de457f4094 100644 --- a/src/bindings/scripts/scripts/boss/boss_taerar.cpp +++ b/src/bindings/scripts/scripts/boss/boss_taerar.cpp @@ -304,3 +304,4 @@ void AddSC_boss_taerar() newscript->GetAI = &GetAI_boss_shadeoftaerar; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/boss/boss_ysondre.cpp b/src/bindings/scripts/scripts/boss/boss_ysondre.cpp index c04076bc716..44795b41750 100644 --- a/src/bindings/scripts/scripts/boss/boss_ysondre.cpp +++ b/src/bindings/scripts/scripts/boss/boss_ysondre.cpp @@ -244,3 +244,4 @@ void AddSC_boss_ysondre() newscript->GetAI = &GetAI_mob_dementeddruids; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/creature/mob_event_ai.cpp b/src/bindings/scripts/scripts/creature/mob_event_ai.cpp index e23a262ed4f..45545c8c6aa 100644 --- a/src/bindings/scripts/scripts/creature/mob_event_ai.cpp +++ b/src/bindings/scripts/scripts/creature/mob_event_ai.cpp @@ -1398,3 +1398,4 @@ void AddSC_mob_event() newscript->GetAI = &GetAI_Mob_EventAI; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/creature/mob_event_ai.h b/src/bindings/scripts/scripts/creature/mob_event_ai.h index 930905158ba..a04c97e9885 100644 --- a/src/bindings/scripts/scripts/creature/mob_event_ai.h +++ b/src/bindings/scripts/scripts/creature/mob_event_ai.h @@ -218,3 +218,4 @@ extern UNORDERED_MAP<uint32, EventAI_CreatureError> EventAI_CreatureErrorPrevent #define EVENTAI_EMPTY_EVENTLIST "SD2: Eventlist for Creature %i is empty but creature is using Mob_EventAI. Preventing EventAI on this creature." */ #endif + diff --git a/src/bindings/scripts/scripts/creature/mob_generic_creature.cpp b/src/bindings/scripts/scripts/creature/mob_generic_creature.cpp index b28f38516ce..79ffef4ad54 100644 --- a/src/bindings/scripts/scripts/creature/mob_generic_creature.cpp +++ b/src/bindings/scripts/scripts/creature/mob_generic_creature.cpp @@ -170,3 +170,4 @@ void AddSC_generic_creature() newscript->GetAI = &GetAI_generic_creature; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/creature/simple_ai.cpp b/src/bindings/scripts/scripts/creature/simple_ai.cpp index 59d59818ef3..54ef8a6a705 100644 --- a/src/bindings/scripts/scripts/creature/simple_ai.cpp +++ b/src/bindings/scripts/scripts/creature/simple_ai.cpp @@ -292,3 +292,4 @@ void SimpleAI::UpdateAI(const uint32 diff) DoMeleeAttackIfReady(); } + diff --git a/src/bindings/scripts/scripts/creature/simple_ai.h b/src/bindings/scripts/scripts/creature/simple_ai.h index 7cfdb8979d1..733dcca6e22 100644 --- a/src/bindings/scripts/scripts/creature/simple_ai.h +++ b/src/bindings/scripts/scripts/creature/simple_ai.h @@ -72,3 +72,4 @@ protected: }; #endif + diff --git a/src/bindings/scripts/scripts/custom/custom_example.cpp b/src/bindings/scripts/scripts/custom/custom_example.cpp new file mode 100644 index 00000000000..aae7fccbd57 --- /dev/null +++ b/src/bindings/scripts/scripts/custom/custom_example.cpp @@ -0,0 +1,278 @@ +/* Copyright (C) 2006 - 2008 ScriptDev2 <https://scriptdev2.svn.sourceforge.net/> + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Custom_Example +SD%Complete: 100 +SDComment: Short custom scripting example +SDCategory: Script Examples +EndScriptData */ + +#include "precompiled.h" + +// **** This script is designed as an example for others to build on **** +// **** Please modify whatever you'd like to as this script is only for developement **** + +// **** Script Info **** +// This script is written in a way that it can be used for both friendly and hostile monsters +// Its primary purpose is to show just how much you can really do with scripts +// I recommend trying it out on both an agressive NPC and on friendly npc + +// **** Quick Info **** +// Functions with Handled Function marked above them are functions that are called automatically by the core +// Functions that are marked Custom Function are functions I've created to simplify code + +#define SPELL_BUFF 25661 +#define SPELL_ONE 12555 +#define SPELL_ONE_ALT 24099 +#define SPELL_TWO 10017 +#define SPELL_THREE 26027 +#define SPELL_ENRAGE 23537 +#define SPELL_BESERK 32309 + +#define SAY_AGGRO "Let the games begin." +#define SAY_RANDOM_0 "I see endless suffering. I see torment. I see rage. I see everything." +#define SAY_RANDOM_1 "Muahahahaha" +#define SAY_RANDOM_2 "These mortal infedels my lord, they have invaded your sanctum and seek to steal your secrets." +#define SAY_RANDOM_3 "You are already dead." +#define SAY_RANDOM_4 "Where to go? What to do? So many choices that all end in pain, end in death." +#define SAY_BESERK "$N, I sentance you to death!" +#define SAY_PHASE "The suffering has just begun!" + +#define GOSSIP_ITEM "I'm looking for a fight" +#define SAY_DANCE "I always thought I was a good dancer" +#define SAY_SALUTE "Move out Soldier!" + +struct TRINITY_DLL_DECL custom_exampleAI : public ScriptedAI +{ + //*** HANDLED FUNCTION *** + //This is the constructor, called only once when the creature is first created + custom_exampleAI(Creature *c) : ScriptedAI(c) {Reset();} + + //*** CUSTOM VARIABLES **** + //These variables are for use only by this individual script. + //Nothing else will ever call them but us. + + uint32 Say_Timer; //Timer for random chat + uint32 Rebuff_Timer; //Timer for rebuffing + uint32 Spell_1_Timer; //Timer for spell 1 when in combat + uint32 Spell_2_Timer; //Timer for spell 1 when in combat + uint32 Spell_3_Timer; //Timer for spell 1 when in combat + uint32 Beserk_Timer; //Timer until we go into Beserk (enraged) mode + uint32 Phase; //The current battle phase we are in + uint32 Phase_Timer; //Timer until phase transition + + //*** HANDLED FUNCTION *** + //This is called whenever the core decides we need to evade + void Reset() + { + Phase = 1; //Start in phase 1 + Phase_Timer = 60000; //60 seconds + Spell_1_Timer = 5000; //5 seconds + Spell_2_Timer = 37000; //37 seconds + Spell_3_Timer = 19000; //19 seconds + Beserk_Timer = 120000; //2 minutes + } + + //*** HANDLED FUNCTION *** + //Attack Start is called whenever someone hits us. + void Aggro(Unit *who) + { + //Say some stuff + DoSay(SAY_AGGRO,LANG_UNIVERSAL,NULL); + DoPlaySoundToSet(m_creature,8280); + } + + //*** HANDLED FUNCTION *** + //Update AI is called Every single map update (roughly once every 100ms if a player is within the grid) + void UpdateAI(const uint32 diff) + { + //Out of combat timers + if (!m_creature->getVictim()) + { + //Random Say timer + if (Say_Timer < diff) + { + //Random switch between 5 outcomes + switch (rand()%5) + { + case 0: + DoYell(SAY_RANDOM_0,LANG_UNIVERSAL,NULL); + DoPlaySoundToSet(m_creature,8831); //8831 is the index of the sound we are playing. You find these numbers in SoundEntries.dbc + break; + + case 1: + DoYell(SAY_RANDOM_1,LANG_UNIVERSAL,NULL); + DoPlaySoundToSet(m_creature,8818); + break; + + case 2: + DoYell(SAY_RANDOM_2,LANG_UNIVERSAL,NULL); + DoPlaySoundToSet(m_creature,8041); + break; + + case 3: + DoYell(SAY_RANDOM_3,LANG_UNIVERSAL,NULL); + DoPlaySoundToSet(m_creature,8581); + break; + + case 4: + DoYell(SAY_RANDOM_4,LANG_UNIVERSAL,NULL); + DoPlaySoundToSet(m_creature,8791); + break; + } + + Say_Timer = 45000; //Say something agian in 45 seconds + }else Say_Timer -= diff; + + //Rebuff timer + if (Rebuff_Timer < diff) + { + DoCast(m_creature,SPELL_BUFF); + Rebuff_Timer = 900000; //Rebuff agian in 15 minutes + }else Rebuff_Timer -= diff; + } + + //Return since we have no target + if (!UpdateVictim()) + return; + + //Spell 1 timer + if (Spell_1_Timer < diff) + { + //Cast spell one on our current target. + if (rand()%50 > 10) + DoCast(m_creature->getVictim(),SPELL_ONE_ALT); + else if (m_creature->GetDistance(m_creature->getVictim()) < 25) + DoCast(m_creature->getVictim(),SPELL_ONE); + + Spell_1_Timer = 5000; + }else Spell_1_Timer -= diff; + + //Spell 2 timer + if (Spell_2_Timer < diff) + { + //Cast spell one on our current target. + DoCast(m_creature->getVictim(),SPELL_TWO); + + Spell_2_Timer = 37000; + }else Spell_2_Timer -= diff; + + //Spell 3 timer + if (Phase > 1) + if (Spell_3_Timer < diff) + { + //Cast spell one on our current target. + DoCast(m_creature->getVictim(),SPELL_THREE); + + Spell_3_Timer = 19000; + }else Spell_3_Timer -= diff; + + //Beserk timer + if (Phase > 1) + if (Beserk_Timer < diff) + { + //Say our line then cast uber death spell + DoPlaySoundToSet(m_creature,8588); + DoYell(SAY_BESERK,LANG_UNIVERSAL,m_creature->getVictim()); + DoCast(m_creature->getVictim(),SPELL_BESERK); + + //Cast our beserk spell agian in 12 seconds if we didn't kill everyone + Beserk_Timer = 12000; + }else Beserk_Timer -= diff; + + //Phase timer + if (Phase == 1) + if (Phase_Timer < diff) + { + //Go to next phase + Phase++; + DoYell(SAY_PHASE,LANG_UNIVERSAL,NULL); + DoCast(m_creature,SPELL_ENRAGE); + }else Phase_Timer -= diff; + + DoMeleeAttackIfReady(); + } +}; + +//This is the GetAI method used by all scripts that involve AI +//It is called every time a new creature using this script is created +CreatureAI* GetAI_custom_example(Creature *_Creature) +{ + return new custom_exampleAI (_Creature); +} + +//This function is called when the player clicks an option on the gossip menu +void SendDefaultMenu_custom_example(Player *player, Creature *_Creature, uint32 action) +{ + if (action == GOSSIP_ACTION_INFO_DEF + 1) //Fight time + { + //Set our faction to hostile twoards all + _Creature->setFaction(24); + _Creature->Attack(player, true); + player->PlayerTalkClass->CloseGossip(); + } +} + +//This function is called when the player clicks an option on the gossip menu +bool GossipSelect_custom_example(Player *player, Creature *_Creature, uint32 sender, uint32 action ) +{ + if (sender == GOSSIP_SENDER_MAIN) + SendDefaultMenu_custom_example(player, _Creature, action); + + return true; +} + +//This function is called when the player opens the gossip menu +bool GossipHello_custom_example(Player *player, Creature *_Creature) +{ + player->ADD_GOSSIP_ITEM( 0, GOSSIP_ITEM , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); + player->PlayerTalkClass->SendGossipMenu(907,_Creature->GetGUID()); + + return true; +} + +//Our Recive emote function +bool ReceiveEmote_custom_example(Player *player, Creature *_Creature, uint32 emote) +{ + _Creature->HandleEmoteCommand(emote); + + if (emote == TEXTEMOTE_DANCE) + ((custom_exampleAI*)_Creature->AI())->DoSay(SAY_DANCE,LANG_UNIVERSAL,NULL); + + if (emote == TEXTEMOTE_SALUTE) + ((custom_exampleAI*)_Creature->AI())->DoSay(SAY_SALUTE,LANG_UNIVERSAL,NULL); + + return true; +} + +//This is the actual function called only once durring InitScripts() +//It must define all handled functions that are to be run in this script +//For example if you want this Script to handle Emotes you must include +//newscript->ReciveEmote = My_Emote_Function; +void AddSC_custom_example() +{ + Script *newscript; + + newscript = new Script; + newscript->Name="custom_example"; + newscript->GetAI = &GetAI_custom_example; + newscript->pGossipHello = &GossipHello_custom_example; + newscript->pGossipSelect = &GossipSelect_custom_example; + newscript->pReceiveEmote = &ReceiveEmote_custom_example; + newscript->RegisterSelf(); +} + diff --git a/src/bindings/scripts/scripts/custom/custom_gossip_codebox.cpp b/src/bindings/scripts/scripts/custom/custom_gossip_codebox.cpp new file mode 100644 index 00000000000..699f5377ee9 --- /dev/null +++ b/src/bindings/scripts/scripts/custom/custom_gossip_codebox.cpp @@ -0,0 +1,82 @@ +/* Copyright (C) 2006 - 2008 ScriptDev2 <https://scriptdev2.svn.sourceforge.net/> + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Custom_Gossip_Codebox +SD%Complete: 100 +SDComment: Show a codebox in gossip option +SDCategory: Script Examples +EndScriptData */ + +#include "precompiled.h" +#include <cstring> + +//This function is called when the player opens the gossip menubool +bool GossipHello_custom_gossip_codebox(Player *player, Creature *_Creature) +{ + player->ADD_GOSSIP_ITEM_EXTENDED(0, "A quiz: what's your name?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1, "", 0, true); + player->ADD_GOSSIP_ITEM(0, "I'm not interested", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); + + player->PlayerTalkClass->SendGossipMenu(907,_Creature->GetGUID()); + return true; +} + +//This function is called when the player clicks an option on the gossip menubool +bool GossipSelect_custom_gossip_codebox(Player *player, Creature *_Creature, uint32 sender, uint32 action ) +{ + if(action == GOSSIP_ACTION_INFO_DEF+2) + { + _Creature->Say("Normal select, guess you're not interested.", LANG_UNIVERSAL, 0); + player->CLOSE_GOSSIP_MENU(); + } + return true; +} + +bool GossipSelectWithCode_custom_gossip_codebox( Player *player, Creature *_Creature, uint32 sender, uint32 action, const char* sCode ) +{ + if(sender == GOSSIP_SENDER_MAIN) + { + if(action == GOSSIP_ACTION_INFO_DEF+1) + { + if(std::strcmp(sCode, player->GetName())!=0) + { + _Creature->Say("Wrong!", LANG_UNIVERSAL, 0); + _Creature->CastSpell(player, 12826, true); + } + else + { + _Creature->Say("You're right, you are allowed to see my inner secrets.", LANG_UNIVERSAL, 0); + _Creature->CastSpell(player, 26990, true); + } + player->CLOSE_GOSSIP_MENU(); + return true; + } + } + return false; +} + +void AddSC_custom_gossip_codebox() +{ + Script *newscript; + + newscript = new Script; + newscript->Name="custom_gossip_codebox"; + newscript->pGossipHello = &GossipHello_custom_gossip_codebox; + newscript->pGossipSelect = &GossipSelect_custom_gossip_codebox; + newscript->pGossipSelectWithCode = &GossipSelectWithCode_custom_gossip_codebox; + newscript->RegisterSelf(); +} + diff --git a/src/bindings/scripts/scripts/custom/test.cpp b/src/bindings/scripts/scripts/custom/test.cpp new file mode 100644 index 00000000000..b4e2780c4f1 --- /dev/null +++ b/src/bindings/scripts/scripts/custom/test.cpp @@ -0,0 +1,201 @@ +/* Copyright (C) 2006 - 2008 ScriptDev2 <https://scriptdev2.svn.sourceforge.net/> + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Test +SD%Complete: 100 +SDComment: Script used for testing escortAI +SDCategory: Script Examples +EndScriptData */ + +#include "precompiled.h" +#include "../npc/npc_escortAI.h" + +struct TRINITY_DLL_DECL npc_testAI : public npc_escortAI +{ + public: + + // CreatureAI functions + npc_testAI(Creature *c) : npc_escortAI(c) {Reset();} + + uint32 DeathCoilTimer; + uint32 ChatTimer; + + // Pure Virtual Functions + void WaypointReached(uint32 i) + { + switch (i) + { + case 1: + m_creature->Say("Hmm a nice day for a walk alright", LANG_UNIVERSAL, 0); + break; + + case 3: + { + m_creature->Say("Wild Felboar attack!", LANG_UNIVERSAL, 0); + Creature* temp = m_creature->SummonCreature(21878, m_creature->GetPositionX()+5, m_creature->GetPositionY()+7, m_creature->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 3000); + + temp->AI()->AttackStart(m_creature); + } + break; + + case 4: + { + m_creature->Say("Time for me to go! See ya around $N!", LANG_UNIVERSAL, PlayerGUID); + m_creature->HandleEmoteCommand(EMOTE_ONESHOT_WAVE); + + Unit* temp = Unit::GetUnit(*m_creature, PlayerGUID); + if (temp) + { + temp->MonsterSay("Bye Bye!", LANG_UNIVERSAL, 0); + temp->HandleEmoteCommand(EMOTE_ONESHOT_WAVE); + } + } + break; + } + } + + void Aggro(Unit*) + { + if (IsBeingEscorted) + m_creature->Say("Help $N! I'm under attack!", LANG_UNIVERSAL, PlayerGUID); + else m_creature->Say("Die scum!", LANG_UNIVERSAL, 0); + } + + void Reset() + { + DeathCoilTimer = 4000; + ChatTimer = 4000; + } + + void JustDied(Unit* killer) + { + if (IsBeingEscorted) + { + //killer = m_creature when player got to far from creature + if (killer == m_creature) + { + Unit *pTemp = Unit::GetUnit(*m_creature,PlayerGUID); + if( pTemp ) + DoWhisper("How dare you leave me like that! I hate you! =*(", pTemp); + } + else m_creature->Say("...no...how could you let me die $N", LANG_UNIVERSAL, PlayerGUID); + } + else m_creature->Say("ugh...", LANG_UNIVERSAL, 0); + } + + void UpdateAI(const uint32 diff) + { + //Must update npc_escortAI + npc_escortAI::UpdateAI(diff); + + //Combat check + if (InCombat && m_creature->getVictim()) + { + if (DeathCoilTimer < diff) + { + m_creature->Say("Taste death!", LANG_UNIVERSAL, 0); + m_creature->CastSpell(m_creature->getVictim(), 33130, false); + + DeathCoilTimer = 4000; + }else DeathCoilTimer -= diff; + }else + { + //Out of combat but being escorted + if (IsBeingEscorted) + if (ChatTimer < diff) + { + if (m_creature->HasAura(3593, 0)) + { + m_creature->Say("Fireworks!", LANG_UNIVERSAL, 0); + m_creature->CastSpell(m_creature, 11540, false); + }else + { + m_creature->Say("Hmm, I think I could use a buff", LANG_UNIVERSAL, 0); + m_creature->CastSpell(m_creature, 3593, false); + } + + ChatTimer = 12000; + }else ChatTimer -= diff; + } + } +}; + +CreatureAI* GetAI_test(Creature *_Creature) +{ + npc_testAI* testAI = new npc_testAI(_Creature); + + testAI->AddWaypoint(0, 1231, -4419, 23); + testAI->AddWaypoint(1, 1198, -4440, 23, 0); + testAI->AddWaypoint(2, 1208, -4392, 23); + testAI->AddWaypoint(3, 1231, -4419, 23, 5000); + testAI->AddWaypoint(4, 1208, -4392, 23, 5000); + + return (CreatureAI*)testAI; +} + +bool GossipHello_npc_test(Player *player, Creature *_Creature) +{ + player->TalkedToCreature(_Creature->GetEntry(),_Creature->GetGUID()); + _Creature->prepareGossipMenu(player,0); + + player->ADD_GOSSIP_ITEM(0, "Click to Test Escort(Attack, Defend, Run)", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); + player->ADD_GOSSIP_ITEM(0, "Click to Test Escort(NoAttack, NoDefend, Walk)", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); + player->ADD_GOSSIP_ITEM(0, "Click to Test Escort(NoAttack, Defend, Walk)", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); + + _Creature->sendPreparedGossip( player ); + return true; +} + +bool GossipSelect_npc_test(Player *player, Creature *_Creature, uint32 sender, uint32 action ) +{ + if (action == GOSSIP_ACTION_INFO_DEF+1) + { + player->CLOSE_GOSSIP_MENU(); + ((npc_escortAI*)(_Creature->AI()))->Start(true, true, true, player->GetGUID()); + + return true; // prevent Trinity core handling + } + + if (action == GOSSIP_ACTION_INFO_DEF+2) + { + player->CLOSE_GOSSIP_MENU(); + ((npc_escortAI*)(_Creature->AI()))->Start(false, false, false, player->GetGUID()); + + return true; // prevent Trinity core handling + } + + if (action == GOSSIP_ACTION_INFO_DEF+3) + { + player->CLOSE_GOSSIP_MENU(); + ((npc_escortAI*)(_Creature->AI()))->Start(false, true, false, player->GetGUID()); + + return true; // prevent Trinity core handling + } + return false; +} + +void AddSC_test() +{ + Script *newscript; + newscript = new Script; + newscript->Name="test"; + newscript->GetAI = &GetAI_test; + newscript->pGossipHello = &GossipHello_npc_test; + newscript->pGossipSelect = &GossipSelect_npc_test; + newscript->RegisterSelf(); +} + diff --git a/src/bindings/scripts/scripts/go/go_scripts.cpp b/src/bindings/scripts/scripts/go/go_scripts.cpp index de4666ce43d..07eb4656563 100644 --- a/src/bindings/scripts/scripts/go/go_scripts.cpp +++ b/src/bindings/scripts/scripts/go/go_scripts.cpp @@ -191,3 +191,4 @@ void AddSC_go_scripts() newscript->pGOHello = &GOHello_go_tablet_of_the_seven; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/guard/guard_ai.cpp b/src/bindings/scripts/scripts/guard/guard_ai.cpp index d7d56b29bd5..b635ae74b2d 100644 --- a/src/bindings/scripts/scripts/guard/guard_ai.cpp +++ b/src/bindings/scripts/scripts/guard/guard_ai.cpp @@ -169,3 +169,4 @@ void guardAI::UpdateAI(const uint32 diff) } } } + diff --git a/src/bindings/scripts/scripts/guard/guard_ai.h b/src/bindings/scripts/scripts/guard/guard_ai.h index d6fa9bb4168..6b346aefbb3 100644 --- a/src/bindings/scripts/scripts/guard/guard_ai.h +++ b/src/bindings/scripts/scripts/guard/guard_ai.h @@ -23,3 +23,4 @@ struct TRINITY_DLL_DECL guardAI : public ScriptedAI void UpdateAI(const uint32 diff); }; #endif + diff --git a/src/bindings/scripts/scripts/guard/guards.cpp b/src/bindings/scripts/scripts/guard/guards.cpp index 7cb0e3376cb..b825c75b6ab 100644 --- a/src/bindings/scripts/scripts/guard/guards.cpp +++ b/src/bindings/scripts/scripts/guard/guards.cpp @@ -4071,3 +4071,4 @@ void AddSC_guards() newscript->GetAI = &GetAI_guard_undercity; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/item/item_scripts.cpp b/src/bindings/scripts/scripts/item/item_scripts.cpp index 53f00ae5e85..b749b5f087f 100644 --- a/src/bindings/scripts/scripts/item/item_scripts.cpp +++ b/src/bindings/scripts/scripts/item/item_scripts.cpp @@ -593,3 +593,4 @@ void AddSC_item_scripts() newscript->pItemUse = &ItemUse_item_zezzak_shard; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/item/item_test.cpp b/src/bindings/scripts/scripts/item/item_test.cpp new file mode 100644 index 00000000000..4fc8ea221db --- /dev/null +++ b/src/bindings/scripts/scripts/item/item_test.cpp @@ -0,0 +1,43 @@ +/* Copyright (C) 2006 - 2008 ScriptDev2 <https://scriptdev2.svn.sourceforge.net/> + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Item_Test +SD%Complete: 100 +SDComment: Used for Testing Item Scripts +SDCategory: Items +EndScriptData */ + +#include "precompiled.h" + +extern void LoadDatabase(); + +bool ItemUse_item_test(Player *player, Item* _Item, SpellCastTargets const& targets) +{ + LoadDatabase(); + return true; +} + +void AddSC_item_test() +{ + Script *newscript; + + newscript = new Script; + newscript->Name="item_test"; + newscript->pItemUse = &ItemUse_item_test; + newscript->RegisterSelf(); +} + diff --git a/src/bindings/scripts/scripts/npc/npc_escortAI.cpp b/src/bindings/scripts/scripts/npc/npc_escortAI.cpp index ba321886496..d9089fe0ccc 100644 --- a/src/bindings/scripts/scripts/npc/npc_escortAI.cpp +++ b/src/bindings/scripts/scripts/npc/npc_escortAI.cpp @@ -300,3 +300,4 @@ void npc_escortAI::Start(bool bAttack, bool bDefend, bool bRun, uint64 pGUID) //Disable questgiver flag m_creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER); } + diff --git a/src/bindings/scripts/scripts/npc/npc_escortAI.h b/src/bindings/scripts/scripts/npc/npc_escortAI.h index e617a1cef4e..af0d3f64aa5 100644 --- a/src/bindings/scripts/scripts/npc/npc_escortAI.h +++ b/src/bindings/scripts/scripts/npc/npc_escortAI.h @@ -85,3 +85,4 @@ struct TRINITY_DLL_DECL npc_escortAI : public ScriptedAI bool Run; }; #endif + diff --git a/src/bindings/scripts/scripts/npc/npc_innkeeper.cpp b/src/bindings/scripts/scripts/npc/npc_innkeeper.cpp index f3be85c5c2d..7e01a85719d 100644 --- a/src/bindings/scripts/scripts/npc/npc_innkeeper.cpp +++ b/src/bindings/scripts/scripts/npc/npc_innkeeper.cpp @@ -142,3 +142,4 @@ void AddSC_npc_innkeeper() newscript->pGossipSelect = &GossipSelect_npc_innkeeper; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/npc/npc_professions.cpp b/src/bindings/scripts/scripts/npc/npc_professions.cpp index 21e0c55aec8..e121e598528 100644 --- a/src/bindings/scripts/scripts/npc/npc_professions.cpp +++ b/src/bindings/scripts/scripts/npc/npc_professions.cpp @@ -1201,3 +1201,4 @@ void AddSC_npc_professions() //newscript->pGossipSelect = &GossipSelect_go_soothsaying_for_dummies; newscript->RegisterSelf();*/ } + diff --git a/src/bindings/scripts/scripts/npc/npcs_special.cpp b/src/bindings/scripts/scripts/npc/npcs_special.cpp index 7b4111b2280..82edfa96e40 100644 --- a/src/bindings/scripts/scripts/npc/npcs_special.cpp +++ b/src/bindings/scripts/scripts/npc/npcs_special.cpp @@ -1213,3 +1213,4 @@ void AddSC_npcs_special() newscript->GetAI = &GetAI_npc_snake_trap_serpents; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/alterac_mountains/alterac_mountains.cpp b/src/bindings/scripts/scripts/zone/alterac_mountains/alterac_mountains.cpp index f1dfcf13859..10736c84acd 100644 --- a/src/bindings/scripts/scripts/zone/alterac_mountains/alterac_mountains.cpp +++ b/src/bindings/scripts/scripts/zone/alterac_mountains/alterac_mountains.cpp @@ -60,3 +60,4 @@ void AddSC_alterac_mountains() newscript->GetAI = &GetAI_npc_ravenholdt; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/arathi_highlands/arathi_highlands.cpp b/src/bindings/scripts/scripts/zone/arathi_highlands/arathi_highlands.cpp index fbde7783b67..b3f92e93408 100644 --- a/src/bindings/scripts/scripts/zone/arathi_highlands/arathi_highlands.cpp +++ b/src/bindings/scripts/scripts/zone/arathi_highlands/arathi_highlands.cpp @@ -162,3 +162,4 @@ void AddSC_arathi_highlands() newscript->pQuestAccept = &QuestAccept_npc_professor_phizzlethorpe; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/ashenvale_forest/ashenvale.cpp b/src/bindings/scripts/scripts/zone/ashenvale_forest/ashenvale.cpp index e98fb43cdb6..0192ac01a4a 100644 --- a/src/bindings/scripts/scripts/zone/ashenvale_forest/ashenvale.cpp +++ b/src/bindings/scripts/scripts/zone/ashenvale_forest/ashenvale.cpp @@ -317,3 +317,4 @@ void AddSC_ashenvale() newscript->pQuestAccept = &QuestAccept_npc_ruul_snowhoof; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/auchenai_crypts/boss_exarch_maladaar.cpp b/src/bindings/scripts/scripts/zone/aunchindoun/auchenai_crypts/boss_exarch_maladaar.cpp index 1a9c3b49e76..de1cc812df8 100644 --- a/src/bindings/scripts/scripts/zone/aunchindoun/auchenai_crypts/boss_exarch_maladaar.cpp +++ b/src/bindings/scripts/scripts/zone/aunchindoun/auchenai_crypts/boss_exarch_maladaar.cpp @@ -356,3 +356,4 @@ void AddSC_boss_exarch_maladaar() newscript->GetAI = &GetAI_mob_stolen_soul; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp b/src/bindings/scripts/scripts/zone/aunchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp index 4d9879151ce..4df3bc3c356 100644 --- a/src/bindings/scripts/scripts/zone/aunchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp +++ b/src/bindings/scripts/scripts/zone/aunchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp @@ -208,4 +208,5 @@ void AddSC_boss_shirrak_the_dead_watcher() newscript->Name="mob_focus_fire"; newscript->GetAI = &GetAI_mob_focus_fire; newscript->RegisterSelf(); -}
\ No newline at end of file +} + diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_nexusprince_shaffar.cpp b/src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_nexusprince_shaffar.cpp index e5cd5ecbe07..02e34437474 100644 --- a/src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_nexusprince_shaffar.cpp +++ b/src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_nexusprince_shaffar.cpp @@ -287,3 +287,4 @@ void AddSC_boss_nexusprince_shaffar() newscript->GetAI = &GetAI_mob_ethereal_beacon; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_pandemonius.cpp b/src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_pandemonius.cpp index 6434ca5ce3b..067ca215169 100644 --- a/src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_pandemonius.cpp +++ b/src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_pandemonius.cpp @@ -136,3 +136,4 @@ void AddSC_boss_pandemonius() newscript->GetAI = &GetAI_boss_pandemonius; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_darkweaver_syth.cpp b/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_darkweaver_syth.cpp index dd534ed9c9e..046ce673b3f 100644 --- a/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_darkweaver_syth.cpp +++ b/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_darkweaver_syth.cpp @@ -440,3 +440,4 @@ void AddSC_boss_darkweaver_syth() newscript->GetAI = &GetAI_mob_syth_shadow; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_tailonking_ikiss.cpp b/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_tailonking_ikiss.cpp index 572497a482f..53953e04d51 100644 --- a/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_tailonking_ikiss.cpp +++ b/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_tailonking_ikiss.cpp @@ -219,3 +219,4 @@ void AddSC_boss_talon_king_ikiss() newscript->GetAI = &GetAI_boss_talon_king_ikiss; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/def_sethekk_halls.h b/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/def_sethekk_halls.h index 8c4bc572541..698571faecc 100644 --- a/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/def_sethekk_halls.h +++ b/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/def_sethekk_halls.h @@ -7,3 +7,4 @@ #define DATA_IKISSDOOREVENT 1 #endif + diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/instance_sethekk_halls.cpp b/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/instance_sethekk_halls.cpp index 718edc2cfc9..3d53f7b29e8 100644 --- a/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/instance_sethekk_halls.cpp +++ b/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/instance_sethekk_halls.cpp @@ -72,3 +72,4 @@ void AddSC_instance_sethekk_halls() newscript->GetInstanceData = &GetInstanceData_instance_sethekk_halls; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp b/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp index 730546cc4c7..b77a2ec7702 100644 --- a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp +++ b/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp @@ -203,3 +203,4 @@ void AddSC_boss_ambassador_hellmaw() newscript->GetAI = &GetAI_boss_ambassador_hellmaw; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp b/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp index d586955c3a8..49b5524d51a 100644 --- a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp +++ b/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp @@ -175,3 +175,4 @@ void AddSC_boss_blackheart_the_inciter() newscript->GetAI = &GetAI_boss_blackheart_the_inciter; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp b/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp index e6c8783d50c..9e2b88dfd83 100644 --- a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp +++ b/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp @@ -321,3 +321,4 @@ void AddSC_boss_grandmaster_vorpil() newscript->GetAI = &GetAI_mob_voidtraveler; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_murmur.cpp b/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_murmur.cpp index 79747210c5e..e5ed8173431 100644 --- a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_murmur.cpp +++ b/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_murmur.cpp @@ -201,3 +201,4 @@ void AddSC_boss_murmur() newscript->GetAI = &GetAI_boss_murmur; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/def_shadow_labyrinth.h b/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/def_shadow_labyrinth.h index f2284e3bdb3..a78955368bf 100644 --- a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/def_shadow_labyrinth.h +++ b/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/def_shadow_labyrinth.h @@ -12,3 +12,4 @@ #define DATA_MURMUREVENT 5 #define DATA_GRANDMASTERVORPIL 6 #endif + diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp b/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp index 6c0f768a924..03605ab4eb7 100644 --- a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp +++ b/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp @@ -244,3 +244,4 @@ void AddSC_instance_shadow_labyrinth() newscript->GetInstanceData = &GetInstanceData_instance_shadow_labyrinth; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/azshara/azshara.cpp b/src/bindings/scripts/scripts/zone/azshara/azshara.cpp index e1a95a6c68e..4428f17ea21 100644 --- a/src/bindings/scripts/scripts/zone/azshara/azshara.cpp +++ b/src/bindings/scripts/scripts/zone/azshara/azshara.cpp @@ -515,3 +515,4 @@ void AddSC_azshara() newscript->GetAI = &GetAI_mob_depth_charge; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/azshara/boss_azuregos.cpp b/src/bindings/scripts/scripts/zone/azshara/boss_azuregos.cpp index 9ee612e6f3f..adc985aaef9 100644 --- a/src/bindings/scripts/scripts/zone/azshara/boss_azuregos.cpp +++ b/src/bindings/scripts/scripts/zone/azshara/boss_azuregos.cpp @@ -152,3 +152,4 @@ void AddSC_boss_azuregos() newscript->GetAI = &GetAI_boss_azuregos; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/azuremyst_isle/azuremyst_isle.cpp b/src/bindings/scripts/scripts/zone/azuremyst_isle/azuremyst_isle.cpp index 109268bd0e7..610590169d7 100644 --- a/src/bindings/scripts/scripts/zone/azuremyst_isle/azuremyst_isle.cpp +++ b/src/bindings/scripts/scripts/zone/azuremyst_isle/azuremyst_isle.cpp @@ -698,3 +698,4 @@ void AddSC_azuremyst_isle() newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/barrens/the_barrens.cpp b/src/bindings/scripts/scripts/zone/barrens/the_barrens.cpp index 8567da0859e..708b199d817 100644 --- a/src/bindings/scripts/scripts/zone/barrens/the_barrens.cpp +++ b/src/bindings/scripts/scripts/zone/barrens/the_barrens.cpp @@ -556,3 +556,4 @@ void AddSC_the_barrens() newscript->pQuestAccept = &QuestAccept_npc_wizzlecrank_shredder; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/black_temple/black_temple.cpp b/src/bindings/scripts/scripts/zone/black_temple/black_temple.cpp index 54eebea4144..738c58eab2e 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/black_temple.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/black_temple.cpp @@ -66,3 +66,4 @@ void AddSC_black_temple() newscript->pGossipSelect = &GossipSelect_npc_spirit_of_olum; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_bloodboil.cpp b/src/bindings/scripts/scripts/zone/black_temple/boss_bloodboil.cpp index 48dcbc9bd35..aab2e8f79c5 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/boss_bloodboil.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/boss_bloodboil.cpp @@ -345,3 +345,4 @@ void AddSC_boss_gurtogg_bloodboil() newscript->GetAI = &GetAI_boss_gurtogg_bloodboil; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp b/src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp index f49929c431b..755cf9a4ae3 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp @@ -2221,3 +2221,4 @@ void AddSC_boss_illidan() newscript->GetAI = &GetAI_parasitic_shadowfiend; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_mother_shahraz.cpp b/src/bindings/scripts/scripts/zone/black_temple/boss_mother_shahraz.cpp index e8434ca7c99..3e6598ae374 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/boss_mother_shahraz.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/boss_mother_shahraz.cpp @@ -313,3 +313,4 @@ void AddSC_boss_mother_shahraz() newscript->GetAI = &GetAI_boss_shahraz; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_reliquary_of_souls.cpp b/src/bindings/scripts/scripts/zone/black_temple/boss_reliquary_of_souls.cpp index 561dd72dee2..a5fcea2923a 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/boss_reliquary_of_souls.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/boss_reliquary_of_souls.cpp @@ -685,3 +685,4 @@ void AddSC_boss_reliquary_of_souls() newscript->GetAI = &GetAI_npc_enslaved_soul; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_shade_of_akama.cpp b/src/bindings/scripts/scripts/zone/black_temple/boss_shade_of_akama.cpp index a99121588f3..d68b51e461f 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/boss_shade_of_akama.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/boss_shade_of_akama.cpp @@ -836,3 +836,4 @@ void AddSC_boss_shade_of_akama() newscript->pGossipSelect = &GossipSelect_npc_akama; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_supremus.cpp b/src/bindings/scripts/scripts/zone/black_temple/boss_supremus.cpp index e82c35fad36..ac6d1091c60 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/boss_supremus.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/boss_supremus.cpp @@ -311,3 +311,4 @@ void AddSC_boss_supremus() newscript->GetAI = &GetAI_npc_volcano; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_teron_gorefiend.cpp b/src/bindings/scripts/scripts/zone/black_temple/boss_teron_gorefiend.cpp index c776d9e7ba4..778874c9078 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/boss_teron_gorefiend.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/boss_teron_gorefiend.cpp @@ -534,3 +534,4 @@ void AddSC_boss_teron_gorefiend() newscript->GetAI = &GetAI_boss_teron_gorefiend; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_warlord_najentus.cpp b/src/bindings/scripts/scripts/zone/black_temple/boss_warlord_najentus.cpp index ea2a7523b5a..55d2b5c8459 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/boss_warlord_najentus.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/boss_warlord_najentus.cpp @@ -223,3 +223,4 @@ void AddSC_boss_najentus() newscript->pGOHello = &GOHello_go_najentus_spine; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/black_temple/def_black_temple.h b/src/bindings/scripts/scripts/zone/black_temple/def_black_temple.h index b2ba677bd2e..4779f92fa4d 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/def_black_temple.h +++ b/src/bindings/scripts/scripts/zone/black_temple/def_black_temple.h @@ -32,3 +32,4 @@ #define DATA_GAMEOBJECT_SUPREMUS_DOORS 25 #define DATA_BLOOD_ELF_COUNCIL_VOICE 26 #endif + diff --git a/src/bindings/scripts/scripts/zone/black_temple/illidari_council.cpp b/src/bindings/scripts/scripts/zone/black_temple/illidari_council.cpp index 3b3701ba4da..21104389edf 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/illidari_council.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/illidari_council.cpp @@ -865,3 +865,4 @@ void AddSC_boss_illidari_council() newscript->GetAI = &GetAI_boss_high_nethermancer_zerevor; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/black_temple/instance_black_temple.cpp b/src/bindings/scripts/scripts/zone/black_temple/instance_black_temple.cpp index 6f20c1394b4..56bef01ae14 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/instance_black_temple.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/instance_black_temple.cpp @@ -349,3 +349,4 @@ void AddSC_instance_black_temple() newscript->GetInstanceData = &GetInstanceData_instance_black_temple; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/blackrock_depths.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/blackrock_depths.cpp index 23c40eb59cb..7941a93840d 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_depths/blackrock_depths.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_depths/blackrock_depths.cpp @@ -1322,3 +1322,4 @@ void AddSC_blackrock_depths() newscript->pChooseReward = &ChooseReward_npc_rocknot; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_ambassador_flamelash.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_ambassador_flamelash.cpp index df25607cdad..8ac58521395 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_ambassador_flamelash.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_ambassador_flamelash.cpp @@ -104,3 +104,4 @@ void AddSC_boss_ambassador_flamelash() newscript->GetAI = &GetAI_boss_ambassador_flamelash; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_anubshiah.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_anubshiah.cpp index 50cba319326..9df9b7039e6 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_anubshiah.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_anubshiah.cpp @@ -113,3 +113,4 @@ void AddSC_boss_anubshiah() newscript->GetAI = &GetAI_boss_anubshiah; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_emperor_dagran_thaurissan.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_emperor_dagran_thaurissan.cpp index a901465b9a2..4d7130dc3d0 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_emperor_dagran_thaurissan.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_emperor_dagran_thaurissan.cpp @@ -102,3 +102,4 @@ void AddSC_boss_draganthaurissan() newscript->GetAI = &GetAI_boss_draganthaurissan; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_general_angerforge.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_general_angerforge.cpp index 62a9f26b635..192cd18fbfa 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_general_angerforge.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_general_angerforge.cpp @@ -165,3 +165,4 @@ void AddSC_boss_general_angerforge() newscript->GetAI = &GetAI_boss_general_angerforge; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_gorosh_the_dervish.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_gorosh_the_dervish.cpp index ca1a418be3d..b2241df6e9d 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_gorosh_the_dervish.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_gorosh_the_dervish.cpp @@ -79,3 +79,4 @@ void AddSC_boss_gorosh_the_dervish() newscript->GetAI = &GetAI_boss_gorosh_the_dervish; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_grizzle.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_grizzle.cpp index 85d79c0aaba..bd9b200ea69 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_grizzle.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_grizzle.cpp @@ -86,3 +86,4 @@ void AddSC_boss_grizzle() newscript->GetAI = &GetAI_boss_grizzle; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_high_interrogator_gerstahn.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_high_interrogator_gerstahn.cpp index 6156ae84de7..65e4f6a0cf7 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_high_interrogator_gerstahn.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_high_interrogator_gerstahn.cpp @@ -103,3 +103,4 @@ void AddSC_boss_high_interrogator_gerstahn() newscript->GetAI = &GetAI_boss_high_interrogator_gerstahn; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_magmus.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_magmus.cpp index 0913f18ee73..722f3f02e04 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_magmus.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_magmus.cpp @@ -82,3 +82,4 @@ void AddSC_boss_magmus() newscript->GetAI = &GetAI_boss_magmus; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_moira_bronzebeard.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_moira_bronzebeard.cpp index 99bccbd1fb0..2f562123068 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_moira_bronzebeard.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_moira_bronzebeard.cpp @@ -97,3 +97,4 @@ void AddSC_boss_moira_bronzebeard() newscript->GetAI = &GetAI_boss_moira_bronzebeard; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_tomb_of_seven.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_tomb_of_seven.cpp index d74b883917a..21fb384db57 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_tomb_of_seven.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_tomb_of_seven.cpp @@ -641,3 +641,4 @@ void AddSC_boss_tomb_of_seven() newscript->pGossipSelect = &GossipSelect_boss_doomrel; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/def_blackrock_depths.h b/src/bindings/scripts/scripts/zone/blackrock_depths/def_blackrock_depths.h index 355c557053a..58d963437bd 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_depths/def_blackrock_depths.h +++ b/src/bindings/scripts/scripts/zone/blackrock_depths/def_blackrock_depths.h @@ -23,4 +23,5 @@ #define DATA_GO_BAR_KEG 16 #define DATA_GO_BAR_KEG_TRAP 17 #define DATA_GO_BAR_DOOR 18 -#endif
\ No newline at end of file +#endif + diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/instance_blackrock_depths.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/instance_blackrock_depths.cpp index 62267fc63dd..e056f732158 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_depths/instance_blackrock_depths.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_depths/instance_blackrock_depths.cpp @@ -304,4 +304,5 @@ InstanceData* GetInstanceData_instance_blackrock_depths(Map* map) newscript->Name = "instance_blackrock_depths"; newscript->GetInstanceData = &GetInstanceData_instance_blackrock_depths; newscript->RegisterSelf(); - }
\ No newline at end of file + } + diff --git a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_drakkisath.cpp b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_drakkisath.cpp index c358973f9b1..9a909141eec 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_drakkisath.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_drakkisath.cpp @@ -99,3 +99,4 @@ void AddSC_boss_drakkisath() newscript->GetAI = &GetAI_boss_drakkisath; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_gyth.cpp b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_gyth.cpp index 4374295a84a..77725fb81d2 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_gyth.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_gyth.cpp @@ -203,3 +203,4 @@ void AddSC_boss_gyth() newscript->GetAI = &GetAI_boss_gyth; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_halycon.cpp b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_halycon.cpp index 6562a3a55ef..437d85d6405 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_halycon.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_halycon.cpp @@ -93,3 +93,4 @@ void AddSC_boss_halycon() newscript->GetAI = &GetAI_boss_halycon; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_highlord_omokk.cpp b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_highlord_omokk.cpp index eba93f971b4..20a37278863 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_highlord_omokk.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_highlord_omokk.cpp @@ -129,3 +129,4 @@ void AddSC_boss_highlordomokk() newscript->GetAI = &GetAI_boss_highlordomokk; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_mother_smolderweb.cpp b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_mother_smolderweb.cpp index ccefc6a4de6..db30e876ec3 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_mother_smolderweb.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_mother_smolderweb.cpp @@ -84,3 +84,4 @@ void AddSC_boss_mothersmolderweb() newscript->GetAI = &GetAI_boss_mothersmolderweb; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_overlord_wyrmthalak.cpp b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_overlord_wyrmthalak.cpp index 88156799b72..c8ba7a91e8e 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_overlord_wyrmthalak.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_overlord_wyrmthalak.cpp @@ -125,3 +125,4 @@ void AddSC_boss_overlordwyrmthalak() newscript->GetAI = &GetAI_boss_overlordwyrmthalak; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_pyroguard_emberseer.cpp b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_pyroguard_emberseer.cpp index b85b08cf06f..f54494d80d1 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_pyroguard_emberseer.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_pyroguard_emberseer.cpp @@ -91,3 +91,4 @@ void AddSC_boss_pyroguard_emberseer() newscript->GetAI = &GetAI_boss_pyroguard_emberseer; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_quartermaster_zigris.cpp b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_quartermaster_zigris.cpp index 3202efe3746..b0977de9696 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_quartermaster_zigris.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_quartermaster_zigris.cpp @@ -83,3 +83,4 @@ void AddSC_boss_quatermasterzigris() newscript->GetAI = &GetAI_boss_quatermasterzigris; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_rend_blackhand.cpp b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_rend_blackhand.cpp index d11105e1b73..46ed8545fad 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_rend_blackhand.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_rend_blackhand.cpp @@ -89,3 +89,4 @@ void AddSC_boss_rend_blackhand() newscript->GetAI = &GetAI_boss_rend_blackhand; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_shadow_hunter_voshgajin.cpp b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_shadow_hunter_voshgajin.cpp index bb9c8f4805c..0d41ca5227f 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_shadow_hunter_voshgajin.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_shadow_hunter_voshgajin.cpp @@ -93,3 +93,4 @@ void AddSC_boss_shadowvosh() newscript->GetAI = &GetAI_boss_shadowvosh; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_the_beast.cpp b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_the_beast.cpp index df3f42ce9e9..855b3539dd2 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_the_beast.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_the_beast.cpp @@ -91,3 +91,4 @@ void AddSC_boss_thebeast() newscript->GetAI = &GetAI_boss_thebeast; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_warmaster_voone.cpp b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_warmaster_voone.cpp index 7ca629a0ec9..e59cecea060 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_warmaster_voone.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_warmaster_voone.cpp @@ -119,3 +119,4 @@ void AddSC_boss_warmastervoone() newscript->GetAI = &GetAI_boss_warmastervoone; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_broodlord_lashlayer.cpp b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_broodlord_lashlayer.cpp index e8261e65720..71fb5e9a022 100644 --- a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_broodlord_lashlayer.cpp +++ b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_broodlord_lashlayer.cpp @@ -126,3 +126,4 @@ void AddSC_boss_broodlord() newscript->GetAI = &GetAI_boss_broodlord; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_chromaggus.cpp b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_chromaggus.cpp index d6bf9ba5429..6d73fdf93e9 100644 --- a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_chromaggus.cpp +++ b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_chromaggus.cpp @@ -312,3 +312,4 @@ void AddSC_boss_chromaggus() newscript->GetAI = &GetAI_boss_chromaggus; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_ebonroc.cpp b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_ebonroc.cpp index bfc108e63e6..981bd74d02c 100644 --- a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_ebonroc.cpp +++ b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_ebonroc.cpp @@ -101,3 +101,4 @@ void AddSC_boss_ebonroc() newscript->GetAI = &GetAI_boss_ebonroc; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_firemaw.cpp b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_firemaw.cpp index 77e74c3666b..a2613feff20 100644 --- a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_firemaw.cpp +++ b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_firemaw.cpp @@ -92,3 +92,4 @@ void AddSC_boss_firemaw() newscript->GetAI = &GetAI_boss_firemaw; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_flamegor.cpp b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_flamegor.cpp index bf40552d656..9c2b5f28387 100644 --- a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_flamegor.cpp +++ b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_flamegor.cpp @@ -95,3 +95,4 @@ void AddSC_boss_flamegor() newscript->GetAI = &GetAI_boss_flamegor; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_nefarian.cpp b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_nefarian.cpp index c7f06dd78c9..548baf49ca3 100644 --- a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_nefarian.cpp +++ b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_nefarian.cpp @@ -225,3 +225,4 @@ void AddSC_boss_nefarian() newscript->GetAI = &GetAI_boss_nefarian; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_razorgore.cpp b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_razorgore.cpp index 764e3bac587..479e81d1d87 100644 --- a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_razorgore.cpp +++ b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_razorgore.cpp @@ -129,3 +129,4 @@ void AddSC_boss_razorgore() newscript->GetAI = &GetAI_boss_razorgore; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_vaelastrasz.cpp b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_vaelastrasz.cpp index 7ba48f84029..46ee49fb1be 100644 --- a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_vaelastrasz.cpp +++ b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_vaelastrasz.cpp @@ -259,3 +259,4 @@ void AddSC_boss_vael() newscript->pGossipSelect = &GossipSelect_boss_vael; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_victor_nefarius.cpp b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_victor_nefarius.cpp index 83303fa49d1..ad437f24275 100644 --- a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_victor_nefarius.cpp +++ b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_victor_nefarius.cpp @@ -392,3 +392,4 @@ void AddSC_boss_victor_nefarius() newscript->pGossipSelect = &GossipSelect_boss_victor_nefarius; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blackwing_lair/instance_blackwing_lair.cpp b/src/bindings/scripts/scripts/zone/blackwing_lair/instance_blackwing_lair.cpp index 78eb73673aa..97bf717589a 100644 --- a/src/bindings/scripts/scripts/zone/blackwing_lair/instance_blackwing_lair.cpp +++ b/src/bindings/scripts/scripts/zone/blackwing_lair/instance_blackwing_lair.cpp @@ -22,3 +22,4 @@ SDCategory: Blackwing Lair EndScriptData */ #include "precompiled.h" + diff --git a/src/bindings/scripts/scripts/zone/blades_edge_mountains/blades_edge_mountains.cpp b/src/bindings/scripts/scripts/zone/blades_edge_mountains/blades_edge_mountains.cpp index 4c215eb4ad0..d3803705ce4 100644 --- a/src/bindings/scripts/scripts/zone/blades_edge_mountains/blades_edge_mountains.cpp +++ b/src/bindings/scripts/scripts/zone/blades_edge_mountains/blades_edge_mountains.cpp @@ -489,3 +489,4 @@ void AddSC_blades_edge_mountains() newscript->pGossipSelect = &GossipSelect_npc_skyguard_handler_irena; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blasted_lands/blasted_lands.cpp b/src/bindings/scripts/scripts/zone/blasted_lands/blasted_lands.cpp index 9d6be6e6471..432633e90fe 100644 --- a/src/bindings/scripts/scripts/zone/blasted_lands/blasted_lands.cpp +++ b/src/bindings/scripts/scripts/zone/blasted_lands/blasted_lands.cpp @@ -159,3 +159,4 @@ void AddSC_blasted_lands() newscript->pGossipSelect = &GossipSelect_npc_fallen_hero_of_horde; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/blasted_lands/boss_kruul.cpp b/src/bindings/scripts/scripts/zone/blasted_lands/boss_kruul.cpp index 8c77b4f314c..ae21c17b526 100644 --- a/src/bindings/scripts/scripts/zone/blasted_lands/boss_kruul.cpp +++ b/src/bindings/scripts/scripts/zone/blasted_lands/boss_kruul.cpp @@ -180,3 +180,4 @@ void AddSC_boss_kruul() newscript->GetAI = &GetAI_boss_kruul; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/bloodmyst_isle/bloodmyst_isle.cpp b/src/bindings/scripts/scripts/zone/bloodmyst_isle/bloodmyst_isle.cpp index 3c3a622b49d..2d13e3168a8 100644 --- a/src/bindings/scripts/scripts/zone/bloodmyst_isle/bloodmyst_isle.cpp +++ b/src/bindings/scripts/scripts/zone/bloodmyst_isle/bloodmyst_isle.cpp @@ -139,3 +139,4 @@ void AddSC_bloodmyst_isle() newscript->pGossipSelect = &GossipSelect_npc_captured_sunhawk_agent; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/burning_steppes/burning_steppes.cpp b/src/bindings/scripts/scripts/zone/burning_steppes/burning_steppes.cpp index 2f5e4b98e81..59fbfae60d8 100644 --- a/src/bindings/scripts/scripts/zone/burning_steppes/burning_steppes.cpp +++ b/src/bindings/scripts/scripts/zone/burning_steppes/burning_steppes.cpp @@ -151,3 +151,4 @@ void AddSC_burning_steppes() newscript->pGossipSelect = &GossipSelect_npc_ragged_john; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_aeonus.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_aeonus.cpp index cf698736945..6599eab6a4e 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_aeonus.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_aeonus.cpp @@ -146,3 +146,4 @@ void AddSC_boss_aeonus() newscript->GetAI = &GetAI_boss_aeonus; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp index e99ba2284c3..636c4a5270e 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp @@ -134,3 +134,4 @@ void AddSC_boss_chrono_lord_deja() newscript->GetAI = &GetAI_boss_chrono_lord_deja; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_temporus.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_temporus.cpp index ddb8ac093f3..ed84d5548c7 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_temporus.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_temporus.cpp @@ -136,3 +136,4 @@ void AddSC_boss_temporus() newscript->GetAI = &GetAI_boss_temporus; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/dark_portal.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/dark_portal.cpp index 6da6dd631e7..e453d83beef 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/dark_portal.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/dark_portal.cpp @@ -403,3 +403,4 @@ void AddSC_dark_portal() newscript->pGossipSelect = &GossipSelect_npc_saat; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/def_dark_portal.h b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/def_dark_portal.h index 21d999cb554..7bfd8c917d7 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/def_dark_portal.h +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/def_dark_portal.h @@ -31,4 +31,5 @@ #define C_EXECU 18994 #define C_VANQU 18995 -#endif
\ No newline at end of file +#endif + diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/instance_dark_portal.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/instance_dark_portal.cpp index 9be48dd8e53..bfb4e4daf41 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/instance_dark_portal.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/instance_dark_portal.cpp @@ -376,3 +376,4 @@ void AddSC_instance_dark_portal() newscript->GetInstanceData = &GetInstanceData_instance_dark_portal; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_archimonde.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_archimonde.cpp index d822a3a43e1..ec6776daa63 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_archimonde.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_archimonde.cpp @@ -745,3 +745,4 @@ void AddSC_boss_archimonde() newscript->GetAI = &GetAI_mob_ancient_wisp; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/def_hyjal.h b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/def_hyjal.h index 66245ce0845..f33f9a95da3 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/def_hyjal.h +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/def_hyjal.h @@ -27,3 +27,4 @@ #define ERROR_INST_DATA "TSCR: Instance data not set properly for Mount Hyjal. Encounters will be buggy" #endif + diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjal.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjal.cpp index 5d033206dfa..98d5c352d3f 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjal.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjal.cpp @@ -247,3 +247,4 @@ void AddSC_hyjal() newscript->GetAI = &GetAI_npc_tyrande_whisperwind; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjalAI.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjalAI.cpp index c605bc78540..960cea141c9 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjalAI.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjalAI.cpp @@ -476,3 +476,4 @@ void hyjalAI::UpdateAI(const uint32 diff) DoMeleeAttackIfReady(); } + diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjalAI.h b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjalAI.h index 34895aedae2..135afede0b7 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjalAI.h +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjalAI.h @@ -212,3 +212,4 @@ struct TRINITY_DLL_DECL hyjalAI : public ScriptedAI std::list<uint64> CreatureList; }; #endif + diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/instance_hyjal.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/instance_hyjal.cpp index 51fd3c5be2c..63256988e27 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/instance_hyjal.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/instance_hyjal.cpp @@ -208,3 +208,4 @@ void AddSC_instance_mount_hyjal() newscript->GetInstanceData = &GetInstanceData_instance_mount_hyjal; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_captain_skarloc.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_captain_skarloc.cpp index 8c8a8e1eef0..e21cc826978 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_captain_skarloc.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_captain_skarloc.cpp @@ -154,3 +154,4 @@ void AddSC_boss_captain_skarloc() newscript->GetAI = &GetAI_boss_captain_skarloc; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_epoch_hunter.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_epoch_hunter.cpp index b0ddea1e1bd..863a3d9d5d1 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_epoch_hunter.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_epoch_hunter.cpp @@ -148,3 +148,4 @@ void AddSC_boss_epoch_hunter() newscript->GetAI = &GetAI_boss_epoch_hunter; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_leutenant_drake.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_leutenant_drake.cpp index 6a0214a7505..9b938d4d18b 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_leutenant_drake.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_leutenant_drake.cpp @@ -193,3 +193,4 @@ void AddSC_boss_lieutenant_drake() newscript->GetAI = &GetAI_boss_lieutenant_drake; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/def_old_hillsbrad.h b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/def_old_hillsbrad.h index 91f4ee1e3bb..95934718599 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/def_old_hillsbrad.h +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/def_old_hillsbrad.h @@ -15,3 +15,4 @@ #define DATA_TARETHA 8 #define WORLD_STATE_OH 2436 #endif + diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp index 92e0d0bc161..92d9c7c10a6 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp @@ -233,3 +233,4 @@ void AddSC_instance_old_hillsbrad() newscript->GetInstanceData = &GetInstanceData_instance_old_hillsbrad; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp index e69699d46f8..bc18f91e795 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp @@ -859,3 +859,4 @@ void AddSC_old_hillsbrad() newscript->GetAI = &GetAI_npc_taretha; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp index e20c3f3429c..22d539db2ab 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp @@ -761,3 +761,4 @@ void AddSC_boss_fathomlord_karathress() newscript->GetAI = &GetAI_boss_fathomguard_caribdis; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp index f4c1979bb13..665af987a6d 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp @@ -384,3 +384,4 @@ void AddSC_boss_hydross_the_unstable() newscript->GetAI = &GetAI_boss_hydross_the_unstable; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp index 7631a2efe97..962d05e6c87 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp @@ -1075,3 +1075,4 @@ void AddSC_boss_lady_vashj() newscript->pItemUse = &ItemUse_item_tainted_core; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp index 47e3a97621a..ae12d1fe47f 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp @@ -815,3 +815,4 @@ void AddSC_boss_leotheras_the_blind() newscript->GetAI = &GetAI_mob_inner_demon; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp index 04a4d6d6316..6d1fc0a9d51 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp @@ -487,3 +487,4 @@ void AddSC_boss_the_lurker_below() newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp index 71c1b8a388e..f243126e0d3 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp @@ -368,3 +368,4 @@ void AddSC_boss_morogrim_tidewalker() newscript->GetAI = &GetAI_mob_water_globule; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/def_serpent_shrine.h b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/def_serpent_shrine.h index ddcde2ffed2..13144bc93c0 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/def_serpent_shrine.h +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/def_serpent_shrine.h @@ -29,3 +29,4 @@ #define DATA_CONTROL_CONSOLE 22 #define DATA_STRANGE_POOL 23 #endif + diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/instance_serpent_shrine.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/instance_serpent_shrine.cpp index c0b14b639ae..cb09a10cd51 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/instance_serpent_shrine.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/instance_serpent_shrine.cpp @@ -289,3 +289,4 @@ void AddSC_instance_serpentshrine_cavern() newscript->pGOHello = &GOHello_go_bridge_console; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/slave_pens/boss_rokmar.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/slave_pens/boss_rokmar.cpp index 5c8ee98efa7..aab4fbd1a85 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/slave_pens/boss_rokmar.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/slave_pens/boss_rokmar.cpp @@ -63,3 +63,4 @@ void AddSC_boss_rokmar_the_crackler() newscript->GetAI = GetAI_boss_rokmar_the_crackler; m_scripts[nrscripts++] = newscript; } + diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_hydromancer_thespia.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_hydromancer_thespia.cpp index 6f75a8fd96e..5fd7837d911 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_hydromancer_thespia.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_hydromancer_thespia.cpp @@ -195,3 +195,4 @@ void AddSC_boss_hydromancer_thespia() newscript->GetAI = &GetAI_mob_coilfang_waterelementalAI; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_mekgineer_steamrigger.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_mekgineer_steamrigger.cpp index 890c589555d..3424850686a 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_mekgineer_steamrigger.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_mekgineer_steamrigger.cpp @@ -278,3 +278,4 @@ void AddSC_boss_mekgineer_steamrigger() newscript->GetAI = &GetAI_mob_steamrigger_mechanic; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_warlord_kalithresh.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_warlord_kalithresh.cpp index e38cfa26bc7..e525461de71 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_warlord_kalithresh.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_warlord_kalithresh.cpp @@ -233,3 +233,4 @@ void AddSC_boss_warlord_kalithresh() newscript->GetAI = &GetAI_boss_warlord_kalithresh; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/def_steam_vault.h b/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/def_steam_vault.h index 48127523f21..4b407ac4816 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/def_steam_vault.h +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/def_steam_vault.h @@ -14,3 +14,4 @@ #define DATA_KALITRESH 6 #define DATA_THESPIA 7 #endif + diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/instance_steam_vault.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/instance_steam_vault.cpp index 57cddb74a56..92df1fffbe1 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/instance_steam_vault.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/instance_steam_vault.cpp @@ -260,3 +260,4 @@ void AddSC_instance_steam_vault() newscript->GetInstanceData = &GetInstanceData_instance_steam_vault; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/underbog/boss_ghazan.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/underbog/boss_ghazan.cpp index b6da72e84dc..914e6b3f2aa 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/underbog/boss_ghazan.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/underbog/boss_ghazan.cpp @@ -77,3 +77,4 @@ void AddSC_boss_ghazan() newscript->GetAI = GetAI_boss_ghazan; m_scripts[nrscripts++] = newscript; } + diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/underbog/boss_hungarfen.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/underbog/boss_hungarfen.cpp index cd54681e65b..1d6584b9523 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/underbog/boss_hungarfen.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/underbog/boss_hungarfen.cpp @@ -154,3 +154,4 @@ void AddSC_boss_hungarfen() newscript->GetAI = &GetAI_mob_underbog_mushroom; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/underbog/boss_the_black_stalker.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/underbog/boss_the_black_stalker.cpp index 0f773ac9754..9e27f2bc063 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/underbog/boss_the_black_stalker.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/underbog/boss_the_black_stalker.cpp @@ -189,3 +189,4 @@ void AddSC_boss_the_black_stalker() newscript->GetAI = &GetAI_boss_the_black_stalker; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/darkshore/darkshore.cpp b/src/bindings/scripts/scripts/zone/darkshore/darkshore.cpp index 449f772e0d6..fcb13e9f479 100644 --- a/src/bindings/scripts/scripts/zone/darkshore/darkshore.cpp +++ b/src/bindings/scripts/scripts/zone/darkshore/darkshore.cpp @@ -22,3 +22,4 @@ SDCategory: Darkshore EndScriptData */ #include "precompiled.h" + diff --git a/src/bindings/scripts/scripts/zone/deadmines/deadmines.cpp b/src/bindings/scripts/scripts/zone/deadmines/deadmines.cpp index beb7c1800f0..db5f5bb4c8e 100644 --- a/src/bindings/scripts/scripts/zone/deadmines/deadmines.cpp +++ b/src/bindings/scripts/scripts/zone/deadmines/deadmines.cpp @@ -228,3 +228,4 @@ void AddSC_instance_deadmines() newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/deadmines/def_deadmines.h b/src/bindings/scripts/scripts/zone/deadmines/def_deadmines.h index 73b95a30bd3..9b535a9fd80 100644 --- a/src/bindings/scripts/scripts/zone/deadmines/def_deadmines.h +++ b/src/bindings/scripts/scripts/zone/deadmines/def_deadmines.h @@ -11,3 +11,4 @@ #define EVENT_STATE 1 #endif + diff --git a/src/bindings/scripts/scripts/zone/deadmines/instance_deadmines.cpp b/src/bindings/scripts/scripts/zone/deadmines/instance_deadmines.cpp index ed74c6f8cbc..35bd4cb34b5 100644 --- a/src/bindings/scripts/scripts/zone/deadmines/instance_deadmines.cpp +++ b/src/bindings/scripts/scripts/zone/deadmines/instance_deadmines.cpp @@ -20,3 +20,4 @@ SD%Complete: 0 SDComment: Placeholder SDCategory: Deadmines EndScriptData */ + diff --git a/src/bindings/scripts/scripts/zone/dun_morogh/dun_morogh.cpp b/src/bindings/scripts/scripts/zone/dun_morogh/dun_morogh.cpp index 14d5170b35e..0a6942b1611 100644 --- a/src/bindings/scripts/scripts/zone/dun_morogh/dun_morogh.cpp +++ b/src/bindings/scripts/scripts/zone/dun_morogh/dun_morogh.cpp @@ -96,3 +96,4 @@ void AddSC_dun_morogh() newscript->GetAI = &GetAI_npc_narm_faulk; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/dustwallow_marsh/dustwallow_marsh.cpp b/src/bindings/scripts/scripts/zone/dustwallow_marsh/dustwallow_marsh.cpp index d247878d4ac..ed8a50f9d94 100644 --- a/src/bindings/scripts/scripts/zone/dustwallow_marsh/dustwallow_marsh.cpp +++ b/src/bindings/scripts/scripts/zone/dustwallow_marsh/dustwallow_marsh.cpp @@ -229,3 +229,4 @@ void AddSC_dustwallow_marsh() newscript->pGossipSelect = &GossipSelect_npc_nat_pagle; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/eastern_plaguelands/eastern_plaguelands.cpp b/src/bindings/scripts/scripts/zone/eastern_plaguelands/eastern_plaguelands.cpp index 2e1fc4082f2..0c8c47a4c52 100644 --- a/src/bindings/scripts/scripts/zone/eastern_plaguelands/eastern_plaguelands.cpp +++ b/src/bindings/scripts/scripts/zone/eastern_plaguelands/eastern_plaguelands.cpp @@ -177,3 +177,4 @@ void AddSC_eastern_plaguelands() newscript->pGossipSelect = &GossipSelect_npc_tirion_fordring; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/elwynn_forest/elwynn_forest.cpp b/src/bindings/scripts/scripts/zone/elwynn_forest/elwynn_forest.cpp index fa14ab3ac20..95661556bad 100644 --- a/src/bindings/scripts/scripts/zone/elwynn_forest/elwynn_forest.cpp +++ b/src/bindings/scripts/scripts/zone/elwynn_forest/elwynn_forest.cpp @@ -96,3 +96,4 @@ void AddSC_elwynn_forest() newscript->GetAI = &GetAI_npc_henze_faulk; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/eversong_woods/eversong_woods.cpp b/src/bindings/scripts/scripts/zone/eversong_woods/eversong_woods.cpp index 8cd8d4c76ff..47d0c4cf8ff 100644 --- a/src/bindings/scripts/scripts/zone/eversong_woods/eversong_woods.cpp +++ b/src/bindings/scripts/scripts/zone/eversong_woods/eversong_woods.cpp @@ -793,3 +793,4 @@ void AddSC_eversong_woods() newscript->GetAI = &GetAI_npc_infused_crystalAI; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/felwood/felwood.cpp b/src/bindings/scripts/scripts/zone/felwood/felwood.cpp index ca27106e20e..4103283be43 100644 --- a/src/bindings/scripts/scripts/zone/felwood/felwood.cpp +++ b/src/bindings/scripts/scripts/zone/felwood/felwood.cpp @@ -87,3 +87,4 @@ void AddSC_felwood() newscript->pGossipSelect = &GossipSelect_npcs_riverbreeze_and_silversky; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/feralas/feralas.cpp b/src/bindings/scripts/scripts/zone/feralas/feralas.cpp index 666b08934a2..ff30fc3f90c 100644 --- a/src/bindings/scripts/scripts/zone/feralas/feralas.cpp +++ b/src/bindings/scripts/scripts/zone/feralas/feralas.cpp @@ -85,3 +85,4 @@ void AddSC_feralas() newscript->pGossipHello = &GossipHello_npc_screecher_spirit; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/ghostlands/ghostlands.cpp b/src/bindings/scripts/scripts/zone/ghostlands/ghostlands.cpp index 7a518bb8a23..b7b462a85a7 100644 --- a/src/bindings/scripts/scripts/zone/ghostlands/ghostlands.cpp +++ b/src/bindings/scripts/scripts/zone/ghostlands/ghostlands.cpp @@ -321,3 +321,4 @@ void AddSC_ghostlands() newscript->pQuestAccept = &QuestAccept_npc_ranger_lilatha; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/gruuls_lair/boss_gruul.cpp b/src/bindings/scripts/scripts/zone/gruuls_lair/boss_gruul.cpp index 6af7883fa94..f2da55becc8 100644 --- a/src/bindings/scripts/scripts/zone/gruuls_lair/boss_gruul.cpp +++ b/src/bindings/scripts/scripts/zone/gruuls_lair/boss_gruul.cpp @@ -324,3 +324,4 @@ void AddSC_boss_gruul() newscript->GetAI = &GetAI_boss_gruul; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/gruuls_lair/boss_high_king_maulgar.cpp b/src/bindings/scripts/scripts/zone/gruuls_lair/boss_high_king_maulgar.cpp index 461c2a941a0..68d89bccc2b 100644 --- a/src/bindings/scripts/scripts/zone/gruuls_lair/boss_high_king_maulgar.cpp +++ b/src/bindings/scripts/scripts/zone/gruuls_lair/boss_high_king_maulgar.cpp @@ -738,3 +738,4 @@ void AddSC_boss_high_king_maulgar() newscript->GetAI = &GetAI_boss_krosh_firehand; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/gruuls_lair/def_gruuls_lair.h b/src/bindings/scripts/scripts/zone/gruuls_lair/def_gruuls_lair.h index b0da8cc8f90..7003dcb1e26 100644 --- a/src/bindings/scripts/scripts/zone/gruuls_lair/def_gruuls_lair.h +++ b/src/bindings/scripts/scripts/zone/gruuls_lair/def_gruuls_lair.h @@ -18,3 +18,4 @@ #define ERROR_INST_DATA "TSCR Error: Instance Data not set properly for Gruul's Lair instance (map 565). Encounters will be buggy." #endif + diff --git a/src/bindings/scripts/scripts/zone/gruuls_lair/instance_gruuls_lair.cpp b/src/bindings/scripts/scripts/zone/gruuls_lair/instance_gruuls_lair.cpp index c9fcd11b3e1..9ecd95176f0 100644 --- a/src/bindings/scripts/scripts/zone/gruuls_lair/instance_gruuls_lair.cpp +++ b/src/bindings/scripts/scripts/zone/gruuls_lair/instance_gruuls_lair.cpp @@ -186,3 +186,4 @@ void AddSC_instance_gruuls_lair() newscript->GetInstanceData = &GetInstanceData_instance_gruuls_lair; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_broggok.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_broggok.cpp index c7bec8c1cc8..901e4dd4264 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_broggok.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_broggok.cpp @@ -92,3 +92,4 @@ void AddSC_boss_broggok() newscript->GetAI = &GetAI_boss_broggokAI; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp index 4c05abbd108..2f8e2738fee 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp @@ -360,4 +360,5 @@ void AddSC_boss_kelidan_the_breaker() newscript->Name="mob_shadowmoon_channeler"; newscript->GetAI = &GetAI_mob_shadowmoon_channeler; newscript->RegisterSelf(); -}
\ No newline at end of file +} + diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_the_maker.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_the_maker.cpp index 7e343f9085c..5606719dc65 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_the_maker.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_the_maker.cpp @@ -129,3 +129,4 @@ void AddSC_boss_the_maker() newscript->GetAI = &GetAI_boss_the_makerAI; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/def_blood_furnace.h b/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/def_blood_furnace.h index 6462b401d3d..e6a49847a5c 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/def_blood_furnace.h +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/def_blood_furnace.h @@ -6,4 +6,5 @@ #define DEF_BLOOD_FURNACE_H #define DATA_KELIDANEVENT 1 -#endif
\ No newline at end of file +#endif + diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp index aae064d77c6..caf29b1f213 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp @@ -109,4 +109,5 @@ void AddSC_instance_blood_furnace() newscript->Name = "instance_blood_furnace"; newscript->GetInstanceData = &GetInstanceData_instance_blood_furnace; newscript->RegisterSelf(); -}
\ No newline at end of file +} + diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp index c640624d88e..be9ae2525d8 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp @@ -211,3 +211,4 @@ void AddSC_boss_omor_the_unscarred() newscript->GetAI = &GetAI_boss_omor_the_unscarredAI; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_vazruden_the_herald.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_vazruden_the_herald.cpp index 97d2878bc1d..4a4647e7c61 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_vazruden_the_herald.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_vazruden_the_herald.cpp @@ -487,4 +487,5 @@ void AddSC_boss_vazruden_the_herald() newscript->Name="mob_hellfire_sentry"; newscript->GetAI = &GetAI_mob_hellfire_sentry; newscript->RegisterSelf(); -}
\ No newline at end of file +} + diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp index f80ca1c627d..608042cc43c 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp @@ -166,3 +166,4 @@ void AddSC_boss_watchkeeper_gargolmar() newscript->GetAI = &GetAI_boss_watchkeeper_gargolmarAI; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp index f114cd005f7..195cc824650 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp @@ -562,4 +562,5 @@ void AddSC_boss_magtheridon() newscript->GetAI = &GetAI_mob_abyssalAI; newscript->RegisterSelf(); -}
\ No newline at end of file +} + diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/def_magtheridons_lair.h b/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/def_magtheridons_lair.h index d6cc6708288..c5469acaea0 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/def_magtheridons_lair.h +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/def_magtheridons_lair.h @@ -11,3 +11,4 @@ #define DATA_COLLAPSE 6 #define DATA_CHANNELER 9 #endif + diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp index 4ec80e7d346..cd26bc3bcaa 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp @@ -255,3 +255,4 @@ void AddSC_instance_magtheridons_lair() newscript->GetInstanceData = &GetInstanceData_instance_magtheridons_lair; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_nethekurse.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_nethekurse.cpp index 05c6b0a51e0..a5d84d7997b 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_nethekurse.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_nethekurse.cpp @@ -450,3 +450,4 @@ void AddSC_boss_grand_warlock_nethekurse() newscript->GetAI = &GetAI_mob_lesser_shadow_fissure; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp index c8a42cb53aa..9f241774cbe 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp @@ -402,3 +402,4 @@ void AddSC_boss_warbringer_omrogg() newscript->GetAI = &GetAI_mob_omrogg_heads; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp index 5bd58a53f0c..391ec9f4b93 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp @@ -301,3 +301,4 @@ void AddSC_boss_warchief_kargath_bladefist() newscript->GetAI = GetAI_boss_warchief_kargath_bladefist; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/def_shattered_halls.h b/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/def_shattered_halls.h index 7a9bb23454b..cbfa23ec4e0 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/def_shattered_halls.h +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/def_shattered_halls.h @@ -11,3 +11,4 @@ #define TYPE_OMROGG 4 #endif + diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/instance_shattered_halls.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/instance_shattered_halls.cpp index 467600bc827..b606ff0f97e 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/instance_shattered_halls.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/instance_shattered_halls.cpp @@ -112,3 +112,4 @@ void AddSC_instance_shattered_halls() newscript->GetInstanceData = &GetInstanceData_instance_shattered_halls; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/hellfire_peninsula/boss_doomlord_kazzak.cpp b/src/bindings/scripts/scripts/zone/hellfire_peninsula/boss_doomlord_kazzak.cpp index 67ec8a642ae..0cb6b7a849e 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_peninsula/boss_doomlord_kazzak.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_peninsula/boss_doomlord_kazzak.cpp @@ -180,3 +180,4 @@ void AddSC_boss_doomlordkazzak() newscript->GetAI = &GetAI_boss_doomlordkazzak; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/hellfire_peninsula/hellfire_peninsula.cpp b/src/bindings/scripts/scripts/zone/hellfire_peninsula/hellfire_peninsula.cpp index 9f71fab3e46..93a5be1e19d 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_peninsula/hellfire_peninsula.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_peninsula/hellfire_peninsula.cpp @@ -436,4 +436,5 @@ void AddSC_hellfire_peninsula() newscript->GetAI = &GetAI_npc_wounded_blood_elf; newscript->pQuestAccept = &QuestAccept_npc_wounded_blood_elf; newscript->RegisterSelf(); -}
\ No newline at end of file +} + diff --git a/src/bindings/scripts/scripts/zone/ironforge/ironforge.cpp b/src/bindings/scripts/scripts/zone/ironforge/ironforge.cpp index 7e367dd9960..b17a280391a 100644 --- a/src/bindings/scripts/scripts/zone/ironforge/ironforge.cpp +++ b/src/bindings/scripts/scripts/zone/ironforge/ironforge.cpp @@ -91,3 +91,4 @@ void AddSC_ironforge() newscript->pGossipSelect = &GossipSelect_npc_royal_historian_archesonus; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/isle_of_queldanas/isle_of_queldanas.cpp b/src/bindings/scripts/scripts/zone/isle_of_queldanas/isle_of_queldanas.cpp index 0b9131883ab..c9ea67ac824 100644 --- a/src/bindings/scripts/scripts/zone/isle_of_queldanas/isle_of_queldanas.cpp +++ b/src/bindings/scripts/scripts/zone/isle_of_queldanas/isle_of_queldanas.cpp @@ -220,3 +220,4 @@ void AddSC_isle_of_queldanas() newscript->GetAI = &GetAI_npc_greengill_slaveAI; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/karazhan/boss_curator.cpp b/src/bindings/scripts/scripts/zone/karazhan/boss_curator.cpp index 95f1cf56155..7d534cdeffc 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/boss_curator.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/boss_curator.cpp @@ -169,3 +169,4 @@ void AddSC_boss_curator() newscript->GetAI = &GetAI_boss_curator; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/karazhan/boss_maiden_of_virtue.cpp b/src/bindings/scripts/scripts/zone/karazhan/boss_maiden_of_virtue.cpp index f1c55f91629..b58dfa4922c 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/boss_maiden_of_virtue.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/boss_maiden_of_virtue.cpp @@ -150,3 +150,4 @@ void AddSC_boss_maiden_of_virtue() newscript->GetAI = &GetAI_boss_maiden_of_virtue; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/karazhan/boss_midnight.cpp b/src/bindings/scripts/scripts/zone/karazhan/boss_midnight.cpp index d9519357f17..440e4bdfec1 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/boss_midnight.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/boss_midnight.cpp @@ -325,3 +325,4 @@ void AddSC_boss_attumen() newscript->GetAI = &GetAI_boss_midnight; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/karazhan/boss_moroes.cpp b/src/bindings/scripts/scripts/zone/karazhan/boss_moroes.cpp index baf31ca2eda..52303a2abc8 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/boss_moroes.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/boss_moroes.cpp @@ -855,3 +855,4 @@ void AddSC_boss_moroes() newscript->GetAI = &GetAI_lord_crispin_ference; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/karazhan/boss_netherspite.cpp b/src/bindings/scripts/scripts/zone/karazhan/boss_netherspite.cpp index 47820d87a4e..6db1b193234 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/boss_netherspite.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/boss_netherspite.cpp @@ -38,3 +38,4 @@ EndScriptData */ #define SPELL_PERSEVERANCE_SELF 30466 #define SPELL_SERENITY_ENEMY 30422 #define SPELL_SERENITY_SELF 30467 + diff --git a/src/bindings/scripts/scripts/zone/karazhan/boss_nightbane.cpp b/src/bindings/scripts/scripts/zone/karazhan/boss_nightbane.cpp index 1f4b26ee1e5..aae8b56cdf7 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/boss_nightbane.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/boss_nightbane.cpp @@ -420,3 +420,4 @@ void AddSC_boss_nightbane() newscript->GetAI = &GetAI_boss_nightbane; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/karazhan/boss_prince_malchezaar.cpp b/src/bindings/scripts/scripts/zone/karazhan/boss_prince_malchezaar.cpp index 5fb7b897eec..fe5c08ae45d 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/boss_prince_malchezaar.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/boss_prince_malchezaar.cpp @@ -660,3 +660,4 @@ void AddSC_boss_malchezaar() newscript->GetAI = &GetAI_netherspite_infernal; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/karazhan/boss_shade_of_aran.cpp b/src/bindings/scripts/scripts/zone/karazhan/boss_shade_of_aran.cpp index dbd99df0a08..e226a28bcd2 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/boss_shade_of_aran.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/boss_shade_of_aran.cpp @@ -600,3 +600,4 @@ void AddSC_boss_shade_of_aran() newscript->GetAI = &GetAI_water_elemental; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/karazhan/boss_terestian_illhoof.cpp b/src/bindings/scripts/scripts/zone/karazhan/boss_terestian_illhoof.cpp index e2796529ebc..1bad8750736 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/boss_terestian_illhoof.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/boss_terestian_illhoof.cpp @@ -434,3 +434,4 @@ void AddSC_boss_terestian_illhoof() newscript->GetAI = &GetAI_mob_demon_chain; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/karazhan/bosses_opera.cpp b/src/bindings/scripts/scripts/zone/karazhan/bosses_opera.cpp index 965fe32d370..0db07e8aa70 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/bosses_opera.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/bosses_opera.cpp @@ -1418,3 +1418,4 @@ void AddSC_bosses_opera() newscript->Name = "boss_romulo"; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/karazhan/def_karazhan.h b/src/bindings/scripts/scripts/zone/karazhan/def_karazhan.h index 71017baeb97..4304477de2a 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/def_karazhan.h +++ b/src/bindings/scripts/scripts/zone/karazhan/def_karazhan.h @@ -41,3 +41,4 @@ #define ERROR_INST_DATA(a) error_log("SD2: Instance Data for Karazhan not set properly. Encounter for Creature Entry %u may not work properly.", a->GetEntry()); #endif + diff --git a/src/bindings/scripts/scripts/zone/karazhan/instance_karazhan.cpp b/src/bindings/scripts/scripts/zone/karazhan/instance_karazhan.cpp index ddae685e82b..72a839cc5bd 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/instance_karazhan.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/instance_karazhan.cpp @@ -289,3 +289,4 @@ void AddSC_instance_karazhan() newscript->GetInstanceData = &GetInstanceData_instance_karazhan; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/karazhan/karazhan.cpp b/src/bindings/scripts/scripts/zone/karazhan/karazhan.cpp index 17547d043a3..76dcd062b92 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/karazhan.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/karazhan.cpp @@ -658,3 +658,4 @@ void AddSC_karazhan() newscript->GetAI = &GetAI_npc_image_of_medivh; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/loch_modan/loch_modan.cpp b/src/bindings/scripts/scripts/zone/loch_modan/loch_modan.cpp index 9e7e61f1f7e..b838fc97aab 100644 --- a/src/bindings/scripts/scripts/zone/loch_modan/loch_modan.cpp +++ b/src/bindings/scripts/scripts/zone/loch_modan/loch_modan.cpp @@ -98,3 +98,4 @@ void AddSC_loch_modan() newscript->pGossipSelect = &GossipSelect_npc_mountaineer_pebblebitty; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/magisters_terrace/boss_felblood_kaelthas.cpp b/src/bindings/scripts/scripts/zone/magisters_terrace/boss_felblood_kaelthas.cpp index 9c73f5fc7d1..f8304b409b3 100644 --- a/src/bindings/scripts/scripts/zone/magisters_terrace/boss_felblood_kaelthas.cpp +++ b/src/bindings/scripts/scripts/zone/magisters_terrace/boss_felblood_kaelthas.cpp @@ -688,3 +688,4 @@ void AddSC_boss_felblood_kaelthas() newscript->GetAI = &GetAI_mob_felkael_flamestrike; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/magisters_terrace/boss_priestess_delrissa.cpp b/src/bindings/scripts/scripts/zone/magisters_terrace/boss_priestess_delrissa.cpp index aeeebdeec89..1a0c7743933 100644 --- a/src/bindings/scripts/scripts/zone/magisters_terrace/boss_priestess_delrissa.cpp +++ b/src/bindings/scripts/scripts/zone/magisters_terrace/boss_priestess_delrissa.cpp @@ -1364,3 +1364,4 @@ void AddSC_boss_priestess_delrissa() newscript->GetAI = &GetAI_mob_sliver; newscript->RegisterSelf();*/ } + diff --git a/src/bindings/scripts/scripts/zone/magisters_terrace/boss_selin_fireheart.cpp b/src/bindings/scripts/scripts/zone/magisters_terrace/boss_selin_fireheart.cpp index 0b03f115058..90533797d5e 100644 --- a/src/bindings/scripts/scripts/zone/magisters_terrace/boss_selin_fireheart.cpp +++ b/src/bindings/scripts/scripts/zone/magisters_terrace/boss_selin_fireheart.cpp @@ -382,3 +382,4 @@ void AddSC_boss_selin_fireheart() newscript->GetAI = &GetAI_mob_fel_crystal; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/magisters_terrace/boss_vexallus.cpp b/src/bindings/scripts/scripts/zone/magisters_terrace/boss_vexallus.cpp index d634164e4fd..073ecef879b 100644 --- a/src/bindings/scripts/scripts/zone/magisters_terrace/boss_vexallus.cpp +++ b/src/bindings/scripts/scripts/zone/magisters_terrace/boss_vexallus.cpp @@ -235,3 +235,4 @@ void AddSC_boss_vexallus() newscript->GetAI = &GetAI_mob_pure_energy; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/magisters_terrace/def_magisters_terrace.h b/src/bindings/scripts/scripts/zone/magisters_terrace/def_magisters_terrace.h index e35e8236be1..d6419ea409c 100644 --- a/src/bindings/scripts/scripts/zone/magisters_terrace/def_magisters_terrace.h +++ b/src/bindings/scripts/scripts/zone/magisters_terrace/def_magisters_terrace.h @@ -28,3 +28,4 @@ #define ERROR_INST_DATA "TSCR Error: Instance Data not set properly for Magister's Terrace instance (map 585). Encounters will be buggy." #endif + diff --git a/src/bindings/scripts/scripts/zone/magisters_terrace/instance_magisters_terrace.cpp b/src/bindings/scripts/scripts/zone/magisters_terrace/instance_magisters_terrace.cpp index 0b8ec081f11..7e16b37c353 100644 --- a/src/bindings/scripts/scripts/zone/magisters_terrace/instance_magisters_terrace.cpp +++ b/src/bindings/scripts/scripts/zone/magisters_terrace/instance_magisters_terrace.cpp @@ -190,3 +190,4 @@ void AddSC_instance_magisters_terrace() newscript->GetInstanceData = &GetInstanceData_instance_magisters_terrace; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/maraudon/boss_celebras_the_cursed.cpp b/src/bindings/scripts/scripts/zone/maraudon/boss_celebras_the_cursed.cpp index b0e370727f8..767246b876c 100644 --- a/src/bindings/scripts/scripts/zone/maraudon/boss_celebras_the_cursed.cpp +++ b/src/bindings/scripts/scripts/zone/maraudon/boss_celebras_the_cursed.cpp @@ -95,3 +95,4 @@ void AddSC_boss_celebras_the_cursed() newscript->GetAI = &GetAI_celebras_the_cursed; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/maraudon/boss_landslide.cpp b/src/bindings/scripts/scripts/zone/maraudon/boss_landslide.cpp index 5272b4adbb8..49d50b43a59 100644 --- a/src/bindings/scripts/scripts/zone/maraudon/boss_landslide.cpp +++ b/src/bindings/scripts/scripts/zone/maraudon/boss_landslide.cpp @@ -92,3 +92,4 @@ void AddSC_boss_landslide() newscript->GetAI = &GetAI_boss_landslide; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/maraudon/boss_noxxion.cpp b/src/bindings/scripts/scripts/zone/maraudon/boss_noxxion.cpp index 8db16848bf7..a987fd6399a 100644 --- a/src/bindings/scripts/scripts/zone/maraudon/boss_noxxion.cpp +++ b/src/bindings/scripts/scripts/zone/maraudon/boss_noxxion.cpp @@ -147,3 +147,4 @@ void AddSC_boss_noxxion() newscript->GetAI = &GetAI_boss_noxxion; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/maraudon/boss_princess_theradras.cpp b/src/bindings/scripts/scripts/zone/maraudon/boss_princess_theradras.cpp index e6e5538c7a2..c78d28e0aa8 100644 --- a/src/bindings/scripts/scripts/zone/maraudon/boss_princess_theradras.cpp +++ b/src/bindings/scripts/scripts/zone/maraudon/boss_princess_theradras.cpp @@ -106,3 +106,4 @@ void AddSC_boss_ptheradras() newscript->GetAI = &GetAI_boss_ptheradras; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/molten_core/boss_baron_geddon.cpp b/src/bindings/scripts/scripts/zone/molten_core/boss_baron_geddon.cpp index ef606f341ee..da8b47d6a7c 100644 --- a/src/bindings/scripts/scripts/zone/molten_core/boss_baron_geddon.cpp +++ b/src/bindings/scripts/scripts/zone/molten_core/boss_baron_geddon.cpp @@ -104,3 +104,4 @@ void AddSC_boss_baron_geddon() newscript->GetAI = &GetAI_boss_baron_geddon; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/molten_core/boss_garr.cpp b/src/bindings/scripts/scripts/zone/molten_core/boss_garr.cpp index 41786ce48a0..ac1ff61c2ba 100644 --- a/src/bindings/scripts/scripts/zone/molten_core/boss_garr.cpp +++ b/src/bindings/scripts/scripts/zone/molten_core/boss_garr.cpp @@ -140,3 +140,4 @@ void AddSC_boss_garr() newscript->GetAI = &GetAI_mob_firesworn; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/molten_core/boss_gehennas.cpp b/src/bindings/scripts/scripts/zone/molten_core/boss_gehennas.cpp index eb7e3659798..c65782c3e4d 100644 --- a/src/bindings/scripts/scripts/zone/molten_core/boss_gehennas.cpp +++ b/src/bindings/scripts/scripts/zone/molten_core/boss_gehennas.cpp @@ -89,3 +89,4 @@ void AddSC_boss_gehennas() newscript->GetAI = &GetAI_boss_gehennas; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/molten_core/boss_golemagg.cpp b/src/bindings/scripts/scripts/zone/molten_core/boss_golemagg.cpp index defac135e18..b5ebfbe4c73 100644 --- a/src/bindings/scripts/scripts/zone/molten_core/boss_golemagg.cpp +++ b/src/bindings/scripts/scripts/zone/molten_core/boss_golemagg.cpp @@ -198,3 +198,4 @@ void AddSC_boss_golemagg() newscript->GetAI = &GetAI_mob_core_rager; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/molten_core/boss_lucifron.cpp b/src/bindings/scripts/scripts/zone/molten_core/boss_lucifron.cpp index cce048d3efa..c87d77ab73b 100644 --- a/src/bindings/scripts/scripts/zone/molten_core/boss_lucifron.cpp +++ b/src/bindings/scripts/scripts/zone/molten_core/boss_lucifron.cpp @@ -88,3 +88,4 @@ void AddSC_boss_lucifron() newscript->GetAI = &GetAI_boss_lucifron; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/molten_core/boss_magmadar.cpp b/src/bindings/scripts/scripts/zone/molten_core/boss_magmadar.cpp index 8281cffcec3..de26001d185 100644 --- a/src/bindings/scripts/scripts/zone/molten_core/boss_magmadar.cpp +++ b/src/bindings/scripts/scripts/zone/molten_core/boss_magmadar.cpp @@ -97,3 +97,4 @@ void AddSC_boss_magmadar() newscript->GetAI = &GetAI_boss_magmadar; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/molten_core/boss_majordomo_executus.cpp b/src/bindings/scripts/scripts/zone/molten_core/boss_majordomo_executus.cpp index 5879cf0380b..9f5f815631a 100644 --- a/src/bindings/scripts/scripts/zone/molten_core/boss_majordomo_executus.cpp +++ b/src/bindings/scripts/scripts/zone/molten_core/boss_majordomo_executus.cpp @@ -137,3 +137,4 @@ void AddSC_boss_majordomo() newscript->GetAI = &GetAI_boss_majordomo; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/molten_core/boss_ragnaros.cpp b/src/bindings/scripts/scripts/zone/molten_core/boss_ragnaros.cpp index 677d74c96af..852fcd3873b 100644 --- a/src/bindings/scripts/scripts/zone/molten_core/boss_ragnaros.cpp +++ b/src/bindings/scripts/scripts/zone/molten_core/boss_ragnaros.cpp @@ -294,3 +294,4 @@ void AddSC_boss_ragnaros() newscript->GetAI = &GetAI_boss_ragnaros; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/molten_core/boss_shazzrah.cpp b/src/bindings/scripts/scripts/zone/molten_core/boss_shazzrah.cpp index 68ae19bcbdc..32612e158f5 100644 --- a/src/bindings/scripts/scripts/zone/molten_core/boss_shazzrah.cpp +++ b/src/bindings/scripts/scripts/zone/molten_core/boss_shazzrah.cpp @@ -119,3 +119,4 @@ void AddSC_boss_shazzrah() newscript->GetAI = &GetAI_boss_shazzrah; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/molten_core/boss_sulfuron_harbinger.cpp b/src/bindings/scripts/scripts/zone/molten_core/boss_sulfuron_harbinger.cpp index 5d99bbcc17f..cc0cb5c9f12 100644 --- a/src/bindings/scripts/scripts/zone/molten_core/boss_sulfuron_harbinger.cpp +++ b/src/bindings/scripts/scripts/zone/molten_core/boss_sulfuron_harbinger.cpp @@ -213,3 +213,4 @@ void AddSC_boss_sulfuron() newscript->GetAI = &GetAI_mob_flamewaker_priest; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/molten_core/def_molten_core.h b/src/bindings/scripts/scripts/zone/molten_core/def_molten_core.h index b3906616c95..5874d8b9408 100644 --- a/src/bindings/scripts/scripts/zone/molten_core/def_molten_core.h +++ b/src/bindings/scripts/scripts/zone/molten_core/def_molten_core.h @@ -19,3 +19,4 @@ #define DATA_SULFURONISDEAD 12 #define DATA_GOLEMAGG 13 #endif + diff --git a/src/bindings/scripts/scripts/zone/molten_core/instance_molten_core.cpp b/src/bindings/scripts/scripts/zone/molten_core/instance_molten_core.cpp index 066bf7d0158..bfaa583e033 100644 --- a/src/bindings/scripts/scripts/zone/molten_core/instance_molten_core.cpp +++ b/src/bindings/scripts/scripts/zone/molten_core/instance_molten_core.cpp @@ -263,3 +263,4 @@ void AddSC_instance_molten_core() newscript->GetInstanceData = &GetInstance_instance_molten_core; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/molten_core/molten_core.cpp b/src/bindings/scripts/scripts/zone/molten_core/molten_core.cpp index b9799d29d1c..d25ddc7631c 100644 --- a/src/bindings/scripts/scripts/zone/molten_core/molten_core.cpp +++ b/src/bindings/scripts/scripts/zone/molten_core/molten_core.cpp @@ -86,3 +86,4 @@ void AddSC_molten_core() newscript->GetAI = &GetAI_mob_ancient_core_hound; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/moonglade/moonglade.cpp b/src/bindings/scripts/scripts/zone/moonglade/moonglade.cpp index 1ecaf826816..0431f348f83 100644 --- a/src/bindings/scripts/scripts/zone/moonglade/moonglade.cpp +++ b/src/bindings/scripts/scripts/zone/moonglade/moonglade.cpp @@ -573,3 +573,4 @@ void AddSC_moonglade() newscript->GetAI = &GetAI_npc_clintar_spirit; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/mulgore/mulgore.cpp b/src/bindings/scripts/scripts/zone/mulgore/mulgore.cpp index 68aee9b122d..d6d905eaa86 100644 --- a/src/bindings/scripts/scripts/zone/mulgore/mulgore.cpp +++ b/src/bindings/scripts/scripts/zone/mulgore/mulgore.cpp @@ -17,16 +17,18 @@ /* ScriptData SDName: Mulgore SD%Complete: 100 -SDComment: Support for quest: 11129 +SDComment: Support for quest: 11129, 772 SDCategory: Mulgore EndScriptData */ /* ContentData npc_skorn_whitecloud npc_kyle_frenzied +npc_plains_vision EndContentData */ #include "precompiled.h" +#include "../../npc/npc_escortAI.h" /*###### # npc_skorn_whitecloud @@ -158,6 +160,117 @@ CreatureAI* GetAI_npc_kyle_frenzied(Creature *_Creature) return new npc_kyle_frenziedAI (_Creature); } +/*##### +# npc_plains_vision +######*/ + +float wp_plain_vision[50][3] = +{ + {-2226.32, -408.095, -9.36235}, + {-2203.04, -437.212, -5.72498}, + {-2163.91, -457.851, -7.09049}, + {-2123.87, -448.137, -9.29591}, + {-2104.66, -427.166, -6.49513}, + {-2101.48, -422.826, -5.3567}, + {-2097.56, -417.083, -7.16716}, + {-2084.87, -398.626, -9.88973}, + {-2072.71, -382.324, -10.2488}, + {-2054.05, -356.728, -6.22468}, + {-2051.8, -353.645, -5.35791}, + {-2049.08, -349.912, -6.15723}, + {-2030.6, -310.724, -9.59302}, + {-2002.15, -249.308, -10.8124}, + {-1972.85, -195.811, -10.6316}, + {-1940.93, -147.652, -11.7055}, + {-1888.06, -81.943, -11.4404}, + {-1837.05, -34.0109, -12.258}, + {-1796.12, -14.6462, -10.3581}, + {-1732.61, -4.27746, -10.0213}, + {-1688.94, -0.829945, -11.7103}, + {-1681.32, 13.0313, -9.48056}, + {-1677.04, 36.8349, -7.10318}, + {-1675.2, 68.559, -8.95384}, + {-1676.57, 89.023, -9.65104}, + {-1678.16, 110.939, -10.1782}, + {-1677.86, 128.681, -5.73869}, + {-1675.27, 144.324, -3.47916}, + {-1671.7, 163.169, -1.23098}, + {-1666.61, 181.584, 5.26145}, + {-1661.51, 196.154, 8.95252}, + {-1655.47, 210.811, 8.38727}, + {-1647.07, 226.947, 5.27755}, + {-1621.65, 232.91, 2.69579}, + {-1600.23, 237.641, 2.98539}, + {-1576.07, 242.546, 4.66541}, + {-1554.57, 248.494, 6.60377}, + {-1547.53, 259.302, 10.6741}, + {-1541.7, 269.847, 16.4418}, + {-1539.83, 278.989, 21.0597}, + {-1540.16, 290.219, 27.8247}, + {-1538.99, 298.983, 34.0032}, + {-1540.38, 307.337, 41.3557}, + {-1536.61, 314.884, 48.0179}, + {-1532.42, 323.277, 55.6667}, + {-1528.77, 329.774, 61.1525}, + {-1525.65, 333.18, 63.2161}, + {-1517.01, 350.713, 62.4286}, + {-1511.39, 362.537, 62.4539}, + {-1508.68, 366.822, 62.733} +}; + +struct TRINITY_DLL_DECL npc_plains_visionAI : public ScriptedAI +{ + npc_plains_visionAI(Creature *c) : ScriptedAI(c) {Reset();} + + bool newWaypoint; + uint8 WayPointId; + uint8 amountWP; + + void Reset() + { + WayPointId = 0; + newWaypoint = true; + amountWP = 49; + } + + void Aggro(Unit* who){} + + void MovementInform(uint32 type, uint32 id) + { + if(type != POINT_MOTION_TYPE) + return; + + if (id < amountWP) + { + ++WayPointId; + newWaypoint = true; + } + else + { + m_creature->setDeathState(JUST_DIED); + m_creature->RemoveCorpse(); + } + } + + void UpdateAI(const uint32 diff) + { + if (newWaypoint) + { + m_creature->GetMotionMaster()->MovePoint(WayPointId, wp_plain_vision[WayPointId][0], wp_plain_vision[WayPointId][1], wp_plain_vision[WayPointId][2]); + newWaypoint = false; + } + } +}; + +CreatureAI* GetAI_npc_plains_vision(Creature *_Creature) +{ + return new npc_plains_visionAI (_Creature); +} + +/*##### +# +######*/ + void AddSC_mulgore() { Script *newscript; @@ -172,4 +285,10 @@ void AddSC_mulgore() newscript->Name="npc_kyle_frenzied"; newscript->GetAI = &GetAI_npc_kyle_frenzied; newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "npc_plains_vision"; + newscript->GetAI = &GetAI_npc_plains_vision; + newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/nagrand/nagrand.cpp b/src/bindings/scripts/scripts/zone/nagrand/nagrand.cpp index 5c6b7eedaaf..c059fe42911 100644 --- a/src/bindings/scripts/scripts/zone/nagrand/nagrand.cpp +++ b/src/bindings/scripts/scripts/zone/nagrand/nagrand.cpp @@ -710,3 +710,4 @@ void AddSC_nagrand() newscript->GetAI = &GetAI_mob_sparrowhawk; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_anubrekhan.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_anubrekhan.cpp index 41f95a37bb9..6e8fb71f155 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_anubrekhan.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_anubrekhan.cpp @@ -148,3 +148,4 @@ void AddSC_boss_anubrekhan() newscript->GetAI = &GetAI_boss_anubrekhan; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_faerlina.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_faerlina.cpp index 8e8ed407823..19ec0ed8487 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_faerlina.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_faerlina.cpp @@ -136,3 +136,4 @@ void AddSC_boss_faerlina() newscript->GetAI = &GetAI_boss_faerlina; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_four_horsemen.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_four_horsemen.cpp index 7bbda22c917..26c9eb09f14 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_four_horsemen.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_four_horsemen.cpp @@ -398,4 +398,5 @@ newscript->Name = "boss_sir_zeliek"; newscript->GetAI = &GetAI_boss_sir_zeliek; newscript->RegisterSelf(); - }
\ No newline at end of file + } + diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_gluth.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_gluth.cpp index ca665e7b4b0..f9e739c5be9 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_gluth.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_gluth.cpp @@ -172,3 +172,4 @@ void AddSC_boss_gluth() newscript->GetAI = &GetAI_boss_gluth; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_gothik.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_gothik.cpp index 8e657cbd1ae..bccfe2362e9 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_gothik.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_gothik.cpp @@ -59,3 +59,4 @@ EndScriptData */ //Spectral Horse #define SPELL_STOMP 27993 + diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_grobbulus.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_grobbulus.cpp index 8f103b499b4..e0bf157dc43 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_grobbulus.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_grobbulus.cpp @@ -28,3 +28,4 @@ Mutating Injection 28169 Enrages 26527*/ #include "precompiled.h" + diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_heigan.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_heigan.cpp index a970039fb70..d5f1e594d0c 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_heigan.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_heigan.cpp @@ -43,3 +43,4 @@ EndScriptData */ //Spell by eye stalks #define SPELL_MIND_FLAY 26143 + diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_highlord_mograine.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_highlord_mograine.cpp index ce2804a7e52..61bf556c561 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_highlord_mograine.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_highlord_mograine.cpp @@ -176,3 +176,4 @@ void AddSC_boss_highlord_mograine() newscript->GetAI = &GetAI_boss_highlord_mograine; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_kelthuzad.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_kelthuzad.cpp index c3574a1c294..bb285c3de4f 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_kelthuzad.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_kelthuzad.cpp @@ -441,3 +441,4 @@ void AddSC_boss_kelthuzad() newscript->GetAI = &GetAI_boss_kelthuzadAI; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_loatheb.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_loatheb.cpp index b95bfa25f6e..9b2458630e3 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_loatheb.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_loatheb.cpp @@ -144,3 +144,4 @@ void AddSC_boss_loatheb() newscript->GetAI = &GetAI_boss_loatheb; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_maexxna.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_maexxna.cpp index 0af576492c2..4885079646d 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_maexxna.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_maexxna.cpp @@ -249,3 +249,4 @@ void AddSC_boss_maexxna() newscript->GetAI = &GetAI_mob_webwrap; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_noth.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_noth.cpp index 9a94e095940..857ec33e3fa 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_noth.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_noth.cpp @@ -142,3 +142,4 @@ void AddSC_boss_noth() newscript->GetAI = &GetAI_boss_noth; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_patchwerk.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_patchwerk.cpp index 76d873fb7b9..9d96e35d572 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_patchwerk.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_patchwerk.cpp @@ -150,3 +150,4 @@ void AddSC_boss_patchwerk() newscript->GetAI = &GetAI_boss_patchwerk; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_razuvious.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_razuvious.cpp index b0df4050023..77e1303f8b6 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_razuvious.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_razuvious.cpp @@ -165,3 +165,4 @@ void AddSC_boss_razuvious() newscript->GetAI = &GetAI_boss_razuvious; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_sapphiron.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_sapphiron.cpp index 160a2f8f0c4..bf600c29eef 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_sapphiron.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_sapphiron.cpp @@ -108,7 +108,7 @@ struct TRINITY_DLL_DECL boss_sapphironAI : public ScriptedAI m_creature->HandleEmoteCommand(EMOTE_ONESHOT_LIFTOFF); m_creature->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING + MOVEMENTFLAG_ONTRANSPORT); m_creature->GetMotionMaster()->Clear(false); - m_creature->GetMotionMaster()->MoveIdle(); + m_creature->GetMotionMaster()->MoveIdle(); m_creature->SetHover(true); Icebolt_Timer = 4000; Icebolt_Count = 0; @@ -132,16 +132,16 @@ struct TRINITY_DLL_DECL boss_sapphironAI : public ScriptedAI }else Icebolt_Timer -= diff; if(Icebolt_Count == 5 && IsInFly && FrostBreath_Timer < diff ) - { + { DoScriptText(EMOTE_BREATH, m_creature); DoCast(m_creature->getVictim(),SPELL_FROST_BREATH); land_Timer = 2000; IsInFly = false; FrostBreath_Timer = 6000; - }else FrostBreath_Timer -= diff; + }else FrostBreath_Timer -= diff; if(!IsInFly && land_Timer < diff) - { + { phase = 1; m_creature->HandleEmoteCommand(EMOTE_ONESHOT_LAND); m_creature->RemoveUnitMovementFlag(MOVEMENTFLAG_LEVITATING + MOVEMENTFLAG_ONTRANSPORT); @@ -181,3 +181,4 @@ void AddSC_boss_sapphiron() newscript->GetAI = &GetAI_boss_sapphiron; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_thaddius.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_thaddius.cpp index 28a35562c6b..259c1589791 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_thaddius.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_thaddius.cpp @@ -67,4 +67,5 @@ EndScriptData */ #define SPELL_BESERK 26662 //generic -#define C_TESLA_COIL 16218 //the coils (emotes "Tesla Coil overloads!")
\ No newline at end of file +#define C_TESLA_COIL 16218 //the coils (emotes "Tesla Coil overloads!") + diff --git a/src/bindings/scripts/scripts/zone/naxxramas/instance_naxxramas.cpp b/src/bindings/scripts/scripts/zone/naxxramas/instance_naxxramas.cpp index 24abbc6b8a4..2ed8399f57a 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/instance_naxxramas.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/instance_naxxramas.cpp @@ -22,3 +22,4 @@ SDCategory: Naxxramas EndScriptData */ #include "precompiled.h" + diff --git a/src/bindings/scripts/scripts/zone/netherstorm/netherstorm.cpp b/src/bindings/scripts/scripts/zone/netherstorm/netherstorm.cpp index 32390d1b029..70add388c60 100644 --- a/src/bindings/scripts/scripts/zone/netherstorm/netherstorm.cpp +++ b/src/bindings/scripts/scripts/zone/netherstorm/netherstorm.cpp @@ -1067,3 +1067,4 @@ void AddSC_netherstorm() newscript->pQuestAccept = &QuestAccept_npc_bessy; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/onyxias_lair/boss_onyxia.cpp b/src/bindings/scripts/scripts/zone/onyxias_lair/boss_onyxia.cpp index 45a2accdabc..eff383f872b 100644 --- a/src/bindings/scripts/scripts/zone/onyxias_lair/boss_onyxia.cpp +++ b/src/bindings/scripts/scripts/zone/onyxias_lair/boss_onyxia.cpp @@ -306,3 +306,4 @@ void AddSC_boss_onyxia() newscript->GetAI = &GetAI_boss_onyxiaAI; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/orgrimmar/orgrimmar.cpp b/src/bindings/scripts/scripts/zone/orgrimmar/orgrimmar.cpp index fd00a527362..68b2d6d3dd9 100644 --- a/src/bindings/scripts/scripts/zone/orgrimmar/orgrimmar.cpp +++ b/src/bindings/scripts/scripts/zone/orgrimmar/orgrimmar.cpp @@ -273,3 +273,4 @@ void AddSC_orgrimmar() newscript->pGossipSelect = &GossipSelect_npc_thrall_warchief; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/razorfen_downs/boss_amnennar_the_coldbringer.cpp b/src/bindings/scripts/scripts/zone/razorfen_downs/boss_amnennar_the_coldbringer.cpp index b8fdaea2ffb..ff03a97481f 100644 --- a/src/bindings/scripts/scripts/zone/razorfen_downs/boss_amnennar_the_coldbringer.cpp +++ b/src/bindings/scripts/scripts/zone/razorfen_downs/boss_amnennar_the_coldbringer.cpp @@ -127,3 +127,4 @@ void AddSC_boss_amnennar_the_coldbringer() newscript->GetAI = &GetAI_boss_amnennar_the_coldbringer; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/razorfen_kraul/razorfen_kraul.cpp b/src/bindings/scripts/scripts/zone/razorfen_kraul/razorfen_kraul.cpp index 57ff43c05a5..540c8e77c0b 100644 --- a/src/bindings/scripts/scripts/zone/razorfen_kraul/razorfen_kraul.cpp +++ b/src/bindings/scripts/scripts/zone/razorfen_kraul/razorfen_kraul.cpp @@ -202,3 +202,4 @@ void AddSC_razorfen_kraul() newscript->pQuestAccept = &QuestAccept_npc_willix; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_ayamiss.cpp b/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_ayamiss.cpp index 54ca9ee3278..4ed8e3cb73f 100644 --- a/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_ayamiss.cpp +++ b/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_ayamiss.cpp @@ -105,3 +105,4 @@ void AddSC_boss_ayamiss() newscript->GetAI = &GetAI_boss_ayamiss; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_buru.cpp b/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_buru.cpp index 9b6b73aee53..58c48540362 100644 --- a/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_buru.cpp +++ b/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_buru.cpp @@ -23,4 +23,5 @@ EndScriptData */ #include "precompiled.h" - #define EMOTE_TARGET -1509002
\ No newline at end of file + #define EMOTE_TARGET -1509002 + diff --git a/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_kurinnaxx.cpp b/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_kurinnaxx.cpp index 83955e32f3e..e1505496516 100644 --- a/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_kurinnaxx.cpp +++ b/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_kurinnaxx.cpp @@ -91,3 +91,4 @@ void AddSC_boss_kurinnaxx() newscript->GetAI = &GetAI_boss_kurinnaxx; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_moam.cpp b/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_moam.cpp index bd66b5fe2be..6c293b4a1c1 100644 --- a/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_moam.cpp +++ b/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_moam.cpp @@ -117,3 +117,4 @@ void AddSC_boss_moam() newscript->GetAI = &GetAI_boss_moam; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_ossirian.cpp b/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_ossirian.cpp index 7d51377b2f6..5652b706917 100644 --- a/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_ossirian.cpp +++ b/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_ossirian.cpp @@ -34,4 +34,5 @@ EndScriptData */ #define SAY_AGGRO -1509025 #define SAY_SLAY -1509026 -#define SAY_DEATH -1509027
\ No newline at end of file +#define SAY_DEATH -1509027 + diff --git a/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_rajaxx.cpp b/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_rajaxx.cpp index a3c3b9bd669..fb2c92ff59f 100644 --- a/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_rajaxx.cpp +++ b/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_rajaxx.cpp @@ -41,4 +41,5 @@ EndScriptData */ #define SAY_DEAGGRO -1509015 #define SAY_KILLS_ANDOROV -1509016 -#define SAY_COMPLETE_QUEST -1509017 //Yell when realm complete quest 8743 for world event
\ No newline at end of file +#define SAY_COMPLETE_QUEST -1509017 //Yell when realm complete quest 8743 for world event + diff --git a/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/instance_ruins_of_ahnqiraj.cpp b/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/instance_ruins_of_ahnqiraj.cpp index 291b53b275f..b94e6f16a80 100644 --- a/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/instance_ruins_of_ahnqiraj.cpp +++ b/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/instance_ruins_of_ahnqiraj.cpp @@ -22,3 +22,4 @@ SDCategory: Ruins of Ahn'Qiraj EndScriptData */ #include "precompiled.h" + diff --git a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_arcanist_doan.cpp b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_arcanist_doan.cpp index 29209d4e579..51355f90198 100644 --- a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_arcanist_doan.cpp +++ b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_arcanist_doan.cpp @@ -157,3 +157,4 @@ void AddSC_boss_arcanist_doan() newscript->GetAI = &GetAI_boss_arcanist_doan; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_azshir_the_sleepless.cpp b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_azshir_the_sleepless.cpp index bdeceeb710a..a7e1785eb4f 100644 --- a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_azshir_the_sleepless.cpp +++ b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_azshir_the_sleepless.cpp @@ -95,3 +95,4 @@ void AddSC_boss_azshir_the_sleepless() newscript->GetAI = &GetAI_boss_azshir_the_sleepless; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_bloodmage_thalnos.cpp b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_bloodmage_thalnos.cpp index cf8c6d57019..8688d6a8292 100644 --- a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_bloodmage_thalnos.cpp +++ b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_bloodmage_thalnos.cpp @@ -127,3 +127,4 @@ void AddSC_boss_bloodmage_thalnos() newscript->GetAI = &GetAI_boss_bloodmage_thalnos; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_headless_horseman.cpp b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_headless_horseman.cpp index d2ba85bca1e..013bebb860d 100644 --- a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_headless_horseman.cpp +++ b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_headless_horseman.cpp @@ -849,3 +849,4 @@ void AddSC_boss_headless_horseman() newscript->pGOHello = &GOHello_go_loosely_turned_soil; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_herod.cpp b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_herod.cpp index 543a0f9c545..d8486fa211d 100644 --- a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_herod.cpp +++ b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_herod.cpp @@ -184,3 +184,4 @@ void AddSC_boss_herod() newscript->GetAI = &GetAI_mob_scarlet_trainee; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_high_inquisitor_fairbanks.cpp b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_high_inquisitor_fairbanks.cpp index 0231a672e83..63d167fb4c4 100644 --- a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_high_inquisitor_fairbanks.cpp +++ b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_high_inquisitor_fairbanks.cpp @@ -130,3 +130,4 @@ void AddSC_boss_high_inquisitor_fairbanks() newscript->GetAI = &GetAI_boss_high_inquisitor_fairbanks; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_houndmaster_loksey.cpp b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_houndmaster_loksey.cpp index fc7d067bd2b..1d193ba43eb 100644 --- a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_houndmaster_loksey.cpp +++ b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_houndmaster_loksey.cpp @@ -73,3 +73,4 @@ void AddSC_boss_houndmaster_loksey() newscript->GetAI = &GetAI_boss_houndmaster_loksey; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_interrogator_vishas.cpp b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_interrogator_vishas.cpp index 00729ca53b5..83f115470e6 100644 --- a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_interrogator_vishas.cpp +++ b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_interrogator_vishas.cpp @@ -113,3 +113,4 @@ void AddSC_boss_interrogator_vishas() newscript->GetAI = &GetAI_boss_interrogator_vishas; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_mograine_and_whitemane.cpp b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_mograine_and_whitemane.cpp index 5f3194b4b71..23e1e50ab75 100644 --- a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_mograine_and_whitemane.cpp +++ b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_mograine_and_whitemane.cpp @@ -321,3 +321,4 @@ void AddSC_boss_mograine_and_whitemane() newscript->GetAI = &GetAI_boss_high_inquisitor_whitemane; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_scorn.cpp b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_scorn.cpp index 84f44a55927..7542b4e4801 100644 --- a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_scorn.cpp +++ b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_scorn.cpp @@ -98,3 +98,4 @@ void AddSC_boss_scorn() newscript->GetAI = &GetAI_boss_scorn; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/scarlet_monastery/def_scarlet_monastery.h b/src/bindings/scripts/scripts/zone/scarlet_monastery/def_scarlet_monastery.h index 29d3b729fcf..2b6399ae3e4 100644 --- a/src/bindings/scripts/scripts/zone/scarlet_monastery/def_scarlet_monastery.h +++ b/src/bindings/scripts/scripts/zone/scarlet_monastery/def_scarlet_monastery.h @@ -15,3 +15,4 @@ #define DATA_VORREL 7 #endif + diff --git a/src/bindings/scripts/scripts/zone/scarlet_monastery/instance_scarlet_monastery.cpp b/src/bindings/scripts/scripts/zone/scarlet_monastery/instance_scarlet_monastery.cpp index 841c7f81a1a..4a2239f3b36 100644 --- a/src/bindings/scripts/scripts/zone/scarlet_monastery/instance_scarlet_monastery.cpp +++ b/src/bindings/scripts/scripts/zone/scarlet_monastery/instance_scarlet_monastery.cpp @@ -152,3 +152,4 @@ void AddSC_instance_scarlet_monastery() newscript->GetInstanceData = &GetInstanceData_instance_scarlet_monastery; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/scholomance/boss_darkmaster_gandling.cpp b/src/bindings/scripts/scripts/zone/scholomance/boss_darkmaster_gandling.cpp index d60067dd70c..4c84da5114e 100644 --- a/src/bindings/scripts/scripts/zone/scholomance/boss_darkmaster_gandling.cpp +++ b/src/bindings/scripts/scripts/zone/scholomance/boss_darkmaster_gandling.cpp @@ -190,3 +190,4 @@ void AddSC_boss_darkmaster_gandling() newscript->GetAI = &GetAI_boss_darkmaster_gandling; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/scholomance/boss_death_knight_darkreaver.cpp b/src/bindings/scripts/scripts/zone/scholomance/boss_death_knight_darkreaver.cpp index 2556ba37b23..6d18d2ba1bf 100644 --- a/src/bindings/scripts/scripts/zone/scholomance/boss_death_knight_darkreaver.cpp +++ b/src/bindings/scripts/scripts/zone/scholomance/boss_death_knight_darkreaver.cpp @@ -57,3 +57,4 @@ void AddSC_boss_death_knight_darkreaver() newscript->GetAI = &GetAI_boss_death_knight_darkreaver; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/scholomance/boss_doctor_theolen_krastinov.cpp b/src/bindings/scripts/scripts/zone/scholomance/boss_doctor_theolen_krastinov.cpp index 0849079fc5c..1fc58987578 100644 --- a/src/bindings/scripts/scripts/zone/scholomance/boss_doctor_theolen_krastinov.cpp +++ b/src/bindings/scripts/scripts/zone/scholomance/boss_doctor_theolen_krastinov.cpp @@ -108,3 +108,4 @@ void AddSC_boss_theolenkrastinov() newscript->GetAI = &GetAI_boss_theolenkrastinov; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/scholomance/boss_illucia_barov.cpp b/src/bindings/scripts/scripts/zone/scholomance/boss_illucia_barov.cpp index 829920a4fda..a1fa023be67 100644 --- a/src/bindings/scripts/scripts/zone/scholomance/boss_illucia_barov.cpp +++ b/src/bindings/scripts/scripts/zone/scholomance/boss_illucia_barov.cpp @@ -114,3 +114,4 @@ void AddSC_boss_illuciabarov() newscript->GetAI = &GetAI_boss_illuciabarov; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/scholomance/boss_instructor_malicia.cpp b/src/bindings/scripts/scripts/zone/scholomance/boss_instructor_malicia.cpp index 45dbf04cb1e..bf693caaadb 100644 --- a/src/bindings/scripts/scripts/zone/scholomance/boss_instructor_malicia.cpp +++ b/src/bindings/scripts/scripts/zone/scholomance/boss_instructor_malicia.cpp @@ -150,3 +150,4 @@ void AddSC_boss_instructormalicia() newscript->GetAI = &GetAI_boss_instructormalicia; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/scholomance/boss_jandice_barov.cpp b/src/bindings/scripts/scripts/zone/scholomance/boss_jandice_barov.cpp index f509afb4400..972fb9d1cfa 100644 --- a/src/bindings/scripts/scripts/zone/scholomance/boss_jandice_barov.cpp +++ b/src/bindings/scripts/scripts/zone/scholomance/boss_jandice_barov.cpp @@ -219,3 +219,4 @@ void AddSC_boss_jandicebarov() newscript->GetAI = &GetAI_mob_illusionofjandicebarov; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/scholomance/boss_kormok.cpp b/src/bindings/scripts/scripts/zone/scholomance/boss_kormok.cpp index 415d9e52451..0a630ad0cd9 100644 --- a/src/bindings/scripts/scripts/zone/scholomance/boss_kormok.cpp +++ b/src/bindings/scripts/scripts/zone/scholomance/boss_kormok.cpp @@ -153,3 +153,4 @@ void AddSC_boss_kormok() newscript->GetAI = &GetAI_boss_kormok; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/scholomance/boss_lord_alexei_barov.cpp b/src/bindings/scripts/scripts/zone/scholomance/boss_lord_alexei_barov.cpp index 9b87188b988..bdddaf2cded 100644 --- a/src/bindings/scripts/scripts/zone/scholomance/boss_lord_alexei_barov.cpp +++ b/src/bindings/scripts/scripts/zone/scholomance/boss_lord_alexei_barov.cpp @@ -96,3 +96,4 @@ void AddSC_boss_lordalexeibarov() newscript->GetAI = &GetAI_boss_lordalexeibarov; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/scholomance/boss_lorekeeper_polkelt.cpp b/src/bindings/scripts/scripts/zone/scholomance/boss_lorekeeper_polkelt.cpp index 67f68108769..f93b9ac41fc 100644 --- a/src/bindings/scripts/scripts/zone/scholomance/boss_lorekeeper_polkelt.cpp +++ b/src/bindings/scripts/scripts/zone/scholomance/boss_lorekeeper_polkelt.cpp @@ -111,3 +111,4 @@ void AddSC_boss_lorekeeperpolkelt() newscript->GetAI = &GetAI_boss_lorekeeperpolkelt; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/scholomance/boss_ras_frostwhisper.cpp b/src/bindings/scripts/scripts/zone/scholomance/boss_ras_frostwhisper.cpp index e44eaae4cac..3ca8b414673 100644 --- a/src/bindings/scripts/scripts/zone/scholomance/boss_ras_frostwhisper.cpp +++ b/src/bindings/scripts/scripts/zone/scholomance/boss_ras_frostwhisper.cpp @@ -123,3 +123,4 @@ void AddSC_boss_rasfrost() newscript->GetAI = &GetAI_boss_rasfrost; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/scholomance/boss_the_ravenian.cpp b/src/bindings/scripts/scripts/zone/scholomance/boss_the_ravenian.cpp index 1cad89ea2b9..ad25ee5e4b0 100644 --- a/src/bindings/scripts/scripts/zone/scholomance/boss_the_ravenian.cpp +++ b/src/bindings/scripts/scripts/zone/scholomance/boss_the_ravenian.cpp @@ -114,3 +114,4 @@ void AddSC_boss_theravenian() newscript->GetAI = &GetAI_boss_theravenian; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/scholomance/boss_vectus.cpp b/src/bindings/scripts/scripts/zone/scholomance/boss_vectus.cpp index 165d465557c..c85ac0158b2 100644 --- a/src/bindings/scripts/scripts/zone/scholomance/boss_vectus.cpp +++ b/src/bindings/scripts/scripts/zone/scholomance/boss_vectus.cpp @@ -95,3 +95,4 @@ void AddSC_boss_vectus() newscript->GetAI = &GetAI_boss_vectus; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/scholomance/def_scholomance.h b/src/bindings/scripts/scripts/zone/scholomance/def_scholomance.h index cf85ce2037e..1593214fc09 100644 --- a/src/bindings/scripts/scripts/zone/scholomance/def_scholomance.h +++ b/src/bindings/scripts/scripts/zone/scholomance/def_scholomance.h @@ -13,3 +13,4 @@ #define DATA_LOREKEEPERPOLKELT_DEATH 6 #define DATA_THERAVENIAN_DEATH 7 #endif + diff --git a/src/bindings/scripts/scripts/zone/scholomance/instance_scholomance.cpp b/src/bindings/scripts/scripts/zone/scholomance/instance_scholomance.cpp index ca50da7526a..6274747fe30 100644 --- a/src/bindings/scripts/scripts/zone/scholomance/instance_scholomance.cpp +++ b/src/bindings/scripts/scripts/zone/scholomance/instance_scholomance.cpp @@ -100,3 +100,4 @@ void AddSC_instance_scholomance() newscript->GetInstanceData = &GetInstanceData_instance_scholomance; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/searing_gorge/searing_gorge.cpp b/src/bindings/scripts/scripts/zone/searing_gorge/searing_gorge.cpp index cd1cc041847..4d55b5d91fd 100644 --- a/src/bindings/scripts/scripts/zone/searing_gorge/searing_gorge.cpp +++ b/src/bindings/scripts/scripts/zone/searing_gorge/searing_gorge.cpp @@ -157,3 +157,4 @@ void AddSC_searing_gorge() newscript->pGossipSelect = &GossipSelect_npc_zamael_lunthistle; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/shadowfang_keep/def_shadowfang_keep.h b/src/bindings/scripts/scripts/zone/shadowfang_keep/def_shadowfang_keep.h index 16b096b7d86..8383a5c3950 100644 --- a/src/bindings/scripts/scripts/zone/shadowfang_keep/def_shadowfang_keep.h +++ b/src/bindings/scripts/scripts/zone/shadowfang_keep/def_shadowfang_keep.h @@ -10,3 +10,4 @@ #define TYPE_FENRUS 3 #define TYPE_NANDOS 4 #endif + diff --git a/src/bindings/scripts/scripts/zone/shadowfang_keep/instance_shadowfang_keep.cpp b/src/bindings/scripts/scripts/zone/shadowfang_keep/instance_shadowfang_keep.cpp index 04ccd98ede3..0364c132447 100644 --- a/src/bindings/scripts/scripts/zone/shadowfang_keep/instance_shadowfang_keep.cpp +++ b/src/bindings/scripts/scripts/zone/shadowfang_keep/instance_shadowfang_keep.cpp @@ -180,3 +180,4 @@ void AddSC_instance_shadowfang_keep() newscript->GetInstanceData = &GetInstanceData_instance_shadowfang_keep; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/shadowfang_keep/shadowfang_keep.cpp b/src/bindings/scripts/scripts/zone/shadowfang_keep/shadowfang_keep.cpp index 1a42e97377a..9759f55a939 100644 --- a/src/bindings/scripts/scripts/zone/shadowfang_keep/shadowfang_keep.cpp +++ b/src/bindings/scripts/scripts/zone/shadowfang_keep/shadowfang_keep.cpp @@ -120,3 +120,4 @@ void AddSC_shadowfang_keep() newscript->GetAI = &GetAI_npc_shadowfang_prisoner; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/shadowmoon_valley/boss_doomwalker.cpp b/src/bindings/scripts/scripts/zone/shadowmoon_valley/boss_doomwalker.cpp index 8ca29502d5a..87698fe7658 100644 --- a/src/bindings/scripts/scripts/zone/shadowmoon_valley/boss_doomwalker.cpp +++ b/src/bindings/scripts/scripts/zone/shadowmoon_valley/boss_doomwalker.cpp @@ -176,3 +176,4 @@ void AddSC_boss_doomwalker() newscript->GetAI = &GetAI_boss_doomwalker; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp b/src/bindings/scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp index c172abcefc3..e00cb397223 100644 --- a/src/bindings/scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp +++ b/src/bindings/scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp @@ -1848,3 +1848,4 @@ void AddSC_shadowmoon_valley() newscript->GetAI = &GetAI_npc_enraged_spirit; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/shattrath/shattrath_city.cpp b/src/bindings/scripts/scripts/zone/shattrath/shattrath_city.cpp index e0186ab5955..460a19aeb59 100644 --- a/src/bindings/scripts/scripts/zone/shattrath/shattrath_city.cpp +++ b/src/bindings/scripts/scripts/zone/shattrath/shattrath_city.cpp @@ -737,3 +737,4 @@ void AddSC_shattrath_city() newscript->pGossipSelect = &GossipSelect_npc_khadgar; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/silithus/silithus.cpp b/src/bindings/scripts/scripts/zone/silithus/silithus.cpp index ebb48655dfd..bd1ecf748a0 100644 --- a/src/bindings/scripts/scripts/zone/silithus/silithus.cpp +++ b/src/bindings/scripts/scripts/zone/silithus/silithus.cpp @@ -220,3 +220,4 @@ void AddSC_silithus() newscript->pGossipSelect = &GossipSelect_npcs_rutgar_and_frankal; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/silvermoon/silvermoon_city.cpp b/src/bindings/scripts/scripts/zone/silvermoon/silvermoon_city.cpp index 9dfa5868612..937a8c2e553 100644 --- a/src/bindings/scripts/scripts/zone/silvermoon/silvermoon_city.cpp +++ b/src/bindings/scripts/scripts/zone/silvermoon/silvermoon_city.cpp @@ -101,3 +101,4 @@ void AddSC_silvermoon_city() newscript->GetAI = &GetAI_npc_blood_knight_stillblade; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/silverpine_forest/silverpine_forest.cpp b/src/bindings/scripts/scripts/zone/silverpine_forest/silverpine_forest.cpp index 64dbcfb9005..8dfda004d55 100644 --- a/src/bindings/scripts/scripts/zone/silverpine_forest/silverpine_forest.cpp +++ b/src/bindings/scripts/scripts/zone/silverpine_forest/silverpine_forest.cpp @@ -231,3 +231,4 @@ void AddSC_silverpine_forest() newscript->pQuestAccept = &QuestAccept_npc_deathstalker_erland; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/stonetalon_mountains/stonetalon_mountains.cpp b/src/bindings/scripts/scripts/zone/stonetalon_mountains/stonetalon_mountains.cpp index a04f5c3ea40..5678c27e276 100644 --- a/src/bindings/scripts/scripts/zone/stonetalon_mountains/stonetalon_mountains.cpp +++ b/src/bindings/scripts/scripts/zone/stonetalon_mountains/stonetalon_mountains.cpp @@ -205,3 +205,4 @@ void AddSC_stonetalon_mountains() newscript->pQuestAccept = &QuestAccept_npc_kaya_flathoof; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/stormwind/stormwind_city.cpp b/src/bindings/scripts/scripts/zone/stormwind/stormwind_city.cpp index f3c0d004e52..16468a04b41 100644 --- a/src/bindings/scripts/scripts/zone/stormwind/stormwind_city.cpp +++ b/src/bindings/scripts/scripts/zone/stormwind/stormwind_city.cpp @@ -300,3 +300,4 @@ void AddSC_stormwind_city() newscript->pGossipSelect = &GossipSelect_npc_stormwind_harbor_taxi; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/stranglethorn_vale/stranglethorn_vale.cpp b/src/bindings/scripts/scripts/zone/stranglethorn_vale/stranglethorn_vale.cpp index d4ae62ccf2f..d9da6ee786b 100644 --- a/src/bindings/scripts/scripts/zone/stranglethorn_vale/stranglethorn_vale.cpp +++ b/src/bindings/scripts/scripts/zone/stranglethorn_vale/stranglethorn_vale.cpp @@ -120,3 +120,4 @@ void AddSC_stranglethorn_vale() newscript->GetAI = &GetAI_mob_yenniku; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/stratholme/boss_baron_rivendare.cpp b/src/bindings/scripts/scripts/zone/stratholme/boss_baron_rivendare.cpp index 137d317fe17..0b612bbf3b9 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/boss_baron_rivendare.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/boss_baron_rivendare.cpp @@ -187,3 +187,4 @@ void AddSC_boss_baron_rivendare() newscript->GetAI = &GetAI_boss_baron_rivendare; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/stratholme/boss_baroness_anastari.cpp b/src/bindings/scripts/scripts/zone/stratholme/boss_baroness_anastari.cpp index f7369165a83..3c9a343c84f 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/boss_baroness_anastari.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/boss_baroness_anastari.cpp @@ -126,3 +126,4 @@ void AddSC_boss_baroness_anastari() newscript->GetAI = &GetAI_boss_baroness_anastari; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/stratholme/boss_cannon_master_willey.cpp b/src/bindings/scripts/scripts/zone/stratholme/boss_cannon_master_willey.cpp index 838456b0627..7a4e71a5413 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/boss_cannon_master_willey.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/boss_cannon_master_willey.cpp @@ -219,3 +219,4 @@ void AddSC_boss_cannon_master_willey() newscript->GetAI = &GetAI_boss_cannon_master_willey; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/stratholme/boss_dathrohan_balnazzar.cpp b/src/bindings/scripts/scripts/zone/stratholme/boss_dathrohan_balnazzar.cpp index 67444b19b8d..bac6d4bcb7d 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/boss_dathrohan_balnazzar.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/boss_dathrohan_balnazzar.cpp @@ -314,3 +314,4 @@ void AddSC_boss_dathrohan_balnazzar() newscript->GetAI = &GetAI_boss_dathrohan_balnazzar; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/stratholme/boss_magistrate_barthilas.cpp b/src/bindings/scripts/scripts/zone/stratholme/boss_magistrate_barthilas.cpp index 71b98e9548a..e4f7903d897 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/boss_magistrate_barthilas.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/boss_magistrate_barthilas.cpp @@ -132,3 +132,4 @@ void AddSC_boss_magistrate_barthilas() newscript->GetAI = &GetAI_boss_magistrate_barthilas; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/stratholme/boss_maleki_the_pallid.cpp b/src/bindings/scripts/scripts/zone/stratholme/boss_maleki_the_pallid.cpp index 6e70bc91f06..b9bd3349d7d 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/boss_maleki_the_pallid.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/boss_maleki_the_pallid.cpp @@ -107,3 +107,4 @@ void AddSC_boss_maleki_the_pallid() newscript->GetAI = &GetAI_boss_maleki_the_pallid; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/stratholme/boss_nerubenkan.cpp b/src/bindings/scripts/scripts/zone/stratholme/boss_nerubenkan.cpp index 48dd8f49bf3..b1376ef7cd6 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/boss_nerubenkan.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/boss_nerubenkan.cpp @@ -141,3 +141,4 @@ void AddSC_boss_nerubenkan() newscript->GetAI = &GetAI_boss_nerubenkan; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/stratholme/boss_order_of_silver_hand.cpp b/src/bindings/scripts/scripts/zone/stratholme/boss_order_of_silver_hand.cpp index 2bc3cdddeed..71ec3d59fed 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/boss_order_of_silver_hand.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/boss_order_of_silver_hand.cpp @@ -159,3 +159,4 @@ void AddSC_boss_order_of_silver_hand() newscript->GetAI = &GetAI_boss_silver_hand_bossesAI; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/stratholme/boss_postmaster_malown.cpp b/src/bindings/scripts/scripts/zone/stratholme/boss_postmaster_malown.cpp index e5b7c1abd0c..5edf47787fd 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/boss_postmaster_malown.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/boss_postmaster_malown.cpp @@ -142,3 +142,4 @@ void AddSC_boss_postmaster_malown() newscript->GetAI = &GetAI_boss_postmaster_malown; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/stratholme/boss_ramstein_the_gorger.cpp b/src/bindings/scripts/scripts/zone/stratholme/boss_ramstein_the_gorger.cpp index fb219f4d4ec..f729e2e34ce 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/boss_ramstein_the_gorger.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/boss_ramstein_the_gorger.cpp @@ -98,3 +98,4 @@ void AddSC_boss_ramstein_the_gorger() newscript->GetAI = &GetAI_boss_ramstein_the_gorger; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/stratholme/boss_timmy_the_cruel.cpp b/src/bindings/scripts/scripts/zone/stratholme/boss_timmy_the_cruel.cpp index c9ee6d1636f..9458964712b 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/boss_timmy_the_cruel.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/boss_timmy_the_cruel.cpp @@ -81,3 +81,4 @@ void AddSC_boss_timmy_the_cruel() newscript->GetAI = &GetAI_boss_timmy_the_cruel; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/stratholme/def_stratholme.h b/src/bindings/scripts/scripts/zone/stratholme/def_stratholme.h index 3684ab9c9aa..b9246091a7c 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/def_stratholme.h +++ b/src/bindings/scripts/scripts/zone/stratholme/def_stratholme.h @@ -25,3 +25,4 @@ #define QUEST_DEAD_MAN_PLEA 8945 #define SPELL_BARON_ULTIMATUM 27861 #endif + diff --git a/src/bindings/scripts/scripts/zone/stratholme/instance_stratholme.cpp b/src/bindings/scripts/scripts/zone/stratholme/instance_stratholme.cpp index 249f2881ba4..62b210313a1 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/instance_stratholme.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/instance_stratholme.cpp @@ -393,3 +393,4 @@ void AddSC_instance_stratholme() newscript->GetInstanceData = &GetInstanceData_instance_stratholme; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/stratholme/stratholme.cpp b/src/bindings/scripts/scripts/zone/stratholme/stratholme.cpp index 88de858adbb..3a5e9c0daa7 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/stratholme.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/stratholme.cpp @@ -287,3 +287,4 @@ void AddSC_stratholme() newscript->pReceiveEmote = &ReciveEmote_mobs_spectral_ghostly_citizen; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_brutallus.cpp b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_brutallus.cpp index 30782b7da6a..e1235155f71 100644 --- a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_brutallus.cpp +++ b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_brutallus.cpp @@ -172,3 +172,4 @@ void AddSC_boss_brutallus() newscript->GetAI = &GetAI_boss_brutallus; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_eredar_twins.cpp b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_eredar_twins.cpp index bc1eae34788..e29f6b06fe2 100644 --- a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_eredar_twins.cpp +++ b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_eredar_twins.cpp @@ -786,3 +786,4 @@ void AddSC_boss_eredar_twins() newscript->GetAI = &GetAI_mob_shadow_image; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_felmyst.cpp b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_felmyst.cpp index 8afba94fa44..adea2dab4e2 100644 --- a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_felmyst.cpp +++ b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_felmyst.cpp @@ -586,3 +586,4 @@ void AddSC_boss_felmyst() newscript->GetAI = &GetAI_mob_felmyst_trail; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kalecgos.cpp b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kalecgos.cpp index 9339901e8e3..ec0ba0037ff 100644 --- a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kalecgos.cpp +++ b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kalecgos.cpp @@ -147,7 +147,7 @@ struct TRINITY_DLL_DECL boss_kalecgosAI : public ScriptedAI TalkSequence = 0; isFriendly = false; isEnraged = false; - isBanished = false; + isBanished = false; } void DamageTaken(Unit *done_by, uint32 &damage) @@ -191,7 +191,7 @@ struct TRINITY_DLL_DECL boss_kalecgosAI : public ScriptedAI switch(TalkSequence) { case 1: - m_creature->setFaction(35); + m_creature->setFaction(35); TalkTimer = 1000; break; case 2: @@ -276,7 +276,7 @@ struct TRINITY_DLL_DECL boss_sathrovarrAI : public ScriptedAI CheckTimer = 1000; ResetThreat = 1000; isEnraged = false; - isBanished = false; + isBanished = false; } void Aggro(Unit* who) @@ -339,7 +339,7 @@ struct TRINITY_DLL_DECL boss_sathrovarrAI : public ScriptedAI if(Player* i_pl = i->getSource()) if(i_pl->HasAura(AURA_SPECTRAL_REALM,0)) i_pl->RemoveAurasDueToSpell(AURA_SPECTRAL_REALM); - } + } void UpdateAI(const uint32 diff) { @@ -471,7 +471,7 @@ struct TRINITY_DLL_DECL boss_kalecAI : public ScriptedAI void UpdateAI(const uint32 diff) { if (!UpdateVictim()) - return; + return; if(YellTimer < diff) { @@ -559,7 +559,7 @@ void boss_kalecgosAI::UpdateAI(const uint32 diff) DoCast(m_creature, SPELL_ENRAGE, true); isEnraged = true; } - + if(!isBanished && (m_creature->GetHealth()*100)/m_creature->GetMaxHealth() < 1) { if(Unit *Sath = Unit::GetUnit(*m_creature, SathGUID)) @@ -673,4 +673,5 @@ void AddSC_boss_kalecgos() newscript->Name="kalocegos_teleporter"; newscript->pGOHello = &GOkalocegos_teleporter; newscript->RegisterSelf(); -}
\ No newline at end of file +} + diff --git a/src/bindings/scripts/scripts/zone/sunwell_plateau/def_sunwell_plateau.h b/src/bindings/scripts/scripts/zone/sunwell_plateau/def_sunwell_plateau.h index 61d4519983b..8ae61602616 100644 --- a/src/bindings/scripts/scripts/zone/sunwell_plateau/def_sunwell_plateau.h +++ b/src/bindings/scripts/scripts/zone/sunwell_plateau/def_sunwell_plateau.h @@ -38,3 +38,4 @@ /*** Misc ***/ #endif + diff --git a/src/bindings/scripts/scripts/zone/sunwell_plateau/instance_sunwell_plateau.cpp b/src/bindings/scripts/scripts/zone/sunwell_plateau/instance_sunwell_plateau.cpp index 4118275e9ef..cd4f62584f0 100644 --- a/src/bindings/scripts/scripts/zone/sunwell_plateau/instance_sunwell_plateau.cpp +++ b/src/bindings/scripts/scripts/zone/sunwell_plateau/instance_sunwell_plateau.cpp @@ -198,3 +198,4 @@ void AddSC_instance_sunwell_plateau() newscript->GetInstanceData = &GetInstanceData_instance_sunwell_plateau; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/tanaris/tanaris.cpp b/src/bindings/scripts/scripts/zone/tanaris/tanaris.cpp index 4a6e6a4641a..538aee596ec 100644 --- a/src/bindings/scripts/scripts/zone/tanaris/tanaris.cpp +++ b/src/bindings/scripts/scripts/zone/tanaris/tanaris.cpp @@ -607,3 +607,4 @@ void AddSC_tanaris() newscript->pQuestAccept = &QuestAccept_npc_OOX17; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/arcatraz.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/arcatraz.cpp index bc6e80e1c95..7b013c54781 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/arcatraz.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/arcatraz.cpp @@ -527,3 +527,4 @@ void AddSC_arcatraz() newscript->GetAI = &GetAI_mob_zerekethvoidzoneAI; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp index aa80f2d38e4..8e17151c0c5 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp @@ -312,3 +312,4 @@ void AddSC_boss_harbinger_skyriss() newscript->GetAI = &GetAI_boss_harbinger_skyriss_illusion; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/def_arcatraz.h b/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/def_arcatraz.h index 420e27d7c16..3f8dee8bbd0 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/def_arcatraz.h +++ b/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/def_arcatraz.h @@ -18,3 +18,4 @@ #define TYPE_SHIELD_OPEN 11 #define DATA_SPHERE_SHIELD 12 #endif + diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/instance_arcatraz.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/instance_arcatraz.cpp index 47797f2caf7..36ff863abe7 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/instance_arcatraz.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/instance_arcatraz.cpp @@ -236,3 +236,4 @@ void AddSC_instance_arcatraz() newscript->GetInstanceData = &GetInstanceData_instance_arcatraz; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_high_botanist_freywinn.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_high_botanist_freywinn.cpp index fe713c13f3e..59ccd996236 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_high_botanist_freywinn.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_high_botanist_freywinn.cpp @@ -196,3 +196,4 @@ void AddSC_boss_high_botanist_freywinn() newscript->GetAI = &GetAI_boss_high_botanist_freywinn; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_laj.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_laj.cpp index 269b20add4c..1c4e27bac48 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_laj.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_laj.cpp @@ -202,3 +202,4 @@ void AddSC_boss_laj() newscript->GetAI = &GetAI_boss_laj; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_warp_splinter.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_warp_splinter.cpp index 2ae692a3aab..dd6344269de 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_warp_splinter.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_warp_splinter.cpp @@ -225,3 +225,4 @@ void AddSC_boss_warp_splinter() newscript->GetAI = &GetAI_mob_treant; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_alar.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_alar.cpp index 9bf7fe0a437..3486f937214 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_alar.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_alar.cpp @@ -502,3 +502,4 @@ void AddSC_boss_alar() newscript->GetAI = &GetAI_mob_flame_patch_alar; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_astromancer.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_astromancer.cpp index 0a4dfb9e35c..e20c32e21d0 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_astromancer.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_astromancer.cpp @@ -41,7 +41,7 @@ EndScriptData */ #define SPELL_FEAR 29321 #define SPELL_VOID_BOLT 39329 #define SPELL_SPOTLIGHT 25824 - + #define CENTER_X 432.909f #define CENTER_Y -373.424f #define CENTER_Z 17.9608f @@ -100,7 +100,7 @@ struct TRINITY_DLL_DECL boss_high_astromancer_solarianAI : public ScriptedAI float Portals[3][3]; bool AppearDelay; - bool BlindingLight; + bool BlindingLight; void Reset() { @@ -134,7 +134,7 @@ struct TRINITY_DLL_DECL boss_high_astromancer_solarianAI : public ScriptedAI void StartEvent() { DoScriptText(SAY_AGGRO, m_creature); - + if(pInstance) pInstance->SetData(DATA_HIGHASTROMANCERSOLARIANEVENT, IN_PROGRESS); } @@ -171,7 +171,7 @@ struct TRINITY_DLL_DECL boss_high_astromancer_solarianAI : public ScriptedAI { if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0)) Summoned->AI()->AttackStart(target); - + Summons.Summon(Summoned); } } @@ -215,7 +215,7 @@ struct TRINITY_DLL_DECL boss_high_astromancer_solarianAI : public ScriptedAI } AppearDelay_Timer = 2000; }else AppearDelay_Timer -= diff; - } + } if (Phase == 1) { @@ -236,12 +236,12 @@ struct TRINITY_DLL_DECL boss_high_astromancer_solarianAI : public ScriptedAI if(!m_creature->HasInArc(2.5f, target)) target = m_creature->getVictim(); - if(target) + if(target) DoCast(target, SPELL_ARCANE_MISSILES); } ArcaneMissiles_Timer = 3000; }else ArcaneMissiles_Timer -= diff; - + if (MarkOfTheSolarian_Timer < diff) { DoCast(m_creature->getVictim(), MARK_OF_SOLARIAN); @@ -469,3 +469,4 @@ void AddSC_boss_high_astromancer_solarian() newscript->GetAI = &GetAI_mob_solarium_priest; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_kaelthas.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_kaelthas.cpp index 99e61096f24..7a3ac76d596 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_kaelthas.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_kaelthas.cpp @@ -1607,3 +1607,4 @@ void AddSC_boss_kaelthas() newscript->GetAI = &GetAI_mob_phoenix_egg_tk; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_void_reaver.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_void_reaver.cpp index 2af70c15d88..3ea1e12ef1e 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_void_reaver.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_void_reaver.cpp @@ -172,3 +172,4 @@ void AddSC_boss_void_reaver() newscript->GetAI = &GetAI_boss_void_reaver; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/def_the_eye.h b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/def_the_eye.h index 342c257f7de..d0d3ea09061 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/def_the_eye.h +++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/def_the_eye.h @@ -17,3 +17,4 @@ #define DATA_VOIDREAVEREVENT 11 #define DATA_ALAR 12 #endif + diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/instance_the_eye.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/instance_the_eye.cpp index c2d13436806..bc407a3de99 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/instance_the_eye.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/instance_the_eye.cpp @@ -174,3 +174,4 @@ void AddSC_instance_the_eye() newscript->GetInstanceData = &GetInstanceData_instance_the_eye; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/the_eye.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/the_eye.cpp index 8bce75fce4a..83ba68c955c 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/the_eye.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/the_eye.cpp @@ -96,3 +96,4 @@ void AddSC_the_eye() newscript->GetAI = &GetAI_mob_crystalcore_devastator; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_gatewatcher_gyrokill.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_gatewatcher_gyrokill.cpp index 79070f98eb0..268cfeb2918 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_gatewatcher_gyrokill.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_gatewatcher_gyrokill.cpp @@ -34,4 +34,5 @@ EndScriptData */ #define SPELL_SAW_BLADE 35318 #define H_SPELL_SAW_BLADE 39192 #define SPELL_SHADOW_POWER 35322 -#define H_SPELL_SHADOW_POWER 39193
\ No newline at end of file +#define H_SPELL_SHADOW_POWER 39193 + diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_gatewatcher_ironhand.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_gatewatcher_ironhand.cpp index aa8da37ec97..2fcf154eb67 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_gatewatcher_ironhand.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_gatewatcher_ironhand.cpp @@ -146,3 +146,4 @@ void AddSC_boss_gatewatcher_iron_hand() newscript->GetAI = &GetAI_boss_gatewatcher_iron_hand; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp index 49aee52839c..66542333e5a 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp @@ -258,3 +258,4 @@ void AddSC_boss_nethermancer_sepethrea() newscript->GetAI = &GetAI_mob_ragin_flames; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp index a15156b6fe9..dd46457c759 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp @@ -252,3 +252,4 @@ void AddSC_boss_pathaleon_the_calculator() newscript->GetAI = &GetAI_mob_nether_wraith; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/def_mechanar.h b/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/def_mechanar.h index 5bbfe79ffb4..8a054604b9d 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/def_mechanar.h +++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/def_mechanar.h @@ -4,3 +4,4 @@ #define DATA_SEPETHREA_DEATH 1 #define DATA_SEPETHREAISDEAD 2 #endif + diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/instance_mechanar.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/instance_mechanar.cpp index 362e0bfe032..45a6d8fb641 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/instance_mechanar.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/instance_mechanar.cpp @@ -88,3 +88,4 @@ void AddSC_instance_mechanar() newscript->GetInstanceData = &GetInstanceData_instance_mechanar; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_bug_trio.cpp b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_bug_trio.cpp index 2a5e2c4a8ff..fe42ae53dd7 100644 --- a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_bug_trio.cpp +++ b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_bug_trio.cpp @@ -346,3 +346,4 @@ void AddSC_bug_trio() newscript->GetAI = &GetAI_boss_yauj; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_cthun.cpp b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_cthun.cpp index eac028190ce..96801fd334b 100644 --- a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_cthun.cpp +++ b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_cthun.cpp @@ -1344,3 +1344,4 @@ void AddSC_boss_cthun() newscript->GetAI = &GetAI_flesh_tentacle; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_fankriss.cpp b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_fankriss.cpp index 08c24b49a7e..b06225344a0 100644 --- a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_fankriss.cpp +++ b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_fankriss.cpp @@ -188,3 +188,4 @@ void AddSC_boss_fankriss() newscript->GetAI = &GetAI_boss_fankriss; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_huhuran.cpp b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_huhuran.cpp index c741b2e0bf5..7d39c026cbc 100644 --- a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_huhuran.cpp +++ b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_huhuran.cpp @@ -145,3 +145,4 @@ void AddSC_boss_huhuran() newscript->GetAI = &GetAI_boss_huhuran; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_ouro.cpp b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_ouro.cpp index df7facfbd37..a8542f14fe6 100644 --- a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_ouro.cpp +++ b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_ouro.cpp @@ -138,3 +138,4 @@ void AddSC_boss_ouro() newscript->GetAI = &GetAI_boss_ouro; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_sartura.cpp b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_sartura.cpp index 1598126bf94..5b0495cb097 100644 --- a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_sartura.cpp +++ b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_sartura.cpp @@ -297,3 +297,4 @@ void AddSC_boss_sartura() newscript->GetAI = &GetAI_mob_sartura_royal_guard; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_skeram.cpp b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_skeram.cpp index 256d92e2360..8ecb7ef0a7a 100644 --- a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_skeram.cpp +++ b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_skeram.cpp @@ -306,3 +306,4 @@ void AddSC_boss_skeram() newscript->GetAI = &GetAI_boss_skeram; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_twinemperors.cpp b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_twinemperors.cpp index 78950503580..92be01c4a6d 100644 --- a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_twinemperors.cpp +++ b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_twinemperors.cpp @@ -647,3 +647,4 @@ void AddSC_boss_twinemperors() newscript->GetAI = &GetAI_boss_veklor; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_viscidus.cpp b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_viscidus.cpp index 1b55d9e182a..2bb9f1bfb0b 100644 --- a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_viscidus.cpp +++ b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_viscidus.cpp @@ -27,3 +27,4 @@ EndScriptData */ #define SPELL_POISONBOLT_VOLLEY 25991 #define SPELL_TOXIN_CLOUD 25989 + diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/def_temple_of_ahnqiraj.h b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/def_temple_of_ahnqiraj.h index 8ab70caa625..5d545ed7c74 100644 --- a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/def_temple_of_ahnqiraj.h +++ b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/def_temple_of_ahnqiraj.h @@ -20,3 +20,4 @@ #define DATA_CTHUN_PHASE 20 #endif + diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/instance_temple_of_ahnqiraj.cpp b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/instance_temple_of_ahnqiraj.cpp index 2b40ddf173c..9048591b774 100644 --- a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/instance_temple_of_ahnqiraj.cpp +++ b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/instance_temple_of_ahnqiraj.cpp @@ -163,3 +163,4 @@ void AddSC_instance_temple_of_ahnqiraj() newscript->GetInstanceData = &GetInstanceData_instance_temple_of_ahnqiraj; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp index a069e861d2f..d86e3937b13 100644 --- a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp +++ b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp @@ -342,3 +342,4 @@ SentinelAbilityAura::SentinelAbilityAura(aqsentinelAI *abilityOwner, SpellEntry abilityId = ability; currentBasePoints = 0; } + diff --git a/src/bindings/scripts/scripts/zone/terokkar_forest/terokkar_forest.cpp b/src/bindings/scripts/scripts/zone/terokkar_forest/terokkar_forest.cpp index 0fd39a8f532..8d71b61e7cc 100644 --- a/src/bindings/scripts/scripts/zone/terokkar_forest/terokkar_forest.cpp +++ b/src/bindings/scripts/scripts/zone/terokkar_forest/terokkar_forest.cpp @@ -533,3 +533,4 @@ void AddSC_terokkar_forest() newscript->pQuestAccept = &QuestAccept_npc_isla_starmane; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/thousand_needles/thousand_needles.cpp b/src/bindings/scripts/scripts/zone/thousand_needles/thousand_needles.cpp index d92a468a239..c4c21fdc132 100644 --- a/src/bindings/scripts/scripts/zone/thousand_needles/thousand_needles.cpp +++ b/src/bindings/scripts/scripts/zone/thousand_needles/thousand_needles.cpp @@ -17,17 +17,22 @@ /* ScriptData SDName: Thousand Needles SD%Complete: 100 -SDComment: Support for Quest: 4770 +SDComment: Support for Quest: 4770, 1950 SDCategory: Thousand Needles EndScriptData */ /* ContentData npc_swiftmountain +npc_plucky EndContentData */ #include "precompiled.h" #include "../../npc/npc_escortAI.h" +/*##### +# npc_swiftmountain +######*/ + #define SAY_READY -1000147 #define SAY_AGGRO -1000148 #define SAY_FINISH -1000149 @@ -35,8 +40,6 @@ EndContentData */ #define QUEST_HOMEWARD_BOUND 4770 #define ENTRY_WYVERN 4107 - - struct TRINITY_DLL_DECL npc_swiftmountainAI : public npc_escortAI { npc_swiftmountainAI(Creature *c) : npc_escortAI(c) {Reset();} @@ -69,11 +72,10 @@ npc_swiftmountainAI(Creature *c) : npc_escortAI(c) {Reset();} void Reset() { - + m_creature->setFaction(104); } - void Aggro(Unit* who) - {} + void Aggro(Unit* who){} void JustSummoned(Creature* summoned) { @@ -101,7 +103,6 @@ bool QuestAccept_npc_swiftmountain(Player* player, Creature* creature, Quest con { ((npc_escortAI*)(creature->AI()))->Start(true, true, false, player->GetGUID()); DoScriptText(SAY_READY, creature, player); - // Change faction so mobs attack creature->setFaction(113); } @@ -188,6 +189,120 @@ CreatureAI* GetAI_npc_swiftmountain(Creature *_Creature) return (CreatureAI*)thisAI; } +/*##### +# npc_plucky +######*/ + +#define GOSSIP_P "<Learn Secret phrase>" + +#define SPELL_TRANSFORM_HUMAN 9192 +#define QUEST_GET_THE_SCOOP 1950 + +struct TRINITY_DLL_DECL npc_pluckyAI : public ScriptedAI +{ + npc_pluckyAI(Creature *c) : ScriptedAI(c) {Reset();} + + bool Transformed; + bool Chicken; + + uint32 Timer; + uint32 ChickenTimer; + + void Reset() { + + Transformed = false; + Chicken = false; + m_creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); + Timer = 0; + ChickenTimer = 0; + } + + void Aggro(Unit *who){} + + void TransformHuman(uint32 emoteid) + { + if (!Transformed) + { + Transformed = true; + DoCast(m_creature, SPELL_TRANSFORM_HUMAN); + Timer = 120000; + if (emoteid == TEXTEMOTE_BECKON) + m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); + else + { + ChickenTimer = 1500; + Chicken = true; + } + } + } + + void UpdateAI(const uint32 diff) + { + if (Transformed) + { + if (Timer < diff) + Reset(); + else Timer-=diff; + } + + if(Chicken) + { + if (ChickenTimer < diff) + { + m_creature->HandleEmoteCommand(EMOTE_ONESHOT_WAVE); + Chicken = false; + }else ChickenTimer-=diff; + } + + if(!UpdateVictim()) + return; + + DoMeleeAttackIfReady(); + } +}; + +bool ReceiveEmote_npc_plucky( Player *player, Creature *_Creature, uint32 emote ) +{ + if( (emote == TEXTEMOTE_BECKON || emote == TEXTEMOTE_CHICKEN && + player->GetQuestStatus(QUEST_GET_THE_SCOOP) == QUEST_STATUS_INCOMPLETE) ) + { + _Creature->SetInFront(player); + ((npc_pluckyAI*)((Creature*)_Creature)->AI())->TransformHuman(emote); + } + + return true; +} + +bool GossipHello_npc_plucky(Player *player, Creature *_Creature) +{ + if(player->GetQuestStatus(QUEST_GET_THE_SCOOP) == QUEST_STATUS_INCOMPLETE) + player->ADD_GOSSIP_ITEM(0, GOSSIP_P, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); + player->SEND_GOSSIP_MENU(738, _Creature->GetGUID()); + + return true; +} + +bool GossipSelect_npc_plucky(Player *player, Creature *_Creature, uint32 sender, uint32 action) +{ + switch( action ) + { + case GOSSIP_ACTION_INFO_DEF+1: + player->CLOSE_GOSSIP_MENU(); + player->CompleteQuest(QUEST_GET_THE_SCOOP); + break; + } + return true; +} + +CreatureAI* GetAI_npc_plucky(Creature *_Creature) +{ +return new npc_pluckyAI(_Creature); +} + +/*##### +# +######*/ + void AddSC_thousand_needles() { Script *newscript; @@ -197,4 +312,13 @@ void AddSC_thousand_needles() newscript->GetAI = &GetAI_npc_swiftmountain; newscript->pQuestAccept = &QuestAccept_npc_swiftmountain; newscript->RegisterSelf(); -}
\ No newline at end of file + + newscript = new Script; + newscript->Name = "npc_plucky"; + newscript->GetAI = &GetAI_npc_plucky; + newscript->pReceiveEmote = &ReceiveEmote_npc_plucky; + newscript->pGossipHello = &GossipHello_npc_plucky; + newscript->pGossipSelect = &GossipSelect_npc_plucky; + newscript->RegisterSelf(); +} + diff --git a/src/bindings/scripts/scripts/zone/thunder_bluff/thunder_bluff.cpp b/src/bindings/scripts/scripts/zone/thunder_bluff/thunder_bluff.cpp index fb4328025cd..e5d345bd0e7 100644 --- a/src/bindings/scripts/scripts/zone/thunder_bluff/thunder_bluff.cpp +++ b/src/bindings/scripts/scripts/zone/thunder_bluff/thunder_bluff.cpp @@ -135,3 +135,4 @@ void AddSC_thunder_bluff() newscript->pGossipSelect = &GossipSelect_npc_cairne_bloodhoof; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/tirisfal_glades/tirisfal_glades.cpp b/src/bindings/scripts/scripts/zone/tirisfal_glades/tirisfal_glades.cpp index 21d353eb10d..4e23707e371 100644 --- a/src/bindings/scripts/scripts/zone/tirisfal_glades/tirisfal_glades.cpp +++ b/src/bindings/scripts/scripts/zone/tirisfal_glades/tirisfal_glades.cpp @@ -160,3 +160,4 @@ void AddSC_tirisfal_glades() newscript->pGOHello = &GOHello_go_mausoleum_trigger; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/uldaman/boss_archaedas.cpp b/src/bindings/scripts/scripts/zone/uldaman/boss_archaedas.cpp index 8859b947eaf..dee990fb495 100644 --- a/src/bindings/scripts/scripts/zone/uldaman/boss_archaedas.cpp +++ b/src/bindings/scripts/scripts/zone/uldaman/boss_archaedas.cpp @@ -494,3 +494,4 @@ void AddSC_boss_archaedas() newscript->GetAI = &GetAI_mob_stonekeepers; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/uldaman/boss_ironaya.cpp b/src/bindings/scripts/scripts/zone/uldaman/boss_ironaya.cpp index 2b1fac514eb..85eede55913 100644 --- a/src/bindings/scripts/scripts/zone/uldaman/boss_ironaya.cpp +++ b/src/bindings/scripts/scripts/zone/uldaman/boss_ironaya.cpp @@ -103,3 +103,4 @@ void AddSC_boss_ironaya() newscript->GetAI = &GetAI_boss_ironaya; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/uldaman/instance_uldaman.cpp b/src/bindings/scripts/scripts/zone/uldaman/instance_uldaman.cpp index bca17fcd031..a8a1820f0a4 100644 --- a/src/bindings/scripts/scripts/zone/uldaman/instance_uldaman.cpp +++ b/src/bindings/scripts/scripts/zone/uldaman/instance_uldaman.cpp @@ -303,3 +303,4 @@ void AddSC_instance_uldaman() newscript->GetInstanceData = &GetInstanceData_instance_uldaman; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/uldaman/uldaman.cpp b/src/bindings/scripts/scripts/zone/uldaman/uldaman.cpp index 7be5d22c6a2..2fecc120d14 100644 --- a/src/bindings/scripts/scripts/zone/uldaman/uldaman.cpp +++ b/src/bindings/scripts/scripts/zone/uldaman/uldaman.cpp @@ -185,3 +185,4 @@ void AddSC_uldaman() newscript->pGossipSelect = &GossipSelect_npc_lore_keeper_of_norgannon; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/undercity/undercity.cpp b/src/bindings/scripts/scripts/zone/undercity/undercity.cpp index d92a55b1fe4..590bf5608c0 100644 --- a/src/bindings/scripts/scripts/zone/undercity/undercity.cpp +++ b/src/bindings/scripts/scripts/zone/undercity/undercity.cpp @@ -263,3 +263,4 @@ void AddSC_undercity() newscript->pGossipSelect = &GossipSelect_npc_parqual_fintallas; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/ungoro_crater/ungoro_crater.cpp b/src/bindings/scripts/scripts/zone/ungoro_crater/ungoro_crater.cpp index 36598bddf2d..16877f16d65 100644 --- a/src/bindings/scripts/scripts/zone/ungoro_crater/ungoro_crater.cpp +++ b/src/bindings/scripts/scripts/zone/ungoro_crater/ungoro_crater.cpp @@ -207,3 +207,4 @@ void AddSC_ungoro_crater() newscript->pQuestAccept = &QuestAccept_npc_ame; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/wailing_caverns/instance_wailing_caverns.cpp b/src/bindings/scripts/scripts/zone/wailing_caverns/instance_wailing_caverns.cpp index 6ed57836455..5327bf7041d 100644 --- a/src/bindings/scripts/scripts/zone/wailing_caverns/instance_wailing_caverns.cpp +++ b/src/bindings/scripts/scripts/zone/wailing_caverns/instance_wailing_caverns.cpp @@ -22,3 +22,4 @@ SDCategory: Wailing Caverns EndScriptData */ #include "precompiled.h" + diff --git a/src/bindings/scripts/scripts/zone/western_plaguelands/western_plaguelands.cpp b/src/bindings/scripts/scripts/zone/western_plaguelands/western_plaguelands.cpp index f97231c2c1c..51fe821f0af 100644 --- a/src/bindings/scripts/scripts/zone/western_plaguelands/western_plaguelands.cpp +++ b/src/bindings/scripts/scripts/zone/western_plaguelands/western_plaguelands.cpp @@ -181,3 +181,4 @@ void AddSC_western_plaguelands() newscript->GetAI = &GetAI_npc_the_scourge_cauldron; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/westfall/westfall.cpp b/src/bindings/scripts/scripts/zone/westfall/westfall.cpp index 751bd941495..a70d2134d36 100644 --- a/src/bindings/scripts/scripts/zone/westfall/westfall.cpp +++ b/src/bindings/scripts/scripts/zone/westfall/westfall.cpp @@ -177,3 +177,4 @@ void AddSC_westfall() newscript->pQuestAccept = &QuestAccept_npc_defias_traitor; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/winterspring/winterspring.cpp b/src/bindings/scripts/scripts/zone/winterspring/winterspring.cpp index ea999a4af93..db6555d058f 100644 --- a/src/bindings/scripts/scripts/zone/winterspring/winterspring.cpp +++ b/src/bindings/scripts/scripts/zone/winterspring/winterspring.cpp @@ -165,3 +165,4 @@ void AddSC_winterspring() newscript->pGossipSelect = &GossipSelect_npc_witch_doctor_mauari; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/zangarmarsh/zangarmarsh.cpp b/src/bindings/scripts/scripts/zone/zangarmarsh/zangarmarsh.cpp index 7fcd3101e7c..7d76ea20917 100644 --- a/src/bindings/scripts/scripts/zone/zangarmarsh/zangarmarsh.cpp +++ b/src/bindings/scripts/scripts/zone/zangarmarsh/zangarmarsh.cpp @@ -411,3 +411,4 @@ void AddSC_zangarmarsh() newscript->pQuestAccept = &QuestAccept_npc_kayra_longmane; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/zulaman/boss_akilzon.cpp b/src/bindings/scripts/scripts/zone/zulaman/boss_akilzon.cpp index 4daff002f38..bd0bcb0ba0f 100644 --- a/src/bindings/scripts/scripts/zone/zulaman/boss_akilzon.cpp +++ b/src/bindings/scripts/scripts/zone/zulaman/boss_akilzon.cpp @@ -466,3 +466,4 @@ void AddSC_boss_akilzon() newscript->GetAI = &GetAI_mob_soaring_eagle; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/zulaman/boss_halazzi.cpp b/src/bindings/scripts/scripts/zone/zulaman/boss_halazzi.cpp index 555fa34154f..3ab0be0747e 100644 --- a/src/bindings/scripts/scripts/zone/zulaman/boss_halazzi.cpp +++ b/src/bindings/scripts/scripts/zone/zulaman/boss_halazzi.cpp @@ -401,3 +401,4 @@ void AddSC_boss_halazzi() newscript->GetAI = &GetAI_boss_spiritlynxAI; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/zulaman/boss_hexlord.cpp b/src/bindings/scripts/scripts/zone/zulaman/boss_hexlord.cpp index c2827ce6701..51e21d86c22 100644 --- a/src/bindings/scripts/scripts/zone/zulaman/boss_hexlord.cpp +++ b/src/bindings/scripts/scripts/zone/zulaman/boss_hexlord.cpp @@ -909,4 +909,5 @@ void AddSC_boss_hex_lord_malacrass() newscript->Name="boss_alyson_antille"; newscript->GetAI = &GetAI_boss_alyson_antille; newscript->RegisterSelf(); -}
\ No newline at end of file +} + diff --git a/src/bindings/scripts/scripts/zone/zulaman/boss_janalai.cpp b/src/bindings/scripts/scripts/zone/zulaman/boss_janalai.cpp index 4b51f7eef42..fe38ef9771a 100644 --- a/src/bindings/scripts/scripts/zone/zulaman/boss_janalai.cpp +++ b/src/bindings/scripts/scripts/zone/zulaman/boss_janalai.cpp @@ -712,3 +712,4 @@ void AddSC_boss_janalai() newscript->GetAI = &GetAI_mob_eggAI; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/zulaman/boss_nalorakk.cpp b/src/bindings/scripts/scripts/zone/zulaman/boss_nalorakk.cpp index ae20e234931..8e908880d3a 100644 --- a/src/bindings/scripts/scripts/zone/zulaman/boss_nalorakk.cpp +++ b/src/bindings/scripts/scripts/zone/zulaman/boss_nalorakk.cpp @@ -450,3 +450,4 @@ void AddSC_boss_nalorakk() newscript->GetAI = &GetAI_boss_nalorakk; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/zulaman/boss_zuljin.cpp b/src/bindings/scripts/scripts/zone/zulaman/boss_zuljin.cpp index d4be29c3557..fd7326a0b7d 100644 --- a/src/bindings/scripts/scripts/zone/zulaman/boss_zuljin.cpp +++ b/src/bindings/scripts/scripts/zone/zulaman/boss_zuljin.cpp @@ -613,3 +613,4 @@ void AddSC_boss_zuljin() newscript->GetAI = &GetAI_feather_vortexAI; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/zulaman/def_zulaman.h b/src/bindings/scripts/scripts/zone/zulaman/def_zulaman.h index 977c42a89e7..6fb0ef173bd 100644 --- a/src/bindings/scripts/scripts/zone/zulaman/def_zulaman.h +++ b/src/bindings/scripts/scripts/zone/zulaman/def_zulaman.h @@ -16,3 +16,4 @@ #define TYPE_RAND_VENDOR_2 9 #endif + diff --git a/src/bindings/scripts/scripts/zone/zulaman/instance_zulaman.cpp b/src/bindings/scripts/scripts/zone/zulaman/instance_zulaman.cpp index b5a8a73b249..2ff8a6e9b8a 100644 --- a/src/bindings/scripts/scripts/zone/zulaman/instance_zulaman.cpp +++ b/src/bindings/scripts/scripts/zone/zulaman/instance_zulaman.cpp @@ -330,3 +330,4 @@ void AddSC_instance_zulaman() newscript->GetInstanceData = &GetInstanceData_instance_zulaman; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/zulaman/zulaman.cpp b/src/bindings/scripts/scripts/zone/zulaman/zulaman.cpp index e2ec994c75d..78fe5ee274b 100644 --- a/src/bindings/scripts/scripts/zone/zulaman/zulaman.cpp +++ b/src/bindings/scripts/scripts/zone/zulaman/zulaman.cpp @@ -190,3 +190,4 @@ void AddSC_zulaman() newscript->pGossipSelect = &GossipSelect_npc_zulaman_hostage; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/zulfarrak/zulfarrak.cpp b/src/bindings/scripts/scripts/zone/zulfarrak/zulfarrak.cpp index 3a616d605a0..a91acd38b54 100644 --- a/src/bindings/scripts/scripts/zone/zulfarrak/zulfarrak.cpp +++ b/src/bindings/scripts/scripts/zone/zulfarrak/zulfarrak.cpp @@ -222,3 +222,4 @@ void AddSC_zulfarrak() newscript->pGossipSelect = &GossipSelect_npc_weegli_blastfuse; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_arlokk.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_arlokk.cpp index 8de897f4d62..466b8bd489f 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_arlokk.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_arlokk.cpp @@ -207,3 +207,4 @@ void AddSC_boss_arlokk() newscript->GetAI = &GetAI_boss_arlokk; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_gahzranka.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_gahzranka.cpp index 58765b7d805..d0c11277cb5 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_gahzranka.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_gahzranka.cpp @@ -90,3 +90,4 @@ void AddSC_boss_gahzranka() newscript->GetAI = &GetAI_boss_gahzranka; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_grilek.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_grilek.cpp index 36f73ebce69..adfddad2ac0 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_grilek.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_grilek.cpp @@ -90,3 +90,4 @@ void AddSC_boss_grilek() newscript->GetAI = &GetAI_boss_grilek; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_hakkar.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_hakkar.cpp index d76de14c926..4c6c62fa4e3 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_hakkar.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_hakkar.cpp @@ -247,3 +247,4 @@ void AddSC_boss_hakkar() newscript->GetAI = &GetAI_boss_hakkar; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_hazzarah.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_hazzarah.cpp index 6afc789eaea..c32608a01a3 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_hazzarah.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_hazzarah.cpp @@ -98,3 +98,4 @@ void AddSC_boss_hazzarah() newscript->GetAI = &GetAI_boss_hazzarah; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_jeklik.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_jeklik.cpp index 995ed5e74f9..3f340a9daf3 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_jeklik.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_jeklik.cpp @@ -293,3 +293,4 @@ void AddSC_boss_jeklik() newscript->GetAI = &GetAI_mob_batrider; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_jindo.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_jindo.cpp index 6c81497f7f2..df3a02e69f2 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_jindo.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_jindo.cpp @@ -267,3 +267,4 @@ void AddSC_boss_jindo() newscript->GetAI = &GetAI_mob_shade_of_jindo; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_mandokir.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_mandokir.cpp index 8574846576c..f6d606490c8 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_mandokir.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_mandokir.cpp @@ -332,3 +332,4 @@ void AddSC_boss_mandokir() newscript->GetAI = &GetAI_mob_ohgan; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_marli.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_marli.cpp index adfe134235b..309e6135a64 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_marli.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_marli.cpp @@ -254,3 +254,4 @@ void AddSC_boss_marli() newscript->GetAI = &GetAI_mob_spawn_of_marli; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_renataki.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_renataki.cpp index 8d5f1232f39..268c5c13b00 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_renataki.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_renataki.cpp @@ -149,3 +149,4 @@ void AddSC_boss_renataki() newscript->GetAI = &GetAI_boss_renataki; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_thekal.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_thekal.cpp index 8dc7bfcd626..ebf3b9dc309 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_thekal.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_thekal.cpp @@ -534,3 +534,4 @@ void AddSC_boss_thekal() newscript->GetAI = &GetAI_mob_zealot_zath; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_venoxis.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_venoxis.cpp index 061e3d47246..04a51ff7925 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_venoxis.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_venoxis.cpp @@ -197,3 +197,4 @@ void AddSC_boss_venoxis() newscript->GetAI = &GetAI_boss_venoxis; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_wushoolay.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_wushoolay.cpp index 9ba3ab622ff..858feb06e54 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/boss_wushoolay.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_wushoolay.cpp @@ -82,3 +82,4 @@ void AddSC_boss_wushoolay() newscript->GetAI = &GetAI_boss_wushoolay; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/scripts/zone/zulgurub/def_zulgurub.h b/src/bindings/scripts/scripts/zone/zulgurub/def_zulgurub.h index 06071e2f6b3..f14bd8eca98 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/def_zulgurub.h +++ b/src/bindings/scripts/scripts/zone/zulgurub/def_zulgurub.h @@ -34,3 +34,4 @@ #define DATA_ZATH_ALIVE 27 #define DATA_ZATH_DEATH 28 #endif + diff --git a/src/bindings/scripts/scripts/zone/zulgurub/instance_zulgurub.cpp b/src/bindings/scripts/scripts/zone/zulgurub/instance_zulgurub.cpp index 4c580cd91d5..eb3cbd1d495 100644 --- a/src/bindings/scripts/scripts/zone/zulgurub/instance_zulgurub.cpp +++ b/src/bindings/scripts/scripts/zone/zulgurub/instance_zulgurub.cpp @@ -236,3 +236,4 @@ void AddSC_instance_zulgurub() newscript->GetInstanceData = &GetInstanceData_instance_zulgurub; newscript->RegisterSelf(); } + diff --git a/src/bindings/scripts/system.cpp b/src/bindings/scripts/system.cpp index 703fa139bee..ab62e530681 100644 --- a/src/bindings/scripts/system.cpp +++ b/src/bindings/scripts/system.cpp @@ -19,3 +19,4 @@ */ #include "precompiled.h" + diff --git a/src/framework/Dynamic/FactoryHolder.h b/src/framework/Dynamic/FactoryHolder.h index cf41be4953f..858b8c1e1d3 100644 --- a/src/framework/Dynamic/FactoryHolder.h +++ b/src/framework/Dynamic/FactoryHolder.h @@ -60,3 +60,4 @@ class Permissible virtual int Permit(const T *) const = 0; }; #endif + diff --git a/src/framework/Dynamic/ObjectRegistry.h b/src/framework/Dynamic/ObjectRegistry.h index ef61ef38cde..8c2659e8f53 100644 --- a/src/framework/Dynamic/ObjectRegistry.h +++ b/src/framework/Dynamic/ObjectRegistry.h @@ -108,3 +108,4 @@ class TRINITY_DLL_DECL ObjectRegistry } }; #endif + diff --git a/src/framework/GameSystem/Grid.h b/src/framework/GameSystem/Grid.h index 0210f62faf7..646345705d3 100644 --- a/src/framework/GameSystem/Grid.h +++ b/src/framework/GameSystem/Grid.h @@ -129,3 +129,4 @@ class TRINITY_DLL_DECL Grid TypeMapContainer<WORLD_OBJECT_TYPES> i_objects; }; #endif + diff --git a/src/framework/GameSystem/GridLoader.h b/src/framework/GameSystem/GridLoader.h index df46585c225..8a483044f8f 100644 --- a/src/framework/GameSystem/GridLoader.h +++ b/src/framework/GameSystem/GridLoader.h @@ -76,3 +76,4 @@ class TRINITY_DLL_DECL GridLoader } }; #endif + diff --git a/src/framework/GameSystem/GridRefManager.h b/src/framework/GameSystem/GridRefManager.h index 63e5065dc12..bd32f836e18 100644 --- a/src/framework/GameSystem/GridRefManager.h +++ b/src/framework/GameSystem/GridRefManager.h @@ -41,3 +41,4 @@ class GridRefManager : public RefManager<GridRefManager<OBJECT>, OBJECT> iterator rend() { return iterator(NULL); } }; #endif + diff --git a/src/framework/GameSystem/GridReference.h b/src/framework/GameSystem/GridReference.h index 529278ea036..d4bd6752515 100644 --- a/src/framework/GameSystem/GridReference.h +++ b/src/framework/GameSystem/GridReference.h @@ -52,3 +52,4 @@ class TRINITY_DLL_SPEC GridReference : public Reference<GridRefManager<OBJECT>, GridReference *next() { return (GridReference*)Reference<GridRefManager<OBJECT>, OBJECT>::next(); } }; #endif + diff --git a/src/framework/GameSystem/NGrid.h b/src/framework/GameSystem/NGrid.h index 6ed87624662..6b89cdbedba 100644 --- a/src/framework/GameSystem/NGrid.h +++ b/src/framework/GameSystem/NGrid.h @@ -160,3 +160,4 @@ class TRINITY_DLL_DECL NGrid bool i_GridObjectDataLoaded; }; #endif + diff --git a/src/framework/GameSystem/TypeContainer.h b/src/framework/GameSystem/TypeContainer.h index e4a30103d2d..9e4c6da65e2 100644 --- a/src/framework/GameSystem/TypeContainer.h +++ b/src/framework/GameSystem/TypeContainer.h @@ -128,3 +128,4 @@ class TRINITY_DLL_DECL TypeMapContainer ContainerMapList<OBJECT_TYPES> i_elements; }; #endif + diff --git a/src/framework/GameSystem/TypeContainerFunctions.h b/src/framework/GameSystem/TypeContainerFunctions.h index ec005e2218c..f9945f84ac7 100644 --- a/src/framework/GameSystem/TypeContainerFunctions.h +++ b/src/framework/GameSystem/TypeContainerFunctions.h @@ -172,3 +172,4 @@ namespace Trinity } #endif + diff --git a/src/framework/GameSystem/TypeContainerFunctionsPtr.h b/src/framework/GameSystem/TypeContainerFunctionsPtr.h index 5f15f6c65a7..b22c07db2b4 100644 --- a/src/framework/GameSystem/TypeContainerFunctionsPtr.h +++ b/src/framework/GameSystem/TypeContainerFunctionsPtr.h @@ -167,3 +167,4 @@ namespace Trinity } #endif + diff --git a/src/framework/GameSystem/TypeContainerVisitor.h b/src/framework/GameSystem/TypeContainerVisitor.h index c544afa0f5e..97570b370c2 100644 --- a/src/framework/GameSystem/TypeContainerVisitor.h +++ b/src/framework/GameSystem/TypeContainerVisitor.h @@ -116,3 +116,4 @@ class TRINITY_DLL_DECL TypeContainerVisitor VISITOR &i_visitor; }; #endif + diff --git a/src/framework/Network/SocketDefines.h b/src/framework/Network/SocketDefines.h index e18be535e91..e69f2fb41e0 100644 --- a/src/framework/Network/SocketDefines.h +++ b/src/framework/Network/SocketDefines.h @@ -46,3 +46,4 @@ typedef int SocketHandle; typedef fd_set SelectSet; #endif #endif + diff --git a/src/framework/Platform/CompilerDefs.h b/src/framework/Platform/CompilerDefs.h index 2bf7f7872f9..691acb2e6d7 100644 --- a/src/framework/Platform/CompilerDefs.h +++ b/src/framework/Platform/CompilerDefs.h @@ -61,3 +61,4 @@ # pragma warning( disable : 4786 ) // identifier was truncated to '255' characters in the debug information #endif #endif + diff --git a/src/framework/Platform/Define.h b/src/framework/Platform/Define.h index 574793a285d..e4d45f6b456 100644 --- a/src/framework/Platform/Define.h +++ b/src/framework/Platform/Define.h @@ -123,3 +123,4 @@ typedef uint32 DWORD; typedef uint64 OBJECT_HANDLE; #endif //TRINITY_DEFINE_H + diff --git a/src/framework/Policies/CreationPolicy.h b/src/framework/Policies/CreationPolicy.h index 10ed0109583..91bec9eab37 100644 --- a/src/framework/Policies/CreationPolicy.h +++ b/src/framework/Policies/CreationPolicy.h @@ -107,3 +107,4 @@ namespace Trinity }; } #endif + diff --git a/src/framework/Policies/ObjectLifeTime.cpp b/src/framework/Policies/ObjectLifeTime.cpp index 55d452f801d..852e382a0e9 100644 --- a/src/framework/Policies/ObjectLifeTime.cpp +++ b/src/framework/Policies/ObjectLifeTime.cpp @@ -33,3 +33,4 @@ namespace Trinity external_wrapper((void*)func); } } + diff --git a/src/framework/Policies/ObjectLifeTime.h b/src/framework/Policies/ObjectLifeTime.h index 0666d7e19a8..86303f889fb 100644 --- a/src/framework/Policies/ObjectLifeTime.h +++ b/src/framework/Policies/ObjectLifeTime.h @@ -50,3 +50,4 @@ namespace Trinity } } #endif + diff --git a/src/framework/Policies/Singleton.h b/src/framework/Policies/Singleton.h index e33a52b2462..66daaba5a9a 100644 --- a/src/framework/Policies/Singleton.h +++ b/src/framework/Policies/Singleton.h @@ -62,3 +62,4 @@ namespace Trinity }; } #endif + diff --git a/src/framework/Policies/SingletonImp.h b/src/framework/Policies/SingletonImp.h index 386b321c1f1..89a4738ae22 100644 --- a/src/framework/Policies/SingletonImp.h +++ b/src/framework/Policies/SingletonImp.h @@ -90,3 +90,4 @@ Trinity::Singleton<T, ThreadingModel, CreatePolicy, LifeTimePolicy>::DestroySing template<> TYPE* Trinity::Singleton<TYPE, THREADINGMODEL, CREATIONPOLICY, OBJECTLIFETIME >::si_instance = 0; \ template<> bool Trinity::Singleton<TYPE, THREADINGMODEL, CREATIONPOLICY, OBJECTLIFETIME >::si_destroyed = false #endif + diff --git a/src/framework/Policies/ThreadingModel.h b/src/framework/Policies/ThreadingModel.h index c482b2f10ad..a380fe78323 100644 --- a/src/framework/Policies/ThreadingModel.h +++ b/src/framework/Policies/ThreadingModel.h @@ -127,3 +127,4 @@ template<class T, class MUTEX> MUTEX Trinity::ClassLevelLockable<T, MUTEX>::si_m #define INSTANTIATE_CLASS_MUTEX(CTYPE,MUTEX) \ template class TRINITY_DLL_DECL Trinity::ClassLevelLockable<CTYPE, MUTEX > #endif + diff --git a/src/framework/Utilities/ByteConverter.h b/src/framework/Utilities/ByteConverter.h index c770be449cb..d9282c1787d 100644 --- a/src/framework/Utilities/ByteConverter.h +++ b/src/framework/Utilities/ByteConverter.h @@ -63,3 +63,4 @@ inline void EndianConvertReverse(uint8&) { } inline void EndianConvertReverse( int8&) { } #endif + diff --git a/src/framework/Utilities/Callback.h b/src/framework/Utilities/Callback.h index 3b8c3e450f3..28c0931e6e7 100644 --- a/src/framework/Utilities/Callback.h +++ b/src/framework/Utilities/Callback.h @@ -382,3 +382,4 @@ namespace Trinity } #endif + diff --git a/src/framework/Utilities/CountedReference/Reference.h b/src/framework/Utilities/CountedReference/Reference.h index 7954c437966..1e1083e1a66 100644 --- a/src/framework/Utilities/CountedReference/Reference.h +++ b/src/framework/Utilities/CountedReference/Reference.h @@ -97,3 +97,4 @@ class TRINITY_DLL_DECL Referencer ReferenceeHolder *i_holder; }; #endif + diff --git a/src/framework/Utilities/CountedReference/ReferenceHolder.h b/src/framework/Utilities/CountedReference/ReferenceHolder.h index 03edff4c7cd..4cfb7d16ded 100644 --- a/src/framework/Utilities/CountedReference/ReferenceHolder.h +++ b/src/framework/Utilities/CountedReference/ReferenceHolder.h @@ -39,3 +39,4 @@ struct ReferenceHolder : public THREADING_MODEL typedef typename THREADING_MODEL::Lock Lock; }; #endif + diff --git a/src/framework/Utilities/CountedReference/ReferenceImpl.h b/src/framework/Utilities/CountedReference/ReferenceImpl.h index 43a01e2bc85..c3116a21cf4 100644 --- a/src/framework/Utilities/CountedReference/ReferenceImpl.h +++ b/src/framework/Utilities/CountedReference/ReferenceImpl.h @@ -130,3 +130,4 @@ Referencer<T, THREADING_MODEL>::addReference(ReferenceHolder<T, THREADING_MODEL> ++holder->i_referenceCount; } #endif + diff --git a/src/framework/Utilities/EventProcessor.cpp b/src/framework/Utilities/EventProcessor.cpp index d6e74ced42c..852f84bc4e2 100644 --- a/src/framework/Utilities/EventProcessor.cpp +++ b/src/framework/Utilities/EventProcessor.cpp @@ -98,3 +98,4 @@ uint64 EventProcessor::CalculateTime(uint64 t_offset) { return(m_time + t_offset); } + diff --git a/src/framework/Utilities/EventProcessor.h b/src/framework/Utilities/EventProcessor.h index ecc7ec608be..d0a98c80e30 100644 --- a/src/framework/Utilities/EventProcessor.h +++ b/src/framework/Utilities/EventProcessor.h @@ -70,3 +70,4 @@ class EventProcessor bool m_aborting; }; #endif + diff --git a/src/framework/Utilities/LinkedList.h b/src/framework/Utilities/LinkedList.h index 22a80f0b9ba..171ff3601e3 100644 --- a/src/framework/Utilities/LinkedList.h +++ b/src/framework/Utilities/LinkedList.h @@ -246,3 +246,4 @@ class LinkedListHead //============================================ #endif + diff --git a/src/framework/Utilities/LinkedReference/RefManager.h b/src/framework/Utilities/LinkedReference/RefManager.h index bef8b32862c..ed580f49ec2 100644 --- a/src/framework/Utilities/LinkedReference/RefManager.h +++ b/src/framework/Utilities/LinkedReference/RefManager.h @@ -55,3 +55,4 @@ template <class TO, class FROM> class RefManager : public LinkedListHead //===================================================== #endif + diff --git a/src/framework/Utilities/LinkedReference/Reference.h b/src/framework/Utilities/LinkedReference/Reference.h index 5ca167a3948..c77d3a2cbdb 100644 --- a/src/framework/Utilities/LinkedReference/Reference.h +++ b/src/framework/Utilities/LinkedReference/Reference.h @@ -91,3 +91,4 @@ template <class TO, class FROM> class Reference : public LinkedListElement //===================================================== #endif + diff --git a/src/framework/Utilities/TypeList.h b/src/framework/Utilities/TypeList.h index fc9f869aa2b..07b1ebad3e6 100644 --- a/src/framework/Utilities/TypeList.h +++ b/src/framework/Utilities/TypeList.h @@ -43,3 +43,4 @@ struct TypeList #define TYPELIST_4(T1, T2, T3, T4) TypeList<T1, TYPELIST_3(T2, T3, T4) > #define TYPELIST_5(T1, T2, T3, T4, T5) TypeList<T1, TYPELIST_4(T2, T3, T4, T5) > #endif + diff --git a/src/framework/Utilities/UnorderedMap.h b/src/framework/Utilities/UnorderedMap.h index 13f9d58619b..dd539cc0bda 100644 --- a/src/framework/Utilities/UnorderedMap.h +++ b/src/framework/Utilities/UnorderedMap.h @@ -70,3 +70,4 @@ namespace __gnu_cxx using std::hash_map; #endif #endif + diff --git a/src/game/AccountMgr.cpp b/src/game/AccountMgr.cpp index d5d7ee1a59a..a39203f3755 100644 --- a/src/game/AccountMgr.cpp +++ b/src/game/AccountMgr.cpp @@ -217,3 +217,4 @@ bool AccountMgr::normilizeString(std::string& utf8str) return WStrToUtf8(wstr_buf,wstr_len,utf8str); } + diff --git a/src/game/AccountMgr.h b/src/game/AccountMgr.h index a40c93989ed..adb1bdfa6b9 100644 --- a/src/game/AccountMgr.h +++ b/src/game/AccountMgr.h @@ -58,3 +58,4 @@ class AccountMgr #define accmgr Trinity::Singleton<AccountMgr>::Instance() #endif + diff --git a/src/game/AddonHandler.cpp b/src/game/AddonHandler.cpp index 1372f9c323c..4dd25c56b26 100644 --- a/src/game/AddonHandler.cpp +++ b/src/game/AddonHandler.cpp @@ -229,3 +229,4 @@ void AddonHandler::BuildAddonPacket(WorldPacket* Source, WorldPacket* Target, ui } } */ + diff --git a/src/game/AddonHandler.h b/src/game/AddonHandler.h index 78305db42bd..fd9ad395924 100644 --- a/src/game/AddonHandler.h +++ b/src/game/AddonHandler.h @@ -37,3 +37,4 @@ class AddonHandler }; #define sAddOnHandler Trinity::Singleton<AddonHandler>::Instance() #endif + diff --git a/src/game/AggressorAI.cpp b/src/game/AggressorAI.cpp index 441a526fd3b..2afe3442a21 100644 --- a/src/game/AggressorAI.cpp +++ b/src/game/AggressorAI.cpp @@ -113,3 +113,4 @@ AggressorAI::UpdateAI(const uint32 /*diff*/) } } } + diff --git a/src/game/AggressorAI.h b/src/game/AggressorAI.h index ef8e081a30f..a2a0230939a 100644 --- a/src/game/AggressorAI.h +++ b/src/game/AggressorAI.h @@ -50,3 +50,4 @@ class TRINITY_DLL_DECL AggressorAI : public CreatureAI TimeTracker i_tracker; }; #endif + diff --git a/src/game/AnimalRandomMovementGenerator.h b/src/game/AnimalRandomMovementGenerator.h index 86a70d0279a..9c64edcaa44 100644 --- a/src/game/AnimalRandomMovementGenerator.h +++ b/src/game/AnimalRandomMovementGenerator.h @@ -28,3 +28,4 @@ * animal creatures. */ #endif + diff --git a/src/game/ArenaTeam.cpp b/src/game/ArenaTeam.cpp index 46dd80f86f8..0e2ea0d341d 100644 --- a/src/game/ArenaTeam.cpp +++ b/src/game/ArenaTeam.cpp @@ -684,3 +684,4 @@ arenateam fields (id from 2.3.3 client): 1430 - unk - rank? 1431 - personal arena rating */ + diff --git a/src/game/ArenaTeam.h b/src/game/ArenaTeam.h index 4b839401e12..ec79e305ba9 100644 --- a/src/game/ArenaTeam.h +++ b/src/game/ArenaTeam.h @@ -224,3 +224,4 @@ class ArenaTeam ArenaTeamStats stats; }; #endif + diff --git a/src/game/ArenaTeamHandler.cpp b/src/game/ArenaTeamHandler.cpp index 56c9a219a73..e625ca41dca 100644 --- a/src/game/ArenaTeamHandler.cpp +++ b/src/game/ArenaTeamHandler.cpp @@ -438,3 +438,4 @@ ERR_ARENA_TEAM_TOO_MANY_MEMBERS_S "%s is full" ERR_ARENA_TEAM_LEVEL_TOO_LOW_I "You must be level %d to form an arena team" */ + diff --git a/src/game/AuctionHouse.cpp b/src/game/AuctionHouse.cpp new file mode 100644 index 00000000000..9fc448cf20b --- /dev/null +++ b/src/game/AuctionHouse.cpp @@ -0,0 +1,759 @@ +/* + * Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/> + * + * Copyright (C) 2008 Trinity <http://www.trinitycore.org/> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "WorldPacket.h" +#include "WorldSession.h" +#include "Opcodes.h" +#include "Log.h" +#include "World.h" +#include "ObjectMgr.h" +#include "Player.h" +#include "UpdateMask.h" +#include "AuctionHouseObject.h" +#include "Util.h" +#include "AuctionHouseBot.h" + +//please DO NOT use iterator++, because it is slower than ++iterator!!! +//post-incrementation is always slower than pre-incrementation ! + +//void called when player click on auctioneer npc +void WorldSession::HandleAuctionHelloOpcode( WorldPacket & recv_data ) +{ + CHECK_PACKET_SIZE(recv_data,8); + + uint64 guid; //NPC guid + recv_data >> guid; + + Creature *unit = ObjectAccessor::GetNPCIfCanInteractWith(*_player, guid,UNIT_NPC_FLAG_AUCTIONEER); + if (!unit) + { + sLog.outDebug( "WORLD: HandleAuctionHelloOpcode - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(guid)) ); + return; + } + + // remove fake death + if(GetPlayer()->hasUnitState(UNIT_STAT_DIED)) + GetPlayer()->RemoveSpellsCausingAura(SPELL_AURA_FEIGN_DEATH); + + SendAuctionHello(guid, unit); +} + +static uint8 AuctioneerFactionToLocation(uint32 faction) +{ + if(sWorld.getConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_AUCTION)) + return 7; // neutral + + FactionTemplateEntry const* u_entry = sFactionTemplateStore.LookupEntry(faction); + if(!u_entry) + return 7; // neutral + + if(u_entry->ourMask & FACTION_MASK_ALLIANCE) + return 2; + else if(u_entry->ourMask & FACTION_MASK_HORDE) + return 6; + else + return 7; +} + +//this void causes that auction window is opened +void WorldSession::SendAuctionHello( uint64 guid, Creature* unit ) +{ + WorldPacket data( MSG_AUCTION_HELLO, 12 ); + data << (uint64) guid; + data << (uint32) AuctioneerFactionToLocation(unit->getFaction()); + SendPacket( &data ); +} + +//this function inserts to WorldPacket auction's data +bool WorldSession::SendAuctionInfo(WorldPacket & data, AuctionEntry* auction) +{ + Item *pItem = objmgr.GetAItem(auction->item_guidlow); + if (!pItem) + { + sLog.outError("auction to item, that doesn't exist !!!!"); + return false; + } + data << (uint32) auction->Id; + data << (uint32) pItem->GetEntry(); + + for (uint8 i = 0; i < MAX_INSPECTED_ENCHANTMENT_SLOT; i++) + { + data << (uint32) pItem->GetEnchantmentId(EnchantmentSlot(i)); + data << (uint32) pItem->GetEnchantmentDuration(EnchantmentSlot(i)); + data << (uint32) pItem->GetEnchantmentCharges(EnchantmentSlot(i)); + } + + data << (uint32) pItem->GetItemRandomPropertyId(); //random item property id + data << (uint32) pItem->GetItemSuffixFactor(); //SuffixFactor + data << (uint32) pItem->GetCount(); //item->count + data << (uint32) pItem->GetSpellCharges(); //item->charge FFFFFFF + data << (uint32) 0; //Unknown + data << (uint64) auction->owner; //Auction->owner + data << (uint32) auction->startbid; //Auction->startbid (not sure if useful) + data << (uint32) ((auction->bid)? objmgr.GetAuctionOutBid(auction->bid) : 0); + //minimal outbid + data << (uint32) auction->buyout; //auction->buyout + data << (uint32) (auction->time - time(NULL)) * 1000; //time left + data << (uint64) auction->bidder; //auction->bidder current + data << (uint32) auction->bid; //current bid + return true; +} + +//call this method when player bids, creates, or deletes auction +void WorldSession::SendAuctionCommandResult(uint32 auctionId, uint32 Action, uint32 ErrorCode, uint32 bidError ) +{ + WorldPacket data( SMSG_AUCTION_COMMAND_RESULT, 16 ); + data << auctionId; + data << Action; + data << ErrorCode; + if ( !ErrorCode && Action ) + data << bidError; //when bid, then send 0, once... + SendPacket(&data); +} + +//this function sends notification, if bidder is online +void WorldSession::SendAuctionBidderNotification( uint32 location, uint32 auctionId, uint64 bidder, uint32 bidSum, uint32 diff, uint32 item_template) +{ + WorldPacket data(SMSG_AUCTION_BIDDER_NOTIFICATION, (8*4)); + data << location; + data << auctionId; + data << (uint64) bidder; + data << bidSum; + data << (uint32) diff; + data << item_template; + data << (uint32) 0; + SendPacket(&data); +} + +//this void causes on client to display: "Your auction sold" +void WorldSession::SendAuctionOwnerNotification( AuctionEntry* auction) +{ + WorldPacket data(SMSG_AUCTION_OWNER_NOTIFICATION, (7*4)); + data << auction->Id; + data << auction->bid; + data << (uint32) 0; //unk + data << (uint32) 0; //unk + data << (uint32) 0; //unk + data << auction->item_template; + data << (uint32) 0; //unk + SendPacket(&data); +} + +//this function sends mail to old bidder +void WorldSession::SendAuctionOutbiddedMail(AuctionEntry *auction, uint32 newPrice) +{ + uint64 oldBidder_guid = MAKE_NEW_GUID(auction->bidder,0, HIGHGUID_PLAYER); + Player *oldBidder = objmgr.GetPlayer(oldBidder_guid); + + uint32 oldBidder_accId = 0; + if(!oldBidder) + oldBidder_accId = objmgr.GetPlayerAccountIdByGUID(oldBidder_guid); + + // old bidder exist + if(oldBidder || oldBidder_accId) + { + std::ostringstream msgAuctionOutbiddedSubject; + msgAuctionOutbiddedSubject << auction->item_template << ":0:" << AUCTION_OUTBIDDED; + + if (oldBidder && !_player) + oldBidder->GetSession()->SendAuctionBidderNotification( auction->location, auction->Id, AHBplayerGUID, newPrice, objmgr.GetAuctionOutBid(auction->bid), auction->item_template); + + if (oldBidder && _player) + oldBidder->GetSession()->SendAuctionBidderNotification( auction->location, auction->Id, _player->GetGUID(), newPrice, objmgr.GetAuctionOutBid(auction->bid), auction->item_template); + + WorldSession::SendMailTo(oldBidder, MAIL_AUCTION, MAIL_STATIONERY_AUCTION, auction->location, auction->bidder, msgAuctionOutbiddedSubject.str(), 0, NULL, auction->bid, 0, MAIL_CHECK_MASK_NONE); + } +} + +//this function sends mail, when auction is canceled to old bidder +void WorldSession::SendAuctionCancelledToBidderMail( AuctionEntry* auction ) +{ + uint64 bidder_guid = MAKE_NEW_GUID(auction->bidder, 0, HIGHGUID_PLAYER); + Player *bidder = objmgr.GetPlayer(bidder_guid); + + uint32 bidder_accId = 0; + if(!bidder) + bidder_accId = objmgr.GetPlayerAccountIdByGUID(bidder_guid); + + // bidder exist + if(bidder || bidder_accId) + { + std::ostringstream msgAuctionCancelledSubject; + msgAuctionCancelledSubject << auction->item_template << ":0:" << AUCTION_CANCELLED_TO_BIDDER; + + WorldSession::SendMailTo(bidder, MAIL_AUCTION, MAIL_STATIONERY_AUCTION, auction->location, auction->bidder, msgAuctionCancelledSubject.str(), 0, NULL, auction->bid, 0, MAIL_CHECK_MASK_NONE); + } +} + +//this void creates new auction and adds auction to some auctionhouse +void WorldSession::HandleAuctionSellItem( WorldPacket & recv_data ) +{ + CHECK_PACKET_SIZE(recv_data,8+8+4+4+4); + + uint64 auctioneer, item; + uint32 etime, bid, buyout; + recv_data >> auctioneer >> item; + recv_data >> bid >> buyout >> etime; + Player *pl = GetPlayer(); + + if (!item || !bid || !etime) + return; //check for cheaters + + Creature *pCreature = ObjectAccessor::GetNPCIfCanInteractWith(*_player, auctioneer,UNIT_NPC_FLAG_AUCTIONEER); + if (!pCreature) + { + sLog.outDebug( "WORLD: HandleAuctionSellItem - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(auctioneer)) ); + return; + } + + // client send time in minutes, convert to common used sec time + etime *= MINUTE; + + // client understand only 3 auction time + switch(etime) + { + case 1*MIN_AUCTION_TIME: + case 2*MIN_AUCTION_TIME: + case 4*MIN_AUCTION_TIME: + break; + default: + return; + } + + // remove fake death + if(GetPlayer()->hasUnitState(UNIT_STAT_DIED)) + GetPlayer()->RemoveSpellsCausingAura(SPELL_AURA_FEIGN_DEATH); + + Item *it = pl->GetItemByGuid( item ); + //do not allow to sell already auctioned items + if(objmgr.GetAItem(GUID_LOPART(item))) + { + sLog.outError("AuctionError, player %s is sending item id: %u, but item is already in another auction", pl->GetName(), GUID_LOPART(item)); + SendAuctionCommandResult(0, AUCTION_SELL_ITEM, AUCTION_INTERNAL_ERROR); + return; + } + // prevent sending bag with items (cheat: can be placed in bag after adding equiped empty bag to auction) + if(!it) + { + SendAuctionCommandResult(0, AUCTION_SELL_ITEM, AUCTION_ITEM_NOT_FOUND); + return; + } + + if(!it->CanBeTraded()) + { + SendAuctionCommandResult(0, AUCTION_SELL_ITEM, AUCTION_INTERNAL_ERROR); + return; + } + + if (it->HasFlag(ITEM_FIELD_FLAGS, ITEM_FLAGS_CONJURED) || it->GetUInt32Value(ITEM_FIELD_DURATION)) + { + SendAuctionCommandResult(0, AUCTION_SELL_ITEM, AUCTION_INTERNAL_ERROR); + return; + } + + uint32 location = AuctioneerFactionToLocation(pCreature->getFaction()); + AuctionHouseObject * mAuctions; + mAuctions = objmgr.GetAuctionsMap( location ); + + //we have to take deposit : + uint32 deposit = objmgr.GetAuctionDeposit( location, etime, it ); + if ( pl->GetMoney() < deposit ) + { + SendAuctionCommandResult(0, AUCTION_SELL_ITEM, AUCTION_NOT_ENOUGHT_MONEY); + return; + } + + if( GetSecurity() > SEC_PLAYER && sWorld.getConfig(CONFIG_GM_LOG_TRADE) ) + { + sLog.outCommand(GetAccountId(),"GM %s (Account: %u) create auction: %s (Entry: %u Count: %u)", + GetPlayerName(),GetAccountId(),it->GetProto()->Name1,it->GetEntry(),it->GetCount()); + } + + pl->ModifyMoney( -int32(deposit) ); + + uint32 auction_time = uint32(etime * sWorld.getRate(RATE_AUCTION_TIME)); + + AuctionEntry *AH = new AuctionEntry; + AH->Id = objmgr.GenerateAuctionID(); + AH->auctioneer = GUID_LOPART(auctioneer); + AH->item_guidlow = GUID_LOPART(item); + AH->item_template = it->GetEntry(); + AH->owner = pl->GetGUIDLow(); + AH->startbid = bid; + AH->bidder = 0; + AH->bid = 0; + AH->buyout = buyout; + AH->time = time(NULL) + auction_time; + AH->deposit = deposit; + AH->location = location; + + sLog.outDetail("selling item %u to auctioneer %u with initial bid %u with buyout %u and with time %u (in sec) in location: %u", GUID_LOPART(item), GUID_LOPART(auctioneer), bid, buyout, auction_time, location); + mAuctions->AddAuction(AH); + + objmgr.AddAItem(it); + pl->MoveItemFromInventory( it->GetBagSlot(), it->GetSlot(), true); + + CharacterDatabase.BeginTransaction(); + it->DeleteFromInventoryDB(); + it->SaveToDB(); // recursive and not have transaction guard into self, not in inventiory and can be save standalone + CharacterDatabase.PExecute("INSERT INTO auctionhouse (id,auctioneerguid,itemguid,item_template,itemowner,buyoutprice,time,buyguid,lastbid,startbid,deposit,location) " + "VALUES ('%u', '%u', '%u', '%u', '%u', '%u', '" I64FMTD "', '%u', '%u', '%u', '%u', '%u')", + AH->Id, AH->auctioneer, AH->item_guidlow, AH->item_template, AH->owner, AH->buyout, (uint64)AH->time, AH->bidder, AH->bid, AH->startbid, AH->deposit, AH->location); + pl->SaveInventoryAndGoldToDB(); + CharacterDatabase.CommitTransaction(); + + SendAuctionCommandResult(AH->Id, AUCTION_SELL_ITEM, AUCTION_OK); +} + +//this function is called when client bids or buys out auction +void WorldSession::HandleAuctionPlaceBid( WorldPacket & recv_data ) +{ + CHECK_PACKET_SIZE(recv_data,8+4+4); + + uint64 auctioneer; + uint32 auctionId; + uint32 price; + recv_data >> auctioneer; + recv_data >> auctionId >> price; + + if (!auctionId || !price) + return; //check for cheaters + + Creature *pCreature = ObjectAccessor::GetNPCIfCanInteractWith(*_player, auctioneer,UNIT_NPC_FLAG_AUCTIONEER); + if (!pCreature) + { + sLog.outDebug( "WORLD: HandleAuctionPlaceBid - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(auctioneer)) ); + return; + } + + // remove fake death + if(GetPlayer()->hasUnitState(UNIT_STAT_DIED)) + GetPlayer()->RemoveSpellsCausingAura(SPELL_AURA_FEIGN_DEATH); + + uint32 location = AuctioneerFactionToLocation(pCreature->getFaction()); + + AuctionHouseObject * mAuctions; + mAuctions = objmgr.GetAuctionsMap( location ); + + AuctionEntry *auction = mAuctions->GetAuction(auctionId); + Player *pl = GetPlayer(); + + if( !auction || auction->owner == pl->GetGUIDLow() ) + { + //you cannot bid your own auction: + SendAuctionCommandResult( 0, AUCTION_PLACE_BID, CANNOT_BID_YOUR_AUCTION_ERROR ); + return; + } + + // impossible have online own another character (use this for speedup check in case online owner) + Player* auction_owner = objmgr.GetPlayer(MAKE_NEW_GUID(auction->owner, 0, HIGHGUID_PLAYER)); + if( !auction_owner && objmgr.GetPlayerAccountIdByGUID(MAKE_NEW_GUID(auction->owner, 0, HIGHGUID_PLAYER)) == pl->GetSession()->GetAccountId()) + { + //you cannot bid your another character auction: + SendAuctionCommandResult( 0, AUCTION_PLACE_BID, CANNOT_BID_YOUR_AUCTION_ERROR ); + return; + } + + // cheating + if(price <= auction->bid) + return; + + // price too low for next bid if not buyout + if ((price < auction->buyout || auction->buyout == 0) && + price < auction->bid + objmgr.GetAuctionOutBid(auction->bid)) + { + //auction has already higher bid, client tests it! + return; + } + + if (price > pl->GetMoney()) + { + //you don't have enought money!, client tests! + //SendAuctionCommandResult(auction->auctionId, AUCTION_PLACE_BID, ???); + return; + } + + if ((price < auction->buyout) || (auction->buyout == 0)) + { + if (auction->bidder > 0) + { + if ( auction->bidder == pl->GetGUIDLow() ) + { + pl->ModifyMoney( -int32(price - auction->bid)); + } + else + { + // mail to last bidder and return money + SendAuctionOutbiddedMail( auction , price ); + pl->ModifyMoney( -int32(price) ); + } + } + else + { + pl->ModifyMoney( -int32(price) ); + } + auction->bidder = pl->GetGUIDLow(); + auction->bid = price; + + // after this update we should save player's money ... + CharacterDatabase.PExecute("UPDATE auctionhouse SET buyguid = '%u',lastbid = '%u' WHERE id = '%u'", auction->bidder, auction->bid, auction->Id); + + SendAuctionCommandResult(auction->Id, AUCTION_PLACE_BID, AUCTION_OK, 0 ); + } + else + { + //buyout: + if (pl->GetGUIDLow() == auction->bidder ) + { + pl->ModifyMoney(-int32(auction->buyout - auction->bid)); + } + else + { + pl->ModifyMoney(-int32(auction->buyout)); + if ( auction->bidder ) //buyout for bidded auction .. + { + SendAuctionOutbiddedMail( auction, auction->buyout ); + } + } + auction->bidder = pl->GetGUIDLow(); + auction->bid = auction->buyout; + + objmgr.SendAuctionSalePendingMail( auction ); + objmgr.SendAuctionSuccessfulMail( auction ); + objmgr.SendAuctionWonMail( auction ); + + SendAuctionCommandResult(auction->Id, AUCTION_PLACE_BID, AUCTION_OK); + + objmgr.RemoveAItem(auction->item_guidlow); + mAuctions->RemoveAuction(auction->Id); + CharacterDatabase.PExecute("DELETE FROM auctionhouse WHERE id = '%u'",auction->Id); + + delete auction; + } + CharacterDatabase.BeginTransaction(); + pl->SaveInventoryAndGoldToDB(); + CharacterDatabase.CommitTransaction(); +} + +//this void is called when auction_owner cancels his auction +void WorldSession::HandleAuctionRemoveItem( WorldPacket & recv_data ) +{ + CHECK_PACKET_SIZE(recv_data,8+4); + + uint64 auctioneer; + uint32 auctionId; + recv_data >> auctioneer; + recv_data >> auctionId; + //sLog.outDebug( "Cancel AUCTION AuctionID: %u", auctionId); + + Creature *pCreature = ObjectAccessor::GetNPCIfCanInteractWith(*_player, auctioneer,UNIT_NPC_FLAG_AUCTIONEER); + if (!pCreature) + { + sLog.outDebug( "WORLD: HandleAuctionRemoveItem - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(auctioneer)) ); + return; + } + + // remove fake death + if(GetPlayer()->hasUnitState(UNIT_STAT_DIED)) + GetPlayer()->RemoveSpellsCausingAura(SPELL_AURA_FEIGN_DEATH); + + uint32 location = AuctioneerFactionToLocation(pCreature->getFaction()); + + AuctionHouseObject * mAuctions; + mAuctions = objmgr.GetAuctionsMap( location ); + + AuctionEntry *auction = mAuctions->GetAuction(auctionId); + Player *pl = GetPlayer(); + + if (auction && auction->owner == pl->GetGUIDLow()) + { + Item *pItem = objmgr.GetAItem(auction->item_guidlow); + if (pItem) + { + if (auction->bidder > 0) // If we have a bidder, we have to send him the money he paid + { + uint32 auctionCut = objmgr.GetAuctionCut( auction->location, auction->bid); + if ( pl->GetMoney() < auctionCut ) //player doesn't have enough money, maybe message needed + return; + //some auctionBidderNotification would be needed, but don't know that parts.. + SendAuctionCancelledToBidderMail( auction ); + pl->ModifyMoney( -int32(auctionCut) ); + } + // Return the item by mail + std::ostringstream msgAuctionCanceledOwner; + msgAuctionCanceledOwner << auction->item_template << ":0:" << AUCTION_CANCELED; + + MailItemsInfo mi; + mi.AddItem(auction->item_guidlow, auction->item_template, pItem); + + // item will deleted or added to received mail list + WorldSession::SendMailTo(pl, MAIL_AUCTION, MAIL_STATIONERY_AUCTION, auction->location, pl->GetGUIDLow(), msgAuctionCanceledOwner.str(), 0, &mi, 0, 0, MAIL_CHECK_MASK_NONE); + } + else + { + sLog.outError("Auction id: %u has non-existed item (item guid : %u)!!!", auction->Id, auction->item_guidlow); + SendAuctionCommandResult( 0, AUCTION_CANCEL, AUCTION_INTERNAL_ERROR ); + return; + } + } + else + { + SendAuctionCommandResult( 0, AUCTION_CANCEL, AUCTION_INTERNAL_ERROR ); + //this code isn't possible ... maybe there should be assert + sLog.outError("CHEATER : %u, he tried to cancel auction (id: %u) of another player, or auction is NULL", pl->GetGUIDLow(), auctionId ); + return; + } + + //inform player, that auction is removed + SendAuctionCommandResult( auction->Id, AUCTION_CANCEL, AUCTION_OK ); + // Now remove the auction + CharacterDatabase.BeginTransaction(); + CharacterDatabase.PExecute("DELETE FROM auctionhouse WHERE id = '%u'",auction->Id); + pl->SaveInventoryAndGoldToDB(); + CharacterDatabase.CommitTransaction(); + objmgr.RemoveAItem( auction->item_guidlow ); + mAuctions->RemoveAuction( auction->Id ); + delete auction; +} + +//called when player lists his bids +void WorldSession::HandleAuctionListBidderItems( WorldPacket & recv_data ) +{ + CHECK_PACKET_SIZE(recv_data,8+4+4); + + uint64 guid; //NPC guid + uint32 listfrom; //page of auctions + uint32 outbiddedCount; //count of outbidded auctions + + recv_data >> guid; + recv_data >> listfrom; // not used in fact (this list not have page control in client) + recv_data >> outbiddedCount; + if (recv_data.size() != (16 + outbiddedCount * 4 )) + { + sLog.outError("Client sent bad opcode!!! with count: %u and size : %d (mustbe: %d", outbiddedCount, recv_data.size(),(16 + outbiddedCount * 4 )); + outbiddedCount = 0; + } + + Creature *pCreature = ObjectAccessor::GetNPCIfCanInteractWith(*_player, guid,UNIT_NPC_FLAG_AUCTIONEER); + if (!pCreature) + { + sLog.outDebug( "WORLD: HandleAuctionListBidderItems - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(guid)) ); + return; + } + + // remove fake death + if(GetPlayer()->hasUnitState(UNIT_STAT_DIED)) + GetPlayer()->RemoveSpellsCausingAura(SPELL_AURA_FEIGN_DEATH); + + uint32 location = AuctioneerFactionToLocation(pCreature->getFaction()); + AuctionHouseObject* mAuctions = objmgr.GetAuctionsMap( location ); + + WorldPacket data( SMSG_AUCTION_BIDDER_LIST_RESULT, (4+4+4) ); + Player *pl = GetPlayer(); + data << (uint32) 0; //add 0 as count + uint32 count = 0; + uint32 totalcount = 0; + while ( outbiddedCount > 0) //add all data, which client requires + { + --outbiddedCount; + uint32 outbiddedAuctionId; + recv_data >> outbiddedAuctionId; + AuctionEntry * auction = mAuctions->GetAuction( outbiddedAuctionId ); + if ( auction && SendAuctionInfo(data, auction)) + { + ++totalcount; + ++count; + } + } + for (AuctionHouseObject::AuctionEntryMap::iterator itr = mAuctions->GetAuctionsBegin();itr != mAuctions->GetAuctionsEnd();++itr) + { + AuctionEntry *Aentry = itr->second; + if( Aentry && Aentry->bidder == pl->GetGUIDLow() ) + { + if (SendAuctionInfo(data, itr->second)) + ++count; + ++totalcount; + } + } + data.put<uint32>( 0, count ); // add count to placeholder + data << totalcount; + data << (uint32)300; //unk 2.3.0 + SendPacket(&data); +} + +//this void sends player info about his auctions +void WorldSession::HandleAuctionListOwnerItems( WorldPacket & recv_data ) +{ + CHECK_PACKET_SIZE(recv_data,8+4); + + uint32 listfrom; + uint64 guid; + + recv_data >> guid; + recv_data >> listfrom; // not used in fact (this list not have page control in client) + + Creature *pCreature = ObjectAccessor::GetNPCIfCanInteractWith(*_player, guid,UNIT_NPC_FLAG_AUCTIONEER); + if (!pCreature) + { + sLog.outDebug( "WORLD: HandleAuctionListOwnerItems - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(guid)) ); + return; + } + + // remove fake death + if(GetPlayer()->hasUnitState(UNIT_STAT_DIED)) + GetPlayer()->RemoveSpellsCausingAura(SPELL_AURA_FEIGN_DEATH); + + uint32 location = AuctioneerFactionToLocation(pCreature->getFaction()); + + AuctionHouseObject* mAuctions = objmgr.GetAuctionsMap( location ); + + WorldPacket data( SMSG_AUCTION_OWNER_LIST_RESULT, (4+4+4) ); + data << (uint32) 0; // amount place holder + + uint32 count = 0; + uint32 totalcount = 0; + for (AuctionHouseObject::AuctionEntryMap::iterator itr = mAuctions->GetAuctionsBegin();itr != mAuctions->GetAuctionsEnd();++itr) + { + AuctionEntry *Aentry = itr->second; + if( Aentry && Aentry->owner == _player->GetGUIDLow() ) + { + if(SendAuctionInfo(data, itr->second)) + ++count; + ++totalcount; + } + } + data.put<uint32>(0, count); + data << (uint32) totalcount; + data << (uint32) 0; + SendPacket(&data); +} + +//this void is called when player clicks on search button +void WorldSession::HandleAuctionListItems( WorldPacket & recv_data ) +{ + CHECK_PACKET_SIZE(recv_data,8+4+1+1+1+4+4+4+4+1); + + std::string searchedname, name; + uint8 levelmin, levelmax, usable, location; + uint32 count, totalcount, listfrom, auctionSlotID, auctionMainCategory, auctionSubCategory, quality; + uint64 guid; + + recv_data >> guid; + recv_data >> listfrom; // start, used for page control listing by 50 elements + recv_data >> searchedname; + + // recheck with known string size + CHECK_PACKET_SIZE(recv_data,8+4+(searchedname.size()+1)+1+1+4+4+4+4+1); + + recv_data >> levelmin >> levelmax; + recv_data >> auctionSlotID >> auctionMainCategory >> auctionSubCategory; + recv_data >> quality >> usable; + + Creature *pCreature = ObjectAccessor::GetNPCIfCanInteractWith(*_player, guid,UNIT_NPC_FLAG_AUCTIONEER); + if (!pCreature) + { + sLog.outDebug( "WORLD: HandleAuctionListItems - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(guid)) ); + return; + } + + // remove fake death + if(GetPlayer()->hasUnitState(UNIT_STAT_DIED)) + GetPlayer()->RemoveSpellsCausingAura(SPELL_AURA_FEIGN_DEATH); + + location = AuctioneerFactionToLocation(pCreature->getFaction()); + AuctionHouseObject * mAuctions; + mAuctions = objmgr.GetAuctionsMap( location ); + + //sLog.outDebug("Auctionhouse search guid: " I64FMTD ", list from: %u, searchedname: %s, levelmin: %u, levelmax: %u, auctionSlotID: %u, auctionMainCategory: %u, auctionSubCategory: %u, quality: %u, usable: %u", guid, listfrom, searchedname.c_str(), levelmin, levelmax, auctionSlotID, auctionMainCategory, auctionSubCategory, quality, usable); + + WorldPacket data( SMSG_AUCTION_LIST_RESULT, (4+4+4) ); + count = 0; + totalcount = 0; + data << (uint32) 0; + + // converting string that we try to find to lower case + std::wstring wsearchedname; + if(!Utf8toWStr(searchedname,wsearchedname)) + return; + + wstrToLower(wsearchedname); + + for (AuctionHouseObject::AuctionEntryMap::iterator itr = mAuctions->GetAuctionsBegin();itr != mAuctions->GetAuctionsEnd();++itr) + { + AuctionEntry *Aentry = itr->second; + Item *item = objmgr.GetAItem(Aentry->item_guidlow); + if( item ) + { + ItemPrototype const *proto = item->GetProto(); + if( proto ) + { + if( auctionMainCategory == (0xffffffff) || proto->Class == auctionMainCategory ) + { + if( auctionSubCategory == (0xffffffff) || proto->SubClass == auctionSubCategory ) + { + if( auctionSlotID == (0xffffffff) || proto->InventoryType == auctionSlotID ) + { + if( quality == (0xffffffff) || proto->Quality == quality ) + { + if( usable == (0x00) || _player->CanUseItem( item ) == EQUIP_ERR_OK ) + { + if( ( levelmin == (0x00) || proto->RequiredLevel >= levelmin ) && ( levelmax == (0x00) || proto->RequiredLevel <= levelmax ) ) + { + name = proto->Name1; + + // local name + int loc_idx = GetSessionDbLocaleIndex(); + if ( loc_idx >= 0 ) + { + ItemLocale const *il = objmgr.GetItemLocale(proto->ItemId); + if (il) + { + if (il->Name.size() > size_t(loc_idx) && !il->Name[loc_idx].empty()) + name = il->Name[loc_idx]; + } + } + + if(name.empty()) + continue; + + if( wsearchedname.empty() || Utf8FitTo(name, wsearchedname) ) + { + if ((count < 50) && (totalcount >= listfrom)) + { + ++count; + SendAuctionInfo( data, Aentry); + } + ++totalcount; + } + } + } + } + } + } + } + } + } + } + data.put<uint32>(0, count); + data << (uint32) totalcount; + data << (uint32) 300; // unk 2.3.0 const? + SendPacket(&data); +} + diff --git a/src/game/AuctionHouseBot.cpp b/src/game/AuctionHouseBot.cpp index 94ee49c54be..afdc08ca7cd 100644 --- a/src/game/AuctionHouseBot.cpp +++ b/src/game/AuctionHouseBot.cpp @@ -1194,3 +1194,4 @@ void AuctionHouseBotLoadValues(AHBConfig *config) {sLog.outError("buyerBidsPerInterval = %u", config->GetBidsPerInterval());} } } + diff --git a/src/game/AuctionHouseBot.h b/src/game/AuctionHouseBot.h index 0d45adb415f..5113089e969 100644 --- a/src/game/AuctionHouseBot.h +++ b/src/game/AuctionHouseBot.h @@ -686,3 +686,4 @@ void AuctionHouseBotInit(); void AuctionHouseBotLoadValues(AHBConfig*); void AuctionHouseBotCommands(uint32, AuctionLocation, uint32, char*); #endif + diff --git a/src/game/AuctionHouseObject.h b/src/game/AuctionHouseObject.h new file mode 100644 index 00000000000..83fd19d19c6 --- /dev/null +++ b/src/game/AuctionHouseObject.h @@ -0,0 +1,107 @@ +/* + * Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/> + * + * Copyright (C) 2008 Trinity <http://www.trinitycore.org/> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef _AUCTION_HOUSE_H +#define _AUCTION_HOUSE_H + +#include "SharedDefines.h" + +#define MIN_AUCTION_TIME (12*HOUR) + +enum AuctionError +{ + AUCTION_OK = 0, + AUCTION_INTERNAL_ERROR = 2, + AUCTION_NOT_ENOUGHT_MONEY = 3, + AUCTION_ITEM_NOT_FOUND = 4, + CANNOT_BID_YOUR_AUCTION_ERROR = 10 +}; + +enum AuctionAction +{ + AUCTION_SELL_ITEM = 0, + AUCTION_CANCEL = 1, + AUCTION_PLACE_BID = 2 +}; + +struct AuctionEntry +{ + uint32 Id; + uint32 auctioneer; + uint32 item_guidlow; + uint32 item_template; + uint32 owner; + uint32 startbid; //maybe useless + uint32 bid; + uint32 buyout; + time_t time; + uint32 bidder; + uint32 deposit; //deposit can be calculated only when creating auction + uint32 location; +}; + +//this class is used as auctionhouse instance +class AuctionHouseObject +{ + public: + AuctionHouseObject() {} + ~AuctionHouseObject() + { + for (AuctionEntryMap::iterator itr = AuctionsMap.begin(); itr != AuctionsMap.end(); ++itr) + delete itr->second; + } + + typedef std::map<uint32, AuctionEntry*> AuctionEntryMap; + + uint32 Getcount() { return AuctionsMap.size(); } + + AuctionEntryMap::iterator GetAuctionsBegin() {return AuctionsMap.begin();} + AuctionEntryMap::iterator GetAuctionsEnd() {return AuctionsMap.end();} + + void AddAuction(AuctionEntry *ah) + { + ASSERT( ah ); + AuctionsMap[ah->Id] = ah; + } + + AuctionEntry* GetAuction(uint32 id) const + { + AuctionEntryMap::const_iterator itr = AuctionsMap.find( id ); + if( itr != AuctionsMap.end() ) + return itr->second; + return NULL; + } + + bool RemoveAuction(uint32 id) + { + AuctionEntryMap::iterator i = AuctionsMap.find(id); + if (i == AuctionsMap.end()) + { + return false; + } + AuctionsMap.erase(i); + return true; + } + + private: + AuctionEntryMap AuctionsMap; +}; +#endif + diff --git a/src/game/Bag.cpp b/src/game/Bag.cpp index 1293b058d00..c3b83a39e2b 100644 --- a/src/game/Bag.cpp +++ b/src/game/Bag.cpp @@ -224,3 +224,4 @@ Item* Bag::GetItemByPos( uint8 slot ) const return NULL; } + diff --git a/src/game/Bag.h b/src/game/Bag.h index 6f38057b4ce..34f56439cea 100644 --- a/src/game/Bag.h +++ b/src/game/Bag.h @@ -75,3 +75,4 @@ inline Item* NewItemOrBag(ItemPrototype const * proto) return (proto->InventoryType == INVTYPE_BAG) ? new Bag : new Item; } #endif + diff --git a/src/game/BattleGround.cpp b/src/game/BattleGround.cpp index bdb78552102..e65266dc811 100644 --- a/src/game/BattleGround.cpp +++ b/src/game/BattleGround.cpp @@ -1635,4 +1635,3 @@ void BattleGround::SetBgRaid( uint32 TeamID, Group *bg_raid ) if(old_raid) old_raid->SetBattlegroundGroup(NULL); if(bg_raid) bg_raid->SetBattlegroundGroup(this); old_raid = bg_raid; -} diff --git a/src/game/BattleGround.h b/src/game/BattleGround.h index aa7cd316eb4..270d20cdb31 100644 --- a/src/game/BattleGround.h +++ b/src/game/BattleGround.h @@ -540,3 +540,4 @@ class BattleGround float m_TeamStartLocO[2]; }; #endif + diff --git a/src/game/BattleGroundAA.cpp b/src/game/BattleGroundAA.cpp index fa7a90014ef..ca52e4ddaf2 100644 --- a/src/game/BattleGroundAA.cpp +++ b/src/game/BattleGroundAA.cpp @@ -63,3 +63,4 @@ bool BattleGroundAA::SetupBattleGround() { return true; } + diff --git a/src/game/BattleGroundAA.h b/src/game/BattleGroundAA.h index 3d4dad0be9a..4f073b21da4 100644 --- a/src/game/BattleGroundAA.h +++ b/src/game/BattleGroundAA.h @@ -47,3 +47,4 @@ class BattleGroundAA : public BattleGround void HandleKillPlayer(Player* player, Player *killer); }; #endif + diff --git a/src/game/BattleGroundAB.cpp b/src/game/BattleGroundAB.cpp index 322c1f6c920..7aecb33af8e 100644 --- a/src/game/BattleGroundAB.cpp +++ b/src/game/BattleGroundAB.cpp @@ -675,3 +675,4 @@ void BattleGroundAB::UpdatePlayerScore(Player *Source, uint32 type, uint32 value break; } } + diff --git a/src/game/BattleGroundAB.h b/src/game/BattleGroundAB.h index d859b34b1e1..5f05d182bee 100644 --- a/src/game/BattleGroundAB.h +++ b/src/game/BattleGroundAB.h @@ -284,3 +284,4 @@ class BattleGroundAB : public BattleGround bool m_IsInformedNearVictory; }; #endif + diff --git a/src/game/BattleGroundAV.cpp b/src/game/BattleGroundAV.cpp index c8d1ed3b673..972c24a8f4d 100644 --- a/src/game/BattleGroundAV.cpp +++ b/src/game/BattleGroundAV.cpp @@ -1446,3 +1446,4 @@ void BattleGroundAV::ResetBGSubclass() } + diff --git a/src/game/BattleGroundAV.h b/src/game/BattleGroundAV.h index d4581b07d41..ef6731b5e73 100644 --- a/src/game/BattleGroundAV.h +++ b/src/game/BattleGroundAV.h @@ -1579,3 +1579,4 @@ class BattleGroundAV : public BattleGround }; #endif + diff --git a/src/game/BattleGroundBE.cpp b/src/game/BattleGroundBE.cpp index e3d7b268c92..c23fae887a1 100644 --- a/src/game/BattleGroundBE.cpp +++ b/src/game/BattleGroundBE.cpp @@ -253,3 +253,4 @@ spell 32725 - Green Team 35774 Gold Team 35775 Green Team */ + diff --git a/src/game/BattleGroundBE.h b/src/game/BattleGroundBE.h index 94b7a189b53..b8922e8f983 100644 --- a/src/game/BattleGroundBE.h +++ b/src/game/BattleGroundBE.h @@ -74,3 +74,4 @@ class BattleGroundBE : public BattleGround void UpdatePlayerScore(Player *Source, uint32 type, uint32 value); }; #endif + diff --git a/src/game/BattleGroundEY.cpp b/src/game/BattleGroundEY.cpp index 05456abc78d..40d55ea6f18 100644 --- a/src/game/BattleGroundEY.cpp +++ b/src/game/BattleGroundEY.cpp @@ -944,3 +944,4 @@ WorldSafeLocsEntry const *BattleGroundEY::GetClosestGraveYard(float x, float y, return nearestEntry; } + diff --git a/src/game/BattleGroundEY.h b/src/game/BattleGroundEY.h index 3a4215d713e..52106461e5a 100644 --- a/src/game/BattleGroundEY.h +++ b/src/game/BattleGroundEY.h @@ -372,3 +372,4 @@ class BattleGroundEY : public BattleGround int32 m_PointAddingTimer; }; #endif + diff --git a/src/game/BattleGroundHandler.cpp b/src/game/BattleGroundHandler.cpp index 6cd12f1c722..7d5a2f503bf 100644 --- a/src/game/BattleGroundHandler.cpp +++ b/src/game/BattleGroundHandler.cpp @@ -872,3 +872,4 @@ void WorldSession::SendBattleGroundOrArenaJoinError(uint8 err) SendPacket(&data); return; } + diff --git a/src/game/BattleGroundMgr.cpp b/src/game/BattleGroundMgr.cpp index 2b6cd408f91..3e0fbb28164 100644 --- a/src/game/BattleGroundMgr.cpp +++ b/src/game/BattleGroundMgr.cpp @@ -1926,4 +1926,3 @@ void BattleGroundMgr::LoadBattleMastersEntry() sLog.outString(); sLog.outString( ">> Loaded %u battlemaster entries", count ); -} diff --git a/src/game/BattleGroundMgr.h b/src/game/BattleGroundMgr.h index 07047e3aaa0..11ff62ab37f 100644 --- a/src/game/BattleGroundMgr.h +++ b/src/game/BattleGroundMgr.h @@ -259,3 +259,4 @@ class BattleGroundMgr #define sBattleGroundMgr Trinity::Singleton<BattleGroundMgr>::Instance() #endif + diff --git a/src/game/BattleGroundNA.cpp b/src/game/BattleGroundNA.cpp index 9574adac9b1..007ff659020 100644 --- a/src/game/BattleGroundNA.cpp +++ b/src/game/BattleGroundNA.cpp @@ -228,3 +228,4 @@ bool BattleGroundNA::SetupBattleGround() 0040: 00 00 00 00 00 00 d5 08 00 00 00 00 00 00 d3 08 | ................ 0050: 00 00 00 00 00 00 | ...... */ + diff --git a/src/game/BattleGroundNA.h b/src/game/BattleGroundNA.h index 531cbe0cb23..8adef0a131b 100644 --- a/src/game/BattleGroundNA.h +++ b/src/game/BattleGroundNA.h @@ -72,3 +72,4 @@ class BattleGroundNA : public BattleGround bool HandlePlayerUnderMap(Player * plr); }; #endif + diff --git a/src/game/BattleGroundRL.cpp b/src/game/BattleGroundRL.cpp index 9b2ffa18289..501ee704948 100644 --- a/src/game/BattleGroundRL.cpp +++ b/src/game/BattleGroundRL.cpp @@ -228,3 +228,4 @@ Packet S->C, id 600, SMSG_INIT_WORLD_STATES (706), len 86 0040: 00 00 00 00 00 00 D3 08 00 00 00 00 00 00 D4 08 | ................ 0050: 00 00 00 00 00 00 | ...... */ + diff --git a/src/game/BattleGroundRL.h b/src/game/BattleGroundRL.h index cc3e460fa6b..abb6b25d4ff 100644 --- a/src/game/BattleGroundRL.h +++ b/src/game/BattleGroundRL.h @@ -68,3 +68,4 @@ class BattleGroundRL : public BattleGround bool HandlePlayerUnderMap(Player * plr); }; #endif + diff --git a/src/game/BattleGroundWS.cpp b/src/game/BattleGroundWS.cpp index 2af90fcd3c6..93b5659a0b9 100644 --- a/src/game/BattleGroundWS.cpp +++ b/src/game/BattleGroundWS.cpp @@ -741,3 +741,4 @@ void BattleGroundWS::FillInitialWorldStates(WorldPacket& data) data << uint32(BG_WS_FLAG_STATE_HORDE) << uint32(1); } + diff --git a/src/game/BattleGroundWS.h b/src/game/BattleGroundWS.h index 92bc8a03008..732c078d2f3 100644 --- a/src/game/BattleGroundWS.h +++ b/src/game/BattleGroundWS.h @@ -185,3 +185,4 @@ class BattleGroundWS : public BattleGround int32 m_FlagsDropTimer[2]; }; #endif + diff --git a/src/game/Cell.h b/src/game/Cell.h index 2459e3e73d2..7e66d5d9f73 100644 --- a/src/game/Cell.h +++ b/src/game/Cell.h @@ -163,3 +163,4 @@ struct TRINITY_DLL_DECL CellLock } }; #endif + diff --git a/src/game/CellImpl.h b/src/game/CellImpl.h index 0aea067b32b..e74e0013a19 100644 --- a/src/game/CellImpl.h +++ b/src/game/CellImpl.h @@ -178,3 +178,4 @@ Cell::Visit(const CellLock<LOCK_TYPE> &l, TypeContainerVisitor<T, CONTAINER> &vi } } #endif + diff --git a/src/game/Channel.cpp b/src/game/Channel.cpp index 992a20353ac..87ede40f0b0 100644 --- a/src/game/Channel.cpp +++ b/src/game/Channel.cpp @@ -989,3 +989,4 @@ void Channel::LeaveNotify(uint64 guid) data << GetName(); SendToAll(&data); } + diff --git a/src/game/Channel.h b/src/game/Channel.h index b4fe04feb44..0e12ff9362c 100644 --- a/src/game/Channel.h +++ b/src/game/Channel.h @@ -285,3 +285,4 @@ class Channel void LeaveNotify(uint64 guid); // invisible notify }; #endif + diff --git a/src/game/ChannelHandler.cpp b/src/game/ChannelHandler.cpp index 2fc634077c5..9b06693c589 100644 --- a/src/game/ChannelHandler.cpp +++ b/src/game/ChannelHandler.cpp @@ -387,3 +387,4 @@ void WorldSession::HandleChannelJoinNotify(WorldPacket &recvPacket) if(Channel *chn = cMgr->GetChannel(channelname, _player)) chn->JoinNotify(_player->GetGUID());*/ } + diff --git a/src/game/ChannelMgr.h b/src/game/ChannelMgr.h index a664e009b90..3a5469d8c63 100644 --- a/src/game/ChannelMgr.h +++ b/src/game/ChannelMgr.h @@ -101,3 +101,4 @@ inline ChannelMgr* channelMgr(uint32 team) return NULL; } #endif + diff --git a/src/game/CharacterHandler.cpp b/src/game/CharacterHandler.cpp index ffdd9942bb5..680fcdbc768 100644 --- a/src/game/CharacterHandler.cpp +++ b/src/game/CharacterHandler.cpp @@ -1326,5 +1326,3 @@ void WorldSession::HandleCharCustomize(WorldPacket& recv_data) data << uint8(hairStyle); data << uint8(hairColor); data << uint8(facialHair); - SendPacket(&data); -} diff --git a/src/game/Chat.cpp b/src/game/Chat.cpp index bfd711c4737..a028fdc860f 100644 --- a/src/game/Chat.cpp +++ b/src/game/Chat.cpp @@ -1583,3 +1583,4 @@ bool ChatHandler::GetPlayerGroupAndGUIDByName(const char* cname, Player* &plr, G return true; } + diff --git a/src/game/Chat.h b/src/game/Chat.h index ab8c840ec4a..6303a37c773 100644 --- a/src/game/Chat.h +++ b/src/game/Chat.h @@ -560,3 +560,4 @@ class CliHandler : public ChatHandler char const *fmtstring( char const *format, ... ); #endif + diff --git a/src/game/ChatHandler.cpp b/src/game/ChatHandler.cpp index 8a79dc42397..97b980eea61 100644 --- a/src/game/ChatHandler.cpp +++ b/src/game/ChatHandler.cpp @@ -588,3 +588,4 @@ void WorldSession::HandleChannelDeclineInvite(WorldPacket &recvPacket) { sLog.outDebug("Opcode %u", recvPacket.GetOpcode()); } + diff --git a/src/game/CombatHandler.cpp b/src/game/CombatHandler.cpp index 1458af5fcef..0c8e5e6bde9 100644 --- a/src/game/CombatHandler.cpp +++ b/src/game/CombatHandler.cpp @@ -95,3 +95,4 @@ void WorldSession::SendAttackStop(Unit const* enemy) data << uint32(0); // unk, can be 1 also SendPacket(&data); } + diff --git a/src/game/ConfusedMovementGenerator.cpp b/src/game/ConfusedMovementGenerator.cpp index 483c4979194..06871ecdfa4 100644 --- a/src/game/ConfusedMovementGenerator.cpp +++ b/src/game/ConfusedMovementGenerator.cpp @@ -161,3 +161,4 @@ template void ConfusedMovementGenerator<Player>::Reset(Player &player); template void ConfusedMovementGenerator<Creature>::Reset(Creature &creature); template bool ConfusedMovementGenerator<Player>::Update(Player &player, const uint32 &diff); template bool ConfusedMovementGenerator<Creature>::Update(Creature &creature, const uint32 &diff); + diff --git a/src/game/ConfusedMovementGenerator.h b/src/game/ConfusedMovementGenerator.h index 2ad5990214f..ad47b13cb39 100644 --- a/src/game/ConfusedMovementGenerator.h +++ b/src/game/ConfusedMovementGenerator.h @@ -55,3 +55,4 @@ class TRINITY_DLL_SPEC ConfusedMovementGenerator uint32 i_nextMove; }; #endif + diff --git a/src/game/Corpse.cpp b/src/game/Corpse.cpp index 75c89ba7287..6f4b0191bb4 100644 --- a/src/game/Corpse.cpp +++ b/src/game/Corpse.cpp @@ -216,3 +216,4 @@ bool Corpse::isVisibleForInState(Player const* u, bool inVisibleList) const { return IsInWorld() && u->IsInWorld() && IsWithinDistInMap(u,World::GetMaxVisibleDistanceForObject()+(inVisibleList ? World::GetVisibleObjectGreyDistance() : 0.0f), false); } + diff --git a/src/game/Corpse.h b/src/game/Corpse.h index 45203a9de76..200512f1cdf 100644 --- a/src/game/Corpse.h +++ b/src/game/Corpse.h @@ -100,3 +100,4 @@ class Corpse : public WorldObject GridPair m_grid; // gride for corpse position for fast search }; #endif + diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp index 7fa615d1c8a..e6fc9e394ba 100644 --- a/src/game/Creature.cpp +++ b/src/game/Creature.cpp @@ -2329,3 +2329,4 @@ const char* Creature::GetNameForLocaleIdx(int32 loc_idx) const return GetName(); } + diff --git a/src/game/Creature.h b/src/game/Creature.h index a99b089214e..a5acdf3eaea 100644 --- a/src/game/Creature.h +++ b/src/game/Creature.h @@ -727,3 +727,4 @@ class AssistDelayEvent : public BasicEvent }; #endif + diff --git a/src/game/CreatureAI.cpp b/src/game/CreatureAI.cpp index 7343bb8333a..880522c20d2 100644 --- a/src/game/CreatureAI.cpp +++ b/src/game/CreatureAI.cpp @@ -100,3 +100,4 @@ void SimpleCharmedAI::UpdateAI(const uint32 /*diff*/) if(!target || !charmer->canAttack(target)) AttackStart(charmer->SelectNearestTarget()); } + diff --git a/src/game/CreatureAI.h b/src/game/CreatureAI.h index eb5b6fd49bc..6e291e2a604 100644 --- a/src/game/CreatureAI.h +++ b/src/game/CreatureAI.h @@ -177,3 +177,4 @@ typedef FactoryHolder<CreatureAI> CreatureAICreator; typedef FactoryHolder<CreatureAI>::FactoryHolderRegistry CreatureAIRegistry; typedef FactoryHolder<CreatureAI>::FactoryHolderRepository CreatureAIRepository; #endif + diff --git a/src/game/CreatureAIImpl.h b/src/game/CreatureAIImpl.h index cb422c2a016..a8b8271c5ff 100644 --- a/src/game/CreatureAIImpl.h +++ b/src/game/CreatureAIImpl.h @@ -30,3 +30,4 @@ CreatureAIFactory<REAL_AI>::Create(void *data) const return (new REAL_AI(creature)); } #endif + diff --git a/src/game/CreatureAIRegistry.cpp b/src/game/CreatureAIRegistry.cpp index 9ed1763141f..2964508af89 100644 --- a/src/game/CreatureAIRegistry.cpp +++ b/src/game/CreatureAIRegistry.cpp @@ -53,3 +53,4 @@ namespace AIRegistry (new MovementGeneratorFactory<WaypointMovementGenerator<Creature> >(WAYPOINT_MOTION_TYPE))->RegisterSelf(); } } + diff --git a/src/game/CreatureAIRegistry.h b/src/game/CreatureAIRegistry.h index 53776e3d4e9..2b92a096731 100644 --- a/src/game/CreatureAIRegistry.h +++ b/src/game/CreatureAIRegistry.h @@ -26,3 +26,4 @@ namespace AIRegistry void Initialize(void); } #endif + diff --git a/src/game/CreatureAISelector.cpp b/src/game/CreatureAISelector.cpp index 8b4205980be..40b9f0c0c07 100644 --- a/src/game/CreatureAISelector.cpp +++ b/src/game/CreatureAISelector.cpp @@ -125,3 +125,4 @@ namespace FactorySelector } } + diff --git a/src/game/CreatureAISelector.h b/src/game/CreatureAISelector.h index a6fc47e3913..436233b5b21 100644 --- a/src/game/CreatureAISelector.h +++ b/src/game/CreatureAISelector.h @@ -31,3 +31,4 @@ namespace FactorySelector MovementGenerator* selectMovementGenerator(Creature *); } #endif + diff --git a/src/game/CreatureGroups.cpp b/src/game/CreatureGroups.cpp index a45c59f9186..215bca059e8 100644 --- a/src/game/CreatureGroups.cpp +++ b/src/game/CreatureGroups.cpp @@ -212,3 +212,4 @@ void CreatureGroup::SetMemberDestination(Creature *member) member->GetMotionMaster()->MovePoint(0, x, y, z); } } + diff --git a/src/game/CreatureGroups.h b/src/game/CreatureGroups.h index 45df16086b1..11d45167fd9 100644 --- a/src/game/CreatureGroups.h +++ b/src/game/CreatureGroups.h @@ -66,3 +66,4 @@ extern UNORDERED_MAP<uint32, FormationMember*> CreatureGroupMap; #define formation_mgr Trinity::Singleton<CreatureGroupManager>::Instance() #endif + diff --git a/src/game/Debugcmds.cpp b/src/game/Debugcmds.cpp index 68e934abc7c..2ec72818fd7 100644 --- a/src/game/Debugcmds.cpp +++ b/src/game/Debugcmds.cpp @@ -657,5 +657,3 @@ bool ChatHandler::HandleSendSetPhaseShiftCommand(const char* args) uint32 PhaseShift = atoi(args); m_session->SendSetPhaseShift(PhaseShift); - return true; -} diff --git a/src/game/DestinationHolder.cpp b/src/game/DestinationHolder.cpp index 6f4e08256c5..f2158e3b5be 100644 --- a/src/game/DestinationHolder.cpp +++ b/src/game/DestinationHolder.cpp @@ -19,3 +19,4 @@ */ #include "DestinationHolder.h" + diff --git a/src/game/DestinationHolder.h b/src/game/DestinationHolder.h index a1d295ead09..94e12a1757d 100644 --- a/src/game/DestinationHolder.h +++ b/src/game/DestinationHolder.h @@ -62,3 +62,4 @@ class TRINITY_DLL_DECL DestinationHolder }; #endif + diff --git a/src/game/DestinationHolderImp.h b/src/game/DestinationHolderImp.h index 963e074fff9..54d087d3f2f 100644 --- a/src/game/DestinationHolderImp.h +++ b/src/game/DestinationHolderImp.h @@ -247,3 +247,4 @@ DestinationHolder<TRAVELLER>::GetLocationNowNoMicroMovement(float &x, float &y, } #endif + diff --git a/src/game/DuelHandler.cpp b/src/game/DuelHandler.cpp index acde3b4ef51..f0b7980821d 100644 --- a/src/game/DuelHandler.cpp +++ b/src/game/DuelHandler.cpp @@ -90,3 +90,4 @@ void WorldSession::HandleDuelCancelledOpcode(WorldPacket& recvPacket) GetPlayer()->DuelComplete(DUEL_INTERUPTED); } + diff --git a/src/game/DynamicObject.cpp b/src/game/DynamicObject.cpp index 09856f1233e..b63928e7278 100644 --- a/src/game/DynamicObject.cpp +++ b/src/game/DynamicObject.cpp @@ -52,6 +52,13 @@ void DynamicObject::AddToWorld() void DynamicObject::RemoveFromWorld() { + // Make sure the object is back to grid container for removal as farsight targets + // are switched to world container on creation and they are also set to active + if (isActive()) + { + GetMap()->SwitchGridContainers(this, false); + setActive(false); + } ///- Remove the dynamicObject from the accessor if(IsInWorld()) ObjectAccessor::Instance().RemoveObject(this); WorldObject::RemoveFromWorld(); @@ -129,19 +136,6 @@ void DynamicObject::Update(uint32 p_time) void DynamicObject::Delete() { - // Make sure the object is back to grid container for removal as farsight targets - // are switched to world container on creation and they are also set to active - if (isActive()) - { - Map* map = GetMap(); - if(!map) - { - sLog.outError("DynamicObject (TypeId: %u Entry: %u GUID: %u) at attempt add to move list not have valid map (Id: %u).",GetTypeId(),GetEntry(),GetGUIDLow(),GetMapId()); - return; - } - map->SwitchGridContainers(this, false); - setActive(false); - } SendObjectDeSpawnAnim(GetGUID()); AddObjectToRemoveList(); } @@ -160,3 +154,4 @@ bool DynamicObject::isVisibleForInState(Player const* u, bool inVisibleList) con && (IsWithinDistInMap(u,World::GetMaxVisibleDistanceForObject()+(inVisibleList ? World::GetVisibleObjectGreyDistance() : 0.0f), false) || GetCasterGUID() == u->GetGUID()); } + diff --git a/src/game/DynamicObject.h b/src/game/DynamicObject.h index 05a5f3d930d..2eda623e36d 100644 --- a/src/game/DynamicObject.h +++ b/src/game/DynamicObject.h @@ -73,3 +73,4 @@ class DynamicObject : public WorldObject GridReference<DynamicObject> m_gridRef; }; #endif + diff --git a/src/game/FleeingMovementGenerator.cpp b/src/game/FleeingMovementGenerator.cpp index a3bbb965961..8f9eb6073d5 100644 --- a/src/game/FleeingMovementGenerator.cpp +++ b/src/game/FleeingMovementGenerator.cpp @@ -409,3 +409,4 @@ template void FleeingMovementGenerator<Player>::Reset(Player &); template void FleeingMovementGenerator<Creature>::Reset(Creature &); template bool FleeingMovementGenerator<Player>::Update(Player &, const uint32 &); template bool FleeingMovementGenerator<Creature>::Update(Creature &, const uint32 &); + diff --git a/src/game/FleeingMovementGenerator.h b/src/game/FleeingMovementGenerator.h index 9bf967fa42d..ec110b62b92 100644 --- a/src/game/FleeingMovementGenerator.h +++ b/src/game/FleeingMovementGenerator.h @@ -63,3 +63,4 @@ class TRINITY_DLL_SPEC FleeingMovementGenerator DestinationHolder< Traveller<T> > i_destinationHolder; }; #endif + diff --git a/src/game/FollowerRefManager.h b/src/game/FollowerRefManager.h index 06e04c8d3ae..093c85adcee 100644 --- a/src/game/FollowerRefManager.h +++ b/src/game/FollowerRefManager.h @@ -31,3 +31,4 @@ class FollowerRefManager : public RefManager<Unit, TargetedMovementGeneratorBase }; #endif + diff --git a/src/game/FollowerReference.cpp b/src/game/FollowerReference.cpp index d6a113a8bb6..173f9881c54 100644 --- a/src/game/FollowerReference.cpp +++ b/src/game/FollowerReference.cpp @@ -36,3 +36,4 @@ void FollowerReference::sourceObjectDestroyLink() { getSource()->stopFollowing(); } + diff --git a/src/game/FollowerReference.h b/src/game/FollowerReference.h index d15664ab6db..3c0b3dc9e7c 100644 --- a/src/game/FollowerReference.h +++ b/src/game/FollowerReference.h @@ -34,3 +34,4 @@ class TRINITY_DLL_SPEC FollowerReference : public Reference<Unit, TargetedMoveme void sourceObjectDestroyLink(); }; #endif + diff --git a/src/game/Formulas.h b/src/game/Formulas.h index 720a7a2825d..dc90b21e535 100644 --- a/src/game/Formulas.h +++ b/src/game/Formulas.h @@ -155,3 +155,4 @@ namespace Trinity } } #endif + diff --git a/src/game/GameEvent.cpp b/src/game/GameEvent.cpp index 62f285e25ac..6c2be2b5267 100644 --- a/src/game/GameEvent.cpp +++ b/src/game/GameEvent.cpp @@ -1535,3 +1535,4 @@ void GameEvent::SendWorldStateUpdate(Player * plr, uint16 event_id) plr->SendUpdateWorldState(itr->second.max_world_state, (uint32)(itr->second.reqNum)); } } + diff --git a/src/game/GameEvent.h b/src/game/GameEvent.h index ab5a1ed3292..6333d906256 100644 --- a/src/game/GameEvent.h +++ b/src/game/GameEvent.h @@ -160,3 +160,4 @@ class GameEvent #define gameeventmgr Trinity::Singleton<GameEvent>::Instance() #endif + diff --git a/src/game/GameObject.cpp b/src/game/GameObject.cpp index e22bd7264ab..8c51259e9f0 100644 --- a/src/game/GameObject.cpp +++ b/src/game/GameObject.cpp @@ -1380,3 +1380,4 @@ const char* GameObject::GetNameForLocaleIdx(int32 loc_idx) const return GetName(); } + diff --git a/src/game/GameObject.h b/src/game/GameObject.h index a492e4dad35..0213bcc9bf2 100644 --- a/src/game/GameObject.h +++ b/src/game/GameObject.h @@ -608,3 +608,4 @@ class TRINITY_DLL_SPEC GameObject : public WorldObject GridReference<GameObject> m_gridRef; }; #endif + diff --git a/src/game/GlobalEvents.cpp b/src/game/GlobalEvents.cpp index 807b0c695d0..a544113f5c8 100644 --- a/src/game/GlobalEvents.cpp +++ b/src/game/GlobalEvents.cpp @@ -86,3 +86,4 @@ void CorpsesErase() CorpsesErase(true, 20*MINUTE); CorpsesErase(false,3*DAY); } + diff --git a/src/game/GlobalEvents.h b/src/game/GlobalEvents.h index 0b76b09330a..aa99c47985e 100644 --- a/src/game/GlobalEvents.h +++ b/src/game/GlobalEvents.h @@ -29,3 +29,4 @@ void CorpsesErase(); void HandleCorpsesErase(void*); #endif /// @} + diff --git a/src/game/GossipDef.cpp b/src/game/GossipDef.cpp index 65e0f54d925..8f810d6355b 100644 --- a/src/game/GossipDef.cpp +++ b/src/game/GossipDef.cpp @@ -807,3 +807,4 @@ void PlayerMenu::SendQuestGiverRequestItems( Quest const *pQuest, uint64 npcGUID pSession->SendPacket( &data ); sLog.outDebug( "WORLD: Sent SMSG_QUESTGIVER_REQUEST_ITEMS NPCGuid=%u, questid=%u", GUID_LOPART(npcGUID), pQuest->GetQuestId() ); } + diff --git a/src/game/GossipDef.h b/src/game/GossipDef.h index dc52eb4dc3b..cbb3e89af41 100644 --- a/src/game/GossipDef.h +++ b/src/game/GossipDef.h @@ -207,3 +207,4 @@ class TRINITY_DLL_SPEC PlayerMenu void SendQuestGiverRequestItems( Quest const *pQuest, uint64 npcGUID, bool Completable, bool CloseOnCancel ); }; #endif + diff --git a/src/game/GridDefines.h b/src/game/GridDefines.h index b45bfe92913..2823df5e101 100644 --- a/src/game/GridDefines.h +++ b/src/game/GridDefines.h @@ -188,3 +188,4 @@ namespace Trinity } } #endif + diff --git a/src/game/GridNotifiers.h b/src/game/GridNotifiers.h index 8df2cad8009..31820d427dc 100644 --- a/src/game/GridNotifiers.h +++ b/src/game/GridNotifiers.h @@ -1013,3 +1013,4 @@ namespace Trinity #endif } #endif + diff --git a/src/game/GridNotifiersImpl.h b/src/game/GridNotifiersImpl.h index c237c95a28b..aee78386b6d 100644 --- a/src/game/GridNotifiersImpl.h +++ b/src/game/GridNotifiersImpl.h @@ -540,3 +540,4 @@ void Trinity::PlayerSearcher<Check>::Visit(PlayerMapType &m) } #endif // TRINITY_GRIDNOTIFIERSIMPL_H + diff --git a/src/game/GridStates.cpp b/src/game/GridStates.cpp index 92df04ef06e..cedec1de60f 100644 --- a/src/game/GridStates.cpp +++ b/src/game/GridStates.cpp @@ -73,3 +73,4 @@ RemovalState::Update(Map &m, NGridType &grid, GridInfo &info, const uint32 &x, c } } } + diff --git a/src/game/GridStates.h b/src/game/GridStates.h index dd22c482c0a..12d64ad58ca 100644 --- a/src/game/GridStates.h +++ b/src/game/GridStates.h @@ -73,3 +73,4 @@ class TRINITY_DLL_DECL RemovalState : public GridState void Update(Map &, NGridType &, GridInfo &, const uint32 &x, const uint32 &y, const uint32 &t_diff) const; }; #endif + diff --git a/src/game/Group.cpp b/src/game/Group.cpp index 9007da3bdaa..33dc3226ec2 100644 --- a/src/game/Group.cpp +++ b/src/game/Group.cpp @@ -1560,3 +1560,4 @@ void Group::BroadcastGroupUpdate(void) } } } + diff --git a/src/game/Group.h b/src/game/Group.h index 79129969513..939f240a7e2 100644 --- a/src/game/Group.h +++ b/src/game/Group.h @@ -413,3 +413,4 @@ class TRINITY_DLL_SPEC Group uint8* m_subGroupsCounts; }; #endif + diff --git a/src/game/GroupHandler.cpp b/src/game/GroupHandler.cpp index 574ebd7de75..79007564c38 100644 --- a/src/game/GroupHandler.cpp +++ b/src/game/GroupHandler.cpp @@ -949,3 +949,4 @@ void WorldSession::HandleGroupPassOnLootOpcode( WorldPacket & recv_data ) if(unkn!=0) sLog.outError("CMSG_GROUP_PASS_ON_LOOT: activation not implemented!"); } + diff --git a/src/game/GroupRefManager.h b/src/game/GroupRefManager.h index b17c3394b94..ab3b6417611 100644 --- a/src/game/GroupRefManager.h +++ b/src/game/GroupRefManager.h @@ -33,3 +33,4 @@ class GroupRefManager : public RefManager<Group, Player> GroupReference* getFirst() { return ((GroupReference* ) RefManager<Group, Player>::getFirst()); } }; #endif + diff --git a/src/game/GroupReference.cpp b/src/game/GroupReference.cpp index e9994a133ca..a09fc769dad 100644 --- a/src/game/GroupReference.cpp +++ b/src/game/GroupReference.cpp @@ -39,3 +39,4 @@ void GroupReference::sourceObjectDestroyLink() // called from invalidate() getTarget()->DelinkMember(this); } + diff --git a/src/game/GroupReference.h b/src/game/GroupReference.h index 60948435533..da896cf02dd 100644 --- a/src/game/GroupReference.h +++ b/src/game/GroupReference.h @@ -41,3 +41,4 @@ class TRINITY_DLL_SPEC GroupReference : public Reference<Group, Player> void setSubGroup(uint8 pSubGroup) { iSubGroup = pSubGroup; } }; #endif + diff --git a/src/game/GuardAI.cpp b/src/game/GuardAI.cpp index 4ec794767ea..8fc8e3e143f 100644 --- a/src/game/GuardAI.cpp +++ b/src/game/GuardAI.cpp @@ -137,3 +137,4 @@ void GuardAI::JustDied(Unit *killer) i_creature.SendZoneUnderAttackMessage(pkiller); } + diff --git a/src/game/GuardAI.h b/src/game/GuardAI.h index 2f91f359115..3bc7ac35f8e 100644 --- a/src/game/GuardAI.h +++ b/src/game/GuardAI.h @@ -53,3 +53,4 @@ class TRINITY_DLL_DECL GuardAI : public CreatureAI TimeTracker i_tracker; }; #endif + diff --git a/src/game/Guild.cpp b/src/game/Guild.cpp index 6c158888310..5c773c14c88 100644 --- a/src/game/Guild.cpp +++ b/src/game/Guild.cpp @@ -2020,3 +2020,4 @@ bool GuildItemPosCount::isContainedIn(GuildItemPosCountVec const &vec) const return false; } + diff --git a/src/game/Guild.h b/src/game/Guild.h index a1bd6d2e36f..a43c594fd1d 100644 --- a/src/game/Guild.h +++ b/src/game/Guild.h @@ -457,3 +457,4 @@ class Guild Item* _StoreItem( uint8 tab, uint8 slot, Item *pItem, uint32 count, bool clone ); }; #endif + diff --git a/src/game/GuildHandler.cpp b/src/game/GuildHandler.cpp index f1a59814d57..0889bf1a646 100644 --- a/src/game/GuildHandler.cpp +++ b/src/game/GuildHandler.cpp @@ -1702,3 +1702,4 @@ void WorldSession::SendSaveGuildEmblem( uint32 msg ) data << uint32(msg); // not part of guild SendPacket( &data ); } + diff --git a/src/game/HomeMovementGenerator.cpp b/src/game/HomeMovementGenerator.cpp index ea31b82f776..1a3adef9419 100644 --- a/src/game/HomeMovementGenerator.cpp +++ b/src/game/HomeMovementGenerator.cpp @@ -85,3 +85,4 @@ HomeMovementGenerator<Creature>::Update(Creature &owner, const uint32& time_diff return true; } + diff --git a/src/game/HomeMovementGenerator.h b/src/game/HomeMovementGenerator.h index 77e78ca23d3..3e3a59456cd 100644 --- a/src/game/HomeMovementGenerator.h +++ b/src/game/HomeMovementGenerator.h @@ -55,3 +55,4 @@ class TRINITY_DLL_SPEC HomeMovementGenerator<Creature> uint32 i_travel_timer; }; #endif + diff --git a/src/game/HostilRefManager.cpp b/src/game/HostilRefManager.cpp index aed4c8d02eb..aee035ded49 100644 --- a/src/game/HostilRefManager.cpp +++ b/src/game/HostilRefManager.cpp @@ -147,3 +147,4 @@ void HostilRefManager::setOnlineOfflineState(Unit *pCreature,bool pIsOnline) } //================================================= + diff --git a/src/game/HostilRefManager.h b/src/game/HostilRefManager.h index 8c4ac623ac0..316509e3908 100644 --- a/src/game/HostilRefManager.h +++ b/src/game/HostilRefManager.h @@ -66,3 +66,4 @@ class HostilRefManager : public RefManager<Unit, ThreatManager> }; //================================================= #endif + diff --git a/src/game/IdleMovementGenerator.cpp b/src/game/IdleMovementGenerator.cpp index b8910f555d0..10cca1d85ff 100644 --- a/src/game/IdleMovementGenerator.cpp +++ b/src/game/IdleMovementGenerator.cpp @@ -49,3 +49,4 @@ DistractMovementGenerator::Update(Unit& owner, const uint32& time_diff) m_timer -= time_diff; return true; } + diff --git a/src/game/IdleMovementGenerator.h b/src/game/IdleMovementGenerator.h index 19618be8e86..7f1f41f9166 100644 --- a/src/game/IdleMovementGenerator.h +++ b/src/game/IdleMovementGenerator.h @@ -52,3 +52,4 @@ class TRINITY_DLL_SPEC DistractMovementGenerator : public MovementGenerator }; #endif + diff --git a/src/game/InstanceData.cpp b/src/game/InstanceData.cpp index 79b1f8bcbb3..473d8433395 100644 --- a/src/game/InstanceData.cpp +++ b/src/game/InstanceData.cpp @@ -29,3 +29,4 @@ void InstanceData::SaveToDB() CharacterDatabase.escape_string(data); CharacterDatabase.PExecute("UPDATE instance SET data = '%s' WHERE id = '%d'", data.c_str(), instance->GetInstanceId()); } + diff --git a/src/game/InstanceData.h b/src/game/InstanceData.h index 146e955f8fe..0b7c1f7faf3 100644 --- a/src/game/InstanceData.h +++ b/src/game/InstanceData.h @@ -70,3 +70,4 @@ class TRINITY_DLL_SPEC InstanceData virtual void SetData(uint32, uint32 data) {} }; #endif + diff --git a/src/game/InstanceSaveMgr.cpp b/src/game/InstanceSaveMgr.cpp index ad827a07bf2..b138c33d9a6 100644 --- a/src/game/InstanceSaveMgr.cpp +++ b/src/game/InstanceSaveMgr.cpp @@ -650,3 +650,4 @@ uint32 InstanceSaveManager::GetNumBoundGroupsTotal() ret += itr->second->GetGroupCount(); return ret; } + diff --git a/src/game/InstanceSaveMgr.h b/src/game/InstanceSaveMgr.h index f868f2e8094..2a913e5cedf 100644 --- a/src/game/InstanceSaveMgr.h +++ b/src/game/InstanceSaveMgr.h @@ -173,3 +173,4 @@ class TRINITY_DLL_DECL InstanceSaveManager : public Trinity::Singleton<InstanceS #define sInstanceSaveManager Trinity::Singleton<InstanceSaveManager>::Instance() #endif + diff --git a/src/game/Item.cpp b/src/game/Item.cpp index 2cb1fe3caa4..85df92f998b 100644 --- a/src/game/Item.cpp +++ b/src/game/Item.cpp @@ -943,3 +943,4 @@ Item* Item::CloneItem( uint32 count, Player const* player ) const newItem->SetItemRandomProperties(GetItemRandomPropertyId()); return newItem; } + diff --git a/src/game/Item.h b/src/game/Item.h index 4f901302105..8e4fc410531 100644 --- a/src/game/Item.h +++ b/src/game/Item.h @@ -302,3 +302,4 @@ class TRINITY_DLL_SPEC Item : public Object bool mb_in_trade; // true if item is currently in trade-window }; #endif + diff --git a/src/game/ItemEnchantmentMgr.cpp b/src/game/ItemEnchantmentMgr.cpp index 305e3a64ebc..e4b2d809582 100644 --- a/src/game/ItemEnchantmentMgr.cpp +++ b/src/game/ItemEnchantmentMgr.cpp @@ -202,3 +202,4 @@ uint32 GenerateEnchSuffixFactor(uint32 item_id) } return 0; } + diff --git a/src/game/ItemEnchantmentMgr.h b/src/game/ItemEnchantmentMgr.h index 0feed4319d5..ce627515aee 100644 --- a/src/game/ItemEnchantmentMgr.h +++ b/src/game/ItemEnchantmentMgr.h @@ -27,3 +27,4 @@ void LoadRandomEnchantmentsTable(); uint32 GetItemEnchantMod(uint32 entry); uint32 GenerateEnchSuffixFactor(uint32 item_id); #endif + diff --git a/src/game/ItemHandler.cpp b/src/game/ItemHandler.cpp index 522539b6bab..7ffa5143786 100644 --- a/src/game/ItemHandler.cpp +++ b/src/game/ItemHandler.cpp @@ -1334,3 +1334,4 @@ void WorldSession::HandleCancelTempItemEnchantmentOpcode(WorldPacket& recv_data) GetPlayer()->ApplyEnchantment(item,TEMP_ENCHANTMENT_SLOT,false); item->ClearEnchantment(TEMP_ENCHANTMENT_SLOT); } + diff --git a/src/game/ItemPrototype.h b/src/game/ItemPrototype.h index c23c0d5978c..1087154c5e7 100644 --- a/src/game/ItemPrototype.h +++ b/src/game/ItemPrototype.h @@ -668,3 +668,4 @@ struct ItemLocale #pragma pack(pop) #endif #endif + diff --git a/src/game/LFGHandler.cpp b/src/game/LFGHandler.cpp index 182e89a42c5..85c196a9346 100644 --- a/src/game/LFGHandler.cpp +++ b/src/game/LFGHandler.cpp @@ -337,3 +337,4 @@ void WorldSession::HandleSetLfgOpcode( WorldPacket & recv_data ) SendLfgResult(type, entry, 0); } + diff --git a/src/game/Language.h b/src/game/Language.h index da7f564755a..ff732ca3bdb 100644 --- a/src/game/Language.h +++ b/src/game/Language.h @@ -898,3 +898,4 @@ enum TrinityStrings // For other tables maybe 2000010000-2147483647 (max index) }; #endif + diff --git a/src/game/Level0.cpp b/src/game/Level0.cpp index d02671c724e..fcd40455072 100644 --- a/src/game/Level0.cpp +++ b/src/game/Level0.cpp @@ -266,3 +266,4 @@ bool ChatHandler::HandleServerMotdCommand(const char* /*args*/) PSendSysMessage(LANG_MOTD_CURRENT, sWorld.GetMotd()); return true; } + diff --git a/src/game/Level1.cpp b/src/game/Level1.cpp index 8bf4e52a2d4..44818cfc7be 100644 --- a/src/game/Level1.cpp +++ b/src/game/Level1.cpp @@ -2991,3 +2991,4 @@ bool ChatHandler::HandleDrunkCommand(const char* args) return true; } + diff --git a/src/game/Level3.cpp b/src/game/Level3.cpp index f731d2ce7ad..0097da93525 100644 --- a/src/game/Level3.cpp +++ b/src/game/Level3.cpp @@ -7398,3 +7398,4 @@ bool ChatHandler::HandleUnbindSightCommand(const char* args) m_session->GetPlayer()->StopCastingBindSight(); return true; } + diff --git a/src/game/LootHandler.cpp b/src/game/LootHandler.cpp index 438b3922cb6..9c04baa6716 100644 --- a/src/game/LootHandler.cpp +++ b/src/game/LootHandler.cpp @@ -514,3 +514,4 @@ void WorldSession::HandleLootMasterGiveOpcode( WorldPacket & recv_data ) pLoot->NotifyItemRemoved(slotid); --pLoot->unlootedCount; } + diff --git a/src/game/LootMgr.cpp b/src/game/LootMgr.cpp index af310b452fe..95a641862c4 100644 --- a/src/game/LootMgr.cpp +++ b/src/game/LootMgr.cpp @@ -1339,3 +1339,4 @@ void LoadLootTemplates_Reference() // output error for any still listed ids (not referenced from any loot table) LootTemplates_Reference.ReportUnusedIds(ids_set); } + diff --git a/src/game/LootMgr.h b/src/game/LootMgr.h index 2d024b307a9..7841a2e0d3b 100644 --- a/src/game/LootMgr.h +++ b/src/game/LootMgr.h @@ -346,3 +346,4 @@ inline void LoadLootTables() } #endif + diff --git a/src/game/Mail.cpp b/src/game/Mail.cpp index a699d9acc4d..62327ccdc6e 100644 --- a/src/game/Mail.cpp +++ b/src/game/Mail.cpp @@ -862,3 +862,4 @@ void WorldSession::SendMailTo(Player* receiver, uint8 messageType, uint8 station } CharacterDatabase.CommitTransaction(); } + diff --git a/src/game/Mail.h b/src/game/Mail.h index ee4f6e54c4b..acf0d9346fe 100644 --- a/src/game/Mail.h +++ b/src/game/Mail.h @@ -212,3 +212,4 @@ struct Mail bool HasItems() const { return !items.empty(); } }; #endif + diff --git a/src/game/Map.cpp b/src/game/Map.cpp index 5ea2de9efb4..fe060d14dff 100644 --- a/src/game/Map.cpp +++ b/src/game/Map.cpp @@ -257,17 +257,16 @@ template<> void Map::AddToGrid(Creature* obj, NGridType *grid, Cell const& cell) { // add to world object registry in grid - if(obj->isPet() || obj->isPossessedByPlayer() || obj->isVehicle()) + if(obj->isPet() || obj->HasSharedVision() || obj->isVehicle()) { (*grid)(cell.CellX(), cell.CellY()).AddWorldObject<Creature>(obj, obj->GetGUID()); - obj->SetCurrentCell(cell); } // add to grid object store else { (*grid)(cell.CellX(), cell.CellY()).AddGridObject<Creature>(obj, obj->GetGUID()); - obj->SetCurrentCell(cell); } + obj->SetCurrentCell(cell); } template<class T> @@ -301,7 +300,7 @@ template<> void Map::RemoveFromGrid(Creature* obj, NGridType *grid, Cell const& cell) { // remove from world object registry in grid - if(obj->isPet() || obj->isPossessedByPlayer() || obj->isVehicle()) + if(obj->isPet() || obj->HasSharedVision() || obj->isVehicle()) { (*grid)(cell.CellX(), cell.CellY()).RemoveWorldObject<Creature>(obj, obj->GetGUID()); } @@ -327,7 +326,8 @@ void Map::SwitchGridContainers(T* obj, bool active) grid.RemoveGridObject<T>(obj, obj->GetGUID()); grid.AddWorldObject<T>(obj, obj->GetGUID()); } - } else + } + else { if (!grid.GetGridObject(obj->GetGUID(), obj)) { @@ -338,7 +338,6 @@ void Map::SwitchGridContainers(T* obj, bool active) } template void Map::SwitchGridContainers(Creature *, bool); -template void Map::SwitchGridContainers(Corpse *, bool); template void Map::SwitchGridContainers(DynamicObject *, bool); template<class T> @@ -349,20 +348,20 @@ void Map::DeleteFromWorld(T* obj) } template<class T> -void Map::AddNotifier(T* , Cell const& , CellPair const& ) +void Map::AddNotifier(T*) { } template<> -void Map::AddNotifier(Player* obj, Cell const& cell, CellPair const& cellpair) +void Map::AddNotifier(Player* obj) { - PlayerRelocationNotify(obj,cell,cellpair); + AddUnitToNotify(obj); } template<> -void Map::AddNotifier(Creature* obj, Cell const& cell, CellPair const& cellpair) +void Map::AddNotifier(Creature* obj) { - CreatureRelocationNotify(obj,cell,cellpair); + AddUnitToNotify(obj); } void @@ -427,33 +426,6 @@ Map::EnsureGridLoadedForPlayer(const Cell &cell, Player *player, bool add_player AddToGrid(player,grid,cell); } -void -Map::LoadGrid(const Cell& cell, bool no_unload) -{ - EnsureGridCreated(GridPair(cell.GridX(), cell.GridY())); - NGridType *grid = getNGrid(cell.GridX(), cell.GridY()); - - assert(grid != NULL); - if( !isGridObjectDataLoaded(cell.GridX(), cell.GridY()) ) - { - ObjectGridLoader loader(*grid, this, cell); - loader.LoadN(); - setGridObjectDataLoaded(true,cell.GridX(), cell.GridY()); - - // Add resurrectable corpses to world object list in grid - ObjectAccessor::Instance().AddCorpsesToGrid(GridPair(cell.GridX(),cell.GridY()),(*grid)(cell.CellX(), cell.CellY()), this); - - // Not sure if this is the reason that far sight cause crash - // Seems crash happens when trying to delete a far sight dynobj from an unopened grid - ResetGridExpiry(*getNGrid(cell.GridX(), cell.GridY()), 1.0f); - grid->SetGridState(GRID_STATE_ACTIVE); - - if(no_unload) - getNGrid(cell.GridX(), cell.GridY())->setUnloadFlag(false); - } - //LoadVMap(63-cell.GridX(),63-cell.GridY()); -} - void Map::LoadGrid(float x, float y) { CellPair pair = Trinity::ComputeCellPair(x, y); @@ -476,11 +448,8 @@ bool Map::Add(Player *player) SendInitSelf(player); SendInitTransports(player); - //UpdatePlayerVisibility(player,cell,p); - //UpdateObjectsVisibilityFor(player,cell,p); + AddNotifier(player); - //AddNotifier(player,cell,p); - AddUnitToNotify(player); return true; } @@ -510,9 +479,7 @@ Map::Add(T *obj) UpdateObjectVisibility(obj,cell,p); - //AddNotifier(obj,cell,p); - if(obj->GetTypeId() == TYPEID_UNIT || obj->GetTypeId() == TYPEID_PLAYER) - AddUnitToNotify((Unit*)obj); + AddNotifier(obj); } void Map::MessageBroadcast(Player *player, WorldPacket *msg, bool to_self, bool to_possessor) @@ -610,49 +577,6 @@ bool Map::loaded(const GridPair &p) const return ( getNGrid(p.x_coord, p.y_coord) && isGridObjectDataLoaded(p.x_coord, p.y_coord) ); } -/*void Map::UpdateActiveCells(const float &x, const float &y, const uint32 &t_diff) -{ - CellPair standing_cell(Trinity::ComputeCellPair(x, y)); - - // Check for correctness of standing_cell, it also avoids problems with update_cell - if (standing_cell.x_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP || standing_cell.y_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP) - return; - - // will this reduce the speed? - Trinity::ObjectUpdater updater(t_diff); - // for creature - TypeContainerVisitor<Trinity::ObjectUpdater, GridTypeMapContainer > grid_object_update(updater); - // for pets - TypeContainerVisitor<Trinity::ObjectUpdater, WorldTypeMapContainer > world_object_update(updater); - - // the overloaded operators handle range checking - // so ther's no need for range checking inside the loop - CellPair begin_cell(standing_cell), end_cell(standing_cell); - begin_cell << 1; begin_cell -= 1; // upper left - end_cell >> 1; end_cell += 1; // lower right - - for(uint32 x = begin_cell.x_coord; x <= end_cell.x_coord; ++x) - { - for(uint32 y = begin_cell.y_coord; y <= end_cell.y_coord; ++y) - { - // marked cells are those that have been visited - // don't visit the same cell twice - uint32 cell_id = (y * TOTAL_NUMBER_OF_CELLS_PER_MAP) + x; - if(!isCellMarked(cell_id)) - { - markCell(cell_id); - CellPair pair(x,y); - Cell cell(pair); - cell.data.Part.reserved = CENTER_DISTRICT; - cell.SetNoCreate(); - CellLock<NullGuard> cell_lock(cell, pair); - cell_lock->Visit(cell_lock, grid_object_update, *this); - cell_lock->Visit(cell_lock, world_object_update, *this); - } - } - } -}*/ - void Map::RelocationNotify() { //creatures may be added to the list during update @@ -838,9 +762,6 @@ void Map::Remove(Player *player, bool remove) SendRemoveTransports(player); - //UpdateObjectsVisibilityFor(player,cell,p); - //AddUnitToNotify(player); - if( remove ) DeleteFromWorld(player); } @@ -918,21 +839,12 @@ Map::PlayerRelocation(Player *player, float x, float y, float z, float orientati RemoveFromGrid(player, oldGrid,old_cell); if( !old_cell.DiffGrid(new_cell) ) AddToGrid(player, oldGrid,new_cell); - - if( old_cell.DiffGrid(new_cell) ) + else EnsureGridLoadedForPlayer(new_cell, player, true); } - // if move then update what player see and who seen - //UpdatePlayerVisibility(player,new_cell,new_val); - //UpdateObjectsVisibilityFor(player,new_cell,new_val); - - // also update what possessing player sees - //if(player->isPossessedByPlayer()) - // UpdateObjectsVisibilityFor((Player*)player->GetCharmer(), new_cell, new_val); - - //PlayerRelocationNotify(player,new_cell,new_val); AddUnitToNotify(player); + NGridType* newGrid = getNGrid(new_cell.GridX(), new_cell.GridY()); if( !same_cell && newGrid->GetGridState()!= GRID_STATE_ACTIVE ) { @@ -971,11 +883,6 @@ Map::CreatureRelocation(Creature *creature, float x, float y, float z, float ang else { creature->Relocate(x, y, z, ang); - // Update visibility back to player who is controlling the creature - //if(creature->isPossessedByPlayer()) - // UpdateObjectsVisibilityFor((Player*)creature->GetCharmer(), new_cell, new_val); - - //CreatureRelocationNotify(creature,new_cell,new_val); AddUnitToNotify(creature); } assert(CheckGridIntegrity(creature,true)); @@ -1042,12 +949,8 @@ bool Map::CreatureCellRelocation(Creature *c, Cell new_cell) sLog.outDebug("Creature (GUID: %u Entry: %u) moved in grid[%u,%u] from cell[%u,%u] to cell[%u,%u].", c->GetGUIDLow(), c->GetEntry(), old_cell.GridX(), old_cell.GridY(), old_cell.CellX(), old_cell.CellY(), new_cell.CellX(), new_cell.CellY()); #endif - if( !old_cell.DiffGrid(new_cell) ) - { - RemoveFromGrid(c,getNGrid(old_cell.GridX(), old_cell.GridY()),old_cell); - AddToGrid(c,getNGrid(new_cell.GridX(), new_cell.GridY()),new_cell); - c->SetCurrentCell(new_cell); - } + RemoveFromGrid(c,getNGrid(old_cell.GridX(), old_cell.GridY()),old_cell); + AddToGrid(c,getNGrid(new_cell.GridX(), new_cell.GridY()),new_cell); } else { @@ -1504,60 +1407,6 @@ void Map::UpdateObjectVisibility( WorldObject* obj, Cell cell, CellPair cellpair cell_lock->Visit(cell_lock, player_notifier, *this); } -/*void Map::UpdatePlayerVisibility( Player* player, Cell cell, CellPair cellpair ) -{ - cell.data.Part.reserved = ALL_DISTRICT; - - Trinity::PlayerNotifier pl_notifier(*player); - TypeContainerVisitor<Trinity::PlayerNotifier, WorldTypeMapContainer > player_notifier(pl_notifier); - - CellLock<ReadGuard> cell_lock(cell, cellpair); - cell_lock->Visit(cell_lock, player_notifier, *this); -}*/ - -void Map::UpdateObjectsVisibilityFor( Player* player, Cell cell, CellPair cellpair ) -{ - Trinity::VisibleNotifier notifier(*player); - - cell.data.Part.reserved = ALL_DISTRICT; - cell.SetNoCreate(); - TypeContainerVisitor<Trinity::VisibleNotifier, WorldTypeMapContainer > world_notifier(notifier); - TypeContainerVisitor<Trinity::VisibleNotifier, GridTypeMapContainer > grid_notifier(notifier); - CellLock<GridReadGuard> cell_lock(cell, cellpair); - cell_lock->Visit(cell_lock, world_notifier, *this); - cell_lock->Visit(cell_lock, grid_notifier, *this); - - // send data - notifier.Notify(); -} - -void Map::PlayerRelocationNotify( Player* player, Cell cell, CellPair cellpair ) -{ - CellLock<ReadGuard> cell_lock(cell, cellpair); - Trinity::PlayerRelocationNotifier relocationNotifier(*player); - cell.data.Part.reserved = ALL_DISTRICT; - - TypeContainerVisitor<Trinity::PlayerRelocationNotifier, GridTypeMapContainer > p2grid_relocation(relocationNotifier); - TypeContainerVisitor<Trinity::PlayerRelocationNotifier, WorldTypeMapContainer > p2world_relocation(relocationNotifier); - - cell_lock->Visit(cell_lock, p2grid_relocation, *this); - cell_lock->Visit(cell_lock, p2world_relocation, *this); -} - -void Map::CreatureRelocationNotify(Creature *creature, Cell cell, CellPair cellpair) -{ - CellLock<ReadGuard> cell_lock(cell, cellpair); - Trinity::CreatureRelocationNotifier relocationNotifier(*creature); - cell.data.Part.reserved = ALL_DISTRICT; - cell.SetNoCreate(); // not trigger load unloaded grids at notifier call - - TypeContainerVisitor<Trinity::CreatureRelocationNotifier, WorldTypeMapContainer > c2world_relocation(relocationNotifier); - TypeContainerVisitor<Trinity::CreatureRelocationNotifier, GridTypeMapContainer > c2grid_relocation(relocationNotifier); - - cell_lock->Visit(cell_lock, c2world_relocation, *this); - cell_lock->Visit(cell_lock, c2grid_relocation, *this); -} - void Map::SendInitSelf( Player * player ) { sLog.outDetail("Creating player data for himself %u", player->GetGUIDLow()); @@ -2220,4 +2069,5 @@ void Map::AddUnitToNotify(Unit* u) i_unitsToNotify.push_back(u->GetGUID()); u->m_IsInNotifyList = true; } -}
\ No newline at end of file +} + diff --git a/src/game/Map.h b/src/game/Map.h index 3c227b47e88..2b6fcfe6900 100644 --- a/src/game/Map.h +++ b/src/game/Map.h @@ -168,7 +168,6 @@ class TRINITY_DLL_SPEC Map : public GridRefManager<NGridType>, public Trinity::O bool GetUnloadFlag(const GridPair &p) const { return getNGrid(p.x_coord, p.y_coord)->getUnloadFlag(); } void SetUnloadFlag(const GridPair &p, bool unload) { getNGrid(p.x_coord, p.y_coord)->setUnloadFlag(unload); } - void LoadGrid(const Cell& cell, bool no_unload = false); void LoadGrid(float x, float y); bool UnloadGrid(const uint32 &x, const uint32 &y, bool pForce); virtual void UnloadAll(bool pForce); @@ -251,8 +250,6 @@ class TRINITY_DLL_SPEC Map : public GridRefManager<NGridType>, public Trinity::O virtual bool RemoveBones(uint64 guid, float x, float y); void UpdateObjectVisibility(WorldObject* obj, Cell cell, CellPair cellpair); - //void UpdatePlayerVisibility(Player* player, Cell cell, CellPair cellpair); - void UpdateObjectsVisibilityFor(Player* player, Cell cell, CellPair cellpair); void resetMarkedCells() { marked_cells.reset(); } bool isCellMarked(uint32 pCellId) { return marked_cells.test(pCellId); } @@ -290,9 +287,6 @@ class TRINITY_DLL_SPEC Map : public GridRefManager<NGridType>, public Trinity::O void SendInitTransports( Player * player ); void SendRemoveTransports( Player * player ); - void PlayerRelocationNotify(Player* player, Cell cell, CellPair cellpair); - void CreatureRelocationNotify(Creature *creature, Cell newcell, CellPair newval); - bool CreatureCellRelocation(Creature *creature, Cell new_cell); void AddCreatureToMoveList(Creature *c, float x, float y, float z, float ang); @@ -349,7 +343,7 @@ class TRINITY_DLL_SPEC Map : public GridRefManager<NGridType>, public Trinity::O void AddToGrid(T*, NGridType *, Cell const&); template<class T> - void AddNotifier(T*, Cell const&, CellPair const&); + void AddNotifier(T*); template<class T> void RemoveFromGrid(T*, NGridType *, Cell const&); @@ -481,3 +475,4 @@ Map::VisitGrid(const float &x, const float &y, float radius, NOTIFIER ¬ifier) cell_lock->Visit(cell_lock, grid_object_notifier, *this, radius, x_off, y_off); } #endif + diff --git a/src/game/MapInstanced.cpp b/src/game/MapInstanced.cpp index 37a4e1dcd6e..5a26a28159f 100644 --- a/src/game/MapInstanced.cpp +++ b/src/game/MapInstanced.cpp @@ -274,3 +274,4 @@ bool MapInstanced::CanEnter(Player *player) return false; } + diff --git a/src/game/MapInstanced.h b/src/game/MapInstanced.h index 581c42aaad5..11c08d4517a 100644 --- a/src/game/MapInstanced.h +++ b/src/game/MapInstanced.h @@ -71,3 +71,4 @@ class TRINITY_DLL_DECL MapInstanced : public Map uint16 GridMapReference[MAX_NUMBER_OF_GRIDS][MAX_NUMBER_OF_GRIDS]; }; #endif + diff --git a/src/game/MapManager.cpp b/src/game/MapManager.cpp index d159b1a6265..fd1f7963593 100644 --- a/src/game/MapManager.cpp +++ b/src/game/MapManager.cpp @@ -291,12 +291,12 @@ bool MapManager::IsValidMAP(uint32 mapid) // TODO: add check for battleground template } -void MapManager::LoadGrid(int mapid, float x, float y, const WorldObject* obj, bool no_unload) +/*void MapManager::LoadGrid(int mapid, float x, float y, const WorldObject* obj, bool no_unload) { CellPair p = Trinity::ComputeCellPair(x,y); Cell cell(p); GetMap(mapid, obj)->LoadGrid(cell,no_unload); -} +}*/ void MapManager::UnloadAll() { @@ -350,3 +350,4 @@ uint32 MapManager::GetNumPlayersInInstances() } return ret; } + diff --git a/src/game/MapManager.h b/src/game/MapManager.h index 8d4b2ba8885..6ca9305711d 100644 --- a/src/game/MapManager.h +++ b/src/game/MapManager.h @@ -75,7 +75,7 @@ class TRINITY_DLL_DECL MapManager : public Trinity::Singleton<MapManager, Trinit i_timer.Reset(); } - void LoadGrid(int mapid, float x, float y, const WorldObject* obj, bool no_unload = false); + //void LoadGrid(int mapid, float x, float y, const WorldObject* obj, bool no_unload = false); void UnloadAll(); static bool ExistMapAndVMap(uint32 mapid, float x, float y); @@ -147,3 +147,4 @@ class TRINITY_DLL_DECL MapManager : public Trinity::Singleton<MapManager, Trinit uint32 i_MaxInstanceId; }; #endif + diff --git a/src/game/MapRefManager.h b/src/game/MapRefManager.h index 02f8b2ea465..4337aa75fd9 100644 --- a/src/game/MapRefManager.h +++ b/src/game/MapRefManager.h @@ -42,3 +42,4 @@ class MapRefManager : public RefManager<Map, Player> const_iterator end() const { return const_iterator(NULL); } }; #endif + diff --git a/src/game/MapReference.h b/src/game/MapReference.h index 397eec0a06b..ae485af7487 100644 --- a/src/game/MapReference.h +++ b/src/game/MapReference.h @@ -50,3 +50,4 @@ class TRINITY_DLL_SPEC MapReference : public Reference<Map, Player> MapReference const *nocheck_prev() const { return (MapReference const*)Reference<Map, Player>::nocheck_prev(); } }; #endif + diff --git a/src/game/MiscHandler.cpp b/src/game/MiscHandler.cpp index fe3ff829ccd..2ea74470156 100644 --- a/src/game/MiscHandler.cpp +++ b/src/game/MiscHandler.cpp @@ -1691,4 +1691,3 @@ void WorldSession::HandleInspectAchievements( WorldPacket & recv_data ) return; player->GetAchievementMgr().SendRespondInspectAchievements(_player); -} diff --git a/src/game/MotionMaster.cpp b/src/game/MotionMaster.cpp index b5a68a19d38..7bfae33c079 100644 --- a/src/game/MotionMaster.cpp +++ b/src/game/MotionMaster.cpp @@ -471,3 +471,4 @@ bool MotionMaster::GetDestination(float &x, float &y, float &z) return top()->GetDestination(x,y,z); } + diff --git a/src/game/MotionMaster.h b/src/game/MotionMaster.h index 84057741d08..d362e6574f0 100644 --- a/src/game/MotionMaster.h +++ b/src/game/MotionMaster.h @@ -152,3 +152,4 @@ class TRINITY_DLL_SPEC MotionMaster //: private std::stack<MovementGenerator *> uint8 m_cleanFlag; }; #endif + diff --git a/src/game/MovementGenerator.cpp b/src/game/MovementGenerator.cpp index a80f09c7204..7784df315c9 100644 --- a/src/game/MovementGenerator.cpp +++ b/src/game/MovementGenerator.cpp @@ -23,3 +23,4 @@ MovementGenerator::~MovementGenerator() { } + diff --git a/src/game/MovementGenerator.h b/src/game/MovementGenerator.h index 554158129d6..cb352b7f1c6 100644 --- a/src/game/MovementGenerator.h +++ b/src/game/MovementGenerator.h @@ -98,3 +98,4 @@ typedef FactoryHolder<MovementGenerator,MovementGeneratorType> MovementGenerator typedef FactoryHolder<MovementGenerator,MovementGeneratorType>::FactoryHolderRegistry MovementGeneratorRegistry; typedef FactoryHolder<MovementGenerator,MovementGeneratorType>::FactoryHolderRepository MovementGeneratorRepository; #endif + diff --git a/src/game/MovementGeneratorImpl.h b/src/game/MovementGeneratorImpl.h index 03b0c873f33..fc676704d3a 100644 --- a/src/game/MovementGeneratorImpl.h +++ b/src/game/MovementGeneratorImpl.h @@ -30,3 +30,4 @@ MovementGeneratorFactory<MOVEMENT_GEN>::Create(void *data) const return (new MOVEMENT_GEN()); } #endif + diff --git a/src/game/MovementHandler.cpp b/src/game/MovementHandler.cpp index 8d595c38089..8ada92957ec 100644 --- a/src/game/MovementHandler.cpp +++ b/src/game/MovementHandler.cpp @@ -488,3 +488,4 @@ void WorldSession::HandleSummonResponseOpcode(WorldPacket& recv_data) _player->SummonIfPossible(agree); } + diff --git a/src/game/NPCHandler.cpp b/src/game/NPCHandler.cpp index 019de97db11..8ab1844fab7 100644 --- a/src/game/NPCHandler.cpp +++ b/src/game/NPCHandler.cpp @@ -837,3 +837,4 @@ void WorldSession::HandleRepairItemOpcode( WorldPacket & recv_data ) pGuild->SendMoneyInfo(this, _player->GetGUIDLow()); } } + diff --git a/src/game/NPCHandler.h b/src/game/NPCHandler.h index 9020bcd8ec8..4d0395a0c87 100644 --- a/src/game/NPCHandler.h +++ b/src/game/NPCHandler.h @@ -76,3 +76,4 @@ struct NpcTextLocale std::vector<std::vector<std::string> > Text_1; }; #endif + diff --git a/src/game/NullCreatureAI.cpp b/src/game/NullCreatureAI.cpp index 37dcdc3bc9d..33218251718 100644 --- a/src/game/NullCreatureAI.cpp +++ b/src/game/NullCreatureAI.cpp @@ -39,3 +39,4 @@ void CritterAI::EnterEvadeMode() me->SetControlled(false, UNIT_STAT_FLEEING); CreatureAI::EnterEvadeMode(); } + diff --git a/src/game/NullCreatureAI.h b/src/game/NullCreatureAI.h index 7d88518ab1a..671e9ea63ab 100644 --- a/src/game/NullCreatureAI.h +++ b/src/game/NullCreatureAI.h @@ -55,3 +55,4 @@ class TRINITY_DLL_DECL CritterAI : public PassiveAI }; #endif + diff --git a/src/game/Object.h b/src/game/Object.h index 8bb8d770519..1d7749c3989 100644 --- a/src/game/Object.h +++ b/src/game/Object.h @@ -527,3 +527,4 @@ class TRINITY_DLL_SPEC WorldObject : public Object bool mSemaphoreTeleport; }; #endif + diff --git a/src/game/ObjectAccessor.cpp b/src/game/ObjectAccessor.cpp index 95ead040cb8..e832aec0c57 100644 --- a/src/game/ObjectAccessor.cpp +++ b/src/game/ObjectAccessor.cpp @@ -596,3 +596,4 @@ template Creature* ObjectAccessor::GetObjectInWorld<Creature>(uint32 mapid, floa template Corpse* ObjectAccessor::GetObjectInWorld<Corpse>(uint32 mapid, float x, float y, uint64 guid, Corpse* /*fake*/); template GameObject* ObjectAccessor::GetObjectInWorld<GameObject>(uint32 mapid, float x, float y, uint64 guid, GameObject* /*fake*/); template DynamicObject* ObjectAccessor::GetObjectInWorld<DynamicObject>(uint32 mapid, float x, float y, uint64 guid, DynamicObject* /*fake*/); + diff --git a/src/game/ObjectAccessor.h b/src/game/ObjectAccessor.h index 723eecb1510..c6144ec4d5b 100644 --- a/src/game/ObjectAccessor.h +++ b/src/game/ObjectAccessor.h @@ -235,3 +235,4 @@ class TRINITY_DLL_DECL ObjectAccessor : public Trinity::Singleton<ObjectAccessor LockType i_petGuard; }; #endif + diff --git a/src/game/ObjectDefines.h b/src/game/ObjectDefines.h index 39082fb5e4d..ee58e8a5f34 100644 --- a/src/game/ObjectDefines.h +++ b/src/game/ObjectDefines.h @@ -118,3 +118,4 @@ inline char const* GetLogNameForGuid(uint64 guid) } } #endif + diff --git a/src/game/ObjectGridLoader.cpp b/src/game/ObjectGridLoader.cpp index 89df0582de0..56334d1c53d 100644 --- a/src/game/ObjectGridLoader.cpp +++ b/src/game/ObjectGridLoader.cpp @@ -304,3 +304,4 @@ ObjectGridStoper::Visit(CreatureMapType &m) template void ObjectGridUnloader::Visit(GameObjectMapType &); template void ObjectGridUnloader::Visit(DynamicObjectMapType &); + diff --git a/src/game/ObjectGridLoader.h b/src/game/ObjectGridLoader.h index b75db484463..7b5c827b7ea 100644 --- a/src/game/ObjectGridLoader.h +++ b/src/game/ObjectGridLoader.h @@ -108,3 +108,4 @@ class TRINITY_DLL_DECL ObjectGridStoper typedef GridLoader<Player, AllWorldObjectTypes, AllGridObjectTypes> GridLoaderType; #endif + diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp index 8b459e7d6de..fe547522a88 100644 --- a/src/game/ObjectMgr.cpp +++ b/src/game/ObjectMgr.cpp @@ -7640,3 +7640,4 @@ void ObjectMgr::LoadTransportEvents() delete result; } + diff --git a/src/game/ObjectMgr.h b/src/game/ObjectMgr.h index 08f16571734..e766d6a5404 100644 --- a/src/game/ObjectMgr.h +++ b/src/game/ObjectMgr.h @@ -926,3 +926,4 @@ TRINITY_DLL_SPEC GameObjectInfo const *GetGameObjectInfo(uint32 id); TRINITY_DLL_SPEC CreatureInfo const *GetCreatureInfo(uint32 id); #endif + diff --git a/src/game/Opcodes.cpp b/src/game/Opcodes.cpp index 78fdeb8d0ce..bba5c81ae9e 100644 --- a/src/game/Opcodes.cpp +++ b/src/game/Opcodes.cpp @@ -1226,3 +1226,4 @@ OpcodeHandler opcodeTable[NUM_MSG_TYPES] = /*0x4AB*/ { "UMSG_UNKNOWN_1195", STATUS_NEVER, &WorldSession::Handle_NULL }, /*0x4AC*/ { "UMSG_UNKNOWN_1196", STATUS_NEVER, &WorldSession::Handle_NULL }, }; + diff --git a/src/game/Opcodes.h b/src/game/Opcodes.h index 2eb5d2d2920..d57cfd62852 100644 --- a/src/game/Opcodes.h +++ b/src/game/Opcodes.h @@ -1265,3 +1265,4 @@ inline const char* LookupOpcodeName(uint16 id) } #endif /// @} + diff --git a/src/game/OutdoorPvP.cpp b/src/game/OutdoorPvP.cpp index adbe220fbe5..b48a226d6a4 100644 --- a/src/game/OutdoorPvP.cpp +++ b/src/game/OutdoorPvP.cpp @@ -776,3 +776,4 @@ bool OutdoorPvP::HandleAreaTrigger(Player *plr, uint32 trigger) { return false; } + diff --git a/src/game/OutdoorPvP.h b/src/game/OutdoorPvP.h index 542863a5341..c1c39c1ff65 100644 --- a/src/game/OutdoorPvP.h +++ b/src/game/OutdoorPvP.h @@ -223,3 +223,4 @@ protected: }; #endif /*OUTDOOR_PVP_H_*/ + diff --git a/src/game/OutdoorPvPEP.cpp b/src/game/OutdoorPvPEP.cpp index c403a5dc094..f0ff85574c0 100644 --- a/src/game/OutdoorPvPEP.cpp +++ b/src/game/OutdoorPvPEP.cpp @@ -928,3 +928,4 @@ void OutdoorPvPEP::SendRemoveWorldStates(Player *plr) plr->SendUpdateWorldState(EP_CGT_N_A,0); plr->SendUpdateWorldState(EP_CGT_N_H,0); } + diff --git a/src/game/OutdoorPvPEP.h b/src/game/OutdoorPvPEP.h index 2a6a47827d6..5ba4591e48d 100644 --- a/src/game/OutdoorPvPEP.h +++ b/src/game/OutdoorPvPEP.h @@ -279,3 +279,4 @@ private: }; #endif + diff --git a/src/game/OutdoorPvPHP.cpp b/src/game/OutdoorPvPHP.cpp index 7294db0fb77..6058b82c102 100644 --- a/src/game/OutdoorPvPHP.cpp +++ b/src/game/OutdoorPvPHP.cpp @@ -396,3 +396,4 @@ bool OutdoorPvPObjectiveHP::HandleCapturePointEvent(Player *plr, uint32 eventId) } return false; } + diff --git a/src/game/OutdoorPvPHP.h b/src/game/OutdoorPvPHP.h index 986e8daee7e..a538f82b216 100644 --- a/src/game/OutdoorPvPHP.h +++ b/src/game/OutdoorPvPHP.h @@ -116,3 +116,4 @@ private: }; #endif + diff --git a/src/game/OutdoorPvPMgr.cpp b/src/game/OutdoorPvPMgr.cpp index 757cbe82188..f6af15e7529 100644 --- a/src/game/OutdoorPvPMgr.cpp +++ b/src/game/OutdoorPvPMgr.cpp @@ -240,3 +240,4 @@ void OutdoorPvPMgr::HandleDropFlag(Player *plr, uint32 spellId) return; } } + diff --git a/src/game/OutdoorPvPMgr.h b/src/game/OutdoorPvPMgr.h index 2478acf76f4..28b01c586b7 100644 --- a/src/game/OutdoorPvPMgr.h +++ b/src/game/OutdoorPvPMgr.h @@ -79,3 +79,4 @@ private: #define sOutdoorPvPMgr Trinity::Singleton<OutdoorPvPMgr>::Instance() #endif /*OUTDOOR_PVP_MGR_H_*/ + diff --git a/src/game/OutdoorPvPNA.cpp b/src/game/OutdoorPvPNA.cpp index c8134944cc1..9030337f2cd 100644 --- a/src/game/OutdoorPvPNA.cpp +++ b/src/game/OutdoorPvPNA.cpp @@ -722,3 +722,4 @@ bool OutdoorPvPObjectiveNA::HandleCapturePointEvent(Player *plr, uint32 eventId) } return false; } + diff --git a/src/game/OutdoorPvPNA.h b/src/game/OutdoorPvPNA.h index e7f157879bc..92e0b9dcbbb 100644 --- a/src/game/OutdoorPvPNA.h +++ b/src/game/OutdoorPvPNA.h @@ -295,3 +295,4 @@ private: }; #endif + diff --git a/src/game/OutdoorPvPObjectiveAI.cpp b/src/game/OutdoorPvPObjectiveAI.cpp index 6e6cf8d64e5..233fffd6b2f 100644 --- a/src/game/OutdoorPvPObjectiveAI.cpp +++ b/src/game/OutdoorPvPObjectiveAI.cpp @@ -45,3 +45,4 @@ int OutdoorPvPObjectiveAI::Permissible(const Creature * c) return PERMIT_BASE_NO; } + diff --git a/src/game/OutdoorPvPObjectiveAI.h b/src/game/OutdoorPvPObjectiveAI.h index 3395b7e1be5..5c68f45b082 100644 --- a/src/game/OutdoorPvPObjectiveAI.h +++ b/src/game/OutdoorPvPObjectiveAI.h @@ -33,3 +33,4 @@ class TRINITY_DLL_DECL OutdoorPvPObjectiveAI : public NullCreatureAI static int Permissible(const Creature *); }; #endif + diff --git a/src/game/OutdoorPvPSI.cpp b/src/game/OutdoorPvPSI.cpp index 9e95c315c7f..615f6fab9f8 100644 --- a/src/game/OutdoorPvPSI.cpp +++ b/src/game/OutdoorPvPSI.cpp @@ -260,3 +260,4 @@ bool OutdoorPvPSI::HandleCustomSpell(Player *plr, uint32 spellId, GameObject *go } return true; } + diff --git a/src/game/OutdoorPvPSI.h b/src/game/OutdoorPvPSI.h index 208e35d09a1..1f2331b4251 100644 --- a/src/game/OutdoorPvPSI.h +++ b/src/game/OutdoorPvPSI.h @@ -73,3 +73,4 @@ private: }; #endif + diff --git a/src/game/OutdoorPvPTF.cpp b/src/game/OutdoorPvPTF.cpp index 39acc70ba53..01b224cffa9 100644 --- a/src/game/OutdoorPvPTF.cpp +++ b/src/game/OutdoorPvPTF.cpp @@ -364,3 +364,4 @@ bool OutdoorPvPObjectiveTF::Update(uint32 diff) } return false; } + diff --git a/src/game/OutdoorPvPTF.h b/src/game/OutdoorPvPTF.h index 802f163d977..255ddb1fda9 100644 --- a/src/game/OutdoorPvPTF.h +++ b/src/game/OutdoorPvPTF.h @@ -115,3 +115,4 @@ private: }; #endif + diff --git a/src/game/OutdoorPvPZM.cpp b/src/game/OutdoorPvPZM.cpp index d8ac0de5f7d..29997eec920 100644 --- a/src/game/OutdoorPvPZM.cpp +++ b/src/game/OutdoorPvPZM.cpp @@ -492,3 +492,4 @@ void OutdoorPvPZM::SendRemoveWorldStates(Player *plr) plr->SendUpdateWorldState(ZM_MAP_ALLIANCE_FLAG_NOT_READY,0); plr->SendUpdateWorldState(ZM_MAP_ALLIANCE_FLAG_READY,0); } + diff --git a/src/game/OutdoorPvPZM.h b/src/game/OutdoorPvPZM.h index c99ad69fa22..405c0133b5c 100644 --- a/src/game/OutdoorPvPZM.h +++ b/src/game/OutdoorPvPZM.h @@ -213,3 +213,4 @@ private: // todo: flag carrier death/leave/mount/activitychange should give back the gossip options #endif + diff --git a/src/game/Path.h b/src/game/Path.h index fe1c3587caf..2fd6723b01c 100644 --- a/src/game/Path.h +++ b/src/game/Path.h @@ -85,3 +85,4 @@ class Path std::vector<PathNode> i_nodes; }; #endif + diff --git a/src/game/Pet.cpp b/src/game/Pet.cpp index bf150ec3a42..9444bca7a02 100644 --- a/src/game/Pet.cpp +++ b/src/game/Pet.cpp @@ -1795,3 +1795,4 @@ void Pet::CastPetAura(PetAura const* aura) else CastSpell(this, auraId, true); } + diff --git a/src/game/Pet.h b/src/game/Pet.h index f863051b74d..f536794fcee 100644 --- a/src/game/Pet.h +++ b/src/game/Pet.h @@ -244,3 +244,4 @@ class Pet : public Creature } }; #endif + diff --git a/src/game/PetAI.cpp b/src/game/PetAI.cpp index 4545b9a395f..9685b71a934 100644 --- a/src/game/PetAI.cpp +++ b/src/game/PetAI.cpp @@ -332,3 +332,4 @@ void PetAI::UpdateAllies() (!i_pet.GetCharmInfo()->HasCommandState(COMMAND_STAY) || i_pet.IsWithinMeleeRange(attacker))) AttackStart(attacker); }*/ + diff --git a/src/game/PetAI.h b/src/game/PetAI.h index ceaa00e7ed3..82f143e725e 100644 --- a/src/game/PetAI.h +++ b/src/game/PetAI.h @@ -58,3 +58,4 @@ class TRINITY_DLL_DECL PetAI : public CreatureAI std::vector<TargetSpellPair> m_targetSpellStore; }; #endif + diff --git a/src/game/PetHandler.cpp b/src/game/PetHandler.cpp index 17c2ba4275b..3c1c6e95aaa 100644 --- a/src/game/PetHandler.cpp +++ b/src/game/PetHandler.cpp @@ -808,4 +808,3 @@ void WorldSession::HandlePetLearnTalent( WorldPacket & recv_data ) // learn! (other talent ranks will unlearned at learning) pet->learnSpell(spellid); sLog.outDetail("TalentID: %u Rank: %u Spell: %u\n", talent_id, requested_rank, spellid); -} diff --git a/src/game/PetitionsHandler.cpp b/src/game/PetitionsHandler.cpp index 5911af4e560..87a8d512597 100644 --- a/src/game/PetitionsHandler.cpp +++ b/src/game/PetitionsHandler.cpp @@ -972,3 +972,4 @@ void WorldSession::SendPetitionShowList(uint64 guid) SendPacket(&data); sLog.outDebug("Sent SMSG_PETITION_SHOWLIST"); } + diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 20abcc3ec02..0a7090265a2 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -1841,8 +1841,6 @@ void Player::RemoveFromWorld() ///- Release charmed creatures, unsummon totems and remove pets/guardians StopCastingCharm(); StopCastingBindSight(); - RemoveCharmAuras(); - RemoveBindSightAuras(); UnsummonAllTotems(); RemoveMiniPet(); RemoveGuardians(); @@ -20395,4 +20393,3 @@ uint8 Player::CanEquipUniqueItem( ItemPrototype const* itemProto, uint8 except_s } return EQUIP_ERR_OK; -} diff --git a/src/game/Player.h b/src/game/Player.h index 8e34ca7e9cd..96180d8d69c 100644 --- a/src/game/Player.h +++ b/src/game/Player.h @@ -2463,3 +2463,4 @@ template <class T> T Player::ApplySpellMod(uint32 spellId, SpellModOp op, T &bas return T(diff); } #endif + diff --git a/src/game/PlayerDump.cpp b/src/game/PlayerDump.cpp index d698e8c293c..fea5666c9e0 100644 --- a/src/game/PlayerDump.cpp +++ b/src/game/PlayerDump.cpp @@ -628,3 +628,4 @@ DumpReturn PlayerDumpReader::LoadDump(const std::string& file, uint32 account, s return DUMP_SUCCESS; } + diff --git a/src/game/PlayerDump.h b/src/game/PlayerDump.h index a33eb9edf24..01f97718267 100644 --- a/src/game/PlayerDump.h +++ b/src/game/PlayerDump.h @@ -96,3 +96,4 @@ class PlayerDumpReader : public PlayerDump }; #endif + diff --git a/src/game/PointMovementGenerator.cpp b/src/game/PointMovementGenerator.cpp index bcc25987e56..f3b1f2281f7 100644 --- a/src/game/PointMovementGenerator.cpp +++ b/src/game/PointMovementGenerator.cpp @@ -82,3 +82,4 @@ template void PointMovementGenerator<Player>::MovementInform(Player&); template void PointMovementGenerator<Creature>::Initialize(Creature&); template bool PointMovementGenerator<Creature>::Update(Creature&, const uint32 &diff); + diff --git a/src/game/PointMovementGenerator.h b/src/game/PointMovementGenerator.h index 08050b24e3d..49b48772ffb 100644 --- a/src/game/PointMovementGenerator.h +++ b/src/game/PointMovementGenerator.h @@ -51,3 +51,4 @@ class TRINITY_DLL_SPEC PointMovementGenerator DestinationHolder< Traveller<T> > i_destinationHolder; }; #endif + diff --git a/src/game/PossessedAI.cpp b/src/game/PossessedAI.cpp index 7ac36a37352..e8d499bf576 100644 --- a/src/game/PossessedAI.cpp +++ b/src/game/PossessedAI.cpp @@ -119,3 +119,4 @@ void PossessedAI::KilledUnit(Unit* victim) if (victim->GetTypeId() == TYPEID_UNIT) victim->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); } + diff --git a/src/game/PossessedAI.h b/src/game/PossessedAI.h index 5671cfa912d..fd90c5429b0 100644 --- a/src/game/PossessedAI.h +++ b/src/game/PossessedAI.h @@ -50,3 +50,4 @@ class TRINITY_DLL_DECL PossessedAI : public CreatureAI uint64 i_victimGuid; }; #endif + diff --git a/src/game/QueryHandler.cpp b/src/game/QueryHandler.cpp index 9829efc3946..eefecbce078 100644 --- a/src/game/QueryHandler.cpp +++ b/src/game/QueryHandler.cpp @@ -450,3 +450,4 @@ void WorldSession::HandlePageQueryOpcode( WorldPacket & recv_data ) sLog.outDebug( "WORLD: Sent SMSG_PAGE_TEXT_QUERY_RESPONSE " ); } } + diff --git a/src/game/QuestDef.cpp b/src/game/QuestDef.cpp index 5d5b4bdf6f5..bbc344732b8 100644 --- a/src/game/QuestDef.cpp +++ b/src/game/QuestDef.cpp @@ -205,3 +205,4 @@ int32 Quest::GetRewOrReqMoney() const return int32(RewOrReqMoney * sWorld.getRate(RATE_DROP_MONEY)); } + diff --git a/src/game/QuestDef.h b/src/game/QuestDef.h index c9bfdf83874..4d4c9829ba8 100644 --- a/src/game/QuestDef.h +++ b/src/game/QuestDef.h @@ -341,3 +341,4 @@ struct QuestStatusData uint32 m_creatureOrGOcount[ QUEST_OBJECTIVES_COUNT ]; }; #endif + diff --git a/src/game/QuestHandler.cpp b/src/game/QuestHandler.cpp index 98d4972c406..24d02504d33 100644 --- a/src/game/QuestHandler.cpp +++ b/src/game/QuestHandler.cpp @@ -654,3 +654,4 @@ void WorldSession::HandleQuestgiverStatusQueryMultipleOpcode(WorldPacket& /*recv data.put<uint32>(0, count); // write real count SendPacket(&data); } + diff --git a/src/game/RandomMovementGenerator.cpp b/src/game/RandomMovementGenerator.cpp index 0e85c1911a5..3e4912d00cd 100644 --- a/src/game/RandomMovementGenerator.cpp +++ b/src/game/RandomMovementGenerator.cpp @@ -182,3 +182,4 @@ RandomMovementGenerator<Creature>::Update(Creature &creature, const uint32 &diff } return true; } + diff --git a/src/game/RandomMovementGenerator.h b/src/game/RandomMovementGenerator.h index e2d2a5005fb..20afe23d375 100644 --- a/src/game/RandomMovementGenerator.h +++ b/src/game/RandomMovementGenerator.h @@ -52,3 +52,4 @@ class TRINITY_DLL_SPEC RandomMovementGenerator uint32 i_nextMove; }; #endif + diff --git a/src/game/ReactorAI.cpp b/src/game/ReactorAI.cpp index 02799431991..7c4d1a73eb6 100644 --- a/src/game/ReactorAI.cpp +++ b/src/game/ReactorAI.cpp @@ -114,3 +114,4 @@ ReactorAI::EnterEvadeMode() else if (i_creature.GetOwner() && i_creature.GetOwner()->isAlive()) i_creature.GetMotionMaster()->MoveFollow(i_creature.GetOwner(),PET_FOLLOW_DIST,PET_FOLLOW_ANGLE); } + diff --git a/src/game/ReactorAI.h b/src/game/ReactorAI.h index e549bfc7243..1cc7da43743 100644 --- a/src/game/ReactorAI.h +++ b/src/game/ReactorAI.h @@ -43,3 +43,4 @@ class TRINITY_DLL_DECL ReactorAI : public CreatureAI uint64 i_victimGuid; }; #endif + diff --git a/src/game/ScriptCalls.cpp b/src/game/ScriptCalls.cpp index 78d63c460ce..c101cd6c10a 100644 --- a/src/game/ScriptCalls.cpp +++ b/src/game/ScriptCalls.cpp @@ -100,3 +100,4 @@ bool LoadScriptingModule(char const* libName) return true; } + diff --git a/src/game/ScriptCalls.h b/src/game/ScriptCalls.h index 216a694936f..bb618e5af9f 100644 --- a/src/game/ScriptCalls.h +++ b/src/game/ScriptCalls.h @@ -92,3 +92,4 @@ typedef struct extern ScriptsSet Script; #endif + diff --git a/src/game/SharedDefines.h b/src/game/SharedDefines.h index aa9d4fe153f..f359fab74f6 100644 --- a/src/game/SharedDefines.h +++ b/src/game/SharedDefines.h @@ -2311,3 +2311,4 @@ enum BattleGroundTypeId #define MAX_BATTLEGROUND_TYPE_ID 12 #endif + diff --git a/src/game/SkillDiscovery.cpp b/src/game/SkillDiscovery.cpp index f5e79bf220b..c6c85990e26 100644 --- a/src/game/SkillDiscovery.cpp +++ b/src/game/SkillDiscovery.cpp @@ -217,3 +217,4 @@ uint32 GetSkillDiscoverySpell(uint32 skillId, uint32 spellId, Player* player) return 0; } + diff --git a/src/game/SkillDiscovery.h b/src/game/SkillDiscovery.h index 9ee29c86810..9981eb133f6 100644 --- a/src/game/SkillDiscovery.h +++ b/src/game/SkillDiscovery.h @@ -29,3 +29,4 @@ void LoadSkillDiscoveryTable(); uint32 GetSkillDiscoverySpell(uint32 skillId, uint32 spellId, Player* player); uint32 GetExplicitDiscoverySpell(uint32 spellId, Player* player); #endif + diff --git a/src/game/SkillExtraItems.cpp b/src/game/SkillExtraItems.cpp index 67ec9719659..f0061f97c00 100644 --- a/src/game/SkillExtraItems.cpp +++ b/src/game/SkillExtraItems.cpp @@ -144,3 +144,4 @@ bool canCreateExtraItems(Player * player, uint32 spellId, float &additionalChanc // enable extra item creation return true; } + diff --git a/src/game/SkillExtraItems.h b/src/game/SkillExtraItems.h index 5d71d8fd753..3a44619a862 100644 --- a/src/game/SkillExtraItems.h +++ b/src/game/SkillExtraItems.h @@ -30,3 +30,4 @@ bool canCreateExtraItems(Player * player, uint32 spellId, float &additionalChanc // function to load the extra item creation info from DB void LoadSkillExtraItemTable(); #endif + diff --git a/src/game/SkillHandler.cpp b/src/game/SkillHandler.cpp index 58c35fe463e..fb00b13c68c 100644 --- a/src/game/SkillHandler.cpp +++ b/src/game/SkillHandler.cpp @@ -175,3 +175,4 @@ void WorldSession::HandleUnlearnSkillOpcode(WorldPacket & recv_data) recv_data >> skill_id; GetPlayer()->SetSkill(skill_id, 0, 0); } + diff --git a/src/game/SocialMgr.cpp b/src/game/SocialMgr.cpp index e98e147b505..b208cc5ece4 100644 --- a/src/game/SocialMgr.cpp +++ b/src/game/SocialMgr.cpp @@ -323,3 +323,4 @@ PlayerSocial *SocialMgr::LoadFromDB(QueryResult *result, uint32 guid) delete result; return social; } + diff --git a/src/game/SocialMgr.h b/src/game/SocialMgr.h index 864cf8b2455..1ca04d69707 100644 --- a/src/game/SocialMgr.h +++ b/src/game/SocialMgr.h @@ -158,3 +158,4 @@ class SocialMgr #define sSocialMgr Trinity::Singleton<SocialMgr>::Instance() #endif + diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index c752cd8d26f..4c862e893ba 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -1254,9 +1254,9 @@ struct ChainHealingOrder : public std::binary_function<const Unit*, const Unit*, int32 ChainHealingHash(Unit const* Target) const { - if (Target == MainTarget) + /*if (Target == MainTarget) return 0; - else if (Target->GetTypeId() == TYPEID_PLAYER && MainTarget->GetTypeId() == TYPEID_PLAYER && + else*/ if (Target->GetTypeId() == TYPEID_PLAYER && MainTarget->GetTypeId() == TYPEID_PLAYER && ((Player const*)Target)->IsInSameRaidWith((Player const*)MainTarget)) { if (Target->GetHealth() == Target->GetMaxHealth()) @@ -5784,3 +5784,4 @@ int32 Spell::CalculateDamageDone(Unit *unit, const uint32 effectMask, float *mul return damageDone; } + diff --git a/src/game/Spell.h b/src/game/Spell.h index beae2f97e04..daeab913345 100644 --- a/src/game/Spell.h +++ b/src/game/Spell.h @@ -737,3 +737,4 @@ class SpellEvent : public BasicEvent Spell* m_Spell; }; #endif + diff --git a/src/game/SpellAuraDefines.h b/src/game/SpellAuraDefines.h index d4bd7a1efe6..efb0f3b11c9 100644 --- a/src/game/SpellAuraDefines.h +++ b/src/game/SpellAuraDefines.h @@ -345,3 +345,4 @@ enum AreaAuraType AREA_AURA_OWNER }; #endif + diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index 011ce5b743e..4f9d4ea8cff 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -5770,7 +5770,7 @@ void Aura::PeriodicTick() int32 gain = pCaster->ModifyPower(power,gain_amount); m_target->AddThreat(pCaster, float(gain) * 0.5f, GetSpellSchoolMask(GetSpellProto()), GetSpellProto()); } - + // Mark of Kaz'rogal if(GetId() == 31447 && m_target->GetPower(power) == 0) { diff --git a/src/game/SpellAuras.h b/src/game/SpellAuras.h index c09feca92b9..e615aa70c20 100644 --- a/src/game/SpellAuras.h +++ b/src/game/SpellAuras.h @@ -382,3 +382,4 @@ class TRINITY_DLL_SPEC PersistentAreaAura : public Aura Aura* CreateAura(SpellEntry const* spellproto, uint32 eff, int32 *currentBasePoints, Unit *target, Unit *caster = NULL, Item* castItem = NULL); #endif + diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index a76f20e0536..2a6d7adf84d 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -708,7 +708,7 @@ void Spell::EffectDummy(uint32 i) if(ihit->effectMask & (1<<i)) { Unit* casttarget = Unit::GetUnit((*unitTarget), ihit->targetGUID); - if(casttarget) + if(casttarget) m_caster->DealDamage(casttarget, damage, NULL, SPELL_DIRECT_DAMAGE, SPELL_SCHOOL_MASK_ARCANE, spellInfo, false); } } @@ -732,7 +732,7 @@ void Spell::EffectDummy(uint32 i) pGameObj->SetRespawnTime(0); pGameObj->SetOwnerGUID(m_caster->GetGUID()); - pGameObj->SetUInt32Value(GAMEOBJECT_LEVEL, m_caster->getLevel()); + //pGameObj->SetUInt32Value(GAMEOBJECT_LEVEL, m_caster->getLevel()); pGameObj->SetSpellId(m_spellInfo->Id); MapManager::Instance().GetMap(creatureTarget->GetMapId(), pGameObj)->Add(pGameObj); @@ -5005,14 +5005,14 @@ void Spell::EffectScriptEffect(uint32 effIndex) } case 48025: // Headless Horseman's Mount { - if(!unitTarget) + if(!unitTarget) return; switch(((Player*)unitTarget)->GetBaseSkillValue(762)) { case 75: unitTarget->CastSpell(unitTarget, 51621, true); break;; case 150: unitTarget->CastSpell(unitTarget, 48024, true); break; - case 225: unitTarget->CastSpell(unitTarget, 51617, true); break; + case 225: unitTarget->CastSpell(unitTarget, 51617, true); break; case 300: unitTarget->CastSpell(unitTarget, 48023, true); break; default: break; } @@ -5020,7 +5020,7 @@ void Spell::EffectScriptEffect(uint32 effIndex) } case 47977: // Magic Broom { - if(!unitTarget) + if(!unitTarget) return; if(unitTarget) @@ -5894,7 +5894,7 @@ void Spell::EffectSummonObject(uint32 i) return; } - pGameObj->SetUInt32Value(GAMEOBJECT_LEVEL,m_caster->getLevel()); + //pGameObj->SetUInt32Value(GAMEOBJECT_LEVEL,m_caster->getLevel()); int32 duration = GetSpellDuration(m_spellInfo); pGameObj->SetRespawnTime(duration > 0 ? duration/1000 : 0); pGameObj->SetSpellId(m_spellInfo->Id); @@ -6249,7 +6249,7 @@ void Spell::EffectKnockBack(uint32 i) return; float x, y; - if(m_targets.HasDest()) + if(m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION) { x = m_targets.m_destX; y = m_targets.m_destY; @@ -6262,10 +6262,19 @@ void Spell::EffectKnockBack(uint32 i) float dx = unitTarget->GetPositionX() - x; float dy = unitTarget->GetPositionY() - y; - float dist = sqrt((dx*dx) + (dy*dy)); - - float vcos = dx / dist; - float vsin = dy / dist; + float vcos, vsin; + if(dx < 0.001f && dy < 0.001f) + { + float angle = rand_norm()*2*M_PI; + vcos = cos(angle); + vsin = sin(angle); + } + else + { + float dist = sqrt((dx*dx) + (dy*dy)); + vcos = dx / dist; + vsin = dy / dist; + } float speedxy = float(m_spellInfo->EffectMiscValue[i])/10; float speedz = float(damage/-10); @@ -6594,7 +6603,7 @@ void Spell::EffectTransmitted(uint32 effIndex) pGameObj->SetOwnerGUID(m_caster->GetGUID() ); - pGameObj->SetUInt32Value(GAMEOBJECT_LEVEL, m_caster->getLevel() ); + //pGameObj->SetUInt32Value(GAMEOBJECT_LEVEL, m_caster->getLevel() ); pGameObj->SetSpellId(m_spellInfo->Id); DEBUG_LOG("AddObject at SpellEfects.cpp EffectTransmitted\n"); @@ -6614,7 +6623,7 @@ void Spell::EffectTransmitted(uint32 effIndex) m_caster->GetPhaseMask(), fx, fy, fz, m_caster->GetOrientation(), 0, 0, 0, 0, 100, 1)) { linkedGO->SetRespawnTime(duration > 0 ? duration/1000 : 0); - linkedGO->SetUInt32Value(GAMEOBJECT_LEVEL, m_caster->getLevel() ); + //linkedGO->SetUInt32Value(GAMEOBJECT_LEVEL, m_caster->getLevel() ); linkedGO->SetSpellId(m_spellInfo->Id); linkedGO->SetOwnerGUID(m_caster->GetGUID() ); @@ -6858,4 +6867,3 @@ void Spell::EffectRenamePet(uint32 /*eff_idx*/) return; unitTarget->SetByteValue(UNIT_FIELD_BYTES_2, 2, UNIT_RENAME_ALLOWED); -} diff --git a/src/game/SpellHandler.cpp b/src/game/SpellHandler.cpp index 676bb6a2dae..3c739a85bb0 100644 --- a/src/game/SpellHandler.cpp +++ b/src/game/SpellHandler.cpp @@ -467,3 +467,4 @@ void WorldSession::HandleSelfResOpcode( WorldPacket & /*recv_data*/ ) _player->SetUInt32Value(PLAYER_SELF_RES_SPELL, 0); } } + diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp index 927044be3a6..6128383590e 100644 --- a/src/game/SpellMgr.cpp +++ b/src/game/SpellMgr.cpp @@ -2930,3 +2930,4 @@ DiminishingReturnsType GetDiminishingReturnsGroupType(DiminishingGroup group) return DRTYPE_NONE; } + diff --git a/src/game/SpellMgr.h b/src/game/SpellMgr.h index 83d17ec2b85..28e574b978f 100644 --- a/src/game/SpellMgr.h +++ b/src/game/SpellMgr.h @@ -1119,3 +1119,4 @@ class SpellMgr #define spellmgr SpellMgr::Instance() #endif + diff --git a/src/game/StatSystem.cpp b/src/game/StatSystem.cpp index 8be79c3cfd8..5d31614cecb 100644 --- a/src/game/StatSystem.cpp +++ b/src/game/StatSystem.cpp @@ -1140,3 +1140,4 @@ void Pet::UpdateDamagePhysical(WeaponAttackType attType) SetStatFloatValue(UNIT_FIELD_MINDAMAGE, mindamage); SetStatFloatValue(UNIT_FIELD_MAXDAMAGE, maxdamage); } + diff --git a/src/game/TargetedMovementGenerator.cpp b/src/game/TargetedMovementGenerator.cpp index d39c2c68071..bdc49d03e4d 100644 --- a/src/game/TargetedMovementGenerator.cpp +++ b/src/game/TargetedMovementGenerator.cpp @@ -211,3 +211,4 @@ template bool TargetedMovementGenerator<Player>::Update(Player &, const uint32 & template bool TargetedMovementGenerator<Creature>::Update(Creature &, const uint32 &); template Unit* TargetedMovementGenerator<Player>::GetTarget() const; template Unit* TargetedMovementGenerator<Creature>::GetTarget() const; + diff --git a/src/game/TargetedMovementGenerator.h b/src/game/TargetedMovementGenerator.h index e6579c0b1de..2083dd95369 100644 --- a/src/game/TargetedMovementGenerator.h +++ b/src/game/TargetedMovementGenerator.h @@ -73,3 +73,4 @@ class TRINITY_DLL_SPEC TargetedMovementGenerator bool i_recalculateTravel; }; #endif + diff --git a/src/game/TaxiHandler.cpp b/src/game/TaxiHandler.cpp index 743f09f94fc..289e141fdd3 100644 --- a/src/game/TaxiHandler.cpp +++ b/src/game/TaxiHandler.cpp @@ -278,3 +278,4 @@ void WorldSession::HandleActivateTaxiOpcode( WorldPacket & recv_data ) GetPlayer()->ActivateTaxiPathTo(nodes, 0, npc); } + diff --git a/src/game/TemporarySummon.cpp b/src/game/TemporarySummon.cpp index 1214ed1bd84..147133bd362 100644 --- a/src/game/TemporarySummon.cpp +++ b/src/game/TemporarySummon.cpp @@ -185,3 +185,4 @@ void TemporarySummon::UnSummon() void TemporarySummon::SaveToDB() { } + diff --git a/src/game/TemporarySummon.h b/src/game/TemporarySummon.h index c3441704438..eaefbab1d84 100644 --- a/src/game/TemporarySummon.h +++ b/src/game/TemporarySummon.h @@ -41,3 +41,4 @@ class TemporarySummon : public Creature uint64 m_summoner; }; #endif + diff --git a/src/game/ThreatManager.cpp b/src/game/ThreatManager.cpp index 8807dff64f8..111da6bff48 100644 --- a/src/game/ThreatManager.cpp +++ b/src/game/ThreatManager.cpp @@ -368,7 +368,8 @@ void ThreatManager::addThreat(Unit* pVictim, float pThreat, SpellSchoolMask scho float threat = ThreatCalcHelper::calcThreat(pVictim, iOwner, pThreat, schoolMask, pThreatSpell); - if(pVictim->GetReducedThreatPercent()) + // must check > 0.0f, otherwise dead loop + if(threat > 0.0f && pVictim->GetReducedThreatPercent()) { float reducedThreat = threat * pVictim->GetReducedThreatPercent() / 100; threat -= reducedThreat; @@ -511,3 +512,4 @@ bool ThreatManager::processThreatEvent(const UnitBaseEvent* pUnitBaseEvent) } return consumed; } + diff --git a/src/game/ThreatManager.h b/src/game/ThreatManager.h index 2d81f411e78..3b07a4ec43d 100644 --- a/src/game/ThreatManager.h +++ b/src/game/ThreatManager.h @@ -216,3 +216,4 @@ class TRINITY_DLL_SPEC ThreatManager //================================================= #endif + diff --git a/src/game/TicketHandler.cpp b/src/game/TicketHandler.cpp index 8d6ed30687e..068a1592df1 100644 --- a/src/game/TicketHandler.cpp +++ b/src/game/TicketHandler.cpp @@ -188,3 +188,4 @@ void WorldSession::HandleGMTicketSystemStatusOpcode( WorldPacket & /*recv_data*/ // Send Packet SendPacket(&data); } + diff --git a/src/game/TicketMgr.cpp b/src/game/TicketMgr.cpp index a622a41aedc..8d89bf9d20b 100644 --- a/src/game/TicketMgr.cpp +++ b/src/game/TicketMgr.cpp @@ -206,3 +206,4 @@ uint64 TicketMgr::GenerateTicketID() { return ++m_ticketid; } + diff --git a/src/game/TicketMgr.h b/src/game/TicketMgr.h index 25d62462dc2..bee4d49fa0d 100644 --- a/src/game/TicketMgr.h +++ b/src/game/TicketMgr.h @@ -74,3 +74,4 @@ class TicketMgr #endif #define ticketmgr Trinity::Singleton<TicketMgr>::Instance() + diff --git a/src/game/Tools.cpp b/src/game/Tools.cpp index f8663a4b4e4..d1728c78c9e 100644 --- a/src/game/Tools.cpp +++ b/src/game/Tools.cpp @@ -114,3 +114,4 @@ void writeGUID(WorldPacket & data, uint64 & guid) data.append(PackedGuid,j); } + diff --git a/src/game/Tools.h b/src/game/Tools.h index 887fe03045a..bdb3ad8e762 100644 --- a/src/game/Tools.h +++ b/src/game/Tools.h @@ -26,3 +26,4 @@ bool readGUID(WorldPacket & data, uint64& guid); void writeGUID(WorldPacket & data, uint64 & guid); #endif + diff --git a/src/game/Totem.cpp b/src/game/Totem.cpp index 0178ed07fdf..ae06be79187 100644 --- a/src/game/Totem.cpp +++ b/src/game/Totem.cpp @@ -193,3 +193,4 @@ bool Totem::IsImmunedToSpellEffect(SpellEntry const* spellInfo, uint32 index) co } return Creature::IsImmunedToSpellEffect(spellInfo, index); } + diff --git a/src/game/Totem.h b/src/game/Totem.h index 572cfa6d315..af2ca7a4023 100644 --- a/src/game/Totem.h +++ b/src/game/Totem.h @@ -64,3 +64,4 @@ class Totem : public Creature uint32 m_duration; }; #endif + diff --git a/src/game/TotemAI.cpp b/src/game/TotemAI.cpp index 184cb141913..7d9a6cfd058 100644 --- a/src/game/TotemAI.cpp +++ b/src/game/TotemAI.cpp @@ -121,3 +121,4 @@ TotemAI::AttackStart(Unit *) ((Player*)i_totem.GetOwner())->GetSession()->SendPacket(&data); } } + diff --git a/src/game/TotemAI.h b/src/game/TotemAI.h index 64675cd11e3..9a19d2c99e5 100644 --- a/src/game/TotemAI.h +++ b/src/game/TotemAI.h @@ -46,3 +46,4 @@ class TRINITY_DLL_DECL TotemAI : public CreatureAI uint64 i_victimGuid; }; #endif + diff --git a/src/game/TradeHandler.cpp b/src/game/TradeHandler.cpp index f444866e8aa..cc3bcab62d2 100644 --- a/src/game/TradeHandler.cpp +++ b/src/game/TradeHandler.cpp @@ -642,3 +642,4 @@ void WorldSession::HandleClearTradeItemOpcode(WorldPacket& recvPacket) _player->pTrader->GetSession()->SendUpdateTrade(); } + diff --git a/src/game/Transports.cpp b/src/game/Transports.cpp index f1d1ff412bf..a46fdee553b 100644 --- a/src/game/Transports.cpp +++ b/src/game/Transports.cpp @@ -561,3 +561,4 @@ void Transport::Update(uint32 /*p_time*/) sLog.outDetail("%s is at wp id: %u", this->m_name.c_str(), m_curr->second.id); } } + diff --git a/src/game/Transports.h b/src/game/Transports.h index 0cb6a6e7503..6fd0898362c 100644 --- a/src/game/Transports.h +++ b/src/game/Transports.h @@ -117,3 +117,4 @@ class Transport : private GameObject WayPointMap::iterator GetNextWayPoint(); }; #endif + diff --git a/src/game/Traveller.h b/src/game/Traveller.h index 6e7757d9bbf..d5e5036447f 100644 --- a/src/game/Traveller.h +++ b/src/game/Traveller.h @@ -113,3 +113,4 @@ inline void Traveller<Player>::MoveTo(float x, float y, float z, uint32 t) typedef Traveller<Creature> CreatureTraveller; typedef Traveller<Player> PlayerTraveller; #endif + diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index b7a92c98125..0c1910d43ea 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -4305,7 +4305,7 @@ void Unit::RemoveDynObject(uint32 spellid) for (DynObjectGUIDs::iterator i = m_dynObjGUIDs.begin(); i != m_dynObjGUIDs.end();) { DynamicObject* dynObj = ObjectAccessor::GetDynamicObject(*this, *i); - if(!dynObj) + if(!dynObj) // may happen if a dynobj is removed when grid unload { i = m_dynObjGUIDs.erase(i); } @@ -7670,20 +7670,11 @@ void Unit::RemovePlayerFromVision(Player* plr) void Unit::RemoveBindSightAuras() { - /*while (!m_sharedVision.empty()) - { - Player* plr = *m_sharedVision.begin(); - m_sharedVision.erase(m_sharedVision.begin()); - plr->ClearFarsight(); - }*/ RemoveSpellsCausingAura(SPELL_AURA_BIND_SIGHT); } void Unit::RemoveCharmAuras() { - if (!GetCharmer()) - return; - RemoveSpellsCausingAura(SPELL_AURA_MOD_CHARM); RemoveSpellsCausingAura(SPELL_AURA_MOD_POSSESS_PET); RemoveSpellsCausingAura(SPELL_AURA_MOD_POSSESS); @@ -10702,6 +10693,8 @@ void Unit::RemoveFromWorld() // cleanup if(IsInWorld()) { + RemoveCharmAuras(); + RemoveBindSightAuras(); RemoveNotOwnSingleTargetAuras(); } diff --git a/src/game/Unit.h b/src/game/Unit.h index a767bbe08eb..0e0bbda6225 100644 --- a/src/game/Unit.h +++ b/src/game/Unit.h @@ -1192,10 +1192,11 @@ class TRINITY_DLL_SPEC Unit : public WorldObject CharmInfo* GetCharmInfo() { return m_charmInfo; } CharmInfo* InitCharmInfo(Unit* charm); SharedVisionList const& GetSharedVisionList() { return m_sharedVision; } - void RemoveBindSightAuras(); - void RemoveCharmAuras(); void AddPlayerToVision(Player* plr); void RemovePlayerFromVision(Player* plr); + bool HasSharedVision() const { return !m_sharedVision.empty(); } + void RemoveBindSightAuras(); + void RemoveCharmAuras(); Pet* CreateTamedPetFrom(Creature* creatureTarget,uint32 spell_id = 0); @@ -1611,3 +1612,4 @@ class TRINITY_DLL_SPEC Unit : public WorldObject uint64 m_misdirectionTargetGUID; }; #endif + diff --git a/src/game/UnitEvents.h b/src/game/UnitEvents.h index 0bde9ca5ada..67f8d01f0d6 100644 --- a/src/game/UnitEvents.h +++ b/src/game/UnitEvents.h @@ -136,3 +136,4 @@ class TRINITY_DLL_SPEC ThreatManagerEvent : public ThreatRefStatusChangeEvent //============================================================== #endif + diff --git a/src/game/UpdateData.cpp b/src/game/UpdateData.cpp index bdd3345751d..de615c9cc8e 100644 --- a/src/game/UpdateData.cpp +++ b/src/game/UpdateData.cpp @@ -160,3 +160,4 @@ void UpdateData::Clear() m_outOfRangeGUIDs.clear(); m_blockCount = 0; } + diff --git a/src/game/UpdateData.h b/src/game/UpdateData.h index c33e06589c1..71a9258b90b 100644 --- a/src/game/UpdateData.h +++ b/src/game/UpdateData.h @@ -68,3 +68,4 @@ class UpdateData void Compress(void* dst, uint32 *dst_size, void* src, int src_size); }; #endif + diff --git a/src/game/UpdateFields.h b/src/game/UpdateFields.h index ca971dac460..97fcbeb05d6 100644 --- a/src/game/UpdateFields.h +++ b/src/game/UpdateFields.h @@ -500,3 +500,4 @@ enum ECorpseFields CORPSE_END = OBJECT_END + 0x0022, }; #endif + diff --git a/src/game/UpdateMask.h b/src/game/UpdateMask.h index 8909b23ed51..3d510c00d60 100644 --- a/src/game/UpdateMask.h +++ b/src/game/UpdateMask.h @@ -124,3 +124,4 @@ class UpdateMask uint32 *mUpdateMask; }; #endif + diff --git a/src/game/VoiceChatHandler.cpp b/src/game/VoiceChatHandler.cpp index ddc178a8694..4cf86493060 100644 --- a/src/game/VoiceChatHandler.cpp +++ b/src/game/VoiceChatHandler.cpp @@ -45,3 +45,4 @@ void WorldSession::HandleChannelVoiceChatQuery( WorldPacket & recv_data ) // uint32, string recv_data.hexlike(); } + diff --git a/src/game/WaypointManager.cpp b/src/game/WaypointManager.cpp index 6e303ca3053..a677fd5b6d2 100644 --- a/src/game/WaypointManager.cpp +++ b/src/game/WaypointManager.cpp @@ -149,3 +149,4 @@ void WaypointStore::UpdatePath(uint32 id) delete result; } + diff --git a/src/game/WaypointManager.h b/src/game/WaypointManager.h index e9787090ede..85f8b765d45 100644 --- a/src/game/WaypointManager.h +++ b/src/game/WaypointManager.h @@ -59,3 +59,4 @@ class WaypointStore extern WaypointStore WaypointMgr; #endif + diff --git a/src/game/WaypointMovementGenerator.cpp b/src/game/WaypointMovementGenerator.cpp index e5b625fb6e5..9810d83dcd1 100644 --- a/src/game/WaypointMovementGenerator.cpp +++ b/src/game/WaypointMovementGenerator.cpp @@ -652,3 +652,4 @@ int GetFCost(int to, int num, int parentNum, float *gcost) return (int)(gc + hc); } #endif //__PATHFINDING__ + diff --git a/src/game/WaypointMovementGenerator.h b/src/game/WaypointMovementGenerator.h index 5b5df75d31e..9804c150d63 100644 --- a/src/game/WaypointMovementGenerator.h +++ b/src/game/WaypointMovementGenerator.h @@ -116,3 +116,4 @@ public PathMovementBase<Player> }; #endif + diff --git a/src/game/Weather.cpp b/src/game/Weather.cpp index 9fd91764ca3..2c41fa886be 100644 --- a/src/game/Weather.cpp +++ b/src/game/Weather.cpp @@ -318,3 +318,4 @@ WeatherState Weather::GetWeatherState() const return WEATHER_STATE_FINE; } } + diff --git a/src/game/Weather.h b/src/game/Weather.h index fd04d6b6abd..e312f004060 100644 --- a/src/game/Weather.h +++ b/src/game/Weather.h @@ -72,3 +72,4 @@ class Weather WeatherZoneChances const* m_weatherChances; }; #endif + diff --git a/src/game/World.cpp b/src/game/World.cpp index d1a10078efc..084be8f691b 100644 --- a/src/game/World.cpp +++ b/src/game/World.cpp @@ -3057,3 +3057,4 @@ void World::LoadDBVersion() else m_DBVersion = "unknown world database"; } + diff --git a/src/game/World.h b/src/game/World.h index 8ceb356c076..408c571d9b0 100644 --- a/src/game/World.h +++ b/src/game/World.h @@ -610,3 +610,4 @@ extern uint32 realmID; #define sWorld Trinity::Singleton<World>::Instance() #endif /// @} + diff --git a/src/game/WorldLog.cpp b/src/game/WorldLog.cpp index eeac973ba5f..7a10986f749 100644 --- a/src/game/WorldLog.cpp +++ b/src/game/WorldLog.cpp @@ -51,3 +51,4 @@ void WorldLog::Initialize() } #define sWorldLog WorldLog::Instance() + diff --git a/src/game/WorldLog.h b/src/game/WorldLog.h index 47e1a912986..97374ddc5f5 100644 --- a/src/game/WorldLog.h +++ b/src/game/WorldLog.h @@ -76,3 +76,4 @@ class TRINITY_DLL_DECL WorldLog : public Trinity::Singleton<WorldLog, Trinity::C #define sWorldLog WorldLog::Instance() #endif /// @} + diff --git a/src/game/WorldSession.cpp b/src/game/WorldSession.cpp index bfe9946e7d3..17d78ae677d 100644 --- a/src/game/WorldSession.cpp +++ b/src/game/WorldSession.cpp @@ -613,5 +613,3 @@ void WorldSession::ReadMovementInfo(WorldPacket &data, MovementInfo *mi) { CHECK_PACKET_SIZE(data, data.rpos()+4); data >> mi->u_unk1; - } -} diff --git a/src/game/WorldSession.h b/src/game/WorldSession.h index 05cf4cec8b3..46fb0f43a1d 100644 --- a/src/game/WorldSession.h +++ b/src/game/WorldSession.h @@ -702,3 +702,4 @@ class TRINITY_DLL_SPEC WorldSession }; #endif /// @} + diff --git a/src/game/WorldSocket.cpp b/src/game/WorldSocket.cpp index 9913c912c70..06247f810a6 100644 --- a/src/game/WorldSocket.cpp +++ b/src/game/WorldSocket.cpp @@ -1124,3 +1124,4 @@ bool WorldSocket::iFlushPacketQueue () return haveone; }*/ + diff --git a/src/game/WorldSocket.h b/src/game/WorldSocket.h index 15d3ec31e06..67e15adf148 100644 --- a/src/game/WorldSocket.h +++ b/src/game/WorldSocket.h @@ -219,3 +219,4 @@ class WorldSocket : protected WorldHandler #endif /* _WORLDSOCKET_H */ /// @} + diff --git a/src/game/WorldSocketMgr.cpp b/src/game/WorldSocketMgr.cpp index b6ea361f7e3..e8f8bad5894 100644 --- a/src/game/WorldSocketMgr.cpp +++ b/src/game/WorldSocketMgr.cpp @@ -366,3 +366,4 @@ WorldSocketMgr::Instance () { return ACE_Singleton<WorldSocketMgr,ACE_Thread_Mutex>::instance(); } + diff --git a/src/game/WorldSocketMgr.h b/src/game/WorldSocketMgr.h index d7cb627b11c..94cfa78324c 100644 --- a/src/game/WorldSocketMgr.h +++ b/src/game/WorldSocketMgr.h @@ -77,3 +77,4 @@ private: #endif /// @} + diff --git a/src/shared/Auth/AuthCrypt.cpp b/src/shared/Auth/AuthCrypt.cpp index 2d8bd824fd1..0b2a3f64338 100644 --- a/src/shared/Auth/AuthCrypt.cpp +++ b/src/shared/Auth/AuthCrypt.cpp @@ -80,3 +80,4 @@ void AuthCrypt::GenerateKey(uint8 *key, BigNumber *bn) hash.Finalize(); memcpy(key, hash.GetDigest(), SHA_DIGEST_LENGTH); } + diff --git a/src/shared/Auth/AuthCrypt.h b/src/shared/Auth/AuthCrypt.h index 7a0b0a4d219..5c35511ad9f 100644 --- a/src/shared/Auth/AuthCrypt.h +++ b/src/shared/Auth/AuthCrypt.h @@ -51,3 +51,4 @@ class AuthCrypt bool _initialized; }; #endif + diff --git a/src/shared/Auth/BigNumber.cpp b/src/shared/Auth/BigNumber.cpp index becbe44c0ed..7872b141f3d 100644 --- a/src/shared/Auth/BigNumber.cpp +++ b/src/shared/Auth/BigNumber.cpp @@ -207,3 +207,4 @@ const char *BigNumber::AsDecStr() { return BN_bn2dec(_bn); } + diff --git a/src/shared/Auth/BigNumber.h b/src/shared/Auth/BigNumber.h index 9ce18ea3047..b9038e86b13 100644 --- a/src/shared/Auth/BigNumber.h +++ b/src/shared/Auth/BigNumber.h @@ -94,3 +94,4 @@ class BigNumber uint8 *_array; }; #endif + diff --git a/src/shared/Auth/Hmac.cpp b/src/shared/Auth/Hmac.cpp index 5f97ee65cc2..a8572f0e9f8 100644 --- a/src/shared/Auth/Hmac.cpp +++ b/src/shared/Auth/Hmac.cpp @@ -56,3 +56,4 @@ void HmacHash::Finalize() HMAC_Final(&m_ctx, m_digest, &length); ASSERT(length == SHA_DIGEST_LENGTH) } + diff --git a/src/shared/Auth/Hmac.h b/src/shared/Auth/Hmac.h index b8ab30f2dc7..fc80bdca4c4 100644 --- a/src/shared/Auth/Hmac.h +++ b/src/shared/Auth/Hmac.h @@ -46,3 +46,4 @@ class HmacHash uint8 m_digest[SHA_DIGEST_LENGTH]; }; #endif + diff --git a/src/shared/Auth/Sha1.cpp b/src/shared/Auth/Sha1.cpp index f367c2919b3..8743a14b838 100644 --- a/src/shared/Auth/Sha1.cpp +++ b/src/shared/Auth/Sha1.cpp @@ -65,3 +65,4 @@ void Sha1Hash::Finalize(void) { SHA1_Final(mDigest, &mC); } + diff --git a/src/shared/Auth/Sha1.h b/src/shared/Auth/Sha1.h index 811ccc2053a..68c61eb7a8e 100644 --- a/src/shared/Auth/Sha1.h +++ b/src/shared/Auth/Sha1.h @@ -51,3 +51,4 @@ class Sha1Hash uint8 mDigest[SHA_DIGEST_LENGTH]; }; #endif + diff --git a/src/shared/Auth/md5.h b/src/shared/Auth/md5.h index fa2937e13e4..0463051b6a6 100644 --- a/src/shared/Auth/md5.h +++ b/src/shared/Auth/md5.h @@ -89,3 +89,4 @@ extern "C" } /* end extern "C" */ #endif #endif /* md5_INCLUDED */ + diff --git a/src/shared/Base.cpp b/src/shared/Base.cpp index 9929cd41fdf..ca5094810d6 100644 --- a/src/shared/Base.cpp +++ b/src/shared/Base.cpp @@ -65,3 +65,4 @@ int Base::GetRefCount () { return RefCount; } + diff --git a/src/shared/Base.h b/src/shared/Base.h index d5907fdf473..e14ea6b27b9 100644 --- a/src/shared/Base.h +++ b/src/shared/Base.h @@ -52,3 +52,4 @@ class Base }; #endif // __BASE_H__ + diff --git a/src/shared/ByteBuffer.h b/src/shared/ByteBuffer.h index 2dd01e8a022..97b6c1cbd17 100644 --- a/src/shared/ByteBuffer.h +++ b/src/shared/ByteBuffer.h @@ -505,3 +505,4 @@ template <typename K, typename V> ByteBuffer &operator>>(ByteBuffer &b, std::map return b; } #endif + diff --git a/src/shared/Common.cpp b/src/shared/Common.cpp index e70dc8358c2..27ae9184d69 100644 --- a/src/shared/Common.cpp +++ b/src/shared/Common.cpp @@ -40,3 +40,4 @@ LocaleConstant GetLocaleByName(const std::string& name) return LOCALE_enUS; // including enGB case } + diff --git a/src/shared/Common.h b/src/shared/Common.h index a0884a8455e..9f5b9473bd9 100644 --- a/src/shared/Common.h +++ b/src/shared/Common.h @@ -208,3 +208,4 @@ LocaleConstant GetLocaleByName(const std::string& name); #endif #endif + diff --git a/src/shared/Config/Config.cpp b/src/shared/Config/Config.cpp index b3a3b13d652..52fca953f64 100644 --- a/src/shared/Config/Config.cpp +++ b/src/shared/Config/Config.cpp @@ -174,3 +174,4 @@ float Config::GetFloatDefault(const char* name, const float def) float val; return (GetFloat(name, &val) ? val : def); } + diff --git a/src/shared/Config/Config.h b/src/shared/Config/Config.h index 424c369bd92..2c709f02ae5 100644 --- a/src/shared/Config/Config.h +++ b/src/shared/Config/Config.h @@ -58,3 +58,4 @@ class TRINITY_DLL_SPEC Config #define sConfig Trinity::Singleton<Config>::Instance() #endif + diff --git a/src/shared/Config/ConfigEnv.h b/src/shared/Config/ConfigEnv.h index 6c3a54a45fc..75209a7fc6b 100644 --- a/src/shared/Config/ConfigEnv.h +++ b/src/shared/Config/ConfigEnv.h @@ -27,3 +27,4 @@ #include "Config.h" #endif + diff --git a/src/shared/Config/dotconfpp/dotconfpp.cpp b/src/shared/Config/dotconfpp/dotconfpp.cpp index c46b1fe6fb9..bd575d95ece 100644 --- a/src/shared/Config/dotconfpp/dotconfpp.cpp +++ b/src/shared/Config/dotconfpp/dotconfpp.cpp @@ -586,3 +586,4 @@ void DOTCONFDocument::setRequiredOptionNames(const char ** requiredOptionNames) ++requiredOptionNames; } } + diff --git a/src/shared/Config/dotconfpp/dotconfpp.h b/src/shared/Config/dotconfpp/dotconfpp.h index 15c4f7fcd78..7887f86ccc1 100644 --- a/src/shared/Config/dotconfpp/dotconfpp.h +++ b/src/shared/Config/dotconfpp/dotconfpp.h @@ -108,3 +108,4 @@ public: }; #endif + diff --git a/src/shared/Config/dotconfpp/mempool.cpp b/src/shared/Config/dotconfpp/mempool.cpp index cf589ffb2bc..487dae0bd0a 100644 --- a/src/shared/Config/dotconfpp/mempool.cpp +++ b/src/shared/Config/dotconfpp/mempool.cpp @@ -98,3 +98,4 @@ char * AsyncDNSMemPool::strdup(const char *str) { return ::strcpy((char*)this->alloc(strlen(str)+1), str); } + diff --git a/src/shared/Config/dotconfpp/mempool.h b/src/shared/Config/dotconfpp/mempool.h index 04bd1e006ad..81c01d15a58 100644 --- a/src/shared/Config/dotconfpp/mempool.h +++ b/src/shared/Config/dotconfpp/mempool.h @@ -44,3 +44,4 @@ public: }; #endif + diff --git a/src/shared/Database/DBCEnums.h b/src/shared/Database/DBCEnums.h index e546b1f7828..ee4f165f898 100644 --- a/src/shared/Database/DBCEnums.h +++ b/src/shared/Database/DBCEnums.h @@ -321,3 +321,4 @@ enum SummonFlags }; */ #endif + diff --git a/src/shared/Database/DBCStores.cpp b/src/shared/Database/DBCStores.cpp index 6e49a344b1a..8890ad0eb1e 100644 --- a/src/shared/Database/DBCStores.cpp +++ b/src/shared/Database/DBCStores.cpp @@ -709,3 +709,4 @@ uint32 const* GetTalentTabPages(uint32 cls) TRINITY_DLL_SPEC DBCStorage <SoundEntriesEntry> const* GetSoundEntriesStore() { return &sSoundEntriesStore; } TRINITY_DLL_SPEC DBCStorage <SpellEntry> const* GetSpellStore() { return &sSpellStore; } TRINITY_DLL_SPEC DBCStorage <SpellRangeEntry> const* GetSpellRangeStore() { return &sSpellRangeStore; } + diff --git a/src/shared/Database/DBCStores.h b/src/shared/Database/DBCStores.h index 4a67164a773..8a7ee02cc95 100644 --- a/src/shared/Database/DBCStores.h +++ b/src/shared/Database/DBCStores.h @@ -221,3 +221,4 @@ TRINITY_DLL_SPEC DBCStorage <SoundEntriesEntry> const* GetSoundEntriesStore(); TRINITY_DLL_SPEC DBCStorage <SpellEntry> const* GetSpellStore(); TRINITY_DLL_SPEC DBCStorage <SpellRangeEntry> const* GetSpellRangeStore(); #endif + diff --git a/src/shared/Database/DBCStructure.h b/src/shared/Database/DBCStructure.h index 4be24d9e24b..975dbf300f1 100644 --- a/src/shared/Database/DBCStructure.h +++ b/src/shared/Database/DBCStructure.h @@ -1578,3 +1578,4 @@ typedef std::vector<TaxiPathNodeList> TaxiPathNodesByPath; #define TaxiMaskSize 12 typedef uint32 TaxiMask[TaxiMaskSize]; #endif + diff --git a/src/shared/Database/Database.cpp b/src/shared/Database/Database.cpp index 5d7f5bf473e..07ece3b0cd9 100644 --- a/src/shared/Database/Database.cpp +++ b/src/shared/Database/Database.cpp @@ -171,3 +171,4 @@ bool Database::DirectPExecute(const char * format,...) return DirectExecute(szQuery); } + diff --git a/src/shared/Database/Database.h b/src/shared/Database/Database.h index beff0fb740a..92a1c991dcc 100644 --- a/src/shared/Database/Database.h +++ b/src/shared/Database/Database.h @@ -135,3 +135,4 @@ class TRINITY_DLL_SPEC Database std::string m_logsDir; }; #endif + diff --git a/src/shared/Database/DatabaseEnv.h b/src/shared/Database/DatabaseEnv.h index df1f51adbe7..9366d1e0070 100644 --- a/src/shared/Database/DatabaseEnv.h +++ b/src/shared/Database/DatabaseEnv.h @@ -56,3 +56,4 @@ extern DatabaseType CharacterDatabase; extern DatabaseType LoginDatabase; #endif + diff --git a/src/shared/Database/DatabaseImpl.h b/src/shared/Database/DatabaseImpl.h index c9a02a0a4a1..3d3c53f0873 100644 --- a/src/shared/Database/DatabaseImpl.h +++ b/src/shared/Database/DatabaseImpl.h @@ -205,3 +205,4 @@ Database::DelayQueryHolder(Class *object, void (Class::*method)(QueryResult*, Sq #undef ASYNC_QUERY_BODY #undef ASYNC_PQUERY_BODY #undef ASYNC_DELAYHOLDER_BODY + diff --git a/src/shared/Database/DatabaseMysql.cpp b/src/shared/Database/DatabaseMysql.cpp index 7e67861d883..e7babedddfe 100644 --- a/src/shared/Database/DatabaseMysql.cpp +++ b/src/shared/Database/DatabaseMysql.cpp @@ -408,3 +408,4 @@ void DatabaseMysql::HaltDelayThread() m_threadBody = NULL; } #endif + diff --git a/src/shared/Database/DatabaseMysql.h b/src/shared/Database/DatabaseMysql.h index 6dbaf4a59ab..2fa157e75a5 100644 --- a/src/shared/Database/DatabaseMysql.h +++ b/src/shared/Database/DatabaseMysql.h @@ -77,3 +77,4 @@ class TRINITY_DLL_SPEC DatabaseMysql : public Database }; #endif #endif + diff --git a/src/shared/Database/DatabasePostgre.cpp b/src/shared/Database/DatabasePostgre.cpp index 8f8cf95b429..502808b7933 100644 --- a/src/shared/Database/DatabasePostgre.cpp +++ b/src/shared/Database/DatabasePostgre.cpp @@ -345,3 +345,4 @@ void DatabasePostgre::HaltDelayThread() m_threadBody = NULL; } #endif + diff --git a/src/shared/Database/DatabasePostgre.h b/src/shared/Database/DatabasePostgre.h index 9a2aeb84a07..c7242add572 100644 --- a/src/shared/Database/DatabasePostgre.h +++ b/src/shared/Database/DatabasePostgre.h @@ -75,3 +75,4 @@ class DatabasePostgre : public Database bool _TransactionCmd(const char *sql); }; #endif + diff --git a/src/shared/Database/DatabaseSqlite.cpp b/src/shared/Database/DatabaseSqlite.cpp index a3fffd8aa4c..b5def933723 100644 --- a/src/shared/Database/DatabaseSqlite.cpp +++ b/src/shared/Database/DatabaseSqlite.cpp @@ -101,3 +101,4 @@ bool DatabaseSqlite::Execute(const char *sql) return true; } #endif + diff --git a/src/shared/Database/DatabaseSqlite.h b/src/shared/Database/DatabaseSqlite.h index a9593989143..c84b59eea80 100644 --- a/src/shared/Database/DatabaseSqlite.h +++ b/src/shared/Database/DatabaseSqlite.h @@ -43,3 +43,4 @@ class DatabaseSqlite : public Database }; #endif #endif + diff --git a/src/shared/Database/Field.cpp b/src/shared/Database/Field.cpp index 18831e23687..9a1fbfa5178 100644 --- a/src/shared/Database/Field.cpp +++ b/src/shared/Database/Field.cpp @@ -65,3 +65,4 @@ void Field::SetValue(const char *value) else mValue = NULL; } + diff --git a/src/shared/Database/Field.h b/src/shared/Database/Field.h index a4514c963cd..da6a865c6f2 100644 --- a/src/shared/Database/Field.h +++ b/src/shared/Database/Field.h @@ -75,3 +75,4 @@ class Field enum DataTypes mType; }; #endif + diff --git a/src/shared/Database/MySQLDelayThread.h b/src/shared/Database/MySQLDelayThread.h index 5f3e66de722..fcebe3fbd35 100644 --- a/src/shared/Database/MySQLDelayThread.h +++ b/src/shared/Database/MySQLDelayThread.h @@ -30,3 +30,4 @@ class MySQLDelayThread : public SqlDelayThread void Stop() { SqlDelayThread::Stop(); } }; #endif //__MYSQLDELAYTHREAD_H + diff --git a/src/shared/Database/PGSQLDelayThread.h b/src/shared/Database/PGSQLDelayThread.h index bd6a2bf962d..8d219bd9c1e 100644 --- a/src/shared/Database/PGSQLDelayThread.h +++ b/src/shared/Database/PGSQLDelayThread.h @@ -30,3 +30,4 @@ class PGSQLDelayThread : public SqlDelayThread void Stop() { SqlDelayThread::Stop(); } }; #endif //__PGSQLDELAYTHREAD_H + diff --git a/src/shared/Database/QueryResult.h b/src/shared/Database/QueryResult.h index 0fab7a3633b..01da45ed281 100644 --- a/src/shared/Database/QueryResult.h +++ b/src/shared/Database/QueryResult.h @@ -64,3 +64,4 @@ class TRINITY_DLL_SPEC QueryResult FieldNames mFieldNames; }; #endif + diff --git a/src/shared/Database/QueryResultMysql.cpp b/src/shared/Database/QueryResultMysql.cpp index 8ae59b350d8..5bc11ae308f 100644 --- a/src/shared/Database/QueryResultMysql.cpp +++ b/src/shared/Database/QueryResultMysql.cpp @@ -110,3 +110,4 @@ enum Field::DataTypes QueryResultMysql::ConvertNativeType(enum_field_types mysql } } #endif + diff --git a/src/shared/Database/QueryResultMysql.h b/src/shared/Database/QueryResultMysql.h index 39d2985ad77..06b1353c12e 100644 --- a/src/shared/Database/QueryResultMysql.h +++ b/src/shared/Database/QueryResultMysql.h @@ -48,3 +48,4 @@ class QueryResultMysql : public QueryResult }; #endif #endif + diff --git a/src/shared/Database/QueryResultPostgre.cpp b/src/shared/Database/QueryResultPostgre.cpp index e10905f0feb..500ca053885 100644 --- a/src/shared/Database/QueryResultPostgre.cpp +++ b/src/shared/Database/QueryResultPostgre.cpp @@ -139,3 +139,4 @@ enum Field::DataTypes QueryResultPostgre::ConvertNativeType(Oid pOid ) const return Field::DB_TYPE_UNKNOWN; } #endif + diff --git a/src/shared/Database/QueryResultPostgre.h b/src/shared/Database/QueryResultPostgre.h index aa183ab4b96..30d69114dc6 100644 --- a/src/shared/Database/QueryResultPostgre.h +++ b/src/shared/Database/QueryResultPostgre.h @@ -48,3 +48,4 @@ class QueryResultPostgre : public QueryResult uint32 mTableIndex; }; #endif + diff --git a/src/shared/Database/QueryResultSqlite.cpp b/src/shared/Database/QueryResultSqlite.cpp index 9a32e36bc84..06a02d1db59 100644 --- a/src/shared/Database/QueryResultSqlite.cpp +++ b/src/shared/Database/QueryResultSqlite.cpp @@ -96,3 +96,4 @@ enum Field::DataTypes QueryResultSqlite::ConvertNativeType(const char* sqliteTyp return Field::DB_TYPE_UNKNOWN; } #endif + diff --git a/src/shared/Database/QueryResultSqlite.h b/src/shared/Database/QueryResultSqlite.h index d3462977e49..5dc3287b385 100644 --- a/src/shared/Database/QueryResultSqlite.h +++ b/src/shared/Database/QueryResultSqlite.h @@ -43,3 +43,4 @@ class QueryResultSqlite : public QueryResult }; #endif #endif + diff --git a/src/shared/Database/SQLStorage.cpp b/src/shared/Database/SQLStorage.cpp index 2f4f4534b3a..2401f715074 100644 --- a/src/shared/Database/SQLStorage.cpp +++ b/src/shared/Database/SQLStorage.cpp @@ -81,3 +81,4 @@ void SQLStorage::Load() SQLStorageLoader loader; loader.Load(*this); } + diff --git a/src/shared/Database/SQLStorage.h b/src/shared/Database/SQLStorage.h index f2250410c26..1b5b9d5dcf1 100644 --- a/src/shared/Database/SQLStorage.h +++ b/src/shared/Database/SQLStorage.h @@ -114,3 +114,4 @@ struct SQLStorageLoader : public SQLStorageLoaderBase<SQLStorageLoader> }; #endif + diff --git a/src/shared/Database/SQLStorageImpl.h b/src/shared/Database/SQLStorageImpl.h index b820d68619b..6cb67832f02 100644 --- a/src/shared/Database/SQLStorageImpl.h +++ b/src/shared/Database/SQLStorageImpl.h @@ -212,3 +212,4 @@ void SQLStorageLoaderBase<T>::Load(SQLStorage &store) store.MaxEntry = maxi; store.data = _data; } + diff --git a/src/shared/Database/SqlDelayThread.cpp b/src/shared/Database/SqlDelayThread.cpp index a35090adb7e..27f58510a0a 100644 --- a/src/shared/Database/SqlDelayThread.cpp +++ b/src/shared/Database/SqlDelayThread.cpp @@ -55,3 +55,4 @@ void SqlDelayThread::Stop() { m_running = false; } + diff --git a/src/shared/Database/SqlDelayThread.h b/src/shared/Database/SqlDelayThread.h index 1fc35741fc5..cbae0c1e5eb 100644 --- a/src/shared/Database/SqlDelayThread.h +++ b/src/shared/Database/SqlDelayThread.h @@ -48,3 +48,4 @@ class SqlDelayThread : public ZThread::Runnable virtual void run(); ///< Main Thread loop }; #endif //__SQLDELAYTHREAD_H + diff --git a/src/shared/Database/SqlOperations.cpp b/src/shared/Database/SqlOperations.cpp index 233eed1e4cb..68f5759a85e 100644 --- a/src/shared/Database/SqlOperations.cpp +++ b/src/shared/Database/SqlOperations.cpp @@ -199,3 +199,4 @@ void SqlQueryHolderEx::Execute(Database *db) /// sync with the caller thread m_queue->add(m_callback); } + diff --git a/src/shared/Database/SqlOperations.h b/src/shared/Database/SqlOperations.h index b7c84b5d6cf..61eef4bb7c4 100644 --- a/src/shared/Database/SqlOperations.h +++ b/src/shared/Database/SqlOperations.h @@ -121,3 +121,4 @@ class SqlQueryHolderEx : public SqlOperation void Execute(Database *db); }; #endif //__SQLOPERATIONS_H + diff --git a/src/shared/Database/dbcfile.cpp b/src/shared/Database/dbcfile.cpp index f0b7e6e3c15..c40c8b223e1 100644 --- a/src/shared/Database/dbcfile.cpp +++ b/src/shared/Database/dbcfile.cpp @@ -243,3 +243,4 @@ char* DBCFile::AutoProduceStrings(const char* format, char* dataTable) return stringPool; } + diff --git a/src/shared/Database/dbcfile.h b/src/shared/Database/dbcfile.h index 470322326aa..e94417b4371 100644 --- a/src/shared/Database/dbcfile.h +++ b/src/shared/Database/dbcfile.h @@ -107,3 +107,4 @@ class DBCFile unsigned char *stringTable; }; #endif + diff --git a/src/shared/Errors.h b/src/shared/Errors.h index a521ae7f3f0..b7bd19a1d94 100644 --- a/src/shared/Errors.h +++ b/src/shared/Errors.h @@ -29,3 +29,4 @@ #define ASSERT WPAssert #endif + diff --git a/src/shared/Log.cpp b/src/shared/Log.cpp index 2ed66ae3189..c0f70f4790b 100644 --- a/src/shared/Log.cpp +++ b/src/shared/Log.cpp @@ -796,3 +796,4 @@ void error_db_log(const char * str, ...) Trinity::Singleton<Log>::Instance().outErrorDb(buf); } + diff --git a/src/shared/Log.h b/src/shared/Log.h index 076d660be61..b4344eac262 100644 --- a/src/shared/Log.h +++ b/src/shared/Log.h @@ -165,3 +165,4 @@ void TRINITY_DLL_SPEC debug_log(const char * str, ...) ATTR_PRINTF(1,2); void TRINITY_DLL_SPEC error_log(const char * str, ...) ATTR_PRINTF(1,2); void TRINITY_DLL_SPEC error_db_log(const char * str, ...) ATTR_PRINTF(1,2); #endif + diff --git a/src/shared/Mthread.cpp b/src/shared/Mthread.cpp index 8985b9cebc8..fbbeeb5a620 100644 --- a/src/shared/Mthread.cpp +++ b/src/shared/Mthread.cpp @@ -203,3 +203,4 @@ MMutex *MMutex::Create () return mutex; } #endif + diff --git a/src/shared/Mthread.h b/src/shared/Mthread.h index 1afee4acd1b..d0ac6deb43c 100644 --- a/src/shared/Mthread.h +++ b/src/shared/Mthread.h @@ -60,3 +60,4 @@ class MMutex : public Base virtual void Unlock (); }; #endif // MTHREAD_H + diff --git a/src/shared/PacketLog.cpp b/src/shared/PacketLog.cpp index 2fcd6c58b9b..96c9727e7fa 100644 --- a/src/shared/PacketLog.cpp +++ b/src/shared/PacketLog.cpp @@ -157,3 +157,4 @@ void PacketLog::WorldHexDump(WorldPacket* data, uint32 socket, bool direction) HexDump((char *)data->contents(), data->size(), "world.log"); } + diff --git a/src/shared/PacketLog.h b/src/shared/PacketLog.h index b4313c48624..49ac72ebc4b 100644 --- a/src/shared/PacketLog.h +++ b/src/shared/PacketLog.h @@ -46,3 +46,4 @@ class PacketLog #define sPacketLog Trinity::Singleton<PacketLog>::Instance() #endif + diff --git a/src/shared/ProgressBar.cpp b/src/shared/ProgressBar.cpp index 0108dfec974..b72118ad804 100644 --- a/src/shared/ProgressBar.cpp +++ b/src/shared/ProgressBar.cpp @@ -80,3 +80,4 @@ void barGoLink::step( void ) rec_pos = n; } } + diff --git a/src/shared/ProgressBar.h b/src/shared/ProgressBar.h index 8c551ed65dc..50c5c7d11e5 100644 --- a/src/shared/ProgressBar.h +++ b/src/shared/ProgressBar.h @@ -40,3 +40,4 @@ class TRINITY_DLL_SPEC barGoLink ~barGoLink(); }; #endif + diff --git a/src/shared/ServiceWin32.cpp b/src/shared/ServiceWin32.cpp index 878656b1d91..bdc2a371297 100644 --- a/src/shared/ServiceWin32.cpp +++ b/src/shared/ServiceWin32.cpp @@ -260,3 +260,4 @@ bool WinServiceRun() return true; } #endif + diff --git a/src/shared/ServiceWin32.h b/src/shared/ServiceWin32.h index 762502ccaa7..18a52c396ea 100644 --- a/src/shared/ServiceWin32.h +++ b/src/shared/ServiceWin32.h @@ -28,3 +28,4 @@ bool WinServiceRun(); #endif // _WIN32_SERVICE_ #endif // WIN32 + diff --git a/src/shared/SystemConfig.h b/src/shared/SystemConfig.h index 7d0143085b4..679eee407e6 100644 --- a/src/shared/SystemConfig.h +++ b/src/shared/SystemConfig.h @@ -52,3 +52,4 @@ #define DEFAULT_REALMSERVER_PORT 3724 #define DEFAULT_SOCKET_SELECT_TIME 10000 #endif + diff --git a/src/shared/Timer.h b/src/shared/Timer.h index 30f5966afce..82f5be161d9 100644 --- a/src/shared/Timer.h +++ b/src/shared/Timer.h @@ -96,3 +96,4 @@ struct TimeTrackerSmall }; #endif + diff --git a/src/shared/Util.cpp b/src/shared/Util.cpp index 0d3010c5f04..36c41e5da48 100644 --- a/src/shared/Util.cpp +++ b/src/shared/Util.cpp @@ -425,3 +425,4 @@ bool Utf8FitTo(const std::string& str, std::wstring search) return true; } + diff --git a/src/shared/Util.h b/src/shared/Util.h index adfbdad620a..712f100bd33 100644 --- a/src/shared/Util.h +++ b/src/shared/Util.h @@ -544,4 +544,3 @@ public: return (part[el]); }; }; -#endif diff --git a/src/shared/WheatyExceptionReport.cpp b/src/shared/WheatyExceptionReport.cpp index 5d365639fbf..7b97edd8f5b 100644 --- a/src/shared/WheatyExceptionReport.cpp +++ b/src/shared/WheatyExceptionReport.cpp @@ -1013,3 +1013,4 @@ int __cdecl WheatyExceptionReport::_tprintf(const TCHAR * format, ...) return retValue; } + diff --git a/src/shared/WheatyExceptionReport.h b/src/shared/WheatyExceptionReport.h index 896d9c72f36..32cd78fa100 100644 --- a/src/shared/WheatyExceptionReport.h +++ b/src/shared/WheatyExceptionReport.h @@ -115,3 +115,4 @@ class WheatyExceptionReport extern WheatyExceptionReport g_WheatyExceptionReport; // global instance of class #endif //WheatyExceptionReport + diff --git a/src/shared/WorldPacket.h b/src/shared/WorldPacket.h index 4d30533d2f1..1eb3f12dd86 100644 --- a/src/shared/WorldPacket.h +++ b/src/shared/WorldPacket.h @@ -51,3 +51,4 @@ class WorldPacket : public ByteBuffer uint16 m_opcode; }; #endif + diff --git a/src/shared/vmap/AABSPTree.h b/src/shared/vmap/AABSPTree.h index bc33a6699d1..ff4335b6774 100644 --- a/src/shared/vmap/AABSPTree.h +++ b/src/shared/vmap/AABSPTree.h @@ -1618,3 +1618,4 @@ public: + diff --git a/src/shared/vmap/BaseModel.cpp b/src/shared/vmap/BaseModel.cpp index bce9c718acd..2ffd5672218 100644 --- a/src/shared/vmap/BaseModel.cpp +++ b/src/shared/vmap/BaseModel.cpp @@ -95,3 +95,4 @@ namespace VMAP } } // VMAP + diff --git a/src/shared/vmap/BaseModel.h b/src/shared/vmap/BaseModel.h index 42e277634ba..098e1d9381b 100644 --- a/src/shared/vmap/BaseModel.h +++ b/src/shared/vmap/BaseModel.h @@ -99,3 +99,4 @@ namespace VMAP } #endif /*BASEMODEL_H_*/ + diff --git a/src/shared/vmap/CoordModelMapping.cpp b/src/shared/vmap/CoordModelMapping.cpp index 9c7cbe58a6b..c362101ffb4 100644 --- a/src/shared/vmap/CoordModelMapping.cpp +++ b/src/shared/vmap/CoordModelMapping.cpp @@ -187,3 +187,4 @@ namespace VMAP //================================================================= } + diff --git a/src/shared/vmap/CoordModelMapping.h b/src/shared/vmap/CoordModelMapping.h index 10392ca7eaf..7c89f0e8a0f 100644 --- a/src/shared/vmap/CoordModelMapping.h +++ b/src/shared/vmap/CoordModelMapping.h @@ -144,3 +144,4 @@ namespace VMAP }; } #endif /*_COORDMODELMAPPING_H_*/ + diff --git a/src/shared/vmap/DebugCmdLogger.cpp b/src/shared/vmap/DebugCmdLogger.cpp index 26846fa5783..de656f4cfc5 100644 --- a/src/shared/vmap/DebugCmdLogger.cpp +++ b/src/shared/vmap/DebugCmdLogger.cpp @@ -125,3 +125,4 @@ namespace VMAP } //======================================================== } + diff --git a/src/shared/vmap/DebugCmdLogger.h b/src/shared/vmap/DebugCmdLogger.h index f0e35d377bf..5493ab6f332 100644 --- a/src/shared/vmap/DebugCmdLogger.h +++ b/src/shared/vmap/DebugCmdLogger.h @@ -116,3 +116,4 @@ namespace VMAP } #endif + diff --git a/src/shared/vmap/IVMapManager.h b/src/shared/vmap/IVMapManager.h index 49f639b845e..243a15aef73 100644 --- a/src/shared/vmap/IVMapManager.h +++ b/src/shared/vmap/IVMapManager.h @@ -99,3 +99,4 @@ namespace VMAP } #endif + diff --git a/src/shared/vmap/ManagedModelContainer.cpp b/src/shared/vmap/ManagedModelContainer.cpp index 34800b3b5f7..c7bfefe7179 100644 --- a/src/shared/vmap/ManagedModelContainer.cpp +++ b/src/shared/vmap/ManagedModelContainer.cpp @@ -35,3 +35,4 @@ namespace VMAP } } + diff --git a/src/shared/vmap/ManagedModelContainer.h b/src/shared/vmap/ManagedModelContainer.h index 5aa6bfdf1c3..e6862f915c7 100644 --- a/src/shared/vmap/ManagedModelContainer.h +++ b/src/shared/vmap/ManagedModelContainer.h @@ -49,3 +49,4 @@ namespace VMAP //======================================================= } #endif + diff --git a/src/shared/vmap/ModelContainer.cpp b/src/shared/vmap/ModelContainer.cpp index a4bc5b8aa17..4a722d2585b 100644 --- a/src/shared/vmap/ModelContainer.cpp +++ b/src/shared/vmap/ModelContainer.cpp @@ -375,3 +375,4 @@ namespace VMAP } //================================================================= } // VMAP + diff --git a/src/shared/vmap/ModelContainer.h b/src/shared/vmap/ModelContainer.h index f66b11658d6..abc96261050 100644 --- a/src/shared/vmap/ModelContainer.h +++ b/src/shared/vmap/ModelContainer.h @@ -108,3 +108,4 @@ namespace VMAP void getBounds(const ModelContainer* pMc, G3D::AABox& pAABox); } #endif + diff --git a/src/shared/vmap/NodeValueAccess.h b/src/shared/vmap/NodeValueAccess.h index 70bd0eeefae..54fc5ee99b6 100644 --- a/src/shared/vmap/NodeValueAccess.h +++ b/src/shared/vmap/NodeValueAccess.h @@ -48,3 +48,4 @@ namespace VMAP }; } #endif + diff --git a/src/shared/vmap/ShortBox.h b/src/shared/vmap/ShortBox.h index 059e59f47e6..0e98677aa9e 100644 --- a/src/shared/vmap/ShortBox.h +++ b/src/shared/vmap/ShortBox.h @@ -148,3 +148,4 @@ namespace VMAP } #endif + diff --git a/src/shared/vmap/ShortVector.h b/src/shared/vmap/ShortVector.h index d02e6b4081e..5f0fb7d9fd8 100644 --- a/src/shared/vmap/ShortVector.h +++ b/src/shared/vmap/ShortVector.h @@ -134,3 +134,4 @@ namespace VMAP }; } #endif + diff --git a/src/shared/vmap/SubModel.cpp b/src/shared/vmap/SubModel.cpp index ed586ce6b52..370c80062d6 100644 --- a/src/shared/vmap/SubModel.cpp +++ b/src/shared/vmap/SubModel.cpp @@ -248,3 +248,4 @@ namespace VMAP //========================================================== } + diff --git a/src/shared/vmap/SubModel.h b/src/shared/vmap/SubModel.h index 5a0b0d38be7..89ea9b91d7b 100644 --- a/src/shared/vmap/SubModel.h +++ b/src/shared/vmap/SubModel.h @@ -102,3 +102,4 @@ namespace VMAP //==================================== } // VMAP #endif + diff --git a/src/shared/vmap/TileAssembler.cpp b/src/shared/vmap/TileAssembler.cpp index e57836a6f9e..64d67205f68 100644 --- a/src/shared/vmap/TileAssembler.cpp +++ b/src/shared/vmap/TileAssembler.cpp @@ -570,3 +570,4 @@ namespace VMAP //========================================== } // VMAP + diff --git a/src/shared/vmap/TileAssembler.h b/src/shared/vmap/TileAssembler.h index cdfd6e1311d..d2183794a9e 100644 --- a/src/shared/vmap/TileAssembler.h +++ b/src/shared/vmap/TileAssembler.h @@ -93,3 +93,4 @@ namespace VMAP //=============================================== } // VMAP #endif /*_TILEASSEMBLER_H_*/ + diff --git a/src/shared/vmap/TreeNode.cpp b/src/shared/vmap/TreeNode.cpp index 1c0cff7d4b3..c884f9b3b1d 100644 --- a/src/shared/vmap/TreeNode.cpp +++ b/src/shared/vmap/TreeNode.cpp @@ -37,3 +37,4 @@ namespace VMAP //================================================================= //================================================================= } + diff --git a/src/shared/vmap/TreeNode.h b/src/shared/vmap/TreeNode.h index d30b470b4b3..1b9532001e5 100644 --- a/src/shared/vmap/TreeNode.h +++ b/src/shared/vmap/TreeNode.h @@ -223,3 +223,4 @@ namespace VMAP }; } #endif + diff --git a/src/shared/vmap/VMapDefinitions.h b/src/shared/vmap/VMapDefinitions.h index 35c672bd82e..fd28a91d515 100644 --- a/src/shared/vmap/VMapDefinitions.h +++ b/src/shared/vmap/VMapDefinitions.h @@ -37,3 +37,4 @@ namespace VMAP //====================================== } #endif + diff --git a/src/shared/vmap/VMapFactory.cpp b/src/shared/vmap/VMapFactory.cpp index f0a78ba4f1c..5189f79daba 100644 --- a/src/shared/vmap/VMapFactory.cpp +++ b/src/shared/vmap/VMapFactory.cpp @@ -110,3 +110,4 @@ namespace VMAP } } } + diff --git a/src/shared/vmap/VMapFactory.h b/src/shared/vmap/VMapFactory.h index 738a8a7f4e0..f3375d723c1 100644 --- a/src/shared/vmap/VMapFactory.h +++ b/src/shared/vmap/VMapFactory.h @@ -43,3 +43,4 @@ namespace VMAP } #endif + diff --git a/src/shared/vmap/VMapManager.cpp b/src/shared/vmap/VMapManager.cpp index 9cf35b2655d..f5c2640be70 100644 --- a/src/shared/vmap/VMapManager.cpp +++ b/src/shared/vmap/VMapManager.cpp @@ -774,3 +774,4 @@ namespace VMAP //========================================================= //========================================================= } + diff --git a/src/shared/vmap/VMapManager.h b/src/shared/vmap/VMapManager.h index 02e0ec3e179..bfeba3cfe67 100644 --- a/src/shared/vmap/VMapManager.h +++ b/src/shared/vmap/VMapManager.h @@ -173,3 +173,4 @@ namespace VMAP }; } #endif + diff --git a/src/shared/vmap/VMapTools.h b/src/shared/vmap/VMapTools.h index 5253392f867..3af3a29310d 100644 --- a/src/shared/vmap/VMapTools.h +++ b/src/shared/vmap/VMapTools.h @@ -150,3 +150,4 @@ namespace VMAP }; } #endif + diff --git a/src/tools/genrevision/genrevision.cpp b/src/tools/genrevision/genrevision.cpp index 83cf4da7c62..1fefe3677fe 100644 --- a/src/tools/genrevision/genrevision.cpp +++ b/src/tools/genrevision/genrevision.cpp @@ -405,3 +405,4 @@ int main(int argc, char **argv) return 0; } + diff --git a/src/trinitycore/CliRunnable.cpp b/src/trinitycore/CliRunnable.cpp index a0609309298..e256128ed90 100644 --- a/src/trinitycore/CliRunnable.cpp +++ b/src/trinitycore/CliRunnable.cpp @@ -373,3 +373,4 @@ void CliRunnable::run() ///- End the database thread WorldDatabase.ThreadEnd(); // free mySQL thread resources } + diff --git a/src/trinitycore/CliRunnable.h b/src/trinitycore/CliRunnable.h index f50cae814bc..ea60ef695bc 100644 --- a/src/trinitycore/CliRunnable.h +++ b/src/trinitycore/CliRunnable.h @@ -33,3 +33,4 @@ class CliRunnable : public ZThread::Runnable }; #endif /// @} + diff --git a/src/trinitycore/Main.cpp b/src/trinitycore/Main.cpp index df9d9185deb..43783dc24ee 100644 --- a/src/trinitycore/Main.cpp +++ b/src/trinitycore/Main.cpp @@ -172,3 +172,4 @@ extern int main(int argc, char **argv) } /// @} + diff --git a/src/trinitycore/Master.cpp b/src/trinitycore/Master.cpp index 8eeda54ab83..557124ca5e0 100644 --- a/src/trinitycore/Master.cpp +++ b/src/trinitycore/Master.cpp @@ -518,3 +518,4 @@ void Master::_UnhookSignals() signal(SIGBREAK, 0); #endif } + diff --git a/src/trinitycore/Master.h b/src/trinitycore/Master.h index 36d4b29495e..456202594f6 100644 --- a/src/trinitycore/Master.h +++ b/src/trinitycore/Master.h @@ -50,3 +50,4 @@ class Master #define sMaster Trinity::Singleton<Master>::Instance() #endif /// @} + diff --git a/src/trinitycore/RASocket.cpp b/src/trinitycore/RASocket.cpp index a48928d5a23..48749b09ceb 100644 --- a/src/trinitycore/RASocket.cpp +++ b/src/trinitycore/RASocket.cpp @@ -257,3 +257,4 @@ void RASocket::zprint( const char * szText ) #endif } + diff --git a/src/trinitycore/RASocket.h b/src/trinitycore/RASocket.h new file mode 100644 index 00000000000..145afd52c60 --- /dev/null +++ b/src/trinitycore/RASocket.h @@ -0,0 +1,68 @@ +/* + * Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/> + * + * Copyright (C) 2008 Trinity <http://www.trinitycore.org/> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/// \addtogroup Trinityd +/// @{ +/// \file + +#ifndef _RASOCKET_H +#define _RASOCKET_H + +#include "Common.h" +#include "sockets/TcpSocket.h" + +#define RA_BUFF_SIZE 1024 + +class ISocketHandler; + +/// Remote Administration socket +class RASocket: public TcpSocket +{ + public: + + RASocket(ISocketHandler& h); + ~RASocket(); + + void OnAccept(); + void OnRead(); + + private: + + char * buff; + std::string szLogin; + uint32 iSess; + unsigned int iInputLength; + bool bLog; + bool bSecure; //kick on wrong pass, non exist. user, user with no priv + //will protect from DOS, bruteforce attacks + //some 'smart' protection must be added for more security + uint8 iMinLevel; + enum + { + NONE, //initial value + LG, //only login was entered + OK, //both login and pass were given, and they are correct and user have enough priv. + }stage; + + static void zprint( const char * szText ); +}; +#endif +/// @} + diff --git a/src/trinitycore/WorldRunnable.cpp b/src/trinitycore/WorldRunnable.cpp index ec4c25a6cf6..b29e1434a64 100644 --- a/src/trinitycore/WorldRunnable.cpp +++ b/src/trinitycore/WorldRunnable.cpp @@ -84,3 +84,4 @@ void WorldRunnable::run() ///- End the database thread WorldDatabase.ThreadEnd(); // free mySQL thread resources } + diff --git a/src/trinitycore/WorldRunnable.h b/src/trinitycore/WorldRunnable.h index 73a7f17e52f..b84e5b6a04c 100644 --- a/src/trinitycore/WorldRunnable.h +++ b/src/trinitycore/WorldRunnable.h @@ -33,3 +33,4 @@ class WorldRunnable : public ZThread::Runnable }; #endif /// @} + diff --git a/src/trinitycore/resource.h b/src/trinitycore/resource.h index 7dc5cb9ef7b..fbc730320b4 100644 --- a/src/trinitycore/resource.h +++ b/src/trinitycore/resource.h @@ -13,3 +13,4 @@ #define _APS_NEXT_SYMED_VALUE 101 #endif #endif + diff --git a/src/trinityrealm/AuthCodes.h b/src/trinityrealm/AuthCodes.h index 14a65b89504..defa513dede 100644 --- a/src/trinityrealm/AuthCodes.h +++ b/src/trinityrealm/AuthCodes.h @@ -73,3 +73,4 @@ enum LoginResult #define EXPECTED_TRINITY_CLIENT_BUILD {8606, 0} #endif + diff --git a/src/trinityrealm/AuthSocket.cpp b/src/trinityrealm/AuthSocket.cpp index c5c81593737..dd7bc31e45b 100644 --- a/src/trinityrealm/AuthSocket.cpp +++ b/src/trinityrealm/AuthSocket.cpp @@ -1092,3 +1092,4 @@ Patcher::~Patcher() for(Patches::iterator i = _patches.begin(); i != _patches.end(); i++ ) delete i->second; } + diff --git a/src/trinityrealm/AuthSocket.h b/src/trinityrealm/AuthSocket.h new file mode 100644 index 00000000000..73aa1b280e2 --- /dev/null +++ b/src/trinityrealm/AuthSocket.h @@ -0,0 +1,87 @@ +/* + * Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/> + * + * Copyright (C) 2008 Trinity <http://www.trinitycore.org/> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/// \addtogroup realmd +/// @{ +/// \file + +#ifndef _AUTHSOCKET_H +#define _AUTHSOCKET_H + +#include "Common.h" +#include "Auth/BigNumber.h" +#include "sockets/TcpSocket.h" +#include "sockets/SocketHandler.h" +#include "sockets/ListenSocket.h" +#include "sockets/Utility.h" +#include "sockets/Parse.h" +#include "sockets/Socket.h" +#include "zthread/Mutex.h" + +/// Handle login commands +class AuthSocket: public TcpSocket +{ + public: + const static int s_BYTE_SIZE = 32; + + AuthSocket(ISocketHandler& h); + ~AuthSocket(); + + void OnAccept(); + void OnRead(); + + bool _HandleLogonChallenge(); + bool _HandleLogonProof(); + bool _HandleReconnectChallenge(); + bool _HandleReconnectProof(); + bool _HandleRealmList(); + //data transfer handle for patch + + bool _HandleXferResume(); + bool _HandleXferCancel(); + bool _HandleXferAccept(); + + void _SetVSFields(const std::string& rI); + + FILE *pPatch; + ZThread::Mutex patcherLock; + bool IsLag(); + + private: + + BigNumber N, s, g, v; + BigNumber b, B; + BigNumber K; + BigNumber _reconnectProof; + + bool _authed; + + std::string _login; + std::string _safelogin; + + // Since GetLocaleByName() is _NOT_ bijective, we have to store the locale as a string. Otherwise we can't differ + // between enUS and enGB, which is important for the patch system + std::string _localizationName; + uint16 _build; + AccountTypes _accountSecurityLevel; +}; +#endif +/// @} + diff --git a/src/trinityrealm/Main.cpp b/src/trinityrealm/Main.cpp index 95829ee96ca..8c2c199b2f4 100644 --- a/src/trinityrealm/Main.cpp +++ b/src/trinityrealm/Main.cpp @@ -351,3 +351,4 @@ void UnhookSignals() } /// @} + diff --git a/src/trinityrealm/RealmList.cpp b/src/trinityrealm/RealmList.cpp index 6a3d6b47e0f..692f457b1a8 100644 --- a/src/trinityrealm/RealmList.cpp +++ b/src/trinityrealm/RealmList.cpp @@ -100,3 +100,4 @@ void RealmList::UpdateRealms(bool init) delete result; } } + diff --git a/src/trinityrealm/RealmList.h b/src/trinityrealm/RealmList.h index 842482bb75a..31690a19eb3 100644 --- a/src/trinityrealm/RealmList.h +++ b/src/trinityrealm/RealmList.h @@ -66,3 +66,4 @@ class RealmList }; #endif /// @} + diff --git a/src/trinityrealm/resource.h b/src/trinityrealm/resource.h index 7dc5cb9ef7b..fbc730320b4 100644 --- a/src/trinityrealm/resource.h +++ b/src/trinityrealm/resource.h @@ -13,3 +13,4 @@ #define _APS_NEXT_SYMED_VALUE 101 #endif #endif + |