summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2009-02-28 09:09:00 -0700
committerJared Adams <jaxad0127@gmail.com>2009-02-28 09:09:00 -0700
commit45ab260d4addc77e66516ebf0f9342cdc9460b32 (patch)
tree085f4f2909eab3d6e1ec6e8e98ea0434624cf4f1 /src
parente673349395f41aeb0ba18711d23f1cc7636ab52c (diff)
downloadtmwa-45ab260d4addc77e66516ebf0f9342cdc9460b32.tar.gz
tmwa-45ab260d4addc77e66516ebf0f9342cdc9460b32.tar.bz2
tmwa-45ab260d4addc77e66516ebf0f9342cdc9460b32.tar.xz
tmwa-45ab260d4addc77e66516ebf0f9342cdc9460b32.zip
Fix some bugs int he map and char servers
Diffstat (limited to 'src')
-rw-r--r--src/char/char.c2
-rw-r--r--src/map/npc.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/char/char.c b/src/char/char.c
index 6b6b1f1..37794a4 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -2679,7 +2679,7 @@ int parse_char(int fd) {
} else {
for (i = 0; i < 9; i++) {
struct mmo_charstatus *cs = NULL;
- if ((cs = &char_dat[sd->found_char[i]])->char_id == RFIFOL(fd,2)) {
+ if (sd->found_char[i] >= 0 && (cs = &char_dat[sd->found_char[i]])->char_id == RFIFOL(fd,2)) {
char_delete(cs); // deletion process
if (sd->found_char[i] != char_num - 1) {
diff --git a/src/map/npc.c b/src/map/npc.c
index cc0880a..d484483 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -1245,7 +1245,7 @@ static int npc_parse_shop(char *w1,char *w2,char *w3,char *w4)
if (value < 0) {
int temp = abs(value);
if (id == NULL) id = itemdb_search(nameid);
- value = id->value_buy; * temp
+ value = id->value_buy * temp;
}
nd->u.shop_item[pos].value = value;