diff options
| author | shennetsind <ind@henn.et> | 2013-11-06 22:41:24 -0200 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-11-06 22:41:24 -0200 |
| commit | 52864b40d6f9df5682b257ac2f36d645895364be (patch) | |
| tree | 45a366ef4f3c911b038487fac8fa5aa6b706e6dd /src | |
| parent | b1f7e524a79ce3e7afd64becaa7657c71d59f18f (diff) | |
| download | hercules-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')
| -rw-r--r-- | src/common/mmo.h | 2 | ||||
| -rw-r--r-- | src/map/pc_groups.c | 1 | ||||
| -rw-r--r-- | src/map/pc_groups.h | 1 |
3 files changed, 3 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; }; diff --git a/src/map/pc_groups.c b/src/map/pc_groups.c index 78d111b1c..c44e2634a 100644 --- a/src/map/pc_groups.c +++ b/src/map/pc_groups.c @@ -417,6 +417,7 @@ void do_init_pc_groups(void) { { "disable_pvp", PC_PERM_DISABLE_PVP }, { "disable_commands_when_dead", PC_PERM_DISABLE_CMD_DEAD }, { "hchsys_admin", PC_PERM_HCHSYS_ADMIN }, + { "can_trade_bounded", PC_PERM_TRADE_BOUNDED }, }; unsigned char i, len = ARRAYLENGTH(pc_g_defaults); diff --git a/src/map/pc_groups.h b/src/map/pc_groups.h index 28c82d619..df99b19df 100644 --- a/src/map/pc_groups.h +++ b/src/map/pc_groups.h @@ -30,6 +30,7 @@ enum e_pc_permission { PC_PERM_DISABLE_PVP = 0x080000, // #20 PC_PERM_DISABLE_CMD_DEAD = 0x100000, PC_PERM_HCHSYS_ADMIN = 0x200000, + PC_PERM_TRADE_BOUNDED = 0x400000, }; // Cached config settings for quick lookup |