--- deliantra/server/server/shop.C 2008/04/13 01:34:09 1.47 +++ deliantra/server/server/shop.C 2008/04/22 02:46:18 1.48 @@ -1,7 +1,7 @@ /* * This file is part of Deliantra, the Roguelike Realtime MMORPG. * - * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team + * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team * Copyright (©) 1992,2007 Frank Tore Johansen * @@ -585,18 +585,12 @@ if (coin_objs [i]) { LOG (llevError, "%s has two money entries of (%s)\n", &pouch->name, coins[NUM_COINS - 1 - i]); - tmp->remove (); coin_objs[i]->nrof += tmp->nrof; - esrv_del_item (pl->contr, tmp->count); tmp->destroy (); } else { tmp->remove (); - - if (pouch->type == PLAYER) - esrv_del_item (pl->contr, tmp->count); - coin_objs[i] = tmp; }