--- deliantra/server/socket/item.C 2006/09/14 22:34:05 1.7 +++ deliantra/server/socket/item.C 2006/09/20 21:53:50 1.9 @@ -679,13 +679,14 @@ tag = GetInt_String (data); op = esrv_get_ob_from_count (pl->ob, tag); + if (!op) { new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark"); return; } + pl->mark = op; - pl->mark_count = op->count; new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Marked item %s", query_name (op)); } @@ -702,7 +703,7 @@ object *tmp; int flag = 0; sint16 x, y; - mapstruct *m; + maptile *m; x = op->x + dx; y = op->y + dy;