| version 1.34 | | version 1.35 |
|---|
| | |
| | | |
| /* | | /* |
| * static char *rcsid_item_c = | | * static char *rcsid_item_c = |
| * "$Id: item.c,v 1.34 2005/08/17 06:58:11 mwedel Exp $"; | | * "$Id: item.c,v 1.35 2005/09/03 00:20:01 akirschbaum Exp $"; |
| */ | | */ |
| | | |
| /* | | /* |
| | |
| return tmp; | | return tmp; |
| | | |
| for(op = get_map_ob (pl->map, pl->x, pl->y); op; op = op->above) | | for(op = get_map_ob (pl->map, pl->x, pl->y); op; op = op->above) |
| if (op->count == count) | | if (op->head != NULL && op->head->count == count) |
| | | return op; |
| | | else if (op->count == count) |
| return op; | | return op; |
| else if (op->type == CONTAINER && pl->container == op) | | else if (op->type == CONTAINER && pl->container == op) |
| for(tmp = op->inv; tmp; tmp = tmp->below) | | for(tmp = op->inv; tmp; tmp = tmp->below) |
| | |
| object *op = esrv_get_ob_from_count(pl->ob, tag); | | object *op = esrv_get_ob_from_count(pl->ob, tag); |
| | | |
| if (!op) { | | if (!op) { |
| LOG(llevDebug, "Player '%s' tried examine the unknown object (%ld)\n", | | LOG(llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", |
| pl->ob->name, tag); | | pl->ob->name, tag); |
| return; | | return; |
| } | | } |
| | |
| } | | } |
| | | |
| if (!op) { | | if (!op) { |
| LOG(llevDebug, "Player '%s' tried apply the unknown object (%d)\n", | | LOG(llevDebug, "Player '%s' tried to apply the unknown object (%d)\n", |
| pl->ob->name, tag); | | pl->ob->name, tag); |
| return; | | return; |
| } | | } |