From 8116c9810cfe29f36d0597e4cc130d9b152099b0 Mon Sep 17 00:00:00 2001 From: freghar Date: Fri, 19 Dec 2008 23:25:20 +0100 Subject: [PATCH] [6922] Whitespace and newline fixes This should fix the GCC "no newline at end of file" warnings. Signed-off-by: freghar --- sql/updates/2008_11_11_02_mangos_scripts.sql | 10 +++++----- sql/updates/2008_11_14_01_mangos_scripts.sql | 10 +++++----- src/bindings/universal/ScriptMgr.h | 2 +- src/game/CharacterHandler.cpp | 2 +- src/game/ObjectMgr.cpp | 2 +- src/shared/Database/DatabaseImpl.h | 4 ++-- src/shared/revision_nr.h | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/sql/updates/2008_11_11_02_mangos_scripts.sql b/sql/updates/2008_11_11_02_mangos_scripts.sql index a9fbd1036..b2d9fb147 100644 --- a/sql/updates/2008_11_11_02_mangos_scripts.sql +++ b/sql/updates/2008_11_11_02_mangos_scripts.sql @@ -2,20 +2,20 @@ ALTER TABLE db_version CHANGE COLUMN required_2008_11_11_01_mangos_db_script_str ALTER TABLE event_scripts DROP datatext, - ADD COLUMN dataint int(11) NOT NULL default '0'; + ADD COLUMN dataint int(11) NOT NULL default '0'; ALTER TABLE gameobject_scripts DROP datatext, - ADD COLUMN dataint int(11) NOT NULL default '0'; + ADD COLUMN dataint int(11) NOT NULL default '0'; ALTER TABLE quest_end_scripts DROP datatext, - ADD COLUMN dataint int(11) NOT NULL default '0'; + ADD COLUMN dataint int(11) NOT NULL default '0'; ALTER TABLE quest_start_scripts DROP datatext, - ADD COLUMN dataint int(11) NOT NULL default '0'; + ADD COLUMN dataint int(11) NOT NULL default '0'; ALTER TABLE spell_scripts DROP datatext, - ADD COLUMN dataint int(11) NOT NULL default '0'; + ADD COLUMN dataint int(11) NOT NULL default '0'; diff --git a/sql/updates/2008_11_14_01_mangos_scripts.sql b/sql/updates/2008_11_14_01_mangos_scripts.sql index ab51cf3d8..a2176b612 100644 --- a/sql/updates/2008_11_14_01_mangos_scripts.sql +++ b/sql/updates/2008_11_14_01_mangos_scripts.sql @@ -1,16 +1,16 @@ ALTER TABLE db_version CHANGE COLUMN required_2008_11_11_02_mangos_scripts required_2008_11_14_01_mangos_scripts bit; ALTER TABLE event_scripts - CHANGE COLUMN dataint dataint int(11) NOT NULL default '0' AFTER datalong2; + CHANGE COLUMN dataint dataint int(11) NOT NULL default '0' AFTER datalong2; ALTER TABLE gameobject_scripts - CHANGE COLUMN dataint dataint int(11) NOT NULL default '0' AFTER datalong2; + CHANGE COLUMN dataint dataint int(11) NOT NULL default '0' AFTER datalong2; ALTER TABLE quest_end_scripts - CHANGE COLUMN dataint dataint int(11) NOT NULL default '0' AFTER datalong2; + CHANGE COLUMN dataint dataint int(11) NOT NULL default '0' AFTER datalong2; ALTER TABLE quest_start_scripts - CHANGE COLUMN dataint dataint int(11) NOT NULL default '0' AFTER datalong2; + CHANGE COLUMN dataint dataint int(11) NOT NULL default '0' AFTER datalong2; ALTER TABLE spell_scripts - CHANGE COLUMN dataint dataint int(11) NOT NULL default '0' AFTER datalong2; + CHANGE COLUMN dataint dataint int(11) NOT NULL default '0' AFTER datalong2; diff --git a/src/bindings/universal/ScriptMgr.h b/src/bindings/universal/ScriptMgr.h index 0b4605b5e..415aa23cc 100644 --- a/src/bindings/universal/ScriptMgr.h +++ b/src/bindings/universal/ScriptMgr.h @@ -68,7 +68,7 @@ struct Script CreatureAI* (*GetAI)(Creature *_Creature); InstanceData* (*GetInstanceData)(Map*); // ----------------------------------------- - + void registerSelf(); }; diff --git a/src/game/CharacterHandler.cpp b/src/game/CharacterHandler.cpp index 9022a5c33..f16680b3c 100644 --- a/src/game/CharacterHandler.cpp +++ b/src/game/CharacterHandler.cpp @@ -942,7 +942,7 @@ void WorldSession::HandleChangePlayerNameOpcode(WorldPacket& recv_data) // and that there is no character with the desired new name CharacterDatabase.AsyncPQuery(&WorldSession::HandleChangePlayerNameOpcodeCallBack, GetAccountId(), newname, - "SELECT guid, name FROM characters WHERE guid = %d AND account = %d AND (at_login & %d) = %d AND NOT EXISTS (SELECT NULL FROM characters WHERE name = '%s')", + "SELECT guid, name FROM characters WHERE guid = %d AND account = %d AND (at_login & %d) = %d AND NOT EXISTS (SELECT NULL FROM characters WHERE name = '%s')", GUID_LOPART(guid), GetAccountId(), AT_LOGIN_RENAME, AT_LOGIN_RENAME, escaped_newname.c_str() ); } diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp index 83b9d7d76..0b1c0d357 100644 --- a/src/game/ObjectMgr.cpp +++ b/src/game/ObjectMgr.cpp @@ -578,7 +578,7 @@ void ObjectMgr::LoadCreatureLocales() sLog.outString(); sLog.outString( ">> Loaded %u creature locale strings", mCreatureLocaleMap.size() ); } - + void ObjectMgr::LoadNpcOptionLocales() { mNpcOptionLocaleMap.clear(); // need for reload case diff --git a/src/shared/Database/DatabaseImpl.h b/src/shared/Database/DatabaseImpl.h index 1be9878e5..d7f8c43e2 100644 --- a/src/shared/Database/DatabaseImpl.h +++ b/src/shared/Database/DatabaseImpl.h @@ -96,7 +96,7 @@ Database::AsyncQuery(Class *object, void (Class::*method)(QueryResult*, ParamTyp return m_threadBody->Delay(new SqlQuery(sql, new MaNGOS::QueryCallback(object, method, (QueryResult*)NULL, param1, param2, param3), itr->second)); } -// -- Query / static -- +// -- Query / static -- template bool @@ -202,4 +202,4 @@ Database::DelayQueryHolder(Class *object, void (Class::*method)(QueryResult*, Sq #undef ASYNC_QUERY_BODY #undef ASYNC_PQUERY_BODY -#undef ASYNC_DELAYHOLDER_BODY \ No newline at end of file +#undef ASYNC_DELAYHOLDER_BODY diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 056d7d999..482bae0e8 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "6921" + #define REVISION_NR "6922" #endif // __REVISION_NR_H__ -- 2.11.4.GIT