summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorLuzZza <LuzZza@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-02-21 18:37:35 +0000
committerLuzZza <LuzZza@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-02-21 18:37:35 +0000
commit0988a4623402706dced4808b565702135d7e963f (patch)
treeddb256d4a586e081b317538095ed7308695ee389 /src/map
parenta102b2dffb9365116701f99c0dcc486a74cbc073 (diff)
downloadhercules-0988a4623402706dced4808b565702135d7e963f.tar.gz
hercules-0988a4623402706dced4808b565702135d7e963f.tar.bz2
hercules-0988a4623402706dced4808b565702135d7e963f.tar.xz
hercules-0988a4623402706dced4808b565702135d7e963f.zip
- Fix to prevent using main chat when it disabled in atcommand_athena.
- Fixed message codes in duel functions. - Small fix in log_refine, incorrect compare expression. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5358 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/atcommand.c4
-rw-r--r--src/map/clif.c4
-rw-r--r--src/map/log.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index a3e22a90a..eb849fb1c 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -9897,13 +9897,13 @@ int atcommand_reject(
{
if(sd->duel_invite <= 0) {
// "Duel: @reject without invititation."
- clif_displaymessage(fd, msg_txt(352));
+ clif_displaymessage(fd, msg_txt(362));
return 0;
}
duel_reject(sd->duel_invite, sd);
// "Duel: Invitation has been rejected."
- clif_displaymessage(fd, msg_txt(352));
+ clif_displaymessage(fd, msg_txt(363));
return 0;
}
diff --git a/src/map/clif.c b/src/map/clif.c
index e980570cf..41416b86f 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -9471,8 +9471,8 @@ if ((strncasecmp((const char*)RFIFOP(fd,4),"NPC:",4) == 0) && (strlen((const cha
// Main chat [LuzZza]
if(strcmpi((const char*)RFIFOP(fd,4), main_chat_nick) == 0) {
if(!sd->state.mainchat) {
- sd->state.mainchat = 1;
- clif_displaymessage(fd, msg_txt(380)); // Main chat has been activated.
+ clif_displaymessage(fd, msg_txt(388)); // You should enable main chat with "@main on" command.
+ return;
}
if (sd->sc.data[SC_NOCHAT].timer != -1) {
clif_displaymessage(fd, msg_txt(387));
diff --git a/src/map/log.c b/src/map/log.c
index 0879023fa..0fa09d9f0 100644
--- a/src/map/log.c
+++ b/src/map/log.c
@@ -357,7 +357,7 @@ int log_refine(struct map_session_data *sd, int n, int success)
item_level = sd->status.inventory[n].refine; //leaving there 0 wasn't informative! we have SUCCESS field anyways
else
item_level = sd->status.inventory[n].refine + 1;
- if(!should_log_item(log_config.refine,sd->status.inventory[n].nameid,1) || log_config.refine_items_log<item_level) return 0; //filter [Lupus]
+ if(!should_log_item(log_config.refine,sd->status.inventory[n].nameid,1) || log_config.refine_items_log>item_level) return 0; //filter [Lupus]
for(i=0;i<MAX_SLOTS;i++)
log_card[i] = sd->status.inventory[n].card[i];