diff options
author | brianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-04-10 00:16:06 +0000 |
---|---|---|
committer | brianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-04-10 00:16:06 +0000 |
commit | 31f066e114c9d10f0e1b8257a524d2779736261a (patch) | |
tree | b910bc891b711604c1bf0c5a6b9a65c9cfe7cc53 | |
parent | 01871e7fbbae3be42b08c2ed47d918a195ede3d3 (diff) | |
download | hercules-31f066e114c9d10f0e1b8257a524d2779736261a.tar.gz hercules-31f066e114c9d10f0e1b8257a524d2779736261a.tar.bz2 hercules-31f066e114c9d10f0e1b8257a524d2779736261a.tar.xz hercules-31f066e114c9d10f0e1b8257a524d2779736261a.zip |
- Fixed a comparison check in OBB quest. (bugreport:4167)
- Fixed the equipment position numbers displayed by @refine. (bugreport:4173)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14281 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r-- | npc/quests/obb_quest.txt | 2 | ||||
-rw-r--r-- | src/map/atcommand.c | 22 |
2 files changed, 12 insertions, 12 deletions
diff --git a/npc/quests/obb_quest.txt b/npc/quests/obb_quest.txt index 7d9a0e63f..c0524340c 100644 --- a/npc/quests/obb_quest.txt +++ b/npc/quests/obb_quest.txt @@ -1845,7 +1845,7 @@ comodo,68,195,0 script Old Man#thai 120,{ } moc_ruins,107,62,0 script Tommy#thai 716,{ - if (thai_head == 6 && thai_head == 11) { + if (thai_head >= 6 && thai_head <= 11) { switch(thai_head) { case 6: mes "[Tommy]"; diff --git a/src/map/atcommand.c b/src/map/atcommand.c index 7424d1ab0..7a4690efb 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -2632,26 +2632,26 @@ int atcommand_refine(const int fd, struct map_session_data* sd, const char* comm memset(atcmd_output, '\0', sizeof(atcmd_output)); if (!message || !*message || sscanf(message, "%d %d", &position, &refine) < 2) { - clif_displaymessage(fd, "Please, enter a position and a amount (usage: @refine <equip position> <+/- amount>)."); - sprintf(atcmd_output, "%d: Left Accessory", EQI_ACC_L); + clif_displaymessage(fd, "Please, enter a position and an amount (usage: @refine <equip position> <+/- amount>)."); + sprintf(atcmd_output, "%d: Lower Headgear", EQP_HEAD_LOW); clif_displaymessage(fd, atcmd_output); - sprintf(atcmd_output, "%d: Right Accessory", EQI_ACC_R); + sprintf(atcmd_output, "%d: Right Hand", EQP_HAND_R); clif_displaymessage(fd, atcmd_output); - sprintf(atcmd_output, "%d: Shoes", EQI_SHOES); + sprintf(atcmd_output, "%d: Garment", EQP_GARMENT); clif_displaymessage(fd, atcmd_output); - sprintf(atcmd_output, "%d: Garment", EQI_GARMENT); + sprintf(atcmd_output, "%d: Left Accessory", EQP_ACC_L); clif_displaymessage(fd, atcmd_output); - sprintf(atcmd_output, "%d: Lower Headgear", EQI_HEAD_LOW); + sprintf(atcmd_output, "%d: Body Armor", EQP_ARMOR); clif_displaymessage(fd, atcmd_output); - sprintf(atcmd_output, "%d: Mid Headgear", EQI_HEAD_MID); + sprintf(atcmd_output, "%d: Left Hand", EQP_HAND_L); clif_displaymessage(fd, atcmd_output); - sprintf(atcmd_output, "%d: Top Headgear", EQI_HEAD_TOP); + sprintf(atcmd_output, "%d: Shoes", EQP_SHOES); clif_displaymessage(fd, atcmd_output); - sprintf(atcmd_output, "%d: Body Armor", EQI_ARMOR); + sprintf(atcmd_output, "%d: Right Accessory", EQP_ACC_R); clif_displaymessage(fd, atcmd_output); - sprintf(atcmd_output, "%d: Left Hand", EQI_HAND_L); + sprintf(atcmd_output, "%d: Top Headgear", EQP_HEAD_TOP); clif_displaymessage(fd, atcmd_output); - sprintf(atcmd_output, "%d: Right Hand", EQI_HAND_R); + sprintf(atcmd_output, "%d: Mid Headgear", EQP_HEAD_MID); clif_displaymessage(fd, atcmd_output); return -1; } |