diff options
| author | brianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-08-27 05:14:42 +0000 |
|---|---|---|
| committer | brianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-08-27 05:14:42 +0000 |
| commit | 46311a784a46d1f1afb3173e73aff722f2208958 (patch) | |
| tree | 9e2994a1e7b73e49cde2b6ff7b266673b9c29c40 /src/map | |
| parent | a81c829b99bfd0ace0fa49c682cc0e04e2711dbe (diff) | |
| download | hercules-46311a784a46d1f1afb3173e73aff722f2208958.tar.gz hercules-46311a784a46d1f1afb3173e73aff722f2208958.tar.bz2 hercules-46311a784a46d1f1afb3173e73aff722f2208958.tar.xz hercules-46311a784a46d1f1afb3173e73aff722f2208958.zip | |
- Fixed typo in Hyegun_Hat (5367). (bugreport:1935)
- Added missing bonuses to Mask_Of_Ifrit (5420). (bugreport:2188)
- Added better examples for some documentation.
- Fixed item loss from mail if you are OVER 100% overweight. (bugreport:1862)
- Fixed 'waitingroom2bg' checking wrong parameter. (bugreport:3330)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14034 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/clif.c | 2 | ||||
| -rw-r--r-- | src/map/script.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index 71df80b36..06a51354f 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -11959,7 +11959,7 @@ void clif_parse_Mail_getattach(int fd, struct map_session_data *sd) } weight = data->weight * sd->mail.inbox.msg[i].item.amount; - if( weight > sd->max_weight - sd->weight ) + if( sd->weight + weight > sd->max_weight ) { clif_Mail_getattachment(fd, 2); return; diff --git a/src/map/script.c b/src/map/script.c index 6597b3eae..f14d0179e 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -13476,8 +13476,8 @@ BUILDIN_FUNC(waitingroom2bg) int x, y, i, mapindex = 0, bg_id, n; struct map_session_data *sd; - if( script_hasdata(st,8) ) - nd = npc_name2id(script_getstr(st,8)); + if( script_hasdata(st,7) ) + nd = npc_name2id(script_getstr(st,7)); else nd = (struct npc_data *)map_id2bl(st->oid); |