summaryrefslogtreecommitdiff
path: root/src/emap
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-08-13 21:50:33 +0300
committerAndrei Karas <akaras@inbox.ru>2015-08-13 21:50:33 +0300
commita38eb2a333972481d99c5fe0c152ba6d59fba839 (patch)
tree1ef8f9da2d4a6ed5caa6c98a2aa50b42c0b1b67f /src/emap
parentcfaf7b65b33fb94ba96be48c0c0187116616279a (diff)
downloadevol-hercules-a38eb2a333972481d99c5fe0c152ba6d59fba839.tar.gz
evol-hercules-a38eb2a333972481d99c5fe0c152ba6d59fba839.tar.bz2
evol-hercules-a38eb2a333972481d99c5fe0c152ba6d59fba839.tar.xz
evol-hercules-a38eb2a333972481d99c5fe0c152ba6d59fba839.zip
Add support for sending all equipped items with cards from char server.
Diffstat (limited to 'src/emap')
-rw-r--r--src/emap/pc.c26
-rw-r--r--src/emap/send.c3
2 files changed, 2 insertions, 27 deletions
diff --git a/src/emap/pc.c b/src/emap/pc.c
index feb1980..96bc074 100644
--- a/src/emap/pc.c
+++ b/src/emap/pc.c
@@ -93,19 +93,6 @@ void epc_equipitem_pos(TBL_PC *sd, struct item_data *id, int *nPtr, int *posPtr)
}
pc->calcweapontype(sd);
eclif_changelook2(&sd->bl, LOOK_WEAPON, sd->status.weapon, id, n);
- if (sd->status.weapon)
- {
- for (int i = 0; i < id->slot; i++ )
- {
- struct item_data *data;
- if (!sd->status.inventory[n].card[i])
- continue;
- if ((data = itemdb->exists(sd->status.inventory[n].card[i])) != NULL)
- {
- ShowWarning("equip: for pos %d card %d\n", LOOK_WEAPON, data->nameid);
- }
- }
- }
}
if (pos & (EQP_HAND_L|EQP_SHADOW_SHIELD))
{
@@ -128,19 +115,6 @@ void epc_equipitem_pos(TBL_PC *sd, struct item_data *id, int *nPtr, int *posPtr)
}
pc->calcweapontype(sd);
eclif_changelook2(&sd->bl, LOOK_SHIELD, sd->status.shield, id, n);
- if (sd->status.shield)
- {
- for (int i = 0; i < id->slot; i++ )
- {
- struct item_data *data;
- if (!sd->status.inventory[n].card[i])
- continue;
- if ((data = itemdb->exists(sd->status.inventory[n].card[i])) != NULL)
- {
- ShowWarning("equip: for pos %d card %d\n", LOOK_SHIELD, data->nameid);
- }
- }
- }
}
equipPos(EQP_HEAD_LOW, head_bottom, LOOK_HEAD_BOTTOM);
diff --git a/src/emap/send.c b/src/emap/send.c
index 8c74d3b..a951ad6 100644
--- a/src/emap/send.c
+++ b/src/emap/send.c
@@ -82,6 +82,7 @@ void send_changelook(struct map_session_data* sd, struct map_session_data* sd2,
struct item_data *data, int n)
{
struct SessionExt *tdata = session_get_bysd(sd2);
+ //ShowWarning("equip: for type %d = %d\n", type, val);
if (!tdata || tdata->clientVersion < 9)
{
WFIFOHEAD (fd, 11);
@@ -102,7 +103,6 @@ void send_changelook(struct map_session_data* sd, struct map_session_data* sd2,
WFIFOW (fd, 9) = val2;
if (data)
{
- //ShowWarning("equip: for type %d\n", type);
for (int i = 0; i < data->slot; i++ )
{
struct item_data *data;
@@ -348,6 +348,7 @@ void send_client_command(TBL_PC *sd, const char *const command)
void send_changelook2(struct map_session_data* sd, struct block_list *bl, int id, int type, int val, int val2,
struct item_data *data, int n, enum send_target target)
{
+ //ShowWarning("equip: for type %d = %d\n", type, val);
unsigned char buf[32];
WBUFW(buf, 0) = 0x1d7;
WBUFL(buf, 2) = id;