API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Jul 20th, 2018
158
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 57.22 KB | None | 0 0
raw download clone embed print report
  1. From a002ab553a99bdde6b5b725302488b1de31fa9ca Mon Sep 17 00:00:00 2001
  2. From: Skirnir <skirnir@getmangos.com>
  3. Date: Tue, 18 Jan 2011 22:04:10 +0100
  4. Subject: [PATCH] make whitespace history
  5.  
  6. ---
  7. ChangeLog | 6 +-
  8. contrib/dbcEditer/SearchFrm.cpp | 4 +-
  9. contrib/dbcEditer/bin/update.txt | 2 +-
  10. contrib/dbcEditer/dbcedit.cpp | 6 +-
  11. contrib/dbcEditer/dbcedit.h | 4 +-
  12. contrib/dbcEditer/thOpenSource.cpp | 6 +-
  13. contrib/dbcEditer/thOpenSource.h | 4 +-
  14. contrib/dbcformat/dbc.desc | 70 ++++++++++----------
  15. contrib/extractor/CMakeLists.txt | 8 +-
  16. contrib/extractor/libmpq/common.cpp | 4 +-
  17. contrib/extractor/libmpq/explode.cpp | 2 +-
  18. contrib/extractor/libmpq/huffman.cpp | 2 +-
  19. contrib/extractor/libmpq/mpq.cpp | 2 +-
  20. contrib/extractor/libmpq/wave.cpp | 4 +-
  21. contrib/extractor/libmpq/wave.h | 2 +-
  22. contrib/extractor/loadlib/adt.h | 20 +++---
  23. contrib/extractor/loadlib/loadlib.h | 4 +-
  24. contrib/git_id/git_id.cpp | 2 +-
  25. .../vmapextract/loadlib/loadlib.h | 4 +-
  26. contrib/vmap_extractor_v3/vmapextract/model.h | 2 +-
  27. .../vmap_extractor_v3/vmapextract/mpq_libmpq04.h | 2 +-
  28. contrib/vmap_extractor_v3/vmapextract/vec3d.h | 2 +-
  29. m4/pkg.m4 | 6 +-
  30. sql/characters.sql | 12 ++--
  31. .../0.16/09977_01_mangos_spell_proc_event.sql | 2 +-
  32. .../0.16/10036_01_mangos_spell_proc_event.sql | 2 +-
  33. sql/updates/10156_01_characters_character_aura.sql | 6 +-
  34. sql/updates/10156_02_characters_pet_aura.sql | 6 +-
  35. .../10217_01_mangos_playercreateinfo_spell.sql | 26 ++++----
  36. sql/updates/10254_01_characters_auctionhouse.sql | 2 +-
  37. sql/updates/10582_01_mangos_spell_proc_event.sql | 2 +-
  38. sql/updates/10604_01_mangos_spell_proc_event.sql | 4 +-
  39. sql/updates/10762_01_mangos_spell_proc_event.sql | 2 +-
  40. src/game/Camera.cpp | 2 +-
  41. src/game/Chat.cpp | 12 ++--
  42. src/game/DBCStructure.h | 2 +-
  43. src/game/GameEventMgr.cpp | 12 ++--
  44. src/game/GameObject.cpp | 2 +-
  45. src/game/GridMap.cpp | 6 +-
  46. src/game/GridMap.h | 2 +-
  47. src/game/ItemHandler.cpp | 2 +-
  48. src/game/Level2.cpp | 6 +-
  49. src/game/Level3.cpp | 6 +-
  50. src/game/LootHandler.cpp | 2 +-
  51. src/game/Map.cpp | 2 +-
  52. src/game/MapManager.cpp | 4 +-
  53. src/game/Object.cpp | 2 +-
  54. src/game/Object.h | 4 +-
  55. src/game/ObjectGuid.cpp | 2 +-
  56. src/game/ObjectMgr.cpp | 2 +-
  57. src/game/Pet.cpp | 2 +-
  58. src/game/PoolManager.cpp | 2 +-
  59. src/game/ScriptMgr.cpp | 2 +-
  60. src/game/SharedDefines.h | 2 +-
  61. src/game/Transports.cpp | 2 +-
  62. src/game/debugcmds.cpp | 4 +-
  63. src/shared/LockedQueue.h | 2 +-
  64. src/shared/Timer.h | 2 +-
  65. 58 files changed, 160 insertions(+), 160 deletions(-)
  66. mode change 100755 => 100644 sql/updates/0.10/5632_characters.sql
  67. mode change 100755 => 100644 src/mangosd/monitor-mangosd
  68. mode change 100755 => 100644 src/mangosd/run-mangosd
  69.  
  70. diff --git a/ChangeLog b/ChangeLog
  71. index 2e6d525..c5bd2b3 100644
  72. --- a/ChangeLog
  73. +++ b/ChangeLog
  74. @@ -41,13 +41,13 @@ MaNGOS 0.16 (2 July 2010)
  75.  
  76. ==== Server Features ====
  77.  
  78. - * Added: Implemented SOAP in MaNGOS
  79. - * Added: Camera framework for proper mind vision like spells use and grid code cleanups including remove unused cell-level thread locking.
  80. + * Added: Implemented SOAP in MaNGOS
  81. + * Added: Camera framework for proper mind vision like spells use and grid code cleanups including remove unused cell-level thread locking.
  82. * Added: New table character_stats for external tools.
  83. * Added: More user friendly output at DB version check fail.
  84. * Improved: Update used utf8 cpp library version up to 2.2.4
  85. * Improved: Character `data` field values finally replaced by normal table fields.
  86. - * Improved: Increase reserved stack size for mangosd up to 4Mb at Windows
  87. + * Improved: Increase reserved stack size for mangosd up to 4Mb at Windows
  88. * Improved: Rewritten realmd and mangosd RA code use ACE network classes and drop Sockets lib.
  89. * Improved: OpenSSL lib upgrade to OpenSSL 1.0.0.
  90. * Improved: Use ACE config library instead dropped dotconfpp.
  91. diff --git a/contrib/dbcEditer/SearchFrm.cpp b/contrib/dbcEditer/SearchFrm.cpp
  92. index 59e198d..51f7bb8 100644
  93. --- a/contrib/dbcEditer/SearchFrm.cpp
  94. +++ b/contrib/dbcEditer/SearchFrm.cpp
  95. @@ -16,11 +16,11 @@ __fastcall TFrmSearch::TFrmSearch(TComponent* Owner)
  96. //---------------------------------------------------------------------------
  97. void __fastcall TFrmSearch::btOkClick(TObject *Sender)
  98. {
  99. - ModalResult = mrOk;
  100. + ModalResult = mrOk;
  101. }
  102. //---------------------------------------------------------------------------
  103. void __fastcall TFrmSearch::btCancelClick(TObject *Sender)
  104. {
  105. - ModalResult = mrCancel;
  106. + ModalResult = mrCancel;
  107. }
  108. //---------------------------------------------------------------------------
  109. diff --git a/contrib/dbcEditer/bin/update.txt b/contrib/dbcEditer/bin/update.txt
  110. index c03af17..a30a9fe 100644
  111. --- a/contrib/dbcEditer/bin/update.txt
  112. +++ b/contrib/dbcEditer/bin/update.txt
  113. @@ -8,4 +8,4 @@
  114.  
  115. 1.41°æ
  116. 1.¿ÉÒԹ̶šºÍÈ¡ÏûµÚÒ»ÁУ¬ÒÔ·œ±ã²é¿ŽSpell ID
  117. - 2.¿ÉÒÔÐЎ棬ÁЎ棬ÐÐÇ壬ÁÐÇ壬µ÷ÓÃŒÆËãÆ÷
  118. \ No newline at end of file
  119. + 2.¿ÉÒÔÐЎ棬ÁЎ棬ÐÐÇ壬ÁÐÇ壬µ÷ÓÃŒÆËãÆ÷
  120. \ No newline at end of file
  121. diff --git a/contrib/dbcEditer/dbcedit.cpp b/contrib/dbcEditer/dbcedit.cpp
  122. index 2812a3f..a162b8f 100644
  123. --- a/contrib/dbcEditer/dbcedit.cpp
  124. +++ b/contrib/dbcEditer/dbcedit.cpp
  125. @@ -61,7 +61,7 @@ void TFrmMain::SaveToFile(const char * pszFileName)
  126. char szFileName[255];
  127. FILE *stream;
  128.  
  129. -
  130. +
  131.  
  132.  
  133. fnsplit(pszFileName, 0, 0, szFileName, 0);
  134. @@ -132,7 +132,7 @@ void TFrmMain::SaveToFile(const char * pszFileName)
  135. }
  136. FileClose(iFileHandle);
  137. fclose(stream);
  138. -
  139. +
  140. delete ini;
  141. ShowMessage("Save To File:"+NewFileName);
  142. }
  143. @@ -445,7 +445,7 @@ void __fastcall TFrmMain::Timer1Timer(TObject *Sender)
  144. void __fastcall TFrmMain::N4Click(TObject *Sender)
  145. {
  146. if(!thOpen) return;
  147. -
  148. +
  149. int iFileHandle; //ÎÄŒþŸä±ú
  150. char buf[4];
  151. int iVal;
  152. diff --git a/contrib/dbcEditer/dbcedit.h b/contrib/dbcEditer/dbcedit.h
  153. index a603768..c1b7a06 100644
  154. --- a/contrib/dbcEditer/dbcedit.h
  155. +++ b/contrib/dbcEditer/dbcedit.h
  156. @@ -89,11 +89,11 @@ private: // User declarations
  157.  
  158.  
  159. thOpenFile *thOpen;
  160. - bool Term;
  161. + bool Term;
  162.  
  163. public: // User declarations
  164. bool OpenOk;
  165. -
  166. +
  167. AnsiString CurrentOpenFile;
  168. __fastcall TFrmMain(TComponent* Owner);
  169. void SaveToFile(const char * pszFileName);
  170. diff --git a/contrib/dbcEditer/thOpenSource.cpp b/contrib/dbcEditer/thOpenSource.cpp
  171. index 7df4deb..6043427 100644
  172. --- a/contrib/dbcEditer/thOpenSource.cpp
  173. +++ b/contrib/dbcEditer/thOpenSource.cpp
  174. @@ -28,7 +28,7 @@
  175. __fastcall thOpenFile::thOpenFile(bool CreateSuspended)
  176. : TThread(CreateSuspended)
  177. {
  178. -
  179. +
  180. }
  181. //---------------------------------------------------------------------------
  182. void __fastcall thOpenFile::Execute()
  183. @@ -57,7 +57,7 @@ void thOpenFile::ReadAndModifyFromBuff(char *pBuff, DWORD dwSize, const char* ps
  184. char szNewFileName[MAX_PATH];
  185. DWORD w;
  186. TIniFile *ini;
  187. -
  188. +
  189.  
  190. TypePtr p(pBuff);
  191. if('WDBC' != TAG(*p.dw))
  192. @@ -95,7 +95,7 @@ void thOpenFile::ReadAndModifyFromBuff(char *pBuff, DWORD dwSize, const char* ps
  193. delete ini;
  194.  
  195. //int *ColType = new int[dwCols];
  196. -
  197. +
  198. DWORD dwTextStartPos = dwRows*dwRowLen+20;
  199. char* pTextPtr = pBuff + dwTextStartPos;
  200. char pszTemp[MAX_PATH];
  201. diff --git a/contrib/dbcEditer/thOpenSource.h b/contrib/dbcEditer/thOpenSource.h
  202. index edf6bd0..47c3c38 100644
  203. --- a/contrib/dbcEditer/thOpenSource.h
  204. +++ b/contrib/dbcEditer/thOpenSource.h
  205. @@ -6,7 +6,7 @@
  206. #include <Classes.hpp>
  207. //---------------------------------------------------------------------------
  208. class thOpenFile : public TThread
  209. -{
  210. +{
  211. private:
  212. protected:
  213. void __fastcall Execute();
  214. @@ -14,7 +14,7 @@ protected:
  215. public:
  216. bool thEnd;
  217. int ColType[10000];
  218. -
  219. +
  220. __fastcall thOpenFile(bool CreateSuspended);
  221. void LoadAndModify(const char * pszFileName);
  222. void ReadAndModifyFromBuff(char *pBuff, DWORD dwSize, const char* pszFileName);
  223. diff --git a/contrib/dbcformat/dbc.desc b/contrib/dbcformat/dbc.desc
  224. index 470108c..e17767d 100644
  225. --- a/contrib/dbcformat/dbc.desc
  226. +++ b/contrib/dbcformat/dbc.desc
  227. @@ -43,7 +43,7 @@ ENDENTRY
  228.  
  229. ENTRY SpellEntry
  230.  
  231. - INDEX Id
  232. + INDEX Id
  233. UINT School
  234. UNKNOWN [2]
  235. UINT Category
  236. @@ -51,17 +51,17 @@ ENTRY SpellEntry
  237. UINT Attributes
  238. UINT AttributesEx
  239. UNKNOWN [3]
  240. - UINT Targets
  241. - UINT TargetCreatureType
  242. - UINT RequiresSpellFocus
  243. + UINT Targets
  244. + UINT TargetCreatureType
  245. + UINT RequiresSpellFocus
  246. UNKNOWN
  247. - UINT CasterAuraState
  248. - UINT CastingTimeIndex
  249. + UINT CasterAuraState
  250. + UINT CastingTimeIndex
  251. UINT RecoveryTime
  252. UINT CategoryRecoveryTime
  253. UINT InterruptFlags
  254. UINT AuraInterruptFlags
  255. - UINT ChannelInterruptFlags
  256. + UINT ChannelInterruptFlags
  257. UINT procFlags
  258. UINT procChance
  259. UINT procCharges
  260. @@ -71,41 +71,41 @@ ENTRY SpellEntry
  261. UINT DurationIndex
  262. UINT powerType
  263. UINT manaCost
  264. - UINT manaCostPerlevel
  265. + UINT manaCostPerlevel
  266. UINT manaPerSecond
  267. UINT manaPerSecondPerLevel
  268. UINT rangeIndex
  269. FLOAT speed
  270. UINT modalNextSpell
  271. - UNKNOWN
  272. - UINT Totem[2]
  273. - UINT Reagent[8]
  274. - UINT ReagentCount[8]
  275. - UINT EquippedItemClass
  276. - UINT EquippedItemSubClass
  277. - UINT Effect[3] // 59 - 61
  278. - UINT EffectDieSides[3]
  279. - UINT EffectBaseDice[3]
  280. - FLOAT EffectDicePerLevel[3]
  281. - FLOAT EffectRealPointsPerLevel[3]
  282. + UNKNOWN
  283. + UINT Totem[2]
  284. + UINT Reagent[8]
  285. + UINT ReagentCount[8]
  286. + UINT EquippedItemClass
  287. + UINT EquippedItemSubClass
  288. + UINT Effect[3] // 59 - 61
  289. + UINT EffectDieSides[3]
  290. + UINT EffectBaseDice[3]
  291. + FLOAT EffectDicePerLevel[3]
  292. + FLOAT EffectRealPointsPerLevel[3]
  293. INT EffectBasePoints[3] // 74 - 76
  294. UNKNOWN [3]
  295. UINT EffectImplicitTargetA[3] // 80 - 82
  296. UINT EffectImplicitTargetB[3] // 83 - 85
  297. - UINT EffectRadiusIndex[3]
  298. - UINT EffectApplyAuraName[3] // 89 - 91
  299. - UINT EffectAmplitude[3]
  300. - UINT Effectunknown[3]
  301. - UINT EffectChainTarget[3]
  302. - UINT EffectItemType[3]
  303. - UINT EffectMiscValue[3] // 104 - 106
  304. - UINT EffectTriggerSpell[3]
  305. - FLOAT EffectPointsPerComboPoint[3]
  306. - UINT SpellVisual
  307. - UNKNOWN
  308. - UINT SpellIconID
  309. + UINT EffectRadiusIndex[3]
  310. + UINT EffectApplyAuraName[3] // 89 - 91
  311. + UINT EffectAmplitude[3]
  312. + UINT Effectunknown[3]
  313. + UINT EffectChainTarget[3]
  314. + UINT EffectItemType[3]
  315. + UINT EffectMiscValue[3] // 104 - 106
  316. + UINT EffectTriggerSpell[3]
  317. + FLOAT EffectPointsPerComboPoint[3]
  318. + UINT SpellVisual
  319. + UNKNOWN
  320. + UINT SpellIconID
  321. UINT activeIconID
  322. - UINT spellPriority
  323. + UINT spellPriority
  324. UNUSED STR Name
  325. UNUSED STR NameAlt1
  326. UNUSED STR NameAlt2
  327. @@ -198,7 +198,7 @@ ENTRY FactionEntry
  328.  
  329. UNKNOWN[7]
  330. UINT something1
  331. - UINT something2
  332. + UINT something2
  333. UINT something3
  334. UINT something4
  335. UINT something5
  336. @@ -208,7 +208,7 @@ ENTRY FactionEntry
  337. UINT something9
  338. UINT faction
  339.  
  340. - UNUSED STR name
  341. + UNUSED STR name
  342. UNKNOWN[17]
  343.  
  344. ENDENTRY
  345. @@ -236,6 +236,6 @@ ENTRY ItemDisplayTemplateEntry
  346. UNKNOWN[5]
  347. UINT seed
  348. UNKNOWN [10]
  349. - UINT randomPropertyID
  350. + UINT randomPropertyID
  351.  
  352. ENDENTRY
  353. diff --git a/contrib/extractor/CMakeLists.txt b/contrib/extractor/CMakeLists.txt
  354. index 684be34..d355767 100644
  355. --- a/contrib/extractor/CMakeLists.txt
  356. +++ b/contrib/extractor/CMakeLists.txt
  357. @@ -14,11 +14,11 @@ project (MANGOS_MAP_EXTRACTOR)
  358. add_subdirectory (libmpq)
  359. add_subdirectory (loadlib)
  360.  
  361. -include_directories (${MANGOS_MAP_EXTRACTOR_SOURCE_DIR}/libmpq)
  362. -include_directories (${MANGOS_MAP_EXTRACTOR_SOURCE_DIR}/loadlib)
  363. +include_directories (${MANGOS_MAP_EXTRACTOR_SOURCE_DIR}/libmpq)
  364. +include_directories (${MANGOS_MAP_EXTRACTOR_SOURCE_DIR}/loadlib)
  365.  
  366. -link_directories (${MANGOS_MAP_EXTRACTOR_SOURCE_DIR}/libmpq)
  367. -link_directories (${MANGOS_MAP_EXTRACTOR_SOURCE_DIR}/loadlib)
  368. +link_directories (${MANGOS_MAP_EXTRACTOR_SOURCE_DIR}/libmpq)
  369. +link_directories (${MANGOS_MAP_EXTRACTOR_SOURCE_DIR}/loadlib)
  370.  
  371. add_executable (ad dbcfile.cpp mpq_libmpq.cpp System.cpp)
  372.  
  373. diff --git a/contrib/extractor/libmpq/common.cpp b/contrib/extractor/libmpq/common.cpp
  374. index 8ce8646..bcb83f0 100644
  375. --- a/contrib/extractor/libmpq/common.cpp
  376. +++ b/contrib/extractor/libmpq/common.cpp
  377. @@ -109,7 +109,7 @@ int libmpq_decrypt_blocktable(mpq_archive *mpq_a, unsigned char *pbKey) {
  378. ch = toupper(*pbKey++);
  379. seed1 = mpq_a->buf[0x300 + ch] ^ (seed1 + seed2);
  380. seed2 = ch + seed1 + seed2 + (seed2 << 5) + 3;
  381. - }
  382. + }
  383.  
  384. /* Decrypt it */
  385. seed2 = 0xEEEEEEEE;
  386. @@ -704,7 +704,7 @@ int libmpq_file_read_file(mpq_archive *mpq_a, mpq_file *mpq_f, unsigned int file
  387. unsigned int loaded = mpq_a->blocksize;
  388.  
  389. /* Check if data are loaded in the cache */
  390. - if (mpq_f->accessed == FALSE || blockpos != mpq_a->blockpos) {
  391. + if (mpq_f->accessed == FALSE || blockpos != mpq_a->blockpos) {
  392.  
  393. /* Load one MPQ block into archive buffer */
  394. loaded = libmpq_file_read_block(mpq_a, mpq_f, blockpos, (char *)mpq_a->blockbuf, mpq_a->blocksize);
  395. diff --git a/contrib/extractor/libmpq/explode.cpp b/contrib/extractor/libmpq/explode.cpp
  396. index bcf9e78..273718f 100644
  397. --- a/contrib/extractor/libmpq/explode.cpp
  398. +++ b/contrib/extractor/libmpq/explode.cpp
  399. @@ -112,7 +112,7 @@ static unsigned short pkzip_code_asc[] = {
  400. 0x0300, 0x0D40, 0x1D00, 0x0D00, 0x1500, 0x0540, 0x0500, 0x1900,
  401. 0x0900, 0x0940, 0x1100, 0x0100, 0x1E00, 0x0E00, 0x0140, 0x1600,
  402. 0x0600, 0x1A00, 0x0E40, 0x0640, 0x0A40, 0x0A00, 0x1200, 0x0200,
  403. - 0x1C00, 0x0C00, 0x1400, 0x0400, 0x1800, 0x0800, 0x1000, 0x0000
  404. + 0x1C00, 0x0C00, 0x1400, 0x0400, 0x1800, 0x0800, 0x1000, 0x0000
  405. };
  406.  
  407. /* Local variables */
  408. diff --git a/contrib/extractor/libmpq/huffman.cpp b/contrib/extractor/libmpq/huffman.cpp
  409. index b63eee4..0c5fee3 100644
  410. --- a/contrib/extractor/libmpq/huffman.cpp
  411. +++ b/contrib/extractor/libmpq/huffman.cpp
  412. @@ -309,7 +309,7 @@ static void libmpq_huff_build_tree(struct huffman_tree *ht, unsigned int cmp_typ
  413. /* Loop while pointer has a negative value. */
  414. while (PTR_INT(ht->last) > 0) { /* ESI - Last entry */
  415. struct huffman_tree_item *temp; /* EAX */
  416. -
  417. +
  418. if (ht->last->next != NULL) { /* ESI->next */
  419. libmpq_huff_remove_item(ht->last);
  420. }
  421. diff --git a/contrib/extractor/libmpq/mpq.cpp b/contrib/extractor/libmpq/mpq.cpp
  422. index 9d60258..14b0e8a 100644
  423. --- a/contrib/extractor/libmpq/mpq.cpp
  424. +++ b/contrib/extractor/libmpq/mpq.cpp
  425. @@ -601,7 +601,7 @@ int libmpq_file_getdata(mpq_archive *mpq_a, mpq_hash mpq_h, const int number, un
  426.  
  427. if (mpq_f->mpq_b->flags & LIBMPQ_FILE_COMPRESSED) {
  428. // Free buffer for block positions
  429. -
  430. +
  431. free(mpq_f->blockpos);
  432. }
  433. /* freeing the file structure */
  434. diff --git a/contrib/extractor/libmpq/wave.cpp b/contrib/extractor/libmpq/wave.cpp
  435. index 8edc1f7..d890761 100644
  436. --- a/contrib/extractor/libmpq/wave.cpp
  437. +++ b/contrib/extractor/libmpq/wave.cpp
  438. @@ -31,8 +31,8 @@
  439. static unsigned long wave_table_1503f120[] = {
  440. 0xFFFFFFFF, 0x00000000, 0xFFFFFFFF, 0x00000004, 0xFFFFFFFF, 0x00000002, 0xFFFFFFFF, 0x00000006,
  441. 0xFFFFFFFF, 0x00000001, 0xFFFFFFFF, 0x00000005, 0xFFFFFFFF, 0x00000003, 0xFFFFFFFF, 0x00000007,
  442. - 0xFFFFFFFF, 0x00000001, 0xFFFFFFFF, 0x00000005, 0xFFFFFFFF, 0x00000003, 0xFFFFFFFF, 0x00000007,
  443. - 0xFFFFFFFF, 0x00000002, 0xFFFFFFFF, 0x00000004, 0xFFFFFFFF, 0x00000006, 0xFFFFFFFF, 0x00000008
  444. + 0xFFFFFFFF, 0x00000001, 0xFFFFFFFF, 0x00000005, 0xFFFFFFFF, 0x00000003, 0xFFFFFFFF, 0x00000007,
  445. + 0xFFFFFFFF, 0x00000002, 0xFFFFFFFF, 0x00000004, 0xFFFFFFFF, 0x00000006, 0xFFFFFFFF, 0x00000008
  446. };
  447.  
  448. static unsigned long wave_table_1503f1a0[] = {
  449. diff --git a/contrib/extractor/libmpq/wave.h b/contrib/extractor/libmpq/wave.h
  450. index 8920880..5beb97a 100644
  451. --- a/contrib/extractor/libmpq/wave.h
  452. +++ b/contrib/extractor/libmpq/wave.h
  453. @@ -22,7 +22,7 @@
  454. * You should have received a copy of the GNU General Public License
  455. * along with this program; if not, write to the Free Software
  456. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  457. - */
  458. + */
  459.  
  460. #ifndef _WAVE_H
  461. #define _WAVE_H
  462. diff --git a/contrib/extractor/loadlib/adt.h b/contrib/extractor/loadlib/adt.h
  463. index 725c5b9..729412a 100644
  464. --- a/contrib/extractor/loadlib/adt.h
  465. +++ b/contrib/extractor/loadlib/adt.h
  466. @@ -55,7 +55,7 @@ public:
  467. uint32 light;
  468. float height;
  469. } liquid[ADT_CELL_SIZE+1][ADT_CELL_SIZE+1];
  470. -
  471. +
  472. // 1<<0 - ochen
  473. // 1<<1 - lava/slime
  474. // 1<<2 - water
  475. @@ -197,7 +197,7 @@ public:
  476. return 0;
  477. }
  478.  
  479. - float *getLiquidHeightMap(adt_liquid_header *h)
  480. + float *getLiquidHeightMap(adt_liquid_header *h)
  481. {
  482. if (h->formatFlags & ADT_LIQUID_HEADER_NO_HIGHT)
  483. return 0;
  484. @@ -206,7 +206,7 @@ public:
  485. return 0;
  486. }
  487.  
  488. - uint8 *getLiquidLightMap(adt_liquid_header *h)
  489. + uint8 *getLiquidLightMap(adt_liquid_header *h)
  490. {
  491. if (h->formatFlags&ADT_LIQUID_HEADER_FULL_LIGHT)
  492. return 0;
  493. @@ -219,7 +219,7 @@ public:
  494. return 0;
  495. }
  496.  
  497. - uint32 *getLiquidFullLightMap(adt_liquid_header *h)
  498. + uint32 *getLiquidFullLightMap(adt_liquid_header *h)
  499. {
  500. if (!(h->formatFlags&ADT_LIQUID_HEADER_FULL_LIGHT))
  501. return 0;
  502. @@ -232,7 +232,7 @@ public:
  503. return 0;
  504. }
  505.  
  506. - uint64 getLiquidShowMap(adt_liquid_header *h)
  507. + uint64 getLiquidShowMap(adt_liquid_header *h)
  508. {
  509. if (h->offsData2a)
  510. return *((uint64 *)((uint8*)this + 8 + h->offsData2a));
  511. @@ -256,11 +256,11 @@ class adt_MHDR
  512. uint32 pad;
  513. uint32 offsMCIN; // MCIN
  514. uint32 offsTex; // MTEX
  515. - uint32 offsModels; // MMDX
  516. - uint32 offsModelsIds; // MMID
  517. - uint32 offsMapObejcts; // MWMO
  518. - uint32 offsMapObejctsIds; // MWID
  519. - uint32 offsDoodsDef; // MDDF
  520. + uint32 offsModels; // MMDX
  521. + uint32 offsModelsIds; // MMID
  522. + uint32 offsMapObejcts; // MWMO
  523. + uint32 offsMapObejctsIds; // MWID
  524. + uint32 offsDoodsDef; // MDDF
  525. uint32 offsObjectsDef; // MODF
  526. uint32 offsMFBO; // MFBO
  527. uint32 offsMH2O; // MH2O
  528. diff --git a/contrib/extractor/loadlib/loadlib.h b/contrib/extractor/loadlib/loadlib.h
  529. index 5373175..96cd25c 100644
  530. --- a/contrib/extractor/loadlib/loadlib.h
  531. +++ b/contrib/extractor/loadlib/loadlib.h
  532. @@ -12,9 +12,9 @@ typedef unsigned __int16 uint16;
  533. typedef unsigned __int8 uint8;
  534. #else
  535. #include <stdint.h>
  536. -#ifndef uint64_t
  537. +#ifndef uint64_t
  538. #ifdef __linux__
  539. -#include <linux/types.h>
  540. +#include <linux/types.h>
  541. #endif
  542. #endif
  543. typedef int64_t int64;
  544. diff --git a/contrib/git_id/git_id.cpp b/contrib/git_id/git_id.cpp
  545. index 47007ea..a80d74e 100644
  546. --- a/contrib/git_id/git_id.cpp
  547. +++ b/contrib/git_id/git_id.cpp
  548. @@ -122,7 +122,7 @@ bool find_path()
  549. getcwd(cur_path, MAX_PATH);
  550. size_t len = strlen(cur_path);
  551. strncpy(base_path, cur_path, len+1);
  552. -
  553. +
  554. if(cur_path[len-1] == '/' || cur_path[len-1] == '\\')
  555. {
  556. // we're in root, don't bother
  557. diff --git a/contrib/vmap_extractor_v3/vmapextract/loadlib/loadlib.h b/contrib/vmap_extractor_v3/vmapextract/loadlib/loadlib.h
  558. index 5373175..96cd25c 100644
  559. --- a/contrib/vmap_extractor_v3/vmapextract/loadlib/loadlib.h
  560. +++ b/contrib/vmap_extractor_v3/vmapextract/loadlib/loadlib.h
  561. @@ -12,9 +12,9 @@ typedef unsigned __int16 uint16;
  562. typedef unsigned __int8 uint8;
  563. #else
  564. #include <stdint.h>
  565. -#ifndef uint64_t
  566. +#ifndef uint64_t
  567. #ifdef __linux__
  568. -#include <linux/types.h>
  569. +#include <linux/types.h>
  570. #endif
  571. #endif
  572. typedef int64_t int64;
  573. diff --git a/contrib/vmap_extractor_v3/vmapextract/model.h b/contrib/vmap_extractor_v3/vmapextract/model.h
  574. index d1be46f..c131645 100644
  575. --- a/contrib/vmap_extractor_v3/vmapextract/model.h
  576. +++ b/contrib/vmap_extractor_v3/vmapextract/model.h
  577. @@ -35,7 +35,7 @@ private:
  578. char outfilename;
  579. };
  580.  
  581. -class ModelInstance
  582. +class ModelInstance
  583. {
  584. public:
  585. Model *model;
  586. diff --git a/contrib/vmap_extractor_v3/vmapextract/mpq_libmpq04.h b/contrib/vmap_extractor_v3/vmapextract/mpq_libmpq04.h
  587. index ccbfe37..4b0a246 100644
  588. --- a/contrib/vmap_extractor_v3/vmapextract/mpq_libmpq04.h
  589. +++ b/contrib/vmap_extractor_v3/vmapextract/mpq_libmpq04.h
  590. @@ -30,7 +30,7 @@ public:
  591. libmpq__file_unpacked_size(mpq_a, filenum, &size);
  592.  
  593. char *buffer = new char[size];
  594. -
  595. +
  596. libmpq__file_read(mpq_a, filenum, (unsigned char*)buffer, size, &transferred);
  597.  
  598. char seps[] = "\n";
  599. diff --git a/contrib/vmap_extractor_v3/vmapextract/vec3d.h b/contrib/vmap_extractor_v3/vmapextract/vec3d.h
  600. index d2569bc..06a5b73 100644
  601. --- a/contrib/vmap_extractor_v3/vmapextract/vec3d.h
  602. +++ b/contrib/vmap_extractor_v3/vmapextract/vec3d.h
  603. @@ -106,7 +106,7 @@ public:
  604. in >> v.x >> v.y >> v.z;
  605. return in;
  606. }
  607. -
  608. +
  609. friend std::ostream& operator<<(std::ostream& out, const Vec3D& v)
  610. {
  611. out << v.x << " " << v.y << " " << v.z;
  612. diff --git a/m4/pkg.m4 b/m4/pkg.m4
  613. index a0b9cd4..64be747 100644
  614. --- a/m4/pkg.m4
  615. +++ b/m4/pkg.m4
  616. @@ -1,5 +1,5 @@
  617. # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
  618. -#
  619. +#
  620. # Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
  621. #
  622. # This program is free software; you can redistribute it and/or modify
  623. @@ -39,7 +39,7 @@ if test -n "$PKG_CONFIG"; then
  624. AC_MSG_RESULT([no])
  625. PKG_CONFIG=""
  626. fi
  627. -
  628. +
  629. fi[]dnl
  630. ])# PKG_PROG_PKG_CONFIG
  631.  
  632. @@ -118,7 +118,7 @@ if test $pkg_failed = yes; then
  633. _PKG_SHORT_ERRORS_SUPPORTED
  634. if test $_pkg_short_errors_supported = yes; then
  635. $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
  636. - else
  637. + else
  638. $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
  639. fi
  640. # Put the nasty error message in config.log where it belongs
  641. diff --git a/sql/characters.sql b/sql/characters.sql
  642. index c1c0504..8b0e52e 100644
  643. --- a/sql/characters.sql
  644. +++ b/sql/characters.sql
  645. @@ -374,12 +374,12 @@ CREATE TABLE `character_aura` (
  646. `spell` int(11) unsigned NOT NULL default '0',
  647. `stackcount` int(11) NOT NULL default '1',
  648. `remaincharges` int(11) NOT NULL default '0',
  649. - `basepoints0` INT(11) NOT NULL DEFAULT '0',
  650. - `basepoints1` INT(11) NOT NULL DEFAULT '0',
  651. + `basepoints0` INT(11) NOT NULL DEFAULT '0',
  652. + `basepoints1` INT(11) NOT NULL DEFAULT '0',
  653. `basepoints2` INT(11) NOT NULL DEFAULT '0',
  654. `maxduration0` INT(11) NOT NULL DEFAULT '0',
  655. `maxduration1` INT(11) NOT NULL DEFAULT '0',
  656. - `maxduration2` INT(11) NOT NULL DEFAULT '0',
  657. + `maxduration2` INT(11) NOT NULL DEFAULT '0',
  658. `remaintime0` INT(11) NOT NULL DEFAULT '0',
  659. `remaintime1` INT(11) NOT NULL DEFAULT '0',
  660. `remaintime2` INT(11) NOT NULL DEFAULT '0',
  661. @@ -1567,12 +1567,12 @@ CREATE TABLE `pet_aura` (
  662. `spell` int(11) unsigned NOT NULL default '0',
  663. `stackcount` int(11) NOT NULL default '1',
  664. `remaincharges` int(11) NOT NULL default '0',
  665. - `basepoints0` INT(11) NOT NULL DEFAULT '0',
  666. - `basepoints1` INT(11) NOT NULL DEFAULT '0',
  667. + `basepoints0` INT(11) NOT NULL DEFAULT '0',
  668. + `basepoints1` INT(11) NOT NULL DEFAULT '0',
  669. `basepoints2` INT(11) NOT NULL DEFAULT '0',
  670. `maxduration0` INT(11) NOT NULL DEFAULT '0',
  671. `maxduration1` INT(11) NOT NULL DEFAULT '0',
  672. - `maxduration2` INT(11) NOT NULL DEFAULT '0',
  673. + `maxduration2` INT(11) NOT NULL DEFAULT '0',
  674. `remaintime0` INT(11) NOT NULL DEFAULT '0',
  675. `remaintime1` INT(11) NOT NULL DEFAULT '0',
  676. `remaintime2` INT(11) NOT NULL DEFAULT '0',
  677. diff --git a/sql/updates/0.10/5632_characters.sql b/sql/updates/0.10/5632_characters.sql
  678. old mode 100755
  679. new mode 100644
  680. diff --git a/sql/updates/0.16/09977_01_mangos_spell_proc_event.sql b/sql/updates/0.16/09977_01_mangos_spell_proc_event.sql
  681. index 9627bfd..e33035b 100644
  682. --- a/sql/updates/0.16/09977_01_mangos_spell_proc_event.sql
  683. +++ b/sql/updates/0.16/09977_01_mangos_spell_proc_event.sql
  684. @@ -1,7 +1,7 @@
  685. ALTER TABLE db_version CHANGE COLUMN required_9967_01_mangos_spell_proc_event required_9977_01_mangos_spell_proc_event bit;
  686.  
  687. DELETE FROM `spell_proc_event` WHERE `entry` IN (16180,16196,16198);
  688. -INSERT INTO `spell_proc_event` VALUES
  689. +INSERT INTO `spell_proc_event` VALUES
  690. (16180,0x00000000,11,0x000001C0,0x00000000,0x00000010,0x00000000,0x00000002,0.000000,0.000000, 0),
  691. (16196,0x00000000,11,0x000001C0,0x00000000,0x00000010,0x00000000,0x00000002,0.000000,0.000000, 0),
  692. (16198,0x00000000,11,0x000001C0,0x00000000,0x00000010,0x00000000,0x00000002,0.000000,0.000000, 0);
  693. diff --git a/sql/updates/0.16/10036_01_mangos_spell_proc_event.sql b/sql/updates/0.16/10036_01_mangos_spell_proc_event.sql
  694. index 626155c..1ef56cb 100644
  695. --- a/sql/updates/0.16/10036_01_mangos_spell_proc_event.sql
  696. +++ b/sql/updates/0.16/10036_01_mangos_spell_proc_event.sql
  697. @@ -1,5 +1,5 @@
  698. ALTER TABLE db_version CHANGE COLUMN required_10036_01_mangos_spell_chain required_10036_01_mangos_spell_proc_event bit;
  699.  
  700. DELETE FROM `spell_proc_event` WHERE `entry` IN (30881,30883,30884,30885,30886);
  701. -INSERT INTO `spell_proc_event` VALUES
  702. +INSERT INTO `spell_proc_event` VALUES
  703. (30881, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 30);
  704. diff --git a/sql/updates/10156_01_characters_character_aura.sql b/sql/updates/10156_01_characters_character_aura.sql
  705. index 73ae864..f9f9087 100644
  706. --- a/sql/updates/10156_01_characters_character_aura.sql
  707. +++ b/sql/updates/10156_01_characters_character_aura.sql
  708. @@ -4,12 +4,12 @@ DELETE FROM `character_aura`;
  709. ALTER TABLE `character_aura`
  710. DROP COLUMN `effect_index`, DROP COLUMN `amount`, DROP COLUMN `maxduration`, DROP COLUMN `remaintime`;
  711. ALTER TABLE `character_aura`
  712. - ADD COLUMN `basepoints0` INT(11) NOT NULL DEFAULT '0',
  713. - ADD COLUMN `basepoints1` INT(11) NOT NULL DEFAULT '0',
  714. + ADD COLUMN `basepoints0` INT(11) NOT NULL DEFAULT '0',
  715. + ADD COLUMN `basepoints1` INT(11) NOT NULL DEFAULT '0',
  716. ADD COLUMN `basepoints2` INT(11) NOT NULL DEFAULT '0',
  717. ADD COLUMN `maxduration0` INT(11) NOT NULL DEFAULT '0',
  718. ADD COLUMN `maxduration1` INT(11) NOT NULL DEFAULT '0',
  719. - ADD COLUMN `maxduration2` INT(11) NOT NULL DEFAULT '0',
  720. + ADD COLUMN `maxduration2` INT(11) NOT NULL DEFAULT '0',
  721. ADD COLUMN `remaintime0` INT(11) NOT NULL DEFAULT '0',
  722. ADD COLUMN `remaintime1` INT(11) NOT NULL DEFAULT '0',
  723. ADD COLUMN `remaintime2` INT(11) NOT NULL DEFAULT '0',
  724. diff --git a/sql/updates/10156_02_characters_pet_aura.sql b/sql/updates/10156_02_characters_pet_aura.sql
  725. index b7f9c5f..38f7472 100644
  726. --- a/sql/updates/10156_02_characters_pet_aura.sql
  727. +++ b/sql/updates/10156_02_characters_pet_aura.sql
  728. @@ -4,12 +4,12 @@ DELETE FROM `pet_aura`;
  729. ALTER TABLE `pet_aura`
  730. DROP COLUMN `effect_index`, DROP COLUMN `amount`, DROP COLUMN `maxduration`, DROP COLUMN `remaintime`;
  731. ALTER TABLE `pet_aura`
  732. - ADD COLUMN `basepoints0` INT(11) NOT NULL DEFAULT '0',
  733. - ADD COLUMN `basepoints1` INT(11) NOT NULL DEFAULT '0',
  734. + ADD COLUMN `basepoints0` INT(11) NOT NULL DEFAULT '0',
  735. + ADD COLUMN `basepoints1` INT(11) NOT NULL DEFAULT '0',
  736. ADD COLUMN `basepoints2` INT(11) NOT NULL DEFAULT '0',
  737. ADD COLUMN `maxduration0` INT(11) NOT NULL DEFAULT '0',
  738. ADD COLUMN `maxduration1` INT(11) NOT NULL DEFAULT '0',
  739. - ADD COLUMN `maxduration2` INT(11) NOT NULL DEFAULT '0',
  740. + ADD COLUMN `maxduration2` INT(11) NOT NULL DEFAULT '0',
  741. ADD COLUMN `remaintime0` INT(11) NOT NULL DEFAULT '0',
  742. ADD COLUMN `remaintime1` INT(11) NOT NULL DEFAULT '0',
  743. ADD COLUMN `remaintime2` INT(11) NOT NULL DEFAULT '0',
  744. diff --git a/sql/updates/10217_01_mangos_playercreateinfo_spell.sql b/sql/updates/10217_01_mangos_playercreateinfo_spell.sql
  745. index ee49e31..a2da627 100644
  746. --- a/sql/updates/10217_01_mangos_playercreateinfo_spell.sql
  747. +++ b/sql/updates/10217_01_mangos_playercreateinfo_spell.sql
  748. @@ -3,7 +3,7 @@ ALTER TABLE db_version CHANGE COLUMN required_10208_01_mangos_playercreateinfo r
  749. DELETE FROM playercreateinfo_spell WHERE spell=1843 ;
  750. DELETE FROM playercreateinfo_spell WHERE spell=21084;
  751. -- humans
  752. -INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES
  753. +INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES
  754. (1, 1, 68398, 'Opening'),
  755. (1, 2, 20154, 'Seal of Righteousness'),
  756. (1, 2, 68398, 'Opening'),
  757. @@ -16,7 +16,7 @@ INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES
  758. (1, 9, 75445, 'Demonic Immolate');
  759.  
  760. -- dwarf
  761. -INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES
  762. +INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES
  763. (3, 1, 68398, 'Opening'),
  764. (3, 2, 20154, 'Seal of Righteousness'),
  765. (3, 2, 68398, 'Opening'),
  766. @@ -25,7 +25,7 @@ INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES
  767. (3, 5, 68398, 'Opening');
  768.  
  769. -- night elfs
  770. -INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES
  771. +INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES
  772. (4, 1, 21009, 'Elusiveness'),
  773. (4, 1, 68398, 'Opening'),
  774. (4, 3, 21009, 'Elusiveness'),
  775. @@ -38,7 +38,7 @@ INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES
  776. (4, 11, 68398, 'Opening');
  777.  
  778. -- gnome
  779. -INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES
  780. +INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES
  781. (7, 1, 68398, 'Opening'),
  782. (7, 4, 68398, 'Opening'),
  783. (7, 8, 68398, 'Opening'),
  784. @@ -48,7 +48,7 @@ INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES
  785. (7, 9, 75445, 'Demonic Immolate');
  786.  
  787. -- orc
  788. -INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES
  789. +INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES
  790. (2, 1, 68398, 'Opening'),
  791. (2, 3, 68398, 'Opening'),
  792. (2, 4, 68398, 'Opening'),
  793. @@ -60,7 +60,7 @@ INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES
  794. (2, 9, 75445, 'Demonic Immolate');
  795.  
  796. -- undead
  797. -INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES
  798. +INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES
  799. (5, 1, 68398, 'Opening'),
  800. (5, 4, 68398, 'Opening'),
  801. (5, 5, 68398, 'Opening'),
  802. @@ -70,8 +70,8 @@ INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES
  803. (5, 9, 68398, 'Opening'),
  804. (5, 9, 75445, 'Demonic Immolate');
  805.  
  806. --- tauren
  807. -INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES
  808. +-- tauren
  809. +INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES
  810. (6, 1, 68398, 'Opening'),
  811. (6, 3, 68398, 'Opening'),
  812. (6, 7, 68398, 'Opening'),
  813. @@ -80,7 +80,7 @@ INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES
  814. (6, 11, 68398, 'Opening');
  815.  
  816. -- troll
  817. -INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES
  818. +INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES
  819. (8, 1, 68398, 'Opening'),
  820. (8, 3, 68398, 'Opening'),
  821. (8, 4, 68398, 'Opening'),
  822. @@ -91,7 +91,7 @@ INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES
  823. (8, 8, 71761, 'Deep Freeze Immunity State');
  824.  
  825. -- bloodelf
  826. -INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES
  827. +INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES
  828. (10, 2, 20154, 'Seal of Righteousness'),
  829. (10, 2, 68398, 'Opening'),
  830. (10, 3, 68398, 'Opening'),
  831. @@ -103,7 +103,7 @@ INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES
  832. (10, 9, 75445, 'Demonic Immolate');
  833.  
  834. -- drarenei
  835. -INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES
  836. +INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES
  837. (11, 1, 68398, 'Opening'),
  838. (11, 2, 20154, 'Seal of Righteousness'),
  839. (11, 2, 68398, 'Opening'),
  840. @@ -114,8 +114,8 @@ INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES
  841. (11, 8, 68398, 'Opening'),
  842. (11, 8, 71761, 'Deep Freeze Immunity State');
  843.  
  844. --- dk
  845. -INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES
  846. +-- dk
  847. +INSERT IGNORE INTO playercreateinfo_spell (race, class, Spell, Note) VALUES
  848. (1, 6, 68398, 'Opening'),
  849. (2, 6, 68398, 'Opening'),
  850. (3, 6, 68398, 'Opening'),
  851. diff --git a/sql/updates/10254_01_characters_auctionhouse.sql b/sql/updates/10254_01_characters_auctionhouse.sql
  852. index cd2c738..ac3c781 100644
  853. --- a/sql/updates/10254_01_characters_auctionhouse.sql
  854. +++ b/sql/updates/10254_01_characters_auctionhouse.sql
  855. @@ -4,7 +4,7 @@ ALTER TABLE auctionhouse
  856. ADD COLUMN houseid int(11) unsigned NOT NULL default '0' AFTER id;
  857.  
  858. UPDATE auctionhouse, mangos.creature AS c, mangos.creature_template AS ct
  859. - SET houseid =
  860. + SET houseid =
  861. CASE ct.faction_A
  862. WHEN 12 THEN 1 /* human */
  863. WHEN 29 THEN 6 /* orc, and generic for horde */
  864. diff --git a/sql/updates/10582_01_mangos_spell_proc_event.sql b/sql/updates/10582_01_mangos_spell_proc_event.sql
  865. index cc91a9d..2f70a0a 100644
  866. --- a/sql/updates/10582_01_mangos_spell_proc_event.sql
  867. +++ b/sql/updates/10582_01_mangos_spell_proc_event.sql
  868. @@ -1,7 +1,7 @@
  869. ALTER TABLE db_version CHANGE COLUMN required_10551_01_mangos_spell_proc_event required_10582_01_mangos_spell_proc_event bit;
  870.  
  871. DELETE FROM spell_proc_event WHERE entry IN (67356, 67363, 67365, 67379, 67381, 67384, 67386, 67389, 67392);
  872. -INSERT INTO spell_proc_event(entry, SchoolMask, SpellFamilyName,
  873. +INSERT INTO spell_proc_event(entry, SchoolMask, SpellFamilyName,
  874. SpellFamilyMaskA0, SpellFamilyMaskA1, SpellFamilyMaskA2,
  875. SpellFamilyMaskB0, SpellFamilyMaskB1, SpellFamilyMaskB2,
  876. SpellFamilyMaskC0, SpellFamilyMaskC1, SpellFamilyMaskC2,
  877. diff --git a/sql/updates/10604_01_mangos_spell_proc_event.sql b/sql/updates/10604_01_mangos_spell_proc_event.sql
  878. index 1a21f51..9ca5e7b 100644
  879. --- a/sql/updates/10604_01_mangos_spell_proc_event.sql
  880. +++ b/sql/updates/10604_01_mangos_spell_proc_event.sql
  881. @@ -1,9 +1,9 @@
  882. ALTER TABLE db_version CHANGE COLUMN required_10582_01_mangos_spell_proc_event required_10604_01_mangos_spell_proc_event bit;
  883.  
  884. -DELETE FROM spell_proc_event WHERE entry IN
  885. +DELETE FROM spell_proc_event WHERE entry IN
  886. (57907,62147,64952,64964,71174,71176,71178,71186,71191,71194,71198,71217,71226,71228);
  887.  
  888. -INSERT INTO spell_proc_event(entry, SchoolMask, SpellFamilyName,
  889. +INSERT INTO spell_proc_event(entry, SchoolMask, SpellFamilyName,
  890. SpellFamilyMaskA0, SpellFamilyMaskA1, SpellFamilyMaskA2,
  891. SpellFamilyMaskB0, SpellFamilyMaskB1, SpellFamilyMaskB2,
  892. SpellFamilyMaskC0, SpellFamilyMaskC1, SpellFamilyMaskC2,
  893. diff --git a/sql/updates/10762_01_mangos_spell_proc_event.sql b/sql/updates/10762_01_mangos_spell_proc_event.sql
  894. index afc5f9e..9ffd0b6 100644
  895. --- a/sql/updates/10762_01_mangos_spell_proc_event.sql
  896. +++ b/sql/updates/10762_01_mangos_spell_proc_event.sql
  897. @@ -5,5 +5,5 @@ INSERT INTO spell_proc_event VALUES
  898. (52437, 0x00, 4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000000, 0.000000, 0.000000, 0);
  899.  
  900.  
  901. -
  902. +
  903.  
  904. diff --git a/src/game/Camera.cpp b/src/game/Camera.cpp
  905. index 5cf39b4..8eb2093 100644
  906. --- a/src/game/Camera.cpp
  907. +++ b/src/game/Camera.cpp
  908. @@ -31,7 +31,7 @@ Camera::Camera(Player* pl) : m_owner(*pl), m_source(pl)
  909. Camera::~Camera()
  910. {
  911. // view of camera should be already reseted to owner (RemoveFromWorld -> Event_RemovedFromWorld -> ResetView)
  912. - MANGOS_ASSERT(m_source == &m_owner);
  913. + MANGOS_ASSERT(m_source == &m_owner);
  914.  
  915. // for symmetry with constructor and way to make viewpoint's list empty
  916. m_source->GetViewPoint().Detach(this);
  917. diff --git a/src/game/Chat.cpp b/src/game/Chat.cpp
  918. index a0f62f9..d29c092 100644
  919. --- a/src/game/Chat.cpp
  920. +++ b/src/game/Chat.cpp
  921. @@ -41,7 +41,7 @@
  922. // |color|Hachievement_criteria:criteria_id|h[name]|h|r
  923. // |color|Harea:area_id|h[name]|h|r
  924. // |color|Hareatrigger:id|h[name]|h|r
  925. -// |color|Hareatrigger_target:id|h[name]|h|r
  926. +// |color|Hareatrigger_target:id|h[name]|h|r
  927. // |color|Hcreature:creature_guid|h[name]|h|r
  928. // |color|Hcreature_entry:creature_id|h[name]|h|r
  929. // |color|Henchant:recipe_spell_id|h[prof_name: recipe_name]|h|r - client, at shift click in recipes list dialog
  930. @@ -2222,7 +2222,7 @@ bool ChatHandler::ExtractOptFloat(char** args, float& val, float defVal)
  931. * Function extract name-like string (from non-numeric or special symbol until whitespace)
  932. *
  933. * @param args variable pointer to non parsed args string, updated at function call to new position (with skipped white spaces)
  934. - * @param lit optional explicit literal requirement. function fail if literal is not starting substring of lit.
  935. + * @param lit optional explicit literal requirement. function fail if literal is not starting substring of lit.
  936. * Note: function in same way fail if no any literal or literal not fit in this case. Need additional check for select specific fail case
  937. * @return name/number-like string without whitespaces, or NULL if args empty or not appropriate content.
  938. */
  939. @@ -2353,7 +2353,7 @@ char* ChatHandler::ExtractQuotedOrLiteralArg(char** args, bool asis /*= false*/)
  940. }
  941.  
  942. /**
  943. - * Function extract on/off literals as boolean values
  944. + * Function extract on/off literals as boolean values
  945. *
  946. * @param args variable pointer to non parsed args string, updated at function call to new position (with skipped white spaces)
  947. * @param val return extracted value if function success, in fail case original value unmodified
  948. @@ -2417,7 +2417,7 @@ char* ChatHandler::ExtractLinkArg(char** args, char const* const* linkTypes /*=
  949.  
  950. if (*tail != 'H') // skip color part, some links can not have color part
  951. {
  952. - while (*tail && *tail != '|')
  953. + while (*tail && *tail != '|')
  954. ++tail;
  955.  
  956. if (!*tail)
  957. @@ -2557,7 +2557,7 @@ char* ChatHandler::ExtractLinkArg(char** args, char const* const* linkTypes /*=
  958. somethingPair[1] = somethingEnd;
  959. }
  960.  
  961. - *args = tail;
  962. + *args = tail;
  963.  
  964. SkipWhiteSpaces(args);
  965.  
  966. @@ -2630,7 +2630,7 @@ char* ChatHandler::ExtractKeyFromLink(char** text, char const* linkType, char**
  967. }
  968.  
  969. /**
  970. - * Function extract data from shift-link "|color|LINKTYPE:RETURN:SOMETHING1|h[name]|h|r if LINKTYPE in linkTypes array
  971. + * Function extract data from shift-link "|color|LINKTYPE:RETURN:SOMETHING1|h[name]|h|r if LINKTYPE in linkTypes array
  972. * It also extract literal/quote if not shift-link in args
  973. *
  974. * @param args variable pointer to non parsed args string, updated at function call to new position (with skipped white spaces)
  975. diff --git a/src/game/DBCStructure.h b/src/game/DBCStructure.h
  976. index 74007ae..9948032 100644
  977. --- a/src/game/DBCStructure.h
  978. +++ b/src/game/DBCStructure.h
  979. @@ -732,7 +732,7 @@ struct CreatureDisplayInfoExtraEntry
  980. //uint32 SkinColor; // 3
  981. //uint32 FaceType; // 4
  982. //uint32 HairType; // 5 CharHairGeosets.dbc
  983. - //uint32 HairStyle; // 6 CharSections.dbc, where GeneralType=3
  984. + //uint32 HairStyle; // 6 CharSections.dbc, where GeneralType=3
  985. //uint32 BeardStyle; // 7
  986. //uint32 Equipment[11]; // 8-18 equipped static items EQUIPMENT_SLOT_HEAD..EQUIPMENT_SLOT_HANDS, client show its by self
  987. //uint32 CanEquip; // 19 0..1 Can equip additional things when used for players
  988. diff --git a/src/game/GameEventMgr.cpp b/src/game/GameEventMgr.cpp
  989. index e785ec5..e7953db 100644
  990. --- a/src/game/GameEventMgr.cpp
  991. +++ b/src/game/GameEventMgr.cpp
  992. @@ -170,8 +170,8 @@ void GameEventMgr::LoadFromDB()
  993. sLog.outString( ">> Loaded %u game events", count );
  994. }
  995.  
  996. - std::map<uint16,int16> pool2event; // for check unique spawn event associated with pool
  997. - std::map<uint32,int16> creature2event; // for check unique spawn event associated with creature
  998. + std::map<uint16,int16> pool2event; // for check unique spawn event associated with pool
  999. + std::map<uint32,int16> creature2event; // for check unique spawn event associated with creature
  1000. std::map<uint32,int16> go2event; // for check unique spawn event associated with gameobject
  1001.  
  1002. // list only positive event top pools, filled at creature/gameobject loading
  1003. @@ -221,7 +221,7 @@ void GameEventMgr::LoadFromDB()
  1004. ++count;
  1005.  
  1006. // spawn objects at event can be grouped in pools and then affected pools have stricter requirements for this case
  1007. - if (event_id > 0)
  1008. + if (event_id > 0)
  1009. {
  1010. creature2event[guid] = event_id;
  1011.  
  1012. @@ -299,7 +299,7 @@ void GameEventMgr::LoadFromDB()
  1013. ++count;
  1014.  
  1015. // spawn objects at event can be grouped in pools and then affected pools have stricter requirements for this case
  1016. - if (event_id > 0)
  1017. + if (event_id > 0)
  1018. {
  1019. go2event[guid] = event_id;
  1020.  
  1021. @@ -690,7 +690,7 @@ void GameEventMgr::GameEventSpawn(int16 event_id)
  1022. CreatureData const* data = sObjectMgr.GetCreatureData(*itr);
  1023. if (data)
  1024. {
  1025. - // negative event id for pool element meaning allow be used in next pool spawn
  1026. + // negative event id for pool element meaning allow be used in next pool spawn
  1027. if (event_id < 0)
  1028. {
  1029. if (uint16 pool_id = sPoolMgr.IsPartOfAPool<Creature>(*itr))
  1030. @@ -737,7 +737,7 @@ void GameEventMgr::GameEventSpawn(int16 event_id)
  1031. GameObjectData const* data = sObjectMgr.GetGOData(*itr);
  1032. if (data)
  1033. {
  1034. - // negative event id for pool element meaning allow be used in next pool spawn
  1035. + // negative event id for pool element meaning allow be used in next pool spawn
  1036. if (event_id < 0)
  1037. {
  1038. if (uint16 pool_id = sPoolMgr.IsPartOfAPool<GameObject>(*itr))
  1039. diff --git a/src/game/GameObject.cpp b/src/game/GameObject.cpp
  1040. index 019686f..9120fe4 100644
  1041. --- a/src/game/GameObject.cpp
  1042. +++ b/src/game/GameObject.cpp
  1043. @@ -454,7 +454,7 @@ void GameObject::AddUniqueUse(Player* player)
  1044. m_firstUser = player->GetObjectGuid();
  1045.  
  1046. m_UniqueUsers.insert(player->GetObjectGuid());
  1047. -
  1048. +
  1049. }
  1050.  
  1051. void GameObject::Delete()
  1052. diff --git a/src/game/GridMap.cpp b/src/game/GridMap.cpp
  1053. index 8b61206..b8869de 100644
  1054. --- a/src/game/GridMap.cpp
  1055. +++ b/src/game/GridMap.cpp
  1056. @@ -1035,7 +1035,7 @@ GridMap * TerrainInfo::GetGrid( const float x, const float y )
  1057. // half opt method
  1058. int gx=(int)(32-x/SIZE_OF_GRIDS); //grid x
  1059. int gy=(int)(32-y/SIZE_OF_GRIDS); //grid y
  1060. -
  1061. +
  1062. //quick check if GridMap already loaded
  1063. GridMap * pMap = m_GridMaps[gx][gy];
  1064. if(!pMap)
  1065. @@ -1134,7 +1134,7 @@ TerrainManager::~TerrainManager()
  1066. TerrainInfo * TerrainManager::LoadTerrain(const uint32 mapId)
  1067. {
  1068. Guard _guard(*this);
  1069. -
  1070. +
  1071. TerrainInfo * ptr = NULL;
  1072. TerrainDataMap::const_iterator iter = i_TerrainMap.find(mapId);
  1073. if(iter == i_TerrainMap.end())
  1074. @@ -1179,7 +1179,7 @@ void TerrainManager::UnloadAll()
  1075. {
  1076. for (TerrainDataMap::iterator it = i_TerrainMap.begin(); it != i_TerrainMap.end(); ++it)
  1077. delete it->second;
  1078. -
  1079. +
  1080. i_TerrainMap.clear();
  1081. }
  1082.  
  1083. diff --git a/src/game/GridMap.h b/src/game/GridMap.h
  1084. index bdea037..1dfeebc 100644
  1085. --- a/src/game/GridMap.h
  1086. +++ b/src/game/GridMap.h
  1087. @@ -245,7 +245,7 @@ public:
  1088.  
  1089. protected:
  1090. friend class Map;
  1091. - //load/unload terrain data
  1092. + //load/unload terrain data
  1093. GridMap * Load(const uint32 x, const uint32 y);
  1094. void Unload(const uint32 x, const uint32 y);
  1095.  
  1096. diff --git a/src/game/ItemHandler.cpp b/src/game/ItemHandler.cpp
  1097. index ed48f52..1915535 100644
  1098. --- a/src/game/ItemHandler.cpp
  1099. +++ b/src/game/ItemHandler.cpp
  1100. @@ -1132,7 +1132,7 @@ void WorldSession::HandleWrapItemOpcode(WorldPacket& recv_data)
  1101. }
  1102.  
  1103. // cheating: non-wrapper wrapper (all empty wrappers is stackable)
  1104. - if (!(gift->GetProto()->Flags & ITEM_FLAG_WRAPPER) || gift->GetMaxStackCount() == 1)
  1105. + if (!(gift->GetProto()->Flags & ITEM_FLAG_WRAPPER) || gift->GetMaxStackCount() == 1)
  1106. {
  1107. _player->SendEquipError( EQUIP_ERR_ITEM_NOT_FOUND, gift, NULL );
  1108. return;
  1109. diff --git a/src/game/Level2.cpp b/src/game/Level2.cpp
  1110. index dd7920b..d0cb585 100644
  1111. --- a/src/game/Level2.cpp
  1112. +++ b/src/game/Level2.cpp
  1113. @@ -2661,7 +2661,7 @@ bool ChatHandler::HandleTicketCommand(char* args)
  1114. if (num == 0)
  1115. return false;
  1116.  
  1117. - // mgr numbering tickets start from 0
  1118. + // mgr numbering tickets start from 0
  1119. ticket = sTicketMgr.GetGMTicketByOrderPos(num-1);
  1120.  
  1121. if (!ticket)
  1122. @@ -2708,7 +2708,7 @@ bool ChatHandler::HandleTicketCommand(char* args)
  1123. if (num == 0)
  1124. return false;
  1125.  
  1126. - // mgr numbering tickets start from 0
  1127. + // mgr numbering tickets start from 0
  1128. GMTicket* ticket = sTicketMgr.GetGMTicketByOrderPos(num-1);
  1129. if (!ticket)
  1130. {
  1131. @@ -2763,7 +2763,7 @@ bool ChatHandler::HandleDelTicketCommand(char *args)
  1132. if (num ==0)
  1133. return false;
  1134.  
  1135. - // mgr numbering tickets start from 0
  1136. + // mgr numbering tickets start from 0
  1137. GMTicket* ticket = sTicketMgr.GetGMTicketByOrderPos(num-1);
  1138.  
  1139. if (!ticket)
  1140. diff --git a/src/game/Level3.cpp b/src/game/Level3.cpp
  1141. index ca37a1c..6addbfc 100644
  1142. --- a/src/game/Level3.cpp
  1143. +++ b/src/game/Level3.cpp
  1144. @@ -1252,7 +1252,7 @@ bool ChatHandler::HandleAchievementCriteriaAddCommand(char* args)
  1145. return false;
  1146.  
  1147. uint32 new_val;
  1148. -
  1149. +
  1150. if (maxValue)
  1151. new_val = progress < maxValue && maxValue - progress > val ? progress + val : maxValue;
  1152. else
  1153. @@ -4604,7 +4604,7 @@ bool ChatHandler::HandleListAurasCommand (char* /*args*/)
  1154. for (Unit::SpellAuraHolderMap::const_iterator itr = uAuras.begin(); itr != uAuras.end(); ++itr)
  1155. {
  1156. bool talent = GetTalentSpellCost(itr->second->GetId()) > 0;
  1157. -
  1158. +
  1159. SpellAuraHolder *holder = itr->second;
  1160. char const* name = holder->GetSpellProto()->SpellName[GetSessionDbcLocale()];
  1161.  
  1162. @@ -4613,7 +4613,7 @@ bool ChatHandler::HandleListAurasCommand (char* /*args*/)
  1163. Aura *aur = holder->GetAuraByEffectIndex(SpellEffectIndex(i));
  1164. if (!aur)
  1165. continue;
  1166. -
  1167. +
  1168. if (m_session)
  1169. {
  1170. std::ostringstream ss_name;
  1171. diff --git a/src/game/LootHandler.cpp b/src/game/LootHandler.cpp
  1172. index 2b9bfc2..0d480d5 100644
  1173. --- a/src/game/LootHandler.cpp
  1174. +++ b/src/game/LootHandler.cpp
  1175. @@ -448,7 +448,7 @@ void WorldSession::DoLootRelease(ObjectGuid lguid)
  1176. // normal persistence loot
  1177. default:
  1178. {
  1179. - // must be destroyed only if no loot
  1180. + // must be destroyed only if no loot
  1181. if (pItem->loot.isLooted())
  1182. {
  1183. pItem->SetLootState(ITEM_LOOT_REMOVED);
  1184. diff --git a/src/game/Map.cpp b/src/game/Map.cpp
  1185. index bbd6543..8748bdc 100644
  1186. --- a/src/game/Map.cpp
  1187. +++ b/src/game/Map.cpp
  1188. @@ -267,7 +267,7 @@ bool Map::EnsureGridLoaded(const Cell &cell)
  1189. //otherwise there is a possibility of infinity chain (grid loading will be called many times for the same grid)
  1190. //possible scenario:
  1191. //active object A(loaded with loader.LoadN call and added to the map)
  1192. - //summons some active object B, while B added to map grid loading called again and so on..
  1193. + //summons some active object B, while B added to map grid loading called again and so on..
  1194. setGridObjectDataLoaded(true,cell.GridX(), cell.GridY());
  1195. ObjectGridLoader loader(*grid, this, cell);
  1196. loader.LoadN();
  1197. diff --git a/src/game/MapManager.cpp b/src/game/MapManager.cpp
  1198. index 65c1913..0e05860 100644
  1199. --- a/src/game/MapManager.cpp
  1200. +++ b/src/game/MapManager.cpp
  1201. @@ -92,7 +92,7 @@ Map* MapManager::CreateMap(uint32 id, const WorldObject* obj)
  1202. MANGOS_ASSERT(obj);
  1203. //if(!obj->IsInWorld()) sLog.outError("GetMap: called for map %d with object (typeid %d, guid %d, mapid %d, instanceid %d) who is not in world!", id, obj->GetTypeId(), obj->GetGUIDLow(), obj->GetMapId(), obj->GetInstanceId());
  1204. Guard _guard(*this);
  1205. -
  1206. +
  1207. Map * m = NULL;
  1208.  
  1209. const MapEntry* entry = sMapStore.LookupEntry(id);
  1210. @@ -136,7 +136,7 @@ Map* MapManager::FindMap(uint32 mapid, uint32 instanceId) const
  1211. MapMapType::const_iterator iter = i_maps.find(MapID(mapid, instanceId));
  1212. if(iter == i_maps.end())
  1213. return NULL;
  1214. -
  1215. +
  1216. //this is a small workaround for transports
  1217. if(instanceId == 0 && iter->second->Instanceable())
  1218. {
  1219. diff --git a/src/game/Object.cpp b/src/game/Object.cpp
  1220. index 4c38ea2..7234491 100644
  1221. --- a/src/game/Object.cpp
  1222. +++ b/src/game/Object.cpp
  1223. @@ -1075,7 +1075,7 @@ void WorldObject::Relocate(float x, float y, float z)
  1224. }
  1225.  
  1226. void WorldObject::SetOrientation(float orientation)
  1227. -{
  1228. +{
  1229. m_orientation = orientation;
  1230.  
  1231. if(isType(TYPEMASK_UNIT))
  1232. diff --git a/src/game/Object.h b/src/game/Object.h
  1233. index 86f4890..9aa64e5 100644
  1234. --- a/src/game/Object.h
  1235. +++ b/src/game/Object.h
  1236. @@ -88,7 +88,7 @@ struct WorldLocation
  1237.  
  1238.  
  1239. //use this class to measure time between world update ticks
  1240. -//essential for units updating their spells after cells become active
  1241. +//essential for units updating their spells after cells become active
  1242. class WorldUpdateCounter
  1243. {
  1244. public:
  1245. @@ -411,7 +411,7 @@ class MANGOS_DLL_SPEC WorldObject : public Object
  1246. ~UpdateHelper() { }
  1247.  
  1248. void Update( uint32 time_diff )
  1249. - {
  1250. + {
  1251. m_obj->Update( m_obj->m_updateTracker.timeElapsed(), time_diff);
  1252. m_obj->m_updateTracker.Reset();
  1253. }
  1254. diff --git a/src/game/ObjectGuid.cpp b/src/game/ObjectGuid.cpp
  1255. index cb1c6b4..59d8478 100644
  1256. --- a/src/game/ObjectGuid.cpp
  1257. +++ b/src/game/ObjectGuid.cpp
  1258. @@ -47,7 +47,7 @@ std::string ObjectGuid::GetString() const
  1259. {
  1260. std::ostringstream str;
  1261. str << GetTypeName();
  1262. -
  1263. +
  1264. if (IsPlayer())
  1265. {
  1266. std::string name;
  1267. diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp
  1268. index 779bae5..966dd27 100644
  1269. --- a/src/game/ObjectMgr.cpp
  1270. +++ b/src/game/ObjectMgr.cpp
  1271. @@ -8911,7 +8911,7 @@ bool FindCreatureData::operator()( CreatureDataPair const& dataPair )
  1272. i_mapDist = new_dist;
  1273. }
  1274.  
  1275. - // skip not spawned (in any state),
  1276. + // skip not spawned (in any state),
  1277. uint16 pool_id = sPoolMgr.IsPartOfAPool<Creature>(dataPair.first);
  1278. if (pool_id && !sPoolMgr.IsSpawnedObject<Creature>(dataPair.first))
  1279. return false;
  1280. diff --git a/src/game/Pet.cpp b/src/game/Pet.cpp
  1281. index 68e4aeb..9e06c3c 100644
  1282. --- a/src/game/Pet.cpp
  1283. +++ b/src/game/Pet.cpp
  1284. @@ -43,7 +43,7 @@ m_declinedname(NULL), m_petModeFlags(PET_MODE_DEFAULT)
  1285.  
  1286. if(type == MINI_PET) // always passive
  1287. charmInfo->SetReactState(REACT_PASSIVE);
  1288. - else if(type == PROTECTOR_PET) // always defensive
  1289. + else if(type == PROTECTOR_PET) // always defensive
  1290. charmInfo->SetReactState(REACT_DEFENSIVE);
  1291. else if(type == GUARDIAN_PET) // always aggressive
  1292. charmInfo->SetReactState(REACT_AGGRESSIVE);
  1293. diff --git a/src/game/PoolManager.cpp b/src/game/PoolManager.cpp
  1294. index 426047c..86f5738 100644
  1295. --- a/src/game/PoolManager.cpp
  1296. +++ b/src/game/PoolManager.cpp
  1297. @@ -158,7 +158,7 @@ bool PoolGroup<T>::CheckPool() const
  1298. return true;
  1299. }
  1300.  
  1301. -// Method to check event linking
  1302. +// Method to check event linking
  1303. template <class T>
  1304. void PoolGroup<T>::CheckEventLinkAndReport(int16 event_id, std::map<uint32, int16> const& creature2event, std::map<uint32, int16> const& go2event) const
  1305. {
  1306. diff --git a/src/game/ScriptMgr.cpp b/src/game/ScriptMgr.cpp
  1307. index bd014a4..384b79c 100644
  1308. --- a/src/game/ScriptMgr.cpp
  1309. +++ b/src/game/ScriptMgr.cpp
  1310. @@ -915,7 +915,7 @@ char const* ScriptMgr::GetScriptLibraryVersion() const
  1311. {
  1312. if (!m_pGetScriptLibraryVersion)
  1313. return "";
  1314. -
  1315. +
  1316. return m_pGetScriptLibraryVersion();
  1317. }
  1318.  
  1319. diff --git a/src/game/SharedDefines.h b/src/game/SharedDefines.h
  1320. index 178bf3e..d8cbaaf 100644
  1321. --- a/src/game/SharedDefines.h
  1322. +++ b/src/game/SharedDefines.h
  1323. @@ -1947,7 +1947,7 @@ enum CreatureTypeFlags
  1324. CREATURE_TYPEFLAGS_UNK15 = 0x00004000, // Lua_UnitGUID, client does guid_low &= 0xFF000000 if this flag is set
  1325. CREATURE_TYPEFLAGS_ENGINEERLOOT = 0x00008000, // Can be looted by engineer
  1326. CREATURE_TYPEFLAGS_EXOTIC = 0x00010000, // Can be tamed by hunter as exotic pet
  1327. - CREATURE_TYPEFLAGS_UNK18 = 0x00020000, // related to CreatureDisplayInfo and scaling in some way
  1328. + CREATURE_TYPEFLAGS_UNK18 = 0x00020000, // related to CreatureDisplayInfo and scaling in some way
  1329. CREATURE_TYPEFLAGS_UNK19 = 0x00040000, // ? Related to vehicle/siege weapons?
  1330. CREATURE_TYPEFLAGS_UNK20 = 0x00080000, // may be has something to do with missiles
  1331. CREATURE_TYPEFLAGS_UNK21 = 0x00100000, // no idea, but it used by client, may be related to rendering
  1332. diff --git a/src/game/Transports.cpp b/src/game/Transports.cpp
  1333. index 0cddf01..08af53d 100644
  1334. --- a/src/game/Transports.cpp
  1335. +++ b/src/game/Transports.cpp
  1336. @@ -420,7 +420,7 @@ bool Transport::GenerateWaypoints(uint32 pathid, std::set<uint32> &mapids)
  1337.  
  1338. m_next = m_WayPoints.begin(); // will used in MoveToNextWayPoint for init m_curr
  1339. MoveToNextWayPoint(); // m_curr -> first point
  1340. - MoveToNextWayPoint(); // skip first point
  1341. + MoveToNextWayPoint(); // skip first point
  1342.  
  1343. m_pathTime = timer;
  1344.  
  1345. diff --git a/src/game/debugcmds.cpp b/src/game/debugcmds.cpp
  1346. index e6b3ef5..c19fbd9 100644
  1347. --- a/src/game/debugcmds.cpp
  1348. +++ b/src/game/debugcmds.cpp
  1349. @@ -548,7 +548,7 @@ bool ChatHandler::HandleDebugGetItemStateCommand(char* args)
  1350. if (container != bag)
  1351. {
  1352. PSendSysMessage("%s in bag %u at slot %u has a different container %s from slot %u!",
  1353. - item2->GetGuidStr().c_str(), bag->GetSlot(), item2->GetSlot(),
  1354. + item2->GetGuidStr().c_str(), bag->GetSlot(), item2->GetSlot(),
  1355. container->GetGuidStr().c_str(), container->GetSlot());
  1356. error = true; continue;
  1357. }
  1358. @@ -1091,7 +1091,7 @@ bool ChatHandler::HandleDebugSpellModsCommand(char* args)
  1359. if (!typeStr)
  1360. return false;
  1361.  
  1362. - uint16 opcode;
  1363. + uint16 opcode;
  1364. if (strncmp(typeStr, "flat", strlen(typeStr)) == 0)
  1365. opcode = SMSG_SET_FLAT_SPELL_MODIFIER;
  1366. else if (strncmp(typeStr, "pct", strlen(typeStr)) == 0)
  1367. diff --git a/src/mangosd/monitor-mangosd b/src/mangosd/monitor-mangosd
  1368. old mode 100755
  1369. new mode 100644
  1370. diff --git a/src/mangosd/run-mangosd b/src/mangosd/run-mangosd
  1371. old mode 100755
  1372. new mode 100644
  1373. diff --git a/src/shared/LockedQueue.h b/src/shared/LockedQueue.h
  1374. index 487b3bf..d1d9719 100644
  1375. --- a/src/shared/LockedQueue.h
  1376. +++ b/src/shared/LockedQueue.h
  1377. @@ -124,7 +124,7 @@ namespace ACE_Based
  1378. {
  1379. this->_lock.release();
  1380. }
  1381. -
  1382. +
  1383. ///! Checks if we're empty or not with locks held
  1384. bool empty()
  1385. {
  1386. diff --git a/src/shared/Timer.h b/src/shared/Timer.h
  1387. index 8ee8dac..b0acb10 100644
  1388. --- a/src/shared/Timer.h
  1389. +++ b/src/shared/Timer.h
  1390. @@ -43,7 +43,7 @@ class WorldTimer
  1391. return newMSTime - oldMSTime;
  1392. }
  1393.  
  1394. - //get last world tick time
  1395. + //get last world tick time
  1396. static MANGOS_DLL_SPEC uint32 tickTime();
  1397. //get previous world tick time
  1398. static MANGOS_DLL_SPEC uint32 tickPrevTime();
  1399. --
  1400. 1.7.3.5
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!