Changeset 272 for trunk/src/game/PlayerDump.cpp

Timestamp:

11/22/08 00:35:41 (17 years ago)

Author:

yumileroy

Message:

Delete possessed AI only on creature delete.

Original author: gvcoman
Date: 2008-11-16 14:38:02-05:00

Files:

• trunk/src/game/PlayerDump.cpp (modified) (16 diffs)

trunk/src/game/PlayerDump.cpp

@@ -11 +11 @@
  * 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
+ * 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
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
@@ -278 +278 @@
     // for guid set stop if set is empty
     if(guids && guids->empty())
-        return;                                             // nothing to do
+        return;                                        // nothing to do
 
     // setup for guids case start position
@@ -344 +344 @@
     FILE *fout = fopen(file.c_str(), "w");
     if (!fout)
-        return DUMP_FILE_OPEN_ERROR;
+                return DUMP_FILE_OPEN_ERROR;
 
     std::string dump = GetDump(guid);
@@ -372 +372 @@
         }
     }
-
     FILE *fin = fopen(file.c_str(), "r");
     if(!fin)
-        return DUMP_FILE_OPEN_ERROR;
+                return DUMP_FILE_OPEN_ERROR;
 
     QueryResult * result = NULL;
@@ -392 +391 @@
         else incHighest = false;
     }
-    else
-        guid = objmgr.m_hiCharGuid;
+    else guid = objmgr.m_hiCharGuid;
 
     // normalize the name if specified and check if it exists
@@ -471 +469 @@
             case DTT_CHAR_TABLE:
                 if(!changenth(line, 1, newguid))
-                    ROLLBACK(DUMP_FILE_BROKEN);
+                                        ROLLBACK(DUMP_FILE_BROKEN);
                 break;
 
@@ -477 +475 @@
             {
                 if(!changenth(line, 1, newguid))
-                    ROLLBACK(DUMP_FILE_BROKEN);
+                                        ROLLBACK(DUMP_FILE_BROKEN);
 
                 // guid, data field:guid, items
                 if(!changenth(line, 2, chraccount))
-                    ROLLBACK(DUMP_FILE_BROKEN);
+                                        ROLLBACK(DUMP_FILE_BROKEN);
+
                 std::string vals = getnth(line, 3);
                 if(!changetoknth(vals, OBJECT_FIELD_GUID+1, newguid))
-                    ROLLBACK(DUMP_FILE_BROKEN);
+                                        ROLLBACK(DUMP_FILE_BROKEN);
+
                 for(uint16 field = PLAYER_FIELD_INV_SLOT_HEAD; field < PLAYER_FARSIGHT; field++)
                     if(!changetokGuid(vals, field+1, items, objmgr.m_hiItemGuid, true))
-                        ROLLBACK(DUMP_FILE_BROKEN);
+                                                ROLLBACK(DUMP_FILE_BROKEN);
+
                 if(!changenth(line, 3, vals.c_str()))
-                    ROLLBACK(DUMP_FILE_BROKEN);
+                                        ROLLBACK(DUMP_FILE_BROKEN);
+
                 if (name == "")
                 {
@@ -502 +504 @@
                                                             // rename on login: `at_login` field 30 in raw field list
                         if(!changenth(line, 30, "1"))
-                            ROLLBACK(DUMP_FILE_BROKEN);
+                                                        ROLLBACK(DUMP_FILE_BROKEN);
                     }
                 }
                 else if(!changenth(line, 4, name.c_str()))
-                    ROLLBACK(DUMP_FILE_BROKEN);
+                                        ROLLBACK(DUMP_FILE_BROKEN);
 
                 break;
@@ -513 +515 @@
             {
                 if(!changenth(line, 1, newguid))
-                    ROLLBACK(DUMP_FILE_BROKEN);
+                                        ROLLBACK(DUMP_FILE_BROKEN);
 
                 // bag, item
                 if(!changeGuid(line, 2, items, objmgr.m_hiItemGuid, true))
-                    ROLLBACK(DUMP_FILE_BROKEN);
-                if(!changeGuid(line, 4, items, objmgr.m_hiItemGuid))
-                    ROLLBACK(DUMP_FILE_BROKEN);
+                                        ROLLBACK(DUMP_FILE_BROKEN);
+                                if(!changeGuid(line, 4, items, objmgr.m_hiItemGuid))
+                                        ROLLBACK(DUMP_FILE_BROKEN);
                 break;
             }
@@ -526 +528 @@
                 // item, owner, data field:item, owner guid
                 if(!changeGuid(line, 1, items, objmgr.m_hiItemGuid))
