summaryrefslogtreecommitdiff
path: root/src/map/intif.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/map/intif.cpp')
-rw-r--r--src/map/intif.cpp575
1 files changed, 1 insertions, 574 deletions
diff --git a/src/map/intif.cpp b/src/map/intif.cpp
index dfbc665..c0c63b0 100644
--- a/src/map/intif.cpp
+++ b/src/map/intif.cpp
@@ -25,7 +25,6 @@
#include "battle.hpp"
#include "chrif.hpp"
#include "clif.hpp"
-#include "guild.hpp"
#include "intif.hpp"
#include "map.hpp"
#include "party.hpp"
@@ -172,26 +171,6 @@ int intif_send_storage (struct storage *stor)
return 0;
}
-int intif_request_guild_storage (int account_id, int guild_id)
-{
- WFIFOW (inter_fd, 0) = 0x3018;
- WFIFOL (inter_fd, 2) = account_id;
- WFIFOL (inter_fd, 6) = guild_id;
- WFIFOSET (inter_fd, 10);
- return 0;
-}
-
-int intif_send_guild_storage (int account_id, struct guild_storage *gstor)
-{
- WFIFOW (inter_fd, 0) = 0x3019;
- WFIFOW (inter_fd, 2) = sizeof (struct guild_storage) + 12;
- WFIFOL (inter_fd, 4) = account_id;
- WFIFOL (inter_fd, 8) = gstor->guild_id;
- memcpy (WFIFOP (inter_fd, 12), gstor, sizeof (struct guild_storage));
- WFIFOSET (inter_fd, WFIFOW (inter_fd, 2));
- return 0;
-}
-
// パーティ作成要求
int intif_create_party (struct map_session_data *sd, const char *name)
{
@@ -316,213 +295,6 @@ int intif_party_checkconflict (int party_id, int account_id, const char *nick)
return 0;
}
-// ギルド作成要求
-int intif_guild_create (const char *name, const struct guild_member *master)
-{
- nullpo_retr (0, master);
-
- WFIFOW (inter_fd, 0) = 0x3030;
- WFIFOW (inter_fd, 2) = sizeof (struct guild_member) + 32;
- WFIFOL (inter_fd, 4) = master->account_id;
- memcpy (WFIFOP (inter_fd, 8), name, 24);
- memcpy (WFIFOP (inter_fd, 32), master, sizeof (struct guild_member));
- WFIFOSET (inter_fd, WFIFOW (inter_fd, 2));
- return 0;
-}
-
-// ギルド情報要求
-int intif_guild_request_info (int guild_id)
-{
- WFIFOW (inter_fd, 0) = 0x3031;
- WFIFOL (inter_fd, 2) = guild_id;
- WFIFOSET (inter_fd, 6);
- return 0;
-}
-
-// ギルドメンバ追加要求
-int intif_guild_addmember (int guild_id, struct guild_member *m)
-{
- WFIFOW (inter_fd, 0) = 0x3032;
- WFIFOW (inter_fd, 2) = sizeof (struct guild_member) + 8;
- WFIFOL (inter_fd, 4) = guild_id;
- memcpy (WFIFOP (inter_fd, 8), m, sizeof (struct guild_member));
- WFIFOSET (inter_fd, WFIFOW (inter_fd, 2));
- return 0;
-}
-
-// ギルドメンバ脱退/追放要求
-int intif_guild_leave (int guild_id, int account_id, int char_id, int flag,
- const char *mes)
-{
- WFIFOW (inter_fd, 0) = 0x3034;
- WFIFOL (inter_fd, 2) = guild_id;
- WFIFOL (inter_fd, 6) = account_id;
- WFIFOL (inter_fd, 10) = char_id;
- WFIFOB (inter_fd, 14) = flag;
- memcpy (WFIFOP (inter_fd, 15), mes, 40);
- WFIFOSET (inter_fd, 55);
- return 0;
-}
-
-// ギルドメンバのオンライン状況/Lv更新要求
-int intif_guild_memberinfoshort (int guild_id,
- int account_id, int char_id, int online,
- int lv, int class_)
-{
- WFIFOW (inter_fd, 0) = 0x3035;
- WFIFOL (inter_fd, 2) = guild_id;
- WFIFOL (inter_fd, 6) = account_id;
- WFIFOL (inter_fd, 10) = char_id;
- WFIFOB (inter_fd, 14) = online;
- WFIFOW (inter_fd, 15) = lv;
- WFIFOW (inter_fd, 17) = class_;
- WFIFOSET (inter_fd, 19);
- return 0;
-}
-
-// ギルド解散通知
-int intif_guild_break (int guild_id)
-{
- WFIFOW (inter_fd, 0) = 0x3036;
- WFIFOL (inter_fd, 2) = guild_id;
- WFIFOSET (inter_fd, 6);
- return 0;
-}
-
-// ギルド会話送信
-int intif_guild_message (int guild_id, int account_id, const char *mes, int len)
-{
- WFIFOW (inter_fd, 0) = 0x3037;
- WFIFOW (inter_fd, 2) = len + 12;
- WFIFOL (inter_fd, 4) = guild_id;
- WFIFOL (inter_fd, 8) = account_id;
- memcpy (WFIFOP (inter_fd, 12), mes, len);
- WFIFOSET (inter_fd, len + 12);
- return 0;
-}
-
-// ギルド競合チェック要求
-int intif_guild_checkconflict (int guild_id, int account_id, int char_id)
-{
- WFIFOW (inter_fd, 0) = 0x3038;
- WFIFOL (inter_fd, 2) = guild_id;
- WFIFOL (inter_fd, 6) = account_id;
- WFIFOL (inter_fd, 10) = char_id;
- WFIFOSET (inter_fd, 14);
- return 0;
-}
-
-// ギルド基本情報変更要求
-int intif_guild_change_basicinfo (int guild_id, int type, const void *data,
- int len)
-{
- WFIFOW (inter_fd, 0) = 0x3039;
- WFIFOW (inter_fd, 2) = len + 10;
- WFIFOL (inter_fd, 4) = guild_id;
- WFIFOW (inter_fd, 8) = type;
- memcpy (WFIFOP (inter_fd, 10), data, len);
- WFIFOSET (inter_fd, len + 10);
- return 0;
-}
-
-// ギルドメンバ情報変更要求
-int intif_guild_change_memberinfo (int guild_id, int account_id, int char_id,
- int type, const void *data, int len)
-{
- WFIFOW (inter_fd, 0) = 0x303a;
- WFIFOW (inter_fd, 2) = len + 18;
- WFIFOL (inter_fd, 4) = guild_id;
- WFIFOL (inter_fd, 8) = account_id;
- WFIFOL (inter_fd, 12) = char_id;
- WFIFOW (inter_fd, 16) = type;
- memcpy (WFIFOP (inter_fd, 18), data, len);
- WFIFOSET (inter_fd, len + 18);
- return 0;
-}
-
-// ギルド役職変更要求
-int intif_guild_position (int guild_id, int idx, struct guild_position *p)
-{
- WFIFOW (inter_fd, 0) = 0x303b;
- WFIFOW (inter_fd, 2) = sizeof (struct guild_position) + 12;
- WFIFOL (inter_fd, 4) = guild_id;
- WFIFOL (inter_fd, 8) = idx;
- memcpy (WFIFOP (inter_fd, 12), p, sizeof (struct guild_position));
- WFIFOSET (inter_fd, WFIFOW (inter_fd, 2));
- return 0;
-}
-
-// ギルドスキルアップ要求
-int intif_guild_skillup (int guild_id, int skill_num, int account_id)
-{
- WFIFOW (inter_fd, 0) = 0x303c;
- WFIFOL (inter_fd, 2) = guild_id;
- WFIFOL (inter_fd, 6) = skill_num;
- WFIFOL (inter_fd, 10) = account_id;
- WFIFOSET (inter_fd, 14);
- return 0;
-}
-
-// ギルド同盟/敵対要求
-int intif_guild_alliance (int guild_id1, int guild_id2, int account_id1,
- int account_id2, int flag)
-{
- WFIFOW (inter_fd, 0) = 0x303d;
- WFIFOL (inter_fd, 2) = guild_id1;
- WFIFOL (inter_fd, 6) = guild_id2;
- WFIFOL (inter_fd, 10) = account_id1;
- WFIFOL (inter_fd, 14) = account_id2;
- WFIFOB (inter_fd, 18) = flag;
- WFIFOSET (inter_fd, 19);
- return 0;
-}
-
-// ギルド告知変更要求
-int intif_guild_notice (int guild_id, const char *mes1, const char *mes2)
-{
- WFIFOW (inter_fd, 0) = 0x303e;
- WFIFOL (inter_fd, 2) = guild_id;
- memcpy (WFIFOP (inter_fd, 6), mes1, 60);
- memcpy (WFIFOP (inter_fd, 66), mes2, 120);
- WFIFOSET (inter_fd, 186);
- return 0;
-}
-
-// ギルドエンブレム変更要求
-int intif_guild_emblem (int guild_id, int len, const char *data)
-{
- if (guild_id <= 0 || len < 0 || len > 2000)
- return 0;
- WFIFOW (inter_fd, 0) = 0x303f;
- WFIFOW (inter_fd, 2) = len + 12;
- WFIFOL (inter_fd, 4) = guild_id;
- WFIFOL (inter_fd, 8) = 0;
- memcpy (WFIFOP (inter_fd, 12), data, len);
- WFIFOSET (inter_fd, len + 12);
- return 0;
-}
-
-//現在のギルド城占領ギルドを調べる
-int intif_guild_castle_dataload (int castle_id, int index)
-{
- WFIFOW (inter_fd, 0) = 0x3040;
- WFIFOW (inter_fd, 2) = castle_id;
- WFIFOB (inter_fd, 4) = index;
- WFIFOSET (inter_fd, 5);
- return 0;
-}
-
-//ギルド城占領ギルド変更要求
-int intif_guild_castle_datasave (int castle_id, int index, int value)
-{
- WFIFOW (inter_fd, 0) = 0x3041;
- WFIFOW (inter_fd, 2) = castle_id;
- WFIFOB (inter_fd, 4) = index;
- WFIFOL (inter_fd, 5) = value;
- WFIFOSET (inter_fd, 9);
- return 0;
-}
-
//-----------------------------------------------------------------
// Packets receive from inter server
@@ -684,7 +456,7 @@ int intif_parse_LoadStorage (int fd)
memcpy (stor, RFIFOP (fd, 8), sizeof (struct storage));
stor->dirty = 0;
stor->storage_status = 1;
- sd->state.storage_flag = 1;
+ sd->state.storage_open = 1;
clif_storageitemlist (sd, stor);
clif_storageequiplist (sd, stor);
clif_updatestorageamount (sd, stor);
@@ -703,82 +475,6 @@ int intif_parse_SaveStorage (int fd)
return 0;
}
-static
-int intif_parse_LoadGuildStorage (int fd)
-{
- struct guild_storage *gstor;
- struct map_session_data *sd;
- int guild_id;
-
- guild_id = RFIFOL (fd, 8);
- if (guild_id > 0)
- {
- gstor = guild2storage (guild_id);
- if (!gstor)
- {
- if (battle_config.error_log)
- printf
- ("intif_parse_LoadGuildStorage: error guild_id %d not exist\n",
- guild_id);
- return 1;
- }
- if (RFIFOW (fd, 2) - 12 != sizeof (struct guild_storage))
- {
- gstor->storage_status = 0;
- if (battle_config.error_log)
- printf
- ("intif_parse_LoadGuildStorage: data size error %d %d\n",
- RFIFOW (fd, 2) - 12, sizeof (struct guild_storage));
- return 1;
- }
- sd = map_id2sd (RFIFOL (fd, 4));
- if (sd == NULL)
- {
- if (battle_config.error_log)
- printf ("intif_parse_LoadGuildStorage: user not found %d\n",
- RFIFOL (fd, 4));
- return 1;
- }
- if (gstor->storage_status == 1)
- { // Already open.. lets ignore this update
- if (battle_config.error_log)
- printf
- ("intif_parse_LoadGuildStorage: storage received for a client already open (User %d:%d)\n",
- sd->status.account_id, sd->status.char_id);
- return 1;
- }
- if (gstor->dirty)
- { // Already have storage, and it has been modified and not saved yet! Exploit! [Skotlex]
- if (battle_config.error_log)
- printf
- ("intif_parse_LoadGuildStorage: received storage for an already modified non-saved storage! (User %d:%d)\n",
- sd->status.account_id, sd->status.char_id);
- return 1;
- }
- if (battle_config.save_log)
- printf ("intif_open_guild_storage: %d\n", RFIFOL (fd, 4));
- memcpy (gstor, RFIFOP (fd, 12), sizeof (struct guild_storage));
- gstor->storage_status = 1;
- sd->state.storage_flag = 2;
- clif_guildstorageitemlist (sd, gstor);
- clif_guildstorageequiplist (sd, gstor);
- clif_updateguildstorageamount (sd, gstor);
- }
- return 0;
-}
-
-static
-int intif_parse_SaveGuildStorage (int fd)
-{
- if (battle_config.save_log)
- {
- printf ("intif_save_guild_storage: done %d %d %d\n", RFIFOL (fd, 2),
- RFIFOL (fd, 6), RFIFOB (fd, 10));
- }
- storage_guild_storagesaved ( /*RFIFOL(fd,2), */ RFIFOL (fd, 6));
- return 0;
-}
-
// パーティ作成可否
static
int intif_parse_PartyCreated (int fd)
@@ -875,214 +571,6 @@ int intif_parse_PartyMessage (int fd)
return 0;
}
-// ギルド作成可否
-static
-int intif_parse_GuildCreated (int fd)
-{
- guild_created (RFIFOL (fd, 2), RFIFOL (fd, 6));
- return 0;
-}
-
-// ギルド情報
-static
-int intif_parse_GuildInfo (int fd)
-{
- if (RFIFOW (fd, 2) == 8)
- {
- if (battle_config.error_log)
- printf ("intif: guild noinfo %d\n", RFIFOL (fd, 4));
- guild_recv_noinfo (RFIFOL (fd, 4));
- return 0;
- }
-
-// if(battle_config.etc_log)
-// printf("intif: guild info %d\n",RFIFOL(fd,4));
- if (RFIFOW (fd, 2) != sizeof (struct guild) + 4)
- {
- if (battle_config.error_log)
- printf ("intif: guild info : data size error\n %d %d %d",
- RFIFOL (fd, 4), RFIFOW (fd, 2),
- sizeof (struct guild) + 4);
- }
- guild_recv_info ((struct guild *) RFIFOP (fd, 4));
- return 0;
-}
-
-// ギルドメンバ追加通知
-static
-int intif_parse_GuildMemberAdded (int fd)
-{
- if (battle_config.etc_log)
- printf ("intif: guild member added %d %d %d %d\n", RFIFOL (fd, 2),
- RFIFOL (fd, 6), RFIFOL (fd, 10), RFIFOB (fd, 14));
- guild_member_added (RFIFOL (fd, 2), RFIFOL (fd, 6), RFIFOL (fd, 10),
- RFIFOB (fd, 14));
- return 0;
-}
-
-// ギルドメンバ脱退/追放通知
-static
-int intif_parse_GuildMemberLeaved (int fd)
-{
- guild_member_leaved (RFIFOL (fd, 2), RFIFOL (fd, 6), RFIFOL (fd, 10),
- RFIFOB (fd, 14), (const char *)RFIFOP (fd, 55), (const char *)RFIFOP (fd, 15));
- return 0;
-}
-
-// ギルドメンバオンライン状態/Lv変更通知
-static
-int intif_parse_GuildMemberInfoShort (int fd)
-{
- guild_recv_memberinfoshort (RFIFOL (fd, 2), RFIFOL (fd, 6),
- RFIFOL (fd, 10), RFIFOB (fd, 14), RFIFOW (fd,
- 15),
- RFIFOW (fd, 17));
- return 0;
-}
-
-// ギルド解散通知
-static
-int intif_parse_GuildBroken (int fd)
-{
- guild_broken (RFIFOL (fd, 2), RFIFOB (fd, 6));
- return 0;
-}
-
-// ギルド基本情報変更通知
-static
-int intif_parse_GuildBasicInfoChanged (int fd)
-{
- int type = RFIFOW (fd, 8), guild_id = RFIFOL (fd, 4);
- void *data = RFIFOP (fd, 10);
- struct guild *g = guild_search (guild_id);
- short dw = *((short *) data);
- int dd = *((int *) data);
- if (g == NULL)
- return 0;
- switch (type)
- {
- case GBI_EXP:
- g->exp = dd;
- break;
- case GBI_GUILDLV:
- g->guild_lv = dw;
- break;
- case GBI_SKILLPOINT:
- g->skill_point = dd;
- break;
- }
- return 0;
-}
-
-// ギルドメンバ情報変更通知
-static
-int intif_parse_GuildMemberInfoChanged (int fd)
-{
- int type = RFIFOW (fd, 16), guild_id = RFIFOL (fd, 4);
- int account_id = RFIFOL (fd, 8), char_id = RFIFOL (fd, 12);
- void *data = RFIFOP (fd, 18);
- struct guild *g = guild_search (guild_id);
- int idx, dd = *((int *) data);
- if (g == NULL)
- return 0;
- idx = guild_getindex (g, account_id, char_id);
- switch (type)
- {
- case GMI_POSITION:
- g->member[idx].position = dd;
- guild_memberposition_changed (g, idx, dd);
- break;
- case GMI_EXP:
- g->member[idx].exp = dd;
- break;
- }
- return 0;
-}
-
-// ギルド役職変更通知
-static
-int intif_parse_GuildPosition (int fd)
-{
- if (RFIFOW (fd, 2) != sizeof (struct guild_position) + 12)
- {
- if (battle_config.error_log)
- printf ("intif: guild info : data size error\n %d %d %d",
- RFIFOL (fd, 4), RFIFOW (fd, 2),
- sizeof (struct guild_position) + 12);
- }
- guild_position_changed (RFIFOL (fd, 4), RFIFOL (fd, 8),
- (struct guild_position *) RFIFOP (fd, 12));
- return 0;
-}
-
-// ギルドスキル割り振り通知
-static
-int intif_parse_GuildSkillUp (int fd)
-{
- guild_skillupack (RFIFOL (fd, 2), RFIFOL (fd, 6), RFIFOL (fd, 10));
- return 0;
-}
-
-// ギルド同盟/敵対通知
-static
-int intif_parse_GuildAlliance (int fd)
-{
- guild_allianceack (RFIFOL (fd, 2), RFIFOL (fd, 6), RFIFOL (fd, 10),
- RFIFOL (fd, 14), RFIFOB (fd, 18), (const char *)RFIFOP (fd, 19),
- (const char *)RFIFOP (fd, 43));
- return 0;
-}
-
-// ギルド告知変更通知
-static
-int intif_parse_GuildNotice (int fd)
-{
- guild_notice_changed (RFIFOL (fd, 2), (const char *)RFIFOP (fd, 6), (const char *)RFIFOP (fd, 66));
- return 0;
-}
-
-// ギルドエンブレム変更通知
-static
-int intif_parse_GuildEmblem (int fd)
-{
- guild_emblem_changed (RFIFOW (fd, 2) - 12, RFIFOL (fd, 4), RFIFOL (fd, 8),
- (const char *)RFIFOP (fd, 12));
- return 0;
-}
-
-// ギルド会話受信
-static
-int intif_parse_GuildMessage (int fd)
-{
- guild_recv_message (RFIFOL (fd, 4), RFIFOL (fd, 8), (const char *)RFIFOP (fd, 12),
- RFIFOW (fd, 2) - 12);
- return 0;
-}
-
-// ギルド城データ要求返信
-static
-int intif_parse_GuildCastleDataLoad (int fd)
-{
- return guild_castledataloadack (RFIFOW (fd, 2), RFIFOB (fd, 4),
- RFIFOL (fd, 5));
-}
-
-// ギルド城データ変更通知
-static
-int intif_parse_GuildCastleDataSave (int fd)
-{
- return guild_castledatasaveack (RFIFOW (fd, 2), RFIFOB (fd, 4),
- RFIFOL (fd, 5));
-}
-
-// ギルド城データ一括受信(初期化時)
-static
-int intif_parse_GuildCastleAllDataLoad (int fd)
-{
- return guild_castlealldataload (RFIFOW (fd, 2),
- (struct guild_castle *) RFIFOP (fd, 4));
-}
-
//-----------------------------------------------------------------
// inter serverからの通信
// エラーがあれば0(false)を返すこと
@@ -1137,12 +625,6 @@ int intif_parse (int fd)
case 0x3811:
intif_parse_SaveStorage (fd);
break;
- case 0x3818:
- intif_parse_LoadGuildStorage (fd);
- break;
- case 0x3819:
- intif_parse_SaveGuildStorage (fd);
- break;
case 0x3820:
intif_parse_PartyCreated (fd);
break;
@@ -1167,61 +649,6 @@ int intif_parse (int fd)
case 0x3827:
intif_parse_PartyMessage (fd);
break;
- case 0x3830:
- intif_parse_GuildCreated (fd);
- break;
- case 0x3831:
- intif_parse_GuildInfo (fd);
- break;
- case 0x3832:
- intif_parse_GuildMemberAdded (fd);
- break;
- case 0x3834:
- intif_parse_GuildMemberLeaved (fd);
- break;
- case 0x3835:
- intif_parse_GuildMemberInfoShort (fd);
- break;
- case 0x3836:
- intif_parse_GuildBroken (fd);
- break;
- case 0x3837:
- intif_parse_GuildMessage (fd);
- break;
- case 0x3839:
- intif_parse_GuildBasicInfoChanged (fd);
- break;
- case 0x383a:
- intif_parse_GuildMemberInfoChanged (fd);
- break;
- case 0x383b:
- intif_parse_GuildPosition (fd);
- break;
- case 0x383c:
- intif_parse_GuildSkillUp (fd);
- break;
- case 0x383d:
- intif_parse_GuildAlliance (fd);
- break;
- case 0x383e:
- intif_parse_GuildNotice (fd);
- break;
- case 0x383f:
- intif_parse_GuildEmblem (fd);
- break;
- case 0x3840:
- intif_parse_GuildCastleDataLoad (fd);
- break;
- case 0x3841:
- intif_parse_GuildCastleDataSave (fd);
- break;
- case 0x3842:
- intif_parse_GuildCastleAllDataLoad (fd);
- break;
- //case 0x3880: intif_parse_CreateP.et(fd); break;
- //case 0x3881: intif_parse_RecvP.etData(fd); break;
- //case 0x3882: intif_parse_SaveP.etOk(fd); break;
- //case 0x3883: intif_parse_DeleteP.etOk(fd); break;
default:
if (battle_config.error_log)
printf ("intif_parse : unknown packet %d %x\n", fd,