| 1 | /* |
1 | /* |
| 2 | * This file is part of Deliantra, the Roguelike Realtime MMORPG. |
2 | * This file is part of Deliantra, the Roguelike Realtime MMORPG. |
| 3 | * |
3 | * |
| 4 | * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
4 | * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
| 5 | * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team |
5 | * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team |
| 6 | * Copyright (©) 1992,2007 Frank Tore Johansen |
6 | * Copyright (©) 1992,2007 Frank Tore Johansen |
| 7 | * |
7 | * |
| 8 | * Deliantra is free software: you can redistribute it and/or modify |
8 | * Deliantra is free software: you can redistribute it and/or modify |
| 9 | * it under the terms of the GNU General Public License as published by |
9 | * it under the terms of the GNU General Public License as published by |
| … | |
… | |
| 583 | { |
583 | { |
| 584 | // This should not happen, but if it does, just merge the two. |
584 | // This should not happen, but if it does, just merge the two. |
| 585 | if (coin_objs [i]) |
585 | if (coin_objs [i]) |
| 586 | { |
586 | { |
| 587 | LOG (llevError, "%s has two money entries of (%s)\n", &pouch->name, coins[NUM_COINS - 1 - i]); |
587 | LOG (llevError, "%s has two money entries of (%s)\n", &pouch->name, coins[NUM_COINS - 1 - i]); |
| 588 | tmp->remove (); |
|
|
| 589 | coin_objs[i]->nrof += tmp->nrof; |
588 | coin_objs[i]->nrof += tmp->nrof; |
| 590 | esrv_del_item (pl->contr, tmp->count); |
|
|
| 591 | tmp->destroy (); |
589 | tmp->destroy (); |
| 592 | } |
590 | } |
| 593 | else |
591 | else |
| 594 | { |
592 | { |
| 595 | tmp->remove (); |
593 | tmp->remove (); |
| 596 | |
|
|
| 597 | if (pouch->type == PLAYER) |
|
|
| 598 | esrv_del_item (pl->contr, tmp->count); |
|
|
| 599 | |
|
|
| 600 | coin_objs[i] = tmp; |
594 | coin_objs[i] = tmp; |
| 601 | } |
595 | } |
| 602 | |
596 | |
| 603 | break; |
597 | break; |
| 604 | } |
598 | } |
