ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/player.C
(Generate patch)

Comparing deliantra/server/server/player.C (file contents):
Revision 1.11 by root, Tue Aug 29 08:01:37 2006 UTC vs.
Revision 1.12 by elmex, Tue Aug 29 10:51:43 2006 UTC

1/* 1/*
2 * static char *rcsid_player_c = 2 * static char *rcsid_player_c =
3 * "$Id: player.C,v 1.11 2006/08/29 08:01:37 root Exp $"; 3 * "$Id: player.C,v 1.12 2006/08/29 10:51:43 elmex Exp $";
4 */ 4 */
5 5
6/* 6/*
7 CrossFire, A Multiplayer game for X-windows 7 CrossFire, A Multiplayer game for X-windows
8 8
2846 * Check to see if the player is in a shop. IF so, then check to see if 2846 * Check to see if the player is in a shop. IF so, then check to see if
2847 * the player has any unpaid items. If so, remove them and put them back 2847 * the player has any unpaid items. If so, remove them and put them back
2848 * in the map. 2848 * in the map.
2849 */ 2849 */
2850 2850
2851 for (tmp= get_map_ob(op->map, op->x, op->y); tmp; tmp=tmp->above) { 2851 if (is_in_shop (op))
2852 if (tmp->type == SHOP_FLOOR) {
2853 remove_unpaid_objects(op->inv, op); 2852 remove_unpaid_objects(op->inv, op);
2854 break;
2855 }
2856 }
2857
2858 2853
2859 /****************************************/ 2854 /****************************************/
2860 /* */ 2855 /* */
2861 /* Move player to his current respawn- */ 2856 /* Move player to his current respawn- */
2862 /* position (usually last savebed) */ 2857 /* position (usually last savebed) */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines