summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-11-06 22:41:24 -0200
committershennetsind <ind@henn.et>2013-11-06 22:41:24 -0200
commit52864b40d6f9df5682b257ac2f36d645895364be (patch)
tree45a366ef4f3c911b038487fac8fa5aa6b706e6dd /src/common
parentb1f7e524a79ce3e7afd64becaa7657c71d59f18f (diff)
downloadhercules-52864b40d6f9df5682b257ac2f36d645895364be.tar.gz
hercules-52864b40d6f9df5682b257ac2f36d645895364be.tar.bz2
hercules-52864b40d6f9df5682b257ac2f36d645895364be.tar.xz
hercules-52864b40d6f9df5682b257ac2f36d645895364be.zip
Update Fix
Re-added the changes that were gone in the update conflict. Signed-off-by: shennetsind <ind@henn.et>
Diffstat (limited to 'src/common')
-rw-r--r--src/common/mmo.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/mmo.h b/src/common/mmo.h
index b1a1caf24..f676893ea 100644
--- a/src/common/mmo.h
+++ b/src/common/mmo.h
@@ -222,7 +222,7 @@ struct item {
char attribute;
short card[MAX_SLOTS];
unsigned int expire_time;
- char favorite;
+ char favorite, bound;
uint64 unique_id;
};