diff options
| -rw-r--r-- | Changelog-Trunk.txt | 3 | ||||
| -rw-r--r-- | conf-tmpl/msg_athena.conf | 1 | ||||
| -rw-r--r-- | src/map/atcommand.c | 4 | ||||
| -rw-r--r-- | src/map/clif.c | 4 | ||||
| -rw-r--r-- | src/map/log.c | 2 |
5 files changed, 9 insertions, 5 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index e8c1f8393..d1f17bd2f 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -5,6 +5,9 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. EV GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS
2006/02/21
+ * Fix to prevent using main chat when it disabled in atcommand_athena. [LuzZza]
+ - Fixed message codes in duel functions.
+ - Small fix in log_refine, incorrect compare expression.
* Some cleaning of the warp portal code so that when it is "pre-casted" it
doesn't mess up with other casted skills. [Skotlex]
* Some fixing on the weapon-refine code. [Skotlex]
diff --git a/conf-tmpl/msg_athena.conf b/conf-tmpl/msg_athena.conf index e86f59a95..6099df769 100644 --- a/conf-tmpl/msg_athena.conf +++ b/conf-tmpl/msg_athena.conf @@ -360,6 +360,7 @@ 385: Main chat is currently disabled. Usage: @main <on|off>, @main <message>.
386: Main@%s: %s
387: You cannot use Main chat while muted.
+388: You should enable main chat with "@main on" command.
// Messages of others (not for GM commands)
// ----------------------------------------
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];
|