diff options
| author | brianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-05-16 15:22:16 +0000 |
|---|---|---|
| committer | brianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-05-16 15:22:16 +0000 |
| commit | a3a9b9a5dc441baa552023b3410e11038fe3f0e1 (patch) | |
| tree | 92196e011ad46923a1ccad9f53fd42785826a089 | |
| parent | 01dc34c9a73819dfbf0e8242a9ba7e572d76955d (diff) | |
| download | hercules-a3a9b9a5dc441baa552023b3410e11038fe3f0e1.tar.gz hercules-a3a9b9a5dc441baa552023b3410e11038fe3f0e1.tar.bz2 hercules-a3a9b9a5dc441baa552023b3410e11038fe3f0e1.tar.xz hercules-a3a9b9a5dc441baa552023b3410e11038fe3f0e1.zip | |
- Fixed a small typo in a shop name. (bugreport:4235)
- Removed a duplicate 'next' in Kiel Hyre Quest. (bugreport:4222)
- Fixed pc_checkitem() running before sending the client the inventory list, resulting in "Unknown Item is taken off" messages. (topic:245385)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14295 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | npc/merchants/shops.txt | 2 | ||||
| -rw-r--r-- | npc/quests/Kiel_Hyre_Quest.txt | 1 | ||||
| -rw-r--r-- | src/map/clif.c | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/npc/merchants/shops.txt b/npc/merchants/shops.txt index b1ee5b111..89f5f9fc9 100644 --- a/npc/merchants/shops.txt +++ b/npc/merchants/shops.txt @@ -137,7 +137,7 @@ izlude_in,60,127,4 shop Weapon Dealer#iz 72,1750:-1,1751:-1,1701:-1,1601:-1,1201 izlude_in,70,127,4 shop Armor Dealer#iz 62,2103:-1,2105:-1,2403:-1,2405:-1,2503:-1,2505:-1,2226:-1,2228:-1,2303:-1,2305:-1,2328:-1,2307:-1,2309:-1,2312:-1,2314:-1,2316:-1,2628:-1 izlude_in,115,61,0 shop Tool Dealer#iz 47,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,1750:-1 izlude,105,99,0 shop Butcher#iz 54,517:-1 -izlude,94,98,4 shop Fruit Gardene#iz 53,512:-1,513:-1,515:-1,516:-1 +izlude,94,98,4 shop Fruit Gardener#iz 53,512:-1,513:-1,515:-1,516:-1 izlude,105,92,7 shop Vendor from Milk Ranch#i 90,519:-1 izlude,164,138,4 shop Pet Groomer#iz 124,537:-1,643:-1,10013:-1,10014:-1 diff --git a/npc/quests/Kiel_Hyre_Quest.txt b/npc/quests/Kiel_Hyre_Quest.txt index 49750fc43..cb6115e4a 100644 --- a/npc/quests/Kiel_Hyre_Quest.txt +++ b/npc/quests/Kiel_Hyre_Quest.txt @@ -5941,7 +5941,6 @@ yuno_fild09,158,217,0 script Wooden Board#kh 111,{ mes "wooden board carved"; mes "with the initials, ''K.H.''^000000"; next; - next; cutin "kh_kyel_port",2; mes "^3355FFYou find a portrait of"; mes "a young man, that looks"; diff --git a/src/map/clif.c b/src/map/clif.c index 5f49ac039..f82b83be3 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -8222,8 +8222,8 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd) clif_refreshlook(&sd->bl,sd->bl.id,LOOK_CLOTHES_COLOR,sd->vd.cloth_color,SELF); // item - pc_checkitem(sd); clif_inventorylist(sd); + pc_checkitem(sd); // cart if(pc_iscarton(sd)) { |