Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2010-09-18 22:11:27 +0000
committerStijn Buys <ingar@osirion.org>2010-09-18 22:11:27 +0000
commitbadfb31888a6bd62e0a019b3f3dec517df4121ec (patch)
tree94cb95e405c05f013c8ae4f66a0b973aa5e59b3a /src/core
parent9c91a9767b570fdc3c3e19e1f452f9a8257f9999 (diff)
trade updates
Diffstat (limited to 'src/core')
-rw-r--r--src/core/inventory.cc2
-rw-r--r--src/core/inventory.h2
-rw-r--r--src/core/item.cc2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/core/inventory.cc b/src/core/inventory.cc
index 6afa76f..c659178 100644
--- a/src/core/inventory.cc
+++ b/src/core/inventory.cc
@@ -29,7 +29,7 @@ void Inventory::set_timestamp(const unsigned long timestamp)
inventory_timestamp = timestamp;
}
-void Inventory::mark()
+void Inventory::set_dirty()
{
inventory_timestamp = core::game()->timestamp();
}
diff --git a/src/core/inventory.h b/src/core/inventory.h
index c715116..0a412b0 100644
--- a/src/core/inventory.h
+++ b/src/core/inventory.h
@@ -74,7 +74,7 @@ public:
/**
* @brief set the timestamp to the current game time
*/
- void mark();
+ void set_dirty();
private:
Items inventory_items;
diff --git a/src/core/item.cc b/src/core/item.cc
index 3528c1a..ca51775 100644
--- a/src/core/item.cc
+++ b/src/core/item.cc
@@ -16,7 +16,7 @@ Item::Item(const Info *info)
{
item_info = info;
item_amount = 0;
- item_price = 0;
+ item_price = info->price();
}
Item::~Item()