… | |
… | |
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> |
… | |
… | |
36 | static const uint64 UUID_GAP = 1<<19; |
37 | static const uint64 UUID_GAP = 1<<19; |
37 | uint32_t mapspace::smellcount = 10000; |
38 | uint32_t mapspace::smellcount = 10000; |
38 | |
39 | |
39 | objectvec objects; |
40 | objectvec objects; |
40 | activevec actives; |
41 | activevec actives; |
|
|
42 | |
|
|
43 | //+GPL |
41 | |
44 | |
42 | short freearr_x[SIZEOFFREE] = { |
45 | short freearr_x[SIZEOFFREE] = { |
43 | 0, |
46 | 0, |
44 | 0, 1, 1, 1, 0, -1, -1, -1, |
47 | 0, 1, 1, 1, 0, -1, -1, -1, |
45 | 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, |
48 | 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, |
… | |
… | |
334 | |
337 | |
335 | // the player itself is always on a map, so we will find him here |
338 | // the player itself is always on a map, so we will find him here |
336 | // even if our inv is in a player. |
339 | // even if our inv is in a player. |
337 | if (envest->is_on_map ()) |
340 | if (envest->is_on_map ()) |
338 | if (object *pl = envest->ms ().player ()) |
341 | if (object *pl = envest->ms ().player ()) |
339 | if (pl->container == env) |
342 | if (pl->container_ () == env) |
340 | return pl; |
343 | return pl; |
341 | } |
344 | } |
342 | else |
345 | else |
343 | { |
346 | { |
344 | // maybe there is a player standing on the same mapspace |
347 | // maybe there is a player standing on the same mapspace |
345 | // this will catch the case where "this" is a player |
348 | // this will catch the case where "this" is a player |
346 | if (object *pl = ms ().player ()) |
349 | if (object *pl = ms ().player ()) |
347 | if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look) |
350 | if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look) |
348 | || this == pl->container) |
351 | || pl->container_ () == this) |
349 | return pl; |
352 | return pl; |
350 | } |
353 | } |
351 | } |
354 | } |
352 | |
355 | |
353 | return 0; |
356 | return 0; |
… | |
… | |
1040 | * the previous environment. |
1043 | * the previous environment. |
1041 | */ |
1044 | */ |
1042 | void |
1045 | void |
1043 | object::do_remove () |
1046 | object::do_remove () |
1044 | { |
1047 | { |
1045 | object *tmp, *last = 0; |
|
|
1046 | object *otmp; |
|
|
1047 | |
|
|
1048 | if (flag [FLAG_REMOVED]) |
1048 | if (flag [FLAG_REMOVED]) |
1049 | return; |
1049 | return; |
1050 | |
1050 | |
1051 | INVOKE_OBJECT (REMOVE, this); |
1051 | INVOKE_OBJECT (REMOVE, this); |
1052 | |
1052 | |
… | |
… | |
1118 | close_container (); |
1118 | close_container (); |
1119 | |
1119 | |
1120 | --map->players; |
1120 | --map->players; |
1121 | map->touch (); |
1121 | map->touch (); |
1122 | } |
1122 | } |
1123 | else if (pl->container == this) |
1123 | else if (pl->container_ () == this) |
1124 | { |
1124 | { |
1125 | // removing a container should close it |
1125 | // removing a container should close it |
1126 | close_container (); |
1126 | close_container (); |
1127 | } |
1127 | } |
1128 | |
1128 | |
… | |
… | |
1144 | |
1144 | |
1145 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1145 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1146 | |
1146 | |
1147 | if (object *pl = ms.player ()) |
1147 | if (object *pl = ms.player ()) |
1148 | { |
1148 | { |
1149 | if (pl->container == this) |
1149 | if (pl->container_ () == this) |
1150 | /* If a container that the player is currently using somehow gets |
1150 | /* If a container that the player is currently using somehow gets |
1151 | * removed (most likely destroyed), update the player view |
1151 | * removed (most likely destroyed), update the player view |
1152 | * appropriately. |
1152 | * appropriately. |
1153 | */ |
1153 | */ |
1154 | pl->close_container (); |
1154 | pl->close_container (); |
… | |
… | |
1158 | //TODO: update floorbox to preserve ordering |
1158 | //TODO: update floorbox to preserve ordering |
1159 | if (pl->contr->ns) |
1159 | if (pl->contr->ns) |
1160 | pl->contr->ns->floorbox_update (); |
1160 | pl->contr->ns->floorbox_update (); |
1161 | } |
1161 | } |
1162 | |
1162 | |
|
|
1163 | if (check_walk_off) |
1163 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
1164 | for (object *above, *tmp = ms.bot; tmp; tmp = above) |
1164 | { |
1165 | { |
|
|
1166 | above = tmp->above; |
|
|
1167 | |
1165 | /* No point updating the players look faces if he is the object |
1168 | /* No point updating the players look faces if he is the object |
1166 | * being removed. |
1169 | * being removed. |
1167 | */ |
1170 | */ |
1168 | |
1171 | |
1169 | /* See if object moving off should effect something */ |
1172 | /* See if object moving off should effect something */ |
1170 | if (check_walk_off |
|
|
1171 | && ((move_type & tmp->move_off) |
1173 | if ((move_type & tmp->move_off) |
1172 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1174 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0) |
1173 | { |
|
|
1174 | move_apply (tmp, this, 0); |
1175 | move_apply (tmp, this, 0); |
1175 | |
|
|
1176 | if (destroyed ()) |
|
|
1177 | LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); |
|
|
1178 | } |
1176 | } |
1179 | |
|
|
1180 | last = tmp; |
|
|
1181 | } |
|
|
1182 | |
1177 | |
1183 | if (affects_los ()) |
1178 | if (affects_los ()) |
1184 | update_all_los (map, x, y); |
1179 | update_all_los (map, x, y); |
1185 | } |
1180 | } |
1186 | } |
1181 | } |
… | |
… | |
2547 | return splay (tmp); |
2542 | return splay (tmp); |
2548 | |
2543 | |
2549 | return 0; |
2544 | return 0; |
2550 | } |
2545 | } |
2551 | |
2546 | |
|
|
2547 | //-GPL |
|
|
2548 | |
2552 | void |
2549 | void |
2553 | object::force_set_timer (int duration) |
2550 | object::force_set_timer (int duration) |
2554 | { |
2551 | { |
2555 | this->duration = 1; |
2552 | this->duration = 1; |
2556 | this->speed_left = -1.f; |
2553 | this->speed_left = -1.f; |
… | |
… | |
2565 | force->destroy (); |
2562 | force->destroy (); |
2566 | |
2563 | |
2567 | object *force = get_archetype (FORCE_NAME); |
2564 | object *force = get_archetype (FORCE_NAME); |
2568 | |
2565 | |
2569 | force->slaying = name; |
2566 | force->slaying = name; |
2570 | |
|
|
2571 | force->force_set_timer (duration); |
2567 | force->force_set_timer (duration); |
2572 | |
|
|
2573 | force->flag [FLAG_APPLIED] = true; |
2568 | force->flag [FLAG_APPLIED] = true; |
2574 | |
2569 | |
2575 | return insert (force); |
2570 | return insert (force); |
2576 | } |
2571 | } |
2577 | |
2572 | |
2578 | void |
2573 | void |