*Massive cleanup (\n\n -> \n, *\n -> \n, cleanup for(...) to for (...), and some other cleanups by hand)

*Fix a possible crash in Spell::DoAllEffectOnTarget

--HG--
branch : trunk

1 files changed, 0 insertions, 101 deletions

diff --git a/src/game/PlayerDump.cpp b/src/game/PlayerDump.cpp
index 12544c62e41..5922582dd10 100644
--- a/src/game/PlayerDump.cpp
+++ b/src/game/PlayerDump.cpp
@@ -17,23 +17,19 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #include "Common.h"
 #include "PlayerDump.h"
 #include "Database/DatabaseEnv.h"
 #include "Database/SQLStorage.h"
 #include "UpdateFields.h"
 #include "ObjectMgr.h"
-
 // Character Dump tables
 #define DUMP_TABLE_COUNT 26
-
 struct DumpTable
 {
     char const* name;
     DumpTableType type;
 };
-
 static DumpTable dumpTables[DUMP_TABLE_COUNT] =
 {
     { "characters",                       DTT_CHARACTER  },
@@ -63,7 +59,6 @@ static DumpTable dumpTables[DUMP_TABLE_COUNT] =
     { "pet_spell",                        DTT_PET_TABLE  },
     { "pet_spell_cooldown",               DTT_PET_TABLE  },
 };
-
 // Low level functions
 static bool findtoknth(std::string &str, int n, std::string::size_type &s, std::string::size_type &e)
 {
@@ -72,32 +67,25 @@ static bool findtoknth(std::string &str, int n, std::string::size_type &s, std::
     for(i = 1; s < size && i < n; s++) if(str[s] == ' ') ++i;
     if (i < n)
         return false;
-
     e = str.find(' ', s);
-
     return e != std::string::npos;
 }
-
 std::string gettoknth(std::string &str, int n)
 {
     std::string::size_type s = 0, e = 0;
     if(!findtoknth(str, n, s, e))
         return "";
-
     return str.substr(s, e-s);
 }
-
 bool findnth(std::string &str, int n, std::string::size_type &s, std::string::size_type &e)
 {
     s = str.find("VALUES ('")+9;
     if (s == std::string::npos) return false;
-
     do
     {
         e = str.find("'",s);
         if (e == std::string::npos) return false;
     } while(str[e-1] == '\\');
-
     for(int i = 1; i < n; ++i)
     {
         do
@@ -109,42 +97,34 @@ bool findnth(std::string &str, int n, std::string::size_type &s, std::string::si
     }
     return true;
 }
-
 std::string gettablename(std::string &str)
 {
     std::string::size_type s = 13;
     std::string::size_type e = str.find(_TABLE_SIM_, s);
     if (e == std::string::npos)
         return "";
-
     return str.substr(s, e-s);
 }
-
 bool changenth(std::string &str, int n, const char *with, bool insert = false, bool nonzero = false)
 {
     std::string::size_type s, e;
     if(!findnth(str,n,s,e))
         return false;
-
     if(nonzero && str.substr(s,e-s) == "0")
         return true;                                        // not an error
     if(!insert)
         str.replace(s,e-s, with);
     else
         str.insert(s, with);
-
     return true;
 }
-
 std::string getnth(std::string &str, int n)
 {
     std::string::size_type s, e;
     if(!findnth(str,n,s,e))
         return "";
-
     return str.substr(s, e-s);
 }
-
 bool changetoknth(std::string &str, int n, const char *with, bool insert = false, bool nonzero = false)
 {
     std::string::size_type s = 0, e = 0;
@@ -156,47 +136,37 @@ bool changetoknth(std::string &str, int n, const char *with, bool insert = false
         str.replace(s, e-s, with);
     else
         str.insert(s, with);
-
     return true;
 }
-
 uint32 registerNewGuid(uint32 oldGuid, std::map<uint32, uint32> &guidMap, uint32 hiGuid)
 {
     std::map<uint32, uint32>::const_iterator itr = guidMap.find(oldGuid);
     if(itr != guidMap.end())
         return itr->second;
-
     uint32 newguid = hiGuid + guidMap.size();
     guidMap[oldGuid] = newguid;
     return newguid;
 }
-
 bool changeGuid(std::string &str, int n, std::map<uint32, uint32> &guidMap, uint32 hiGuid, bool nonzero = false)
 {
     char chritem[20];
     uint32 oldGuid = atoi(getnth(str, n).c_str());
     if (nonzero && oldGuid == 0)
         return true;                                        // not an error
-
     uint32 newGuid = registerNewGuid(oldGuid, guidMap, hiGuid);
     snprintf(chritem, 20, "%d", newGuid);
-
     return changenth(str, n, chritem, false, nonzero);
 }
-
 bool changetokGuid(std::string &str, int n, std::map<uint32, uint32> &guidMap, uint32 hiGuid, bool nonzero = false)
 {
     char chritem[20];
     uint32 oldGuid = atoi(gettoknth(str, n).c_str());
     if (nonzero && oldGuid == 0)
         return true;                                        // not an error
-
     uint32 newGuid = registerNewGuid(oldGuid, guidMap, hiGuid);
     snprintf(chritem, 20, "%d", newGuid);
-
     return changetoknth(str, n, chritem, false, nonzero);
 }
-
 std::string CreateDumpString(char const* tableName, QueryResult *result)
 {
     if(!tableName || !result) return "";
@@ -207,24 +177,20 @@ std::string CreateDumpString(char const* tableName, QueryResult *result)
     {
         if (i == 0) ss << "'";
         else ss << ", '";
-
         std::string s = fields[i].GetCppString();
         CharacterDatabase.escape_string(s);
         ss << s;
-
         ss << "'";
     }
     ss << ");";
     return ss.str();
 }
-
 std::string PlayerDumpWriter::GenerateWhereStr(char const* field, uint32 guid)
 {
     std::ostringstream wherestr;
     wherestr << field << " = '" << guid << "'";
     return wherestr.str();
 }
-
 std::string PlayerDumpWriter::GenerateWhereStr(char const* field, GUIDs const& guids, GUIDs::const_iterator& itr)
 {
     std::ostringstream wherestr;
@@ -232,13 +198,11 @@ std::string PlayerDumpWriter::GenerateWhereStr(char const* field, GUIDs const& g
     for(; itr != guids.end(); ++itr)
     {
         wherestr << *itr;
-
         if(wherestr.str().size() > MAX_QUERY_LEN - 50)      // near to max query
         {
             ++itr;
             break;
         }
-
         GUIDs::const_iterator itr2 = itr;
         if(++itr2 != guids.end())
             wherestr << "','";
@@ -246,7 +210,6 @@ std::string PlayerDumpWriter::GenerateWhereStr(char const* field, GUIDs const& g
     wherestr << "')";
     return wherestr.str();
 }
-
 void StoreGUID(QueryResult *result,uint32 field,std::set<uint32>& guids)
 {
     Field* fields = result->Fetch();
@@ -254,7 +217,6 @@ void StoreGUID(QueryResult *result,uint32 field,std::set<uint32>& guids)
     if(guid)
         guids.insert(guid);
 }
-
 void StoreGUID(QueryResult *result,uint32 data,uint32 field, std::set<uint32>& guids)
 {
     Field* fields = result->Fetch();
@@ -263,13 +225,11 @@ void StoreGUID(QueryResult *result,uint32 data,uint32 field, std::set<uint32>& g
     if(guid)
         guids.insert(guid);
 }
-
 // Writing - High-level functions
 void PlayerDumpWriter::DumpTable(std::string& dump, uint32 guid, char const*tableFrom, char const*tableTo, DumpTableType type)
 {
     GUIDs const* guids = NULL;
     char const* fieldname = NULL;
-
     switch ( type )
     {
         case DTT_ITEM:      fieldname = "guid";      guids = &items; break;
@@ -281,29 +241,23 @@ void PlayerDumpWriter::DumpTable(std::string& dump, uint32 guid, char const*tabl
         case DTT_ITEM_TEXT: fieldname = "id";        guids = &texts; break;
         default:            fieldname = "guid";                      break;
     }
-
     // for guid set stop if set is empty
     if(guids && guids->empty())
         return;                                             // nothing to do
-
     // setup for guids case start position
     GUIDs::const_iterator guids_itr;
     if(guids)
         guids_itr = guids->begin();
-
     do
     {
         std::string wherestr;
-
         if(guids)                                           // set case, get next guids string
             wherestr = GenerateWhereStr(fieldname,*guids,guids_itr);
         else                                                // not set case, get single guid string
             wherestr = GenerateWhereStr(fieldname,guid);
-
         QueryResult *result = CharacterDatabase.PQuery("SELECT * FROM %s WHERE %s", tableFrom, wherestr.c_str());
         if(!result)
             return;
-
         do
         {
             // collect guids
@@ -323,24 +277,19 @@ void PlayerDumpWriter::DumpTable(std::string& dump, uint32 guid, char const*tabl
                     StoreGUID(result,1,items); break;       // item guid collection
                 default:                       break;
             }
-
             dump += CreateDumpString(tableTo, result);
             dump += "\n";
         }
         while (result->NextRow());
-
         delete result;
     }
     while(guids && guids_itr != guids->end());              // not set case iterate single time, set case iterate for all guids
 }
-
 std::string PlayerDumpWriter::GetDump(uint32 guid)
 {
     std::string dump;
-
     dump += "IMPORTANT NOTE: This sql queries not created for apply directly, use '.pdump load' command in console or client chat instead.\n";
     dump += "IMPORTANT NOTE: NOT APPLY ITS DIRECTLY to character DB or you will DAMAGE and CORRUPT character DB\n\n";
-
     // revision check guard
     /*
     QueryNamedResult* result = CharacterDatabase.QueryNamed("SELECT * FROM character_db_version LIMIT 1");
@@ -356,7 +305,6 @@ std::string PlayerDumpWriter::GetDump(uint32 guid)
                 break;
             }
         }
-
         if(!reqName.empty())
         {
             // this will fail at wrong character DB version
@@ -364,7 +312,6 @@ std::string PlayerDumpWriter::GetDump(uint32 guid)
         }
         else
             sLog.outError("Table 'character_db_version' not have revision guard field, revision guard query not added to pdump.");
-
         delete result;
     }
     else
@@ -372,29 +319,22 @@ std::string PlayerDumpWriter::GetDump(uint32 guid)
     */
     for(int i = 0; i < DUMP_TABLE_COUNT; ++i)
         DumpTable(dump, guid, dumpTables[i].name, dumpTables[i].name, dumpTables[i].type);
-
     // TODO: Add instance/group..
     // TODO: Add a dump level option to skip some non-important tables
-
     return dump;
 }
-
 DumpReturn PlayerDumpWriter::WriteDump(const std::string& file, uint32 guid)
 {
     FILE *fout = fopen(file.c_str(), "w");
     if (!fout)
         return DUMP_FILE_OPEN_ERROR;
-
     std::string dump = GetDump(guid);
-
     fprintf(fout,"%s\n",dump.c_str());
     fclose(fout);
     return DUMP_SUCCESS;
 }
-
 // Reading - High-level functions
 #define ROLLBACK(DR) {CharacterDatabase.RollbackTransaction(); fclose(fin); return (DR);}
-
 DumpReturn PlayerDumpReader::LoadDump(const std::string& file, uint32 account, std::string name, uint32 guid)
 {
     // check character count
@@ -406,19 +346,15 @@ DumpReturn PlayerDumpReader::LoadDump(const std::string& file, uint32 account, s
             Field *fields=result->Fetch();
             charcount = fields[0].GetUInt8();
             delete result;
-
             if (charcount >= 10)
                 return DUMP_TOO_MANY_CHARS;
         }
     }
-
     FILE *fin = fopen(file.c_str(), "r");
     if (!fin)
         return DUMP_FILE_OPEN_ERROR;
-
     QueryResult * result = NULL;
     char newguid[20], chraccount[20], newpetid[20], currpetid[20], lastpetid[20];
-
     // make sure the same guid doesn't already exist and is safe to use
     bool incHighest = true;
     if (guid != 0 && guid < objmgr.m_hiCharGuid)
@@ -433,11 +369,9 @@ DumpReturn PlayerDumpReader::LoadDump(const std::string& file, uint32 account, s
     }
     else
         guid = objmgr.m_hiCharGuid;
-
     // normalize the name if specified and check if it exists
     if (!normalizePlayerName(name))
         name = "";
-
     if (ObjectMgr::CheckPlayerName(name,true) == CHAR_NAME_SUCCESS)
     {
         CharacterDatabase.escape_string(name);              // for safe, we use name only for sql quearies anyway
@@ -450,23 +384,18 @@ DumpReturn PlayerDumpReader::LoadDump(const std::string& file, uint32 account, s
     }
     else
         name = "";
-
     // name encoded or empty
-
     snprintf(newguid, 20, "%d", guid);
     snprintf(chraccount, 20, "%d", account);
     snprintf(newpetid, 20, "%d", objmgr.GeneratePetNumber());
     snprintf(lastpetid, 20, "%s", "");
-
     std::map<uint32,uint32> items;
     std::map<uint32,uint32> mails;
     std::map<uint32,uint32> itemTexts;
     char buf[32000] = "";
-
     typedef std::map<uint32, uint32> PetIds;                // old->new petid relation
     typedef PetIds::value_type PetIdsPair;
     PetIds petids;
-
     CharacterDatabase.BeginTransaction();
     while(!feof(fin))
     {
@@ -475,29 +404,23 @@ DumpReturn PlayerDumpReader::LoadDump(const std::string& file, uint32 account, s
             if(feof(fin)) break;
             ROLLBACK(DUMP_FILE_BROKEN);
         }
-
         std::string line; line.assign(buf);
-
         // skip empty strings
         size_t nw_pos = line.find_first_not_of(" \t\n\r\7");
         if(nw_pos==std::string::npos)
             continue;
-
         // skip NOTE
         if(line.substr(nw_pos,15)=="IMPORTANT NOTE:")
             continue;
-
         // add required_ check
         /*
         if(line.substr(nw_pos,41)=="UPDATE character_db_version SET required_")
         {
             if(!CharacterDatabase.Execute(line.c_str()))
                 ROLLBACK(DUMP_FILE_BROKEN);
-
             continue;
         }
         */
-
         // determine table name and load type
         std::string tn = gettablename(line);
         if(tn.empty())
@@ -505,7 +428,6 @@ DumpReturn PlayerDumpReader::LoadDump(const std::string& file, uint32 account, s
             sLog.outError("LoadPlayerDump: Can't extract table name from line: '%s'!", line.c_str());
             ROLLBACK(DUMP_FILE_BROKEN);
         }
-
         DumpTableType type;
         uint8 i;
         for(i = 0; i < DUMP_TABLE_COUNT; ++i)
@@ -516,13 +438,11 @@ DumpReturn PlayerDumpReader::LoadDump(const std::string& file, uint32 account, s
                 break;
             }
         }
-
         if (i == DUMP_TABLE_COUNT)
         {
             sLog.outError("LoadPlayerDump: Unknown table: '%s'!", tn.c_str());
             ROLLBACK(DUMP_FILE_BROKEN);
         }
-
         // change the data to server values
         switch(type)
         {
@@ -530,12 +450,10 @@ DumpReturn PlayerDumpReader::LoadDump(const std::string& file, uint32 account, s
                 if(!changenth(line, 1, newguid))
                     ROLLBACK(DUMP_FILE_BROKEN);
                 break;
-
             case DTT_CHARACTER:                             // character t.
             {
                 if(!changenth(line, 1, newguid))
                     ROLLBACK(DUMP_FILE_BROKEN);
-
                 // guid, data field:guid, items
                 if(!changenth(line, 2, chraccount))
                     ROLLBACK(DUMP_FILE_BROKEN);
@@ -552,26 +470,22 @@ DumpReturn PlayerDumpReader::LoadDump(const std::string& file, uint32 account, s
                     // check if the original name already exists
                     name = getnth(line, 4);
                     CharacterDatabase.escape_string(name);
-
                     result = CharacterDatabase.PQuery("SELECT * FROM characters WHERE name = '%s'", name.c_str());
                     if (result)
                     {
                         delete result;
-
                         if(!changenth(line, 37, "1"))       // rename on login: `at_login` field 37 in raw field list
                             ROLLBACK(DUMP_FILE_BROKEN);
                     }
                 }
                 else if(!changenth(line, 4, name.c_str()))
                     ROLLBACK(DUMP_FILE_BROKEN);
-
                 break;
             }
             case DTT_INVENTORY:                             // character_inventory t.
             {
                 if(!changenth(line, 1, newguid))
                     ROLLBACK(DUMP_FILE_BROKEN);
-
                 // bag, item
                 if(!changeGuid(line, 2, items, objmgr.m_hiItemGuid, true))
                     ROLLBACK(DUMP_FILE_BROKEN);
@@ -616,36 +530,28 @@ DumpReturn PlayerDumpReader::LoadDump(const std::string& file, uint32 account, s
                     snprintf(newpetid, 20, "%d", objmgr.GeneratePetNumber());
                     snprintf(lastpetid, 20, "%s", currpetid);
                 }
-
                 std::map<uint32, uint32> :: const_iterator petids_iter = petids.find(atoi(currpetid));
-
                 if(petids_iter == petids.end())
                 {
                     petids.insert(PetIdsPair(atoi(currpetid), atoi(newpetid)));
                 }
-
                 // item, entry, owner, ...
                 if(!changenth(line, 1, newpetid))
                     ROLLBACK(DUMP_FILE_BROKEN);
                 if(!changenth(line, 3, newguid))
                     ROLLBACK(DUMP_FILE_BROKEN);
-
                 break;
             }
             case DTT_PET_TABLE:                             // pet_aura, pet_spell, pet_spell_cooldown t
             {
                 snprintf(currpetid, 20, "%s", getnth(line, 1).c_str());
-
                 // lookup currpetid and match to new inserted pet id
                 std::map<uint32, uint32> :: const_iterator petids_iter = petids.find(atoi(currpetid));
                 if(petids_iter == petids.end())             // couldn't find new inserted id
                     ROLLBACK(DUMP_FILE_BROKEN);
-
                 snprintf(newpetid, 20, "%d", petids_iter->second);
-
                 if(!changenth(line, 1, newpetid))
                     ROLLBACK(DUMP_FILE_BROKEN);
-
                 break;
             }
             case DTT_MAIL:                                  // mail
@@ -675,7 +581,6 @@ DumpReturn PlayerDumpReader::LoadDump(const std::string& file, uint32 account, s
                 // id
                 if(!changeGuid(line, 1, itemTexts, objmgr.m_ItemTextId))
                     ROLLBACK(DUMP_FILE_BROKEN);
-
                 // add it to cache
                 uint32 id= atoi(getnth(line,1).c_str());
                 std::string text = getnth(line,2);
@@ -686,22 +591,16 @@ DumpReturn PlayerDumpReader::LoadDump(const std::string& file, uint32 account, s
                 sLog.outError("Unknown dump table type: %u",type);
                 break;
         }
-
         if(!CharacterDatabase.Execute(line.c_str()))
             ROLLBACK(DUMP_FILE_BROKEN);
     }
-
     CharacterDatabase.CommitTransaction();
-
     objmgr.m_hiItemGuid += items.size();
     objmgr.m_mailid     += mails.size();
     objmgr.m_ItemTextId += itemTexts.size();
-
     if(incHighest)
         ++objmgr.m_hiCharGuid;
-
     fclose(fin);
-
     return DUMP_SUCCESS;
 }