Added in a new tileset, as well as some new artwork, changed the update

handler to store updates in a subfolder based on port (so that if one 
server domain hosts multiple update folders, that it doesn't have to 
redownload an update should an update have the same name as the other 
server, as well as a different checksum), and made the inventory window 
display the units of measurement (for all of those people that wanted 
to know exactly what those units were supposed to be).

3 files changed, 8 insertions, 8 deletions

diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 8866515f..0f7b6792 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -94,8 +94,8 @@ void InventoryWindow::logic()
 
     // Update weight information
     mWeightLabel->setCaption(
-        "Total Weight: " + toString(player_node->mTotalWeight) + " - " +
-        "Maximum Weight: " + toString(player_node->mMaxWeight));
+        "Total Weight: " + toString(player_node->mTotalWeight) + " g - " +
+        "Maximum Weight: " + toString(player_node->mMaxWeight) + " g");
 }
 
 void InventoryWindow::action(const gcn::ActionEvent &event)
diff --git a/src/main.cpp b/src/main.cpp
index f9061c42..3755ad03 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -177,7 +177,7 @@ void setUpdatesDir()
     if (pos != updateHost.npos) {
         if (pos + 3 < updateHost.length()) {
             updates << "updates/" << updateHost.substr(pos + 3) 
-                    << "-" << loginData.port;
+                    << "/" << loginData.port;
             updatesDir = updates.str();
         } else {
             logger->log("Error: Invalid update host: %s", updateHost.c_str());
@@ -186,7 +186,7 @@ void setUpdatesDir()
         }
     } else {
         logger->log("Warning: no protocol was specified for the update host");
-        updates << "updates/" << updateHost  << "-" << loginData.port;
+        updates << "updates/" << updateHost  << "/" << loginData.port;
         updatesDir = updates.str();
     }
 
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp
index fbab5380..ad9eda01 100644
--- a/src/resources/itemdb.cpp
+++ b/src/resources/itemdb.cpp
@@ -90,8 +90,8 @@ void ItemDB::load()
         std::string name = XML::getProperty(node, "name", "");
         std::string image = XML::getProperty(node, "image", "");
         std::string description = XML::getProperty(node, "description", "");
-        //std::string effect = XML::getProperty(node, "effect", ""); // Not used by Aethyra
-        //int weaponType = XML::getProperty(node, "weapon_type", 0);
+        std::string effect = XML::getProperty(node, "effect", "");
+        //int weaponType = XML::getProperty(node, "weapon_type", 0);// Not used by Aethyra
 
         if (id)
         {
@@ -99,7 +99,7 @@ void ItemDB::load()
             itemInfo->setImageName(image);
             itemInfo->setName((name == "") ? "Unnamed" : name);
             itemInfo->setDescription(description);
-            //itemInfo->setEffect(effect);
+            itemInfo->setEffect(effect);
             itemInfo->setType(type);
             itemInfo->setView(view);
             //itemInfo->setWeight(weight);
@@ -127,7 +127,7 @@ void ItemDB::load()
         CHECK_PARAM(name, "");
         CHECK_PARAM(image, "");
         CHECK_PARAM(description, "");
-        //CHECK_PARAM(effect, "");
+        // CHECK_PARAM(effect, "");
         // CHECK_PARAM(type, 0);
         // CHECK_PARAM(weight, 0);
         // CHECK_PARAM(slot, 0);