… | |
… | |
3 | * |
3 | * |
4 | * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
4 | * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
5 | * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team |
5 | * Copyright (©) 2001,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 it under |
9 | * it under the terms of the GNU General Public License as published by |
9 | * the terms of the Affero GNU General Public License as published by the |
10 | * the Free Software Foundation, either version 3 of the License, or |
10 | * Free Software Foundation, either version 3 of the License, or (at your |
11 | * (at your option) any later version. |
11 | * option) any later version. |
12 | * |
12 | * |
13 | * This program is distributed in the hope that it will be useful, |
13 | * This program is distributed in the hope that it will be useful, |
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
16 | * GNU General Public License for more details. |
16 | * GNU General Public License for more details. |
17 | * |
17 | * |
18 | * You should have received a copy of the GNU General Public License |
18 | * You should have received a copy of the Affero GNU General Public License |
19 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
19 | * and the GNU General Public License along with this program. If not, see |
|
|
20 | * <http://www.gnu.org/licenses/>. |
20 | * |
21 | * |
21 | * The authors can be reached via e-mail to <support@deliantra.net> |
22 | * The authors can be reached via e-mail to <support@deliantra.net> |
22 | */ |
23 | */ |
23 | |
24 | |
24 | #include <global.h> |
25 | #include <global.h> |
… | |
… | |
334 | |
335 | |
335 | // the player itself is always on a map, so we will find him here |
336 | // the player itself is always on a map, so we will find him here |
336 | // even if our inv is in a player. |
337 | // even if our inv is in a player. |
337 | if (envest->is_on_map ()) |
338 | if (envest->is_on_map ()) |
338 | if (object *pl = envest->ms ().player ()) |
339 | if (object *pl = envest->ms ().player ()) |
339 | if (pl->container == env) |
340 | if (pl->container_ () == env) |
340 | return pl; |
341 | return pl; |
341 | } |
342 | } |
342 | else |
343 | else |
343 | { |
344 | { |
344 | // maybe there is a player standing on the same mapspace |
345 | // maybe there is a player standing on the same mapspace |
345 | // this will catch the case where "this" is a player |
346 | // this will catch the case where "this" is a player |
346 | if (object *pl = ms ().player ()) |
347 | if (object *pl = ms ().player ()) |
347 | if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look) |
348 | if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look) |
348 | || this == pl->container) |
349 | || pl->container_ () == this) |
349 | return pl; |
350 | return pl; |
350 | } |
351 | } |
351 | } |
352 | } |
352 | |
353 | |
353 | return 0; |
354 | return 0; |
… | |
… | |
1118 | close_container (); |
1119 | close_container (); |
1119 | |
1120 | |
1120 | --map->players; |
1121 | --map->players; |
1121 | map->touch (); |
1122 | map->touch (); |
1122 | } |
1123 | } |
1123 | else if (pl->container == this) |
1124 | else if (pl->container_ () == this) |
1124 | { |
1125 | { |
1125 | // removing a container should close it |
1126 | // removing a container should close it |
1126 | close_container (); |
1127 | close_container (); |
1127 | } |
1128 | } |
1128 | |
1129 | |
… | |
… | |
1144 | |
1145 | |
1145 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1146 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1146 | |
1147 | |
1147 | if (object *pl = ms.player ()) |
1148 | if (object *pl = ms.player ()) |
1148 | { |
1149 | { |
1149 | if (pl->container == this) |
1150 | if (pl->container_ () == this) |
1150 | /* If a container that the player is currently using somehow gets |
1151 | /* If a container that the player is currently using somehow gets |
1151 | * removed (most likely destroyed), update the player view |
1152 | * removed (most likely destroyed), update the player view |
1152 | * appropriately. |
1153 | * appropriately. |
1153 | */ |
1154 | */ |
1154 | pl->close_container (); |
1155 | pl->close_container (); |