Added support for persistent inventory.

2 files changed, 55 insertions, 26 deletions

diff --git a/ChangeLog b/ChangeLog
index 106f84d2..865f138f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-2007-07-02  Guillaume Melquiond <guillaume.melquiong@gmail.com>
+2007-07-02  Guillaume Melquiond <guillaume.melquiond@gmail.com>
 
 	* src/account-server/storage.cpp, src/account-server/storage.hpp: Moved
 	trivial accessors to header file. Removed C-like prototypes and harmful
@@ -6,12 +6,14 @@
 	* src/account-server/dalstorage.cpp, src/account-server/dalstorage.hpp:
 	Factored duplicate query code. Removed C-like prototypes and harmful
 	exception specifications.
+	* src/account-server/dalstorage.cpp: Added support for loading
+	inventory from database. Fixed mysqlism for multi-insertion.
 
 2007-07-02  Eugenio Favalli  <elvenprogrammer@gmail.com>
 
 	* accountserver.cbp, gameserver.cbp: Updated project files.
 
-2007-07-01  Guillaume Melquiond <guillaume.melquiong@gmail.com>
+2007-07-01  Guillaume Melquiond <guillaume.melquiond@gmail.com>
 
 	* src/abstractcharacterdata.cpp, src/abstractcharacterdata.hpp,
 	src/serialize/characterdata.hpp, src/account-server/serverhandler.cpp,
@@ -67,7 +69,7 @@
 	* src/game-server/spawnarea.cpp: Monsters are no longer spawned on 
 	unwalkable tiles.
 
-2007-06-28  Guillaume Melquiond <guillaume.melquiong@gmail.com>
+2007-06-28  Guillaume Melquiond <guillaume.melquiond@gmail.com>
 
 	* src/game-server/spawnarea.cpp: Delegated creature insertion to the
 	State class so that it does not disturb object updating.
@@ -81,7 +83,7 @@
 	* accountserver.cbp, gameserver.cbp: Fixed include directories and
 	updated project files.
 
-2007-06-16  Guillaume Melquiond <guillaume.melquiong@gmail.com>
+2007-06-16  Guillaume Melquiond <guillaume.melquiond@gmail.com>
 
 	* src/utils/mathutils.cpp: Fixed miscompilation of rsqrt due to type
 	aliasing and sped up sqrt.
diff --git a/src/account-server/dalstorage.cpp b/src/account-server/dalstorage.cpp
index a7350333..ce42daf7 100644
--- a/src/account-server/dalstorage.cpp
+++ b/src/account-server/dalstorage.cpp
@@ -368,6 +368,41 @@ CharacterPtr DALStorage::getCharacterBySQL(std::string const &query)
             character->setMapId((int)config.getValue("defaultMap", 1));
         }
 
+        std::ostringstream sql;
+        sql << " select * from " << INVENTORIES_TBL_NAME << " where owner_id = '"
+            << character->getDatabaseID() << "' order by slot asc;";
+
+        RecordSet const &itemInfo = mDb->execSql(sql.str());
+        if (!itemInfo.isEmpty())
+        {
+            Possessions &poss = character->getPossessions();
+            int size = itemInfo.rows(), nextSlot = 0;
+
+            for (int k = 0; k < size; ++k)
+            {
+                int slot = toUint(itemInfo(k, 2));
+                if (slot < EQUIPMENT_SLOTS)
+                {
+                    poss.equipment[slot] = toUint(itemInfo(k, 3));
+                }
+                else
+                {
+                    slot -= 32;
+                    InventoryItem item;
+                    if (slot != nextSlot)
+                    {
+                        item.itemId = 0;
+                        item.amount = slot - nextSlot;
+                        poss.inventory.push_back(item);
+                    }
+                    item.itemId = toUint(itemInfo(k, 3));
+                    item.amount = toUint(itemInfo(k, 4));
+                    poss.inventory.push_back(item);
+                    nextSlot = slot + 1;
+                }
+            }
+        }
+
         CharacterPtr ptr(character);
         mCharacters.push_back(ptr);
         return ptr;
@@ -521,11 +556,11 @@ DALStorage::updateCharacter(CharacterPtr character)
             << "set "
             << "gender = '"     << character->getGender()
                                << "', "
-            << "hair_style = '" << (int)character->getHairStyle()
+            << "hair_style = '" << character->getHairStyle()
                                << "', "
-            << "hair_color = '" << (int)character->getHairColor()
+            << "hair_color = '" << character->getHairColor()
                                << "', "
-            << "level = '"      << (int)character->getLevel()
+            << "level = '"      << character->getLevel()
                                << "', "
             << "money = '"      << character->getMoney()
                                << "', "
@@ -590,25 +625,22 @@ DALStorage::updateCharacter(CharacterPtr character)
     // Insert the new inventory data
     try
     {
-        std::ostringstream sqlInsertCharacterInventory;
+        std::ostringstream sql;
 
-        sqlInsertCharacterInventory
-            << "insert into " << INVENTORIES_TBL_NAME
-            << " (owner_id, slot, class_id, amount) "
-            << "values ";
+        sql << "insert into " << INVENTORIES_TBL_NAME
+            << " (owner_id, slot, class_id, amount) values ("
+            << character->getDatabaseID() << ", ";
+        std::string base = sql.str();
 
-        int id = character->getDatabaseID();
-        bool first = true;
         Possessions const &poss = character->getPossessions();
 
         for (int j = 0; j < EQUIPMENT_SLOTS; ++j)
         {
             int v = poss.equipment[j];
             if (!v) continue;
-            if (first) first = false;
-            else sqlInsertCharacterInventory << ", ";
-            sqlInsertCharacterInventory
-                << '(' << id << ", " << j << ", " << v << ", " << 1 << ')';
+            sql.str(std::string());
+            sql << base << j << ", " << v << ", 1);";
+            mDb->execSql(sql.str());
         }
 
         int slot = 32;
@@ -621,17 +653,12 @@ DALStorage::updateCharacter(CharacterPtr character)
                 slot += j->amount;
                 continue;
             }
-            if (first) first = false;
-            else sqlInsertCharacterInventory << ", ";
-            sqlInsertCharacterInventory
-                << '(' << id << ", " << slot << ", " << v << ", " << unsigned(j->amount) << ')';
+            sql.str(std::string());
+            sql << base << slot << ", " << v << ", " << unsigned(j->amount) << ");";
+            mDb->execSql(sql.str());
             ++slot;
         }
 
-        sqlInsertCharacterInventory << ';';
-
-        if (!first)
-            mDb->execSql(sqlInsertCharacterInventory.str());
     }
     catch (const dal::DbSqlQueryExecFailure& e)
     {