diff options
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/atcommand.c | 16 | ||||
| -rw-r--r-- | src/map/guild.c | 2 | ||||
| -rw-r--r-- | src/map/intif.c | 4 | ||||
| -rw-r--r-- | src/map/party.c | 1 |
4 files changed, 7 insertions, 16 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c index b530376a1..ea457ed47 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -136,11 +136,7 @@ ACMD_FUNC(agitend); ACMD_FUNC(reloaditemdb); ACMD_FUNC(reloadmobdb); ACMD_FUNC(reloadskilldb); -#ifndef TXT_ONLY -ACMD_FUNC(rehash);// by Fr3DBr -#else /* TXT_ONLY */ ACMD_FUNC(reloadscript); -#endif /* TXT_ONLY */ ACMD_FUNC(reloadgmdb); // by Yor ACMD_FUNC(mapexit); ACMD_FUNC(idsearch); @@ -369,11 +365,7 @@ static AtCommandInfo atcommand_info[] = { { AtCommand_ReloadItemDB, "@reloaditemdb", 99, atcommand_reloaditemdb }, // admin command { AtCommand_ReloadMobDB, "@reloadmobdb", 99, atcommand_reloadmobdb }, // admin command { AtCommand_ReloadSkillDB, "@reloadskilldb", 99, atcommand_reloadskilldb }, // admin command -#ifndef TXT_ONLY - { AtCommand_Rehash, "@rehash", 99, atcommand_rehash }, // admin command -#else /* TXT_ONLY */ { AtCommand_ReloadScript, "@reloadscript", 99, atcommand_reloadscript }, // admin command -#endif /* TXT_ONLY */ { AtCommand_ReloadGMDB, "@reloadgmdb", 99, atcommand_reloadgmdb }, // admin command { AtCommand_CharModel, "@charmodel", 50, atcommand_charmodel }, { AtCommand_CharSKPoint, "@charskpoint", 60, atcommand_charskpoint }, @@ -812,7 +804,6 @@ static int atkillmonster_sub(struct block_list *bl, va_list ap) { return 0; } -#ifndef TXT_ONLY static int atkillnpc_sub(struct block_list *bl, va_list ap) { int flag = va_arg(ap,int); @@ -842,7 +833,6 @@ void rehash( const int fd, struct map_session_data* sd ) } } -#endif /* not TXT_ONLY */ /*========================================== * Read Message Data *------------------------------------------ @@ -5590,23 +5580,17 @@ int atcommand_reloadskilldb( * *------------------------------------------ */ -#ifndef TXT_ONLY -int atcommand_rehash( -#else /* TXT_ONLY */ int atcommand_reloadscript( -#endif /* TXT_ONLY */ const int fd, struct map_session_data* sd, const char* command, const char* message) { nullpo_retr(-1, sd); -#ifndef TXT_ONLY atcommand_broadcast( fd, sd, "@broadcast", "eAthena SQL Server is Rehashing..." ); atcommand_broadcast( fd, sd, "@broadcast", "You will feel a bit of lag at this point !" ); rehash( fd, sd ); atcommand_broadcast( fd, sd, "@broadcast", "Reloading NPCs..." ); -#endif /* not TXT_ONLY */ do_init_npc(); do_init_script(); diff --git a/src/map/guild.c b/src/map/guild.c index 7d73692c9..7369757a7 100644 --- a/src/map/guild.c +++ b/src/map/guild.c @@ -802,6 +802,8 @@ int guild_send_message(struct map_session_data *sd,char *mes,int len) if(sd->status.guild_id==0) return 0; intif_guild_message(sd->status.guild_id,sd->status.account_id,mes,len); + guild_recv_message(sd->status.guild_id,sd->status.account_id,mes,len); + return 0; } // ギルド会話受信 diff --git a/src/map/intif.c b/src/map/intif.c index cf9d8ccee..fd79acc0c 100644 --- a/src/map/intif.c +++ b/src/map/intif.c @@ -130,6 +130,9 @@ int intif_GMmessage(char* mes,int len,int flag) memcpy(WFIFOP(inter_fd,lp), mes, len); WFIFOSET(inter_fd, WFIFOW(inter_fd,2)); + // Send to the local players + clif_GMmessage(NULL, mes, len, 0); + return 0; } @@ -482,6 +485,7 @@ int intif_guild_message(int guild_id,int account_id,char *mes,int len) WFIFOL(inter_fd,8)=account_id; memcpy(WFIFOP(inter_fd,12),mes,len); WFIFOSET(inter_fd,len+12); + return 0; } // ギルド競合チェック要求 diff --git a/src/map/party.c b/src/map/party.c index 1e5a3dbd1..075209f7e 100644 --- a/src/map/party.c +++ b/src/map/party.c @@ -481,6 +481,7 @@ int party_send_message(struct map_session_data *sd,char *mes,int len) if(sd->status.party_id==0) return 0; intif_party_message(sd->status.party_id,sd->status.account_id,mes,len); + party_recv_message(sd->status.party_id,sd->status.account_id,mes,len); return 0; } |