-                    ROLLBACK(DUMP_FILE_BROKEN);
-                if(!changenth(line, 2, newguid))
-                    ROLLBACK(DUMP_FILE_BROKEN);
+                                        ROLLBACK(DUMP_FILE_BROKEN);
+                                if(!changenth(line, 2, newguid))
+                                        ROLLBACK(DUMP_FILE_BROKEN);
+
                 std::string vals = getnth(line,3);
                 if(!changetokGuid(vals, OBJECT_FIELD_GUID+1, items, objmgr.m_hiItemGuid))
-                    ROLLBACK(DUMP_FILE_BROKEN);
-                if(!changetoknth(vals, ITEM_FIELD_OWNER+1, newguid))
-                    ROLLBACK(DUMP_FILE_BROKEN);
-                if(!changenth(line, 3, vals.c_str()))
-                    ROLLBACK(DUMP_FILE_BROKEN);
+                                        ROLLBACK(DUMP_FILE_BROKEN);
+                                if(!changetoknth(vals, ITEM_FIELD_OWNER+1, newguid))
+                                        ROLLBACK(DUMP_FILE_BROKEN);
+                                if(!changenth(line, 3, vals.c_str()))
+                                        ROLLBACK(DUMP_FILE_BROKEN);
                 break;
             }
@@ -542 +545 @@
                 // guid,item_guid,
                 if(!changenth(line, 1, newguid))
-                    ROLLBACK(DUMP_FILE_BROKEN);
-                if(!changeGuid(line, 2, items, objmgr.m_hiItemGuid))
-                    ROLLBACK(DUMP_FILE_BROKEN);
+                                        ROLLBACK(DUMP_FILE_BROKEN);
+                                if(!changeGuid(line, 2, items, objmgr.m_hiItemGuid))
+                                        ROLLBACK(DUMP_FILE_BROKEN);
                 break;
             }
@@ -567 +570 @@
                 // item, entry, owner, ...
                 if(!changenth(line, 1, newpetid))
-                    ROLLBACK(DUMP_FILE_BROKEN);
-                if(!changenth(line, 3, newguid))
-                    ROLLBACK(DUMP_FILE_BROKEN);
+                                        ROLLBACK(DUMP_FILE_BROKEN);
+                                if(!changenth(line, 3, newguid))
+                                        ROLLBACK(DUMP_FILE_BROKEN);
 
                 break;
@@ -580 +583 @@
                 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);
+                                        ROLLBACK(DUMP_FILE_BROKEN);
 
                 snprintf(newpetid, 20, "%d", petids_iter->second);
 
                 if(!changenth(line, 1, newpetid))
-                    ROLLBACK(DUMP_FILE_BROKEN);
+                                        ROLLBACK(DUMP_FILE_BROKEN);
 
                 break;
@@ -593 +596 @@
                 // id,messageType,stationery,sender,receiver
                 if(!changeGuid(line, 1, mails, objmgr.m_mailid))
-                    ROLLBACK(DUMP_FILE_BROKEN);
-                if(!changenth(line, 5, newguid))
-                    ROLLBACK(DUMP_FILE_BROKEN);
+                                        ROLLBACK(DUMP_FILE_BROKEN);
+                                if(!changenth(line, 5, newguid))
+                                        ROLLBACK(DUMP_FILE_BROKEN);
                 break;
             }
@@ -602 +605 @@
                 // mail_id,item_guid,item_template,receiver
                 if(!changeGuid(line, 1, mails, objmgr.m_mailid))
-                    ROLLBACK(DUMP_FILE_BROKEN);
-                if(!changeGuid(line, 2, items, objmgr.m_hiItemGuid))
-                    ROLLBACK(DUMP_FILE_BROKEN);
-                if(!changenth(line, 4, newguid))
-                    ROLLBACK(DUMP_FILE_BROKEN);
+                                        ROLLBACK(DUMP_FILE_BROKEN);
+                                if(!changeGuid(line, 2, items, objmgr.m_hiItemGuid))
+                                        ROLLBACK(DUMP_FILE_BROKEN);
+                                if(!changenth(line, 4, newguid))
+                                        ROLLBACK(DUMP_FILE_BROKEN);
                 break;
             }
@@ -615 +618 @@
 
         if(!CharacterDatabase.Execute(line.c_str()))
-            ROLLBACK(DUMP_FILE_BROKEN);
+                        ROLLBACK(DUMP_FILE_BROKEN);
     }