@@ -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'; sql/updates/2008_11_11_02_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; sql/updates/2008_11_14_01_mangos_scripts.sql @@ -68,7 +68,7 @@ struct Script CreatureAI* (*GetAI)(Creature *_Creature); InstanceData* (*GetInstanceData)(Map*); // ----------------------------------------- - + void registerSelf(); }; src/bindings/universal/ScriptMgr.h @@ -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() ); } src/game/CharacterHandler.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 src/game/ObjectMgr.cpp @@ -96,7 +96,7 @@ Database::AsyncQuery(Class *object, void (Class::*method)(QueryResult*, ParamTyp return m_threadBody->Delay(new SqlQuery(sql, new MaNGOS::QueryCallback<Class, ParamType1, ParamType2, ParamType3>(object, method, (QueryResult*)NULL, param1, param2, param3), itr->second)); } -// -- Query / static -- +// -- Query / static -- template<typename ParamType1> 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 src/shared/Database/DatabaseImpl.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__ src/shared/revision_nr.h 42290b2bf953c24f0455a0f58a26a18c01a587ef freghar compmancz@gmail.com http://github.com/mangos/mangos/commit/8116c9810cfe29f36d0597e4cc130d9b152099b0 8116c9810cfe29f36d0597e4cc130d9b152099b0 2008-12-19T16:46:21-08:00 2008-12-19T14:25:20-08:00 [6922] Whitespace and newline fixes This should fix the GCC "no newline at end of file" warnings. Signed-off-by: freghar <compmancz@gmail.com> aaae104d2d6355f386631d9d7121b52e806dc945 freghar compmancz@gmail.com