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,2008 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> |
… | |
… | |
32 | #include <bitset> |
33 | #include <bitset> |
33 | |
34 | |
34 | UUID UUID::cur; |
35 | UUID UUID::cur; |
35 | static uint64_t seq_next_save; |
36 | static uint64_t seq_next_save; |
36 | static const uint64 UUID_GAP = 1<<19; |
37 | static const uint64 UUID_GAP = 1<<19; |
|
|
38 | uint32_t mapspace::smellcount = 10000; |
37 | |
39 | |
38 | objectvec objects; |
40 | objectvec objects; |
39 | activevec actives; |
41 | activevec actives; |
|
|
42 | |
|
|
43 | //+GPL |
40 | |
44 | |
41 | short freearr_x[SIZEOFFREE] = { |
45 | short freearr_x[SIZEOFFREE] = { |
42 | 0, |
46 | 0, |
43 | 0, 1, 1, 1, 0, -1, -1, -1, |
47 | 0, 1, 1, 1, 0, -1, -1, -1, |
44 | 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, |
… | |
… | |
48 | 0, |
52 | 0, |
49 | -1, -1, 0, 1, 1, 1, 0, -1, |
53 | -1, -1, 0, 1, 1, 1, 0, -1, |
50 | -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, |
54 | -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, |
51 | -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3 |
55 | -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3 |
52 | }; |
56 | }; |
53 | int maxfree[SIZEOFFREE] = { |
|
|
54 | 0, |
|
|
55 | 9, 10, 13, 14, 17, 18, 21, 22, |
|
|
56 | 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48, |
|
|
57 | 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49 |
|
|
58 | }; |
|
|
59 | int freedir[SIZEOFFREE] = { |
57 | int freedir[SIZEOFFREE] = { |
60 | 0, |
58 | 0, |
61 | 1, 2, 3, 4, 5, 6, 7, 8, |
59 | 1, 2, 3, 4, 5, 6, 7, 8, |
62 | 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8, |
60 | 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8, |
63 | 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8 |
61 | 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8 |
|
|
62 | }; |
|
|
63 | |
|
|
64 | static int maxfree[SIZEOFFREE] = { |
|
|
65 | 0, |
|
|
66 | 9, 10, 13, 14, 17, 18, 21, 22, |
|
|
67 | 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48, |
|
|
68 | 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49 |
64 | }; |
69 | }; |
65 | |
70 | |
66 | static void |
71 | static void |
67 | write_uuid (uval64 skip, bool sync) |
72 | write_uuid (uval64 skip, bool sync) |
68 | { |
73 | { |
… | |
… | |
139 | |
144 | |
140 | /* Returns TRUE if every key_values in wants has a partner with the same value in has. */ |
145 | /* Returns TRUE if every key_values in wants has a partner with the same value in has. */ |
141 | static bool |
146 | static bool |
142 | compare_ob_value_lists_one (const object *wants, const object *has) |
147 | compare_ob_value_lists_one (const object *wants, const object *has) |
143 | { |
148 | { |
144 | key_value *wants_field; |
|
|
145 | |
|
|
146 | /* n-squared behaviour (see get_ob_key_link()), but I'm hoping both |
149 | /* n-squared behaviour (see kv_get), but I'm hoping both |
147 | * objects with lists are rare, and lists stay short. If not, use a |
150 | * objects with lists are rare, and lists stay short. If not, use a |
148 | * different structure or at least keep the lists sorted... |
151 | * different structure or at least keep the lists sorted... |
149 | */ |
152 | */ |
150 | |
153 | |
151 | /* For each field in wants, */ |
154 | /* For each field in wants, */ |
152 | for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next) |
155 | for (key_value *kv = wants->key_values; kv; kv = kv->next) |
153 | { |
156 | if (has->kv_get (kv->key) != kv->value) |
154 | key_value *has_field; |
157 | return false; |
155 | |
|
|
156 | /* Look for a field in has with the same key. */ |
|
|
157 | has_field = get_ob_key_link (has, wants_field->key); |
|
|
158 | |
|
|
159 | if (!has_field) |
|
|
160 | return 0; /* No field with that name. */ |
|
|
161 | |
|
|
162 | /* Found the matching field. */ |
|
|
163 | if (has_field->value != wants_field->value) |
|
|
164 | return 0; /* Values don't match, so this half of the comparison is false. */ |
|
|
165 | |
|
|
166 | /* If we get here, we found a match. Now for the next field in wants. */ |
|
|
167 | } |
|
|
168 | |
158 | |
169 | /* If we get here, every field in wants has a matching field in has. */ |
159 | /* If we get here, every field in wants has a matching field in has. */ |
170 | return 1; |
160 | return true; |
171 | } |
161 | } |
172 | |
162 | |
173 | /* Returns TRUE if ob1 has the same key_values as ob2. */ |
163 | /* Returns TRUE if ob1 has the same key_values as ob2. */ |
174 | static bool |
164 | static bool |
175 | compare_ob_value_lists (const object *ob1, const object *ob2) |
165 | compare_ob_value_lists (const object *ob1, const object *ob2) |
176 | { |
166 | { |
177 | /* However, there may be fields in has which aren't partnered in wants, |
167 | /* However, there may be fields in has which aren't partnered in wants, |
178 | * so we need to run the comparison *twice*. :( |
168 | * so we need to run the comparison *twice*. :( |
179 | */ |
169 | */ |
180 | return compare_ob_value_lists_one (ob1, ob2) && compare_ob_value_lists_one (ob2, ob1); |
170 | return compare_ob_value_lists_one (ob1, ob2) |
|
|
171 | && compare_ob_value_lists_one (ob2, ob1); |
181 | } |
172 | } |
182 | |
173 | |
183 | /* Function examines the 2 objects given to it, and returns true if |
174 | /* Function examines the 2 objects given to it, and returns true if |
184 | * they can be merged together. |
175 | * they can be merged together. |
185 | * |
176 | * |
… | |
… | |
195 | bool object::can_merge_slow (object *ob1, object *ob2) |
186 | bool object::can_merge_slow (object *ob1, object *ob2) |
196 | { |
187 | { |
197 | /* A couple quicksanity checks */ |
188 | /* A couple quicksanity checks */ |
198 | if (ob1 == ob2 |
189 | if (ob1 == ob2 |
199 | || ob1->type != ob2->type |
190 | || ob1->type != ob2->type |
200 | || ob1->speed != ob2->speed |
191 | || fabs (ob1->speed - ob2->speed) < MIN_ACTIVE_SPEED |
201 | || ob1->value != ob2->value |
192 | || ob1->value != ob2->value |
202 | || ob1->name != ob2->name) |
193 | || ob1->name != ob2->name) |
203 | return 0; |
194 | return 0; |
204 | |
195 | |
205 | /* Do not merge objects if nrof would overflow. First part checks |
196 | /* Do not merge objects if nrof would overflow, assume nrof |
206 | * for unsigned overflow (2c), second part checks whether the result |
197 | * is always 0 .. 2**31-1 */ |
207 | * would fit into a 32 bit signed int, which is often used to hold |
198 | if (ob1->nrof > 0x7fffffff - ob2->nrof) |
208 | * nrof values. |
|
|
209 | */ |
|
|
210 | if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31)) |
|
|
211 | return 0; |
199 | return 0; |
212 | |
200 | |
213 | /* If the objects have been identified, set the BEEN_APPLIED flag. |
201 | /* If the objects have been identified, set the BEEN_APPLIED flag. |
214 | * This is to the comparison of the flags below will be OK. We |
202 | * This is to the comparison of the flags below will be OK. We |
215 | * just can't ignore the been applied or identified flags, as they |
203 | * just can't ignore the been applied or identified flags, as they |
… | |
… | |
220 | SET_FLAG (ob1, FLAG_BEEN_APPLIED); |
208 | SET_FLAG (ob1, FLAG_BEEN_APPLIED); |
221 | |
209 | |
222 | if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) |
210 | if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) |
223 | SET_FLAG (ob2, FLAG_BEEN_APPLIED); |
211 | SET_FLAG (ob2, FLAG_BEEN_APPLIED); |
224 | |
212 | |
225 | if (ob1->arch->name != ob2->arch->name |
213 | if (ob1->arch->archname != ob2->arch->archname |
226 | || ob1->name != ob2->name |
214 | || ob1->name != ob2->name |
227 | || ob1->title != ob2->title |
215 | || ob1->title != ob2->title |
228 | || ob1->msg != ob2->msg |
216 | || ob1->msg != ob2->msg |
229 | || ob1->weight != ob2->weight |
217 | || ob1->weight != ob2->weight |
230 | || ob1->attacktype != ob2->attacktype |
218 | || ob1->attacktype != ob2->attacktype |
231 | || ob1->magic != ob2->magic |
219 | || ob1->magic != ob2->magic |
232 | || ob1->slaying != ob2->slaying |
220 | || ob1->slaying != ob2->slaying |
233 | || ob1->skill != ob2->skill |
221 | || ob1->skill != ob2->skill |
234 | || ob1->value != ob2->value |
222 | || ob1->value != ob2->value |
235 | || ob1->animation_id != ob2->animation_id |
223 | || ob1->animation_id != ob2->animation_id |
|
|
224 | || (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other |
236 | || ob1->client_type != ob2->client_type |
225 | || ob1->client_type != ob2->client_type |
237 | || ob1->materialname != ob2->materialname |
226 | || ob1->materialname != ob2->materialname |
238 | || ob1->lore != ob2->lore |
227 | || ob1->lore != ob2->lore |
239 | || ob1->subtype != ob2->subtype |
228 | || ob1->subtype != ob2->subtype |
240 | || ob1->move_type != ob2->move_type |
229 | || ob1->move_type != ob2->move_type |
241 | || ob1->move_block != ob2->move_block |
230 | || ob1->move_block != ob2->move_block |
242 | || ob1->move_allow != ob2->move_allow |
231 | || ob1->move_allow != ob2->move_allow |
243 | || ob1->move_on != ob2->move_on |
232 | || ob1->move_on != ob2->move_on |
244 | || ob1->move_off != ob2->move_off |
233 | || ob1->move_off != ob2->move_off |
245 | || ob1->move_slow != ob2->move_slow |
234 | || ob1->move_slow != ob2->move_slow |
246 | || ob1->move_slow_penalty != ob2->move_slow_penalty |
235 | || fabs (ob1->move_slow_penalty - ob2->move_slow_penalty) < (1.f / 1024.f) |
247 | || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) |
236 | || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) |
248 | || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats))) |
237 | || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats))) |
249 | return 0; |
238 | return 0; |
250 | |
239 | |
251 | if ((ob1->flag ^ ob2->flag) |
240 | if ((ob1->flag ^ ob2->flag) |
252 | .reset (FLAG_INV_LOCKED) |
241 | .reset (FLAG_INV_LOCKED) |
253 | .reset (FLAG_CLIENT_SENT) |
|
|
254 | .reset (FLAG_REMOVED) |
242 | .reset (FLAG_REMOVED) |
255 | .any ()) |
243 | .any ()) |
256 | return 0; |
244 | return 0; |
257 | |
245 | |
258 | /* This is really a spellbook check - we should in general |
246 | /* This is really a spellbook check - we should in general |
… | |
… | |
334 | |
322 | |
335 | // find player who can see this object |
323 | // find player who can see this object |
336 | object * |
324 | object * |
337 | object::visible_to () const |
325 | object::visible_to () const |
338 | { |
326 | { |
339 | if (!flag [FLAG_REMOVED]) |
327 | if (client_visible () && !flag [FLAG_REMOVED]) |
340 | { |
328 | { |
341 | // see if we are in a container of sorts |
329 | // see if we are in a container of sorts |
342 | if (env) |
330 | if (env) |
343 | { |
331 | { |
344 | // the player inventory itself is always visible |
332 | // the player inventory itself is always visible |
345 | if (env->type == PLAYER) |
333 | if (env->is_player ()) |
346 | return env; |
334 | return env; |
347 | |
335 | |
348 | // else a player could have our env open |
336 | // else a player could have our env open |
349 | object *envest = env->outer_env (); |
337 | object *envest = env->outer_env_or_self (); |
350 | |
338 | |
351 | // the player itself is always on a map, so we will find him here |
339 | // the player itself is always on a map, so we will find him here |
352 | // even if our inv is in a player. |
340 | // even if our inv is in a player. |
353 | if (envest->is_on_map ()) |
341 | if (envest->is_on_map ()) |
354 | if (object *pl = envest->ms ().player ()) |
342 | if (object *pl = envest->ms ().player ()) |
355 | if (pl->container == env) |
343 | if (pl->container_ () == env) |
356 | return pl; |
344 | return pl; |
357 | } |
345 | } |
358 | else |
346 | else |
359 | { |
347 | { |
360 | // maybe there is a player standing on the same mapspace |
348 | // maybe there is a player standing on the same mapspace |
361 | // this will catch the case where "this" is a player |
349 | // this will catch the case where "this" is a player |
362 | if (object *pl = ms ().player ()) |
350 | if (object *pl = ms ().player ()) |
|
|
351 | if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look) |
|
|
352 | || pl->container_ () == this) |
363 | return pl; |
353 | return pl; |
364 | } |
354 | } |
365 | } |
355 | } |
366 | |
356 | |
367 | return 0; |
357 | return 0; |
368 | } |
358 | } |
369 | |
359 | |
370 | // adjust weight per container type ("of holding") |
360 | // adjust weight per container type ("of holding") |
371 | static sint32 |
361 | static sint32 |
372 | weight_adjust (object *op, sint32 weight) |
362 | weight_adjust_for (object *op, sint32 weight) |
373 | { |
363 | { |
374 | return op->type == CONTAINER |
364 | return op->type == CONTAINER |
375 | ? lerp (weight, 0, 100, 0, 100 - op->stats.Str) |
365 | ? lerp (weight, 0, 100, 0, 100 - op->stats.Str) |
376 | : weight; |
366 | : weight; |
377 | } |
367 | } |
… | |
… | |
383 | static void |
373 | static void |
384 | adjust_weight (object *op, sint32 weight) |
374 | adjust_weight (object *op, sint32 weight) |
385 | { |
375 | { |
386 | while (op) |
376 | while (op) |
387 | { |
377 | { |
|
|
378 | // adjust by actual difference to account for rounding errors |
|
|
379 | // i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct |
388 | weight = weight_adjust (op, weight); |
380 | weight = weight_adjust_for (op, op->carrying) |
|
|
381 | - weight_adjust_for (op, op->carrying - weight); |
389 | |
382 | |
390 | if (!weight) |
383 | if (!weight) |
391 | return; |
384 | return; |
392 | |
385 | |
393 | op->carrying += weight; |
386 | op->carrying += weight; |
… | |
… | |
416 | op->update_weight (); |
409 | op->update_weight (); |
417 | |
410 | |
418 | sum += op->total_weight (); |
411 | sum += op->total_weight (); |
419 | } |
412 | } |
420 | |
413 | |
421 | sum = weight_adjust (this, sum); |
414 | sum = weight_adjust_for (this, sum); |
422 | |
415 | |
423 | if (sum != carrying) |
416 | if (sum != carrying) |
424 | { |
417 | { |
425 | carrying = sum; |
418 | carrying = sum; |
426 | |
419 | |
… | |
… | |
442 | object_freezer freezer; |
435 | object_freezer freezer; |
443 | op->write (freezer); |
436 | op->write (freezer); |
444 | return freezer.as_string (); |
437 | return freezer.as_string (); |
445 | } |
438 | } |
446 | |
439 | |
447 | /* |
440 | char * |
448 | * get_nearest_part(multi-object, object 2) returns the part of the |
441 | object::as_string () |
449 | * multi-object 1 which is closest to the second object. |
|
|
450 | * If it's not a multi-object, it is returned. |
|
|
451 | */ |
|
|
452 | object * |
|
|
453 | get_nearest_part (object *op, const object *pl) |
|
|
454 | { |
442 | { |
455 | object *tmp, *closest; |
443 | return dump_object (this); |
456 | int last_dist, i; |
|
|
457 | |
|
|
458 | if (!op->more) |
|
|
459 | return op; |
|
|
460 | |
|
|
461 | for (last_dist = distance (op, pl), closest = op, tmp = op->more; |
|
|
462 | tmp; |
|
|
463 | tmp = tmp->more) |
|
|
464 | if ((i = distance (tmp, pl)) < last_dist) |
|
|
465 | closest = tmp, last_dist = i; |
|
|
466 | |
|
|
467 | return closest; |
|
|
468 | } |
444 | } |
469 | |
445 | |
470 | /* |
446 | /* |
471 | * Returns the object which has the count-variable equal to the argument. |
447 | * Returns the object which has the count-variable equal to the argument. |
472 | * VERRRY slow. |
448 | * VERRRY slow. |
… | |
… | |
488 | */ |
464 | */ |
489 | object * |
465 | object * |
490 | find_object_name (const char *str) |
466 | find_object_name (const char *str) |
491 | { |
467 | { |
492 | shstr_cmp str_ (str); |
468 | shstr_cmp str_ (str); |
493 | object *op; |
|
|
494 | |
469 | |
|
|
470 | if (str_) |
495 | for_all_objects (op) |
471 | for_all_objects (op) |
496 | if (op->name == str_) |
472 | if (op->name == str_) |
497 | break; |
473 | return op; |
498 | |
474 | |
499 | return op; |
475 | return 0; |
500 | } |
476 | } |
501 | |
477 | |
502 | /* |
478 | /* |
503 | * Sets the owner and sets the skill and exp pointers to owner's current |
479 | * Sets the owner and sets the skill and exp pointers to owner's current |
504 | * skill and experience objects. |
480 | * skill and experience objects. |
… | |
… | |
566 | update_stats (); |
542 | update_stats (); |
567 | |
543 | |
568 | new_draw_info_format (NDI_UNIQUE, 0, this, |
544 | new_draw_info_format (NDI_UNIQUE, 0, this, |
569 | "You try to balance all your items at once, " |
545 | "You try to balance all your items at once, " |
570 | "but the %s is just too much for your body. " |
546 | "but the %s is just too much for your body. " |
571 | "[You need to unapply some items first.]", &ob->name); |
547 | "[You need to unapply some items first - use the 'body' command to see " |
|
|
548 | "how many items you cna wera on a specific body part.]", &ob->name); |
572 | return false; |
549 | return false; |
573 | } |
550 | } |
574 | |
551 | |
575 | //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name); |
552 | //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name); |
576 | } |
553 | } |
… | |
… | |
602 | } |
579 | } |
603 | |
580 | |
604 | op->key_values = 0; |
581 | op->key_values = 0; |
605 | } |
582 | } |
606 | |
583 | |
607 | object & |
584 | /* |
608 | object::operator =(const object &src) |
585 | * copy_to first frees everything allocated by the dst object, |
|
|
586 | * and then copies the contents of itself into the second |
|
|
587 | * object, allocating what needs to be allocated. Basically, any |
|
|
588 | * data that is malloc'd needs to be re-malloc/copied. Otherwise, |
|
|
589 | * if the first object is freed, the pointers in the new object |
|
|
590 | * will point at garbage. |
|
|
591 | */ |
|
|
592 | void |
|
|
593 | object::copy_to (object *dst) |
609 | { |
594 | { |
610 | bool is_freed = flag [FLAG_FREED]; |
595 | dst->remove (); |
611 | bool is_removed = flag [FLAG_REMOVED]; |
|
|
612 | |
|
|
613 | *(object_copy *)this = src; |
596 | *(object_copy *)dst = *this; |
614 | |
|
|
615 | flag [FLAG_FREED] = is_freed; |
|
|
616 | flag [FLAG_REMOVED] = is_removed; |
597 | dst->flag [FLAG_REMOVED] = true; |
617 | |
598 | |
618 | /* Copy over key_values, if any. */ |
599 | /* Copy over key_values, if any. */ |
619 | if (src.key_values) |
600 | if (key_values) |
620 | { |
601 | { |
621 | key_value *tail = 0; |
602 | key_value *tail = 0; |
622 | key_values = 0; |
603 | dst->key_values = 0; |
623 | |
604 | |
624 | for (key_value *i = src.key_values; i; i = i->next) |
605 | for (key_value *i = key_values; i; i = i->next) |
625 | { |
606 | { |
626 | key_value *new_link = new key_value; |
607 | key_value *new_link = new key_value; |
627 | |
608 | |
628 | new_link->next = 0; |
609 | new_link->next = 0; |
629 | new_link->key = i->key; |
610 | new_link->key = i->key; |
630 | new_link->value = i->value; |
611 | new_link->value = i->value; |
631 | |
612 | |
632 | /* Try and be clever here, too. */ |
613 | /* Try and be clever here, too. */ |
633 | if (!key_values) |
614 | if (!dst->key_values) |
634 | { |
615 | { |
635 | key_values = new_link; |
616 | dst->key_values = new_link; |
636 | tail = new_link; |
617 | tail = new_link; |
637 | } |
618 | } |
638 | else |
619 | else |
639 | { |
620 | { |
640 | tail->next = new_link; |
621 | tail->next = new_link; |
641 | tail = new_link; |
622 | tail = new_link; |
642 | } |
623 | } |
643 | } |
624 | } |
644 | } |
625 | } |
645 | } |
|
|
646 | |
|
|
647 | /* |
|
|
648 | * copy_to first frees everything allocated by the dst object, |
|
|
649 | * and then copies the contents of itself into the second |
|
|
650 | * object, allocating what needs to be allocated. Basically, any |
|
|
651 | * data that is malloc'd needs to be re-malloc/copied. Otherwise, |
|
|
652 | * if the first object is freed, the pointers in the new object |
|
|
653 | * will point at garbage. |
|
|
654 | */ |
|
|
655 | void |
|
|
656 | object::copy_to (object *dst) |
|
|
657 | { |
|
|
658 | *dst = *this; |
|
|
659 | |
626 | |
660 | if (speed < 0) |
627 | if (speed < 0) |
661 | dst->speed_left -= rndm (); |
628 | dst->speed_left -= rndm (); |
662 | |
629 | |
663 | dst->set_speed (dst->speed); |
630 | dst->activate (); |
664 | } |
631 | } |
665 | |
632 | |
666 | void |
633 | void |
667 | object::instantiate () |
634 | object::instantiate () |
668 | { |
635 | { |
… | |
… | |
685 | object * |
652 | object * |
686 | object::clone () |
653 | object::clone () |
687 | { |
654 | { |
688 | object *neu = create (); |
655 | object *neu = create (); |
689 | copy_to (neu); |
656 | copy_to (neu); |
|
|
657 | neu->map = map; // not copied by copy_to |
690 | return neu; |
658 | return neu; |
691 | } |
659 | } |
692 | |
660 | |
693 | /* |
661 | /* |
694 | * If an object with the IS_TURNABLE() flag needs to be turned due |
662 | * If an object with the IS_TURNABLE() flag needs to be turned due |
… | |
… | |
711 | * This function needs to be called whenever the speed of an object changes. |
679 | * This function needs to be called whenever the speed of an object changes. |
712 | */ |
680 | */ |
713 | void |
681 | void |
714 | object::set_speed (float speed) |
682 | object::set_speed (float speed) |
715 | { |
683 | { |
716 | if (flag [FLAG_FREED] && speed) |
|
|
717 | { |
|
|
718 | LOG (llevError, "Object %s is freed but has speed.\n", &name); |
|
|
719 | speed = 0; |
|
|
720 | } |
|
|
721 | |
|
|
722 | this->speed = speed; |
684 | this->speed = speed; |
723 | |
685 | |
724 | if (has_active_speed ()) |
686 | if (has_active_speed ()) |
725 | activate (); |
687 | activate (); |
726 | else |
688 | else |
… | |
… | |
745 | * UP_OBJ_FACE: only the objects face has changed. |
707 | * UP_OBJ_FACE: only the objects face has changed. |
746 | */ |
708 | */ |
747 | void |
709 | void |
748 | update_object (object *op, int action) |
710 | update_object (object *op, int action) |
749 | { |
711 | { |
750 | if (op == NULL) |
712 | if (!op) |
751 | { |
713 | { |
752 | /* this should never happen */ |
714 | /* this should never happen */ |
753 | LOG (llevDebug, "update_object() called for NULL object.\n"); |
715 | LOG (llevError | logBacktrace, "update_object() called for NULL object.\n"); |
754 | return; |
716 | return; |
755 | } |
717 | } |
756 | |
718 | |
757 | if (op->env) |
719 | if (!op->is_on_map ()) |
758 | { |
720 | { |
759 | /* Animation is currently handled by client, so nothing |
721 | /* Animation is currently handled by client, so nothing |
760 | * to do in this case. |
722 | * to do in this case. |
761 | */ |
723 | */ |
762 | return; |
724 | return; |
763 | } |
725 | } |
764 | |
|
|
765 | /* If the map is saving, don't do anything as everything is |
|
|
766 | * going to get freed anyways. |
|
|
767 | */ |
|
|
768 | if (!op->map || op->map->in_memory == MAP_SAVING) |
|
|
769 | return; |
|
|
770 | |
726 | |
771 | /* make sure the object is within map boundaries */ |
727 | /* make sure the object is within map boundaries */ |
772 | if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height) |
728 | if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height) |
773 | { |
729 | { |
774 | LOG (llevError, "update_object() called for object out of map!\n"); |
730 | LOG (llevError, "update_object() called for object out of map!\n"); |
… | |
… | |
782 | |
738 | |
783 | if (!(m.flags_ & P_UPTODATE)) |
739 | if (!(m.flags_ & P_UPTODATE)) |
784 | /* nop */; |
740 | /* nop */; |
785 | else if (action == UP_OBJ_INSERT) |
741 | else if (action == UP_OBJ_INSERT) |
786 | { |
742 | { |
|
|
743 | #if 0 |
787 | // this is likely overkill, TODO: revisit (schmorp) |
744 | // this is likely overkill, TODO: revisit (schmorp) |
788 | if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) |
745 | if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) |
789 | || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) |
746 | || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) |
790 | || (op->type == PLAYER && !(m.flags_ & P_PLAYER)) |
747 | || (op->is_player () && !(m.flags_ & P_PLAYER)) |
791 | || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) |
748 | || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) |
792 | || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) |
749 | || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) |
793 | || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) |
750 | || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) |
794 | || (m.move_on | op->move_on ) != m.move_on |
751 | || (m.move_on | op->move_on ) != m.move_on |
795 | || (m.move_off | op->move_off ) != m.move_off |
752 | || (m.move_off | op->move_off ) != m.move_off |
796 | || (m.move_slow | op->move_slow) != m.move_slow |
753 | || (m.move_slow | op->move_slow) != m.move_slow |
797 | /* This isn't perfect, but I don't expect a lot of objects to |
754 | /* This isn't perfect, but I don't expect a lot of objects to |
798 | * to have move_allow right now. |
755 | * have move_allow right now. |
799 | */ |
756 | */ |
800 | || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block |
757 | || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block |
|
|
758 | m.invalidate (); |
|
|
759 | #else |
801 | || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) |
760 | // the above is not strong enough a test to skip updating. los maybe? TODO (schmorp) |
802 | m.flags_ = 0; |
761 | m.invalidate (); |
|
|
762 | #endif |
803 | } |
763 | } |
804 | /* if the object is being removed, we can't make intelligent |
764 | /* if the object is being removed, we can't make intelligent |
805 | * decisions, because remove_ob can't really pass the object |
765 | * decisions, because remove_ob can't really pass the object |
806 | * that is being removed. |
766 | * that is being removed. |
807 | */ |
767 | */ |
808 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
768 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
809 | m.flags_ = 0; |
769 | m.invalidate (); |
810 | else if (action == UP_OBJ_FACE) |
770 | else if (action == UP_OBJ_FACE) |
811 | /* Nothing to do for that case */ ; |
771 | /* Nothing to do for that case */ ; |
812 | else |
772 | else |
813 | LOG (llevError, "update_object called with invalid action: %d\n", action); |
773 | LOG (llevError, "update_object called with invalid action: %d\n", action); |
814 | |
774 | |
… | |
… | |
818 | |
778 | |
819 | object::object () |
779 | object::object () |
820 | { |
780 | { |
821 | SET_FLAG (this, FLAG_REMOVED); |
781 | SET_FLAG (this, FLAG_REMOVED); |
822 | |
782 | |
823 | expmul = 1.0; |
783 | //expmul = 1.0; declared const for the time being |
824 | face = blank_face; |
784 | face = blank_face; |
825 | } |
785 | } |
826 | |
786 | |
827 | object::~object () |
787 | object::~object () |
828 | { |
788 | { |
… | |
… | |
858 | /* If already on active list, don't do anything */ |
818 | /* If already on active list, don't do anything */ |
859 | if (active) |
819 | if (active) |
860 | return; |
820 | return; |
861 | |
821 | |
862 | if (has_active_speed ()) |
822 | if (has_active_speed ()) |
|
|
823 | { |
|
|
824 | if (flag [FLAG_FREED]) |
|
|
825 | LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D |
|
|
826 | |
863 | actives.insert (this); |
827 | actives.insert (this); |
|
|
828 | } |
864 | } |
829 | } |
865 | |
830 | |
866 | void |
831 | void |
867 | object::activate_recursive () |
832 | object::activate_recursive () |
868 | { |
833 | { |
… | |
… | |
917 | object::destroy_inv (bool drop_to_ground) |
882 | object::destroy_inv (bool drop_to_ground) |
918 | { |
883 | { |
919 | // need to check first, because the checks below might segfault |
884 | // need to check first, because the checks below might segfault |
920 | // as we might be on an invalid mapspace and crossfire code |
885 | // as we might be on an invalid mapspace and crossfire code |
921 | // is too buggy to ensure that the inventory is empty. |
886 | // is too buggy to ensure that the inventory is empty. |
922 | // corollary: if you create arrows etc. with stuff in tis inventory, |
887 | // corollary: if you create arrows etc. with stuff in its inventory, |
923 | // cf will crash below with off-map x and y |
888 | // cf will crash below with off-map x and y |
924 | if (!inv) |
889 | if (!inv) |
925 | return; |
890 | return; |
926 | |
891 | |
927 | /* Only if the space blocks everything do we not process - |
892 | /* Only if the space blocks everything do we not process - |
… | |
… | |
929 | * drop on that space. |
894 | * drop on that space. |
930 | */ |
895 | */ |
931 | if (!drop_to_ground |
896 | if (!drop_to_ground |
932 | || !map |
897 | || !map |
933 | || map->in_memory != MAP_ACTIVE |
898 | || map->in_memory != MAP_ACTIVE |
934 | || map->nodrop |
899 | || map->no_drop |
935 | || ms ().move_block == MOVE_ALL) |
900 | || ms ().move_block == MOVE_ALL) |
936 | { |
901 | { |
937 | while (inv) |
902 | while (inv) |
938 | { |
|
|
939 | inv->destroy_inv (drop_to_ground); |
|
|
940 | inv->destroy (); |
903 | inv->destroy (); |
941 | } |
|
|
942 | } |
904 | } |
943 | else |
905 | else |
944 | { /* Put objects in inventory onto this space */ |
906 | { /* Put objects in inventory onto this space */ |
945 | while (inv) |
907 | while (inv) |
946 | { |
908 | { |
… | |
… | |
964 | object *op = new object; |
926 | object *op = new object; |
965 | op->link (); |
927 | op->link (); |
966 | return op; |
928 | return op; |
967 | } |
929 | } |
968 | |
930 | |
|
|
931 | static struct freed_map : maptile |
|
|
932 | { |
|
|
933 | freed_map () |
|
|
934 | { |
|
|
935 | path = "<freed objects map>"; |
|
|
936 | name = "/internal/freed_objects_map"; |
|
|
937 | width = 3; |
|
|
938 | height = 3; |
|
|
939 | no_drop = 1; |
|
|
940 | no_reset = 1; |
|
|
941 | |
|
|
942 | alloc (); |
|
|
943 | in_memory = MAP_ACTIVE; |
|
|
944 | } |
|
|
945 | |
|
|
946 | ~freed_map () |
|
|
947 | { |
|
|
948 | destroy (); |
|
|
949 | } |
|
|
950 | } freed_map; // freed objects are moved here to avoid crashes |
|
|
951 | |
969 | void |
952 | void |
970 | object::do_destroy () |
953 | object::do_destroy () |
971 | { |
954 | { |
972 | if (flag [FLAG_IS_LINKED]) |
955 | if (flag [FLAG_IS_LINKED]) |
973 | remove_button_link (this); |
956 | remove_link (); |
974 | |
957 | |
975 | if (flag [FLAG_FRIENDLY]) |
958 | if (flag [FLAG_FRIENDLY]) |
976 | remove_friendly_object (this); |
959 | remove_friendly_object (this); |
977 | |
960 | |
978 | remove (); |
961 | remove (); |
979 | |
962 | |
980 | attachable::do_destroy (); |
963 | attachable::do_destroy (); |
981 | |
964 | |
982 | destroy_inv (true); |
|
|
983 | |
|
|
984 | deactivate (); |
965 | deactivate (); |
985 | unlink (); |
966 | unlink (); |
986 | |
967 | |
987 | flag [FLAG_FREED] = 1; |
968 | flag [FLAG_FREED] = 1; |
988 | |
969 | |
989 | // hack to ensure that freed objects still have a valid map |
970 | // hack to ensure that freed objects still have a valid map |
990 | { |
|
|
991 | static maptile *freed_map; // freed objects are moved here to avoid crashes |
|
|
992 | |
|
|
993 | if (!freed_map) |
|
|
994 | { |
|
|
995 | freed_map = new maptile; |
|
|
996 | |
|
|
997 | freed_map->path = "<freed objects map>"; |
|
|
998 | freed_map->name = "/internal/freed_objects_map"; |
|
|
999 | freed_map->width = 3; |
|
|
1000 | freed_map->height = 3; |
|
|
1001 | freed_map->nodrop = 1; |
|
|
1002 | |
|
|
1003 | freed_map->alloc (); |
|
|
1004 | freed_map->in_memory = MAP_ACTIVE; |
|
|
1005 | } |
|
|
1006 | |
|
|
1007 | map = freed_map; |
971 | map = &freed_map; |
1008 | x = 1; |
972 | x = 1; |
1009 | y = 1; |
973 | y = 1; |
1010 | } |
|
|
1011 | |
974 | |
1012 | if (more) |
975 | if (more) |
1013 | { |
976 | { |
1014 | more->destroy (); |
977 | more->destroy (); |
1015 | more = 0; |
978 | more = 0; |
… | |
… | |
1023 | attacked_by = 0; |
986 | attacked_by = 0; |
1024 | current_weapon = 0; |
987 | current_weapon = 0; |
1025 | } |
988 | } |
1026 | |
989 | |
1027 | void |
990 | void |
1028 | object::destroy (bool destroy_inventory) |
991 | object::destroy () |
1029 | { |
992 | { |
1030 | if (destroyed ()) |
993 | if (destroyed ()) |
1031 | return; |
994 | return; |
1032 | |
995 | |
1033 | if (destroy_inventory) |
996 | if (!is_head () && !head->destroyed ()) |
|
|
997 | { |
|
|
998 | LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); |
|
|
999 | head->destroy (); |
|
|
1000 | return; |
|
|
1001 | } |
|
|
1002 | |
1034 | destroy_inv (false); |
1003 | destroy_inv (false); |
1035 | |
1004 | |
1036 | if (is_head ()) |
1005 | if (is_head ()) |
1037 | if (sound_destroy) |
1006 | if (sound_destroy) |
1038 | play_sound (sound_destroy); |
1007 | play_sound (sound_destroy); |
1039 | else if (flag [FLAG_MONSTER]) |
1008 | else if (flag [FLAG_MONSTER]) |
… | |
… | |
1050 | * the previous environment. |
1019 | * the previous environment. |
1051 | */ |
1020 | */ |
1052 | void |
1021 | void |
1053 | object::do_remove () |
1022 | object::do_remove () |
1054 | { |
1023 | { |
1055 | object *tmp, *last = 0; |
|
|
1056 | object *otmp; |
|
|
1057 | |
|
|
1058 | if (flag [FLAG_REMOVED]) |
1024 | if (flag [FLAG_REMOVED]) |
1059 | return; |
1025 | return; |
1060 | |
1026 | |
1061 | INVOKE_OBJECT (REMOVE, this); |
1027 | INVOKE_OBJECT (REMOVE, this); |
1062 | |
|
|
1063 | if (object *pl = visible_to ()) |
|
|
1064 | esrv_del_item (pl->contr, count); |
|
|
1065 | |
1028 | |
1066 | flag [FLAG_REMOVED] = true; |
1029 | flag [FLAG_REMOVED] = true; |
1067 | |
1030 | |
1068 | if (more) |
1031 | if (more) |
1069 | more->remove (); |
1032 | more->remove (); |
… | |
… | |
1072 | * In this case, the object to be removed is in someones |
1035 | * In this case, the object to be removed is in someones |
1073 | * inventory. |
1036 | * inventory. |
1074 | */ |
1037 | */ |
1075 | if (env) |
1038 | if (env) |
1076 | { |
1039 | { |
|
|
1040 | flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed |
|
|
1041 | if (object *pl = visible_to ()) |
|
|
1042 | esrv_del_item (pl->contr, count); |
|
|
1043 | flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed |
|
|
1044 | |
1077 | adjust_weight (env, -total_weight ()); |
1045 | adjust_weight (env, -total_weight ()); |
1078 | |
1046 | |
1079 | *(above ? &above->below : &env->inv) = below; |
1047 | object *pl = in_player (); |
1080 | |
|
|
1081 | if (below) |
|
|
1082 | below->above = above; |
|
|
1083 | |
1048 | |
1084 | /* we set up values so that it could be inserted into |
1049 | /* we set up values so that it could be inserted into |
1085 | * the map, but we don't actually do that - it is up |
1050 | * the map, but we don't actually do that - it is up |
1086 | * to the caller to decide what we want to do. |
1051 | * to the caller to decide what we want to do. |
1087 | */ |
1052 | */ |
1088 | map = env->map; |
1053 | map = env->map; |
1089 | x = env->x; |
1054 | x = env->x; |
1090 | y = env->y; |
1055 | y = env->y; |
|
|
1056 | |
|
|
1057 | // make sure cmov optimisation is applicable |
|
|
1058 | *(above ? &above->below : &env->inv) = below; |
|
|
1059 | *(below ? &below->above : &above ) = above; // &above is just a dummy |
|
|
1060 | |
1091 | above = 0; |
1061 | above = 0; |
1092 | below = 0; |
1062 | below = 0; |
1093 | env = 0; |
1063 | env = 0; |
1094 | |
1064 | |
1095 | /* NO_FIX_PLAYER is set when a great many changes are being |
1065 | /* NO_FIX_PLAYER is set when a great many changes are being |
1096 | * made to players inventory. If set, avoiding the call |
1066 | * made to players inventory. If set, avoiding the call |
1097 | * to save cpu time. |
1067 | * to save cpu time. |
1098 | */ |
1068 | */ |
1099 | if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1069 | if (pl) |
|
|
1070 | if (pl->is_player () && (glow_radius || !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER))) |
|
|
1071 | { |
1100 | otmp->update_stats (); |
1072 | pl->update_stats (); |
|
|
1073 | |
|
|
1074 | if (glow_radius && pl->is_on_map ()) |
|
|
1075 | update_all_los (pl->map, pl->x, pl->y); |
|
|
1076 | } |
1101 | } |
1077 | } |
1102 | else if (map) |
1078 | else if (map) |
1103 | { |
1079 | { |
1104 | if (type == PLAYER) |
|
|
1105 | { |
|
|
1106 | // leaving a spot always closes any open container on the ground |
|
|
1107 | if (container && !container->env) |
|
|
1108 | // this causes spurious floorbox updates, but it ensures |
|
|
1109 | // that the CLOSE event is being sent. |
|
|
1110 | close_container (); |
|
|
1111 | |
|
|
1112 | --map->players; |
|
|
1113 | map->touch (); |
|
|
1114 | } |
|
|
1115 | |
|
|
1116 | map->dirty = true; |
1080 | map->dirty = true; |
1117 | mapspace &ms = this->ms (); |
1081 | mapspace &ms = this->ms (); |
1118 | |
1082 | |
|
|
1083 | if (object *pl = ms.player ()) |
|
|
1084 | { |
|
|
1085 | if (is_player ()) |
|
|
1086 | { |
|
|
1087 | if (!flag [FLAG_WIZPASS]) |
|
|
1088 | ms.smell = ++mapspace::smellcount; // remember the smell of the player |
|
|
1089 | |
|
|
1090 | // leaving a spot always closes any open container on the ground |
|
|
1091 | if (container && !container->env) |
|
|
1092 | // this causes spurious floorbox updates, but it ensures |
|
|
1093 | // that the CLOSE event is being sent. |
|
|
1094 | close_container (); |
|
|
1095 | |
|
|
1096 | --map->players; |
|
|
1097 | map->touch (); |
|
|
1098 | } |
|
|
1099 | else if (pl->container_ () == this) |
|
|
1100 | { |
|
|
1101 | // removing a container should close it |
|
|
1102 | close_container (); |
|
|
1103 | } |
|
|
1104 | |
|
|
1105 | esrv_del_item (pl->contr, count); |
|
|
1106 | } |
|
|
1107 | |
1119 | /* link the object above us */ |
1108 | /* link the object above us */ |
1120 | if (above) |
1109 | // re-link, make sure compiler can easily use cmove |
1121 | above->below = below; |
1110 | *(above ? &above->below : &ms.top) = below; |
1122 | else |
1111 | *(below ? &below->above : &ms.bot) = above; |
1123 | ms.top = below; /* we were top, set new top */ |
|
|
1124 | |
|
|
1125 | /* Relink the object below us, if there is one */ |
|
|
1126 | if (below) |
|
|
1127 | below->above = above; |
|
|
1128 | else |
|
|
1129 | { |
|
|
1130 | /* Nothing below, which means we need to relink map object for this space |
|
|
1131 | * use translated coordinates in case some oddness with map tiling is |
|
|
1132 | * evident |
|
|
1133 | */ |
|
|
1134 | if (GET_MAP_OB (map, x, y) != this) |
|
|
1135 | LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom? %s\n", debug_desc ()); |
|
|
1136 | |
|
|
1137 | ms.bot = above; /* goes on above it. */ |
|
|
1138 | } |
|
|
1139 | |
1112 | |
1140 | above = 0; |
1113 | above = 0; |
1141 | below = 0; |
1114 | below = 0; |
1142 | |
1115 | |
|
|
1116 | ms.invalidate (); |
|
|
1117 | |
1143 | if (map->in_memory == MAP_SAVING) |
1118 | if (map->in_memory == MAP_SAVING) |
1144 | return; |
1119 | return; |
1145 | |
1120 | |
1146 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1121 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1147 | |
1122 | |
1148 | if (object *pl = ms.player ()) |
1123 | if (object *pl = ms.player ()) |
1149 | { |
1124 | { |
1150 | if (pl->container == this) |
1125 | if (pl->container_ () == this) |
1151 | /* If a container that the player is currently using somehow gets |
1126 | /* If a container that the player is currently using somehow gets |
1152 | * removed (most likely destroyed), update the player view |
1127 | * removed (most likely destroyed), update the player view |
1153 | * appropriately. |
1128 | * appropriately. |
1154 | */ |
1129 | */ |
1155 | pl->close_container (); |
1130 | pl->close_container (); |
1156 | |
1131 | |
|
|
1132 | //TODO: the floorbox prev/next might need updating |
|
|
1133 | //esrv_del_item (pl->contr, count); |
|
|
1134 | //TODO: update floorbox to preserve ordering |
|
|
1135 | if (pl->contr->ns) |
1157 | pl->contr->ns->floorbox_update (); |
1136 | pl->contr->ns->floorbox_update (); |
1158 | } |
1137 | } |
1159 | |
1138 | |
|
|
1139 | if (check_walk_off) |
1160 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
1140 | for (object *above, *tmp = ms.bot; tmp; tmp = above) |
1161 | { |
1141 | { |
|
|
1142 | above = tmp->above; |
|
|
1143 | |
1162 | /* No point updating the players look faces if he is the object |
1144 | /* No point updating the players look faces if he is the object |
1163 | * being removed. |
1145 | * being removed. |
1164 | */ |
1146 | */ |
1165 | |
1147 | |
1166 | /* See if object moving off should effect something */ |
1148 | /* See if object moving off should effect something */ |
1167 | if (check_walk_off |
|
|
1168 | && ((move_type & tmp->move_off) |
1149 | if ((move_type & tmp->move_off) |
1169 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1150 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0) |
1170 | { |
|
|
1171 | move_apply (tmp, this, 0); |
1151 | move_apply (tmp, this, 0); |
1172 | |
|
|
1173 | if (destroyed ()) |
|
|
1174 | LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); |
|
|
1175 | } |
1152 | } |
1176 | |
1153 | |
1177 | last = tmp; |
1154 | if (affects_los ()) |
1178 | } |
|
|
1179 | |
|
|
1180 | /* last == NULL if there are no objects on this space */ |
|
|
1181 | //TODO: this makes little sense, why only update the topmost object? |
|
|
1182 | if (!last) |
|
|
1183 | map->at (x, y).flags_ = 0; |
|
|
1184 | else |
|
|
1185 | update_object (last, UP_OBJ_REMOVE); |
|
|
1186 | |
|
|
1187 | if (flag [FLAG_BLOCKSVIEW] || glow_radius) |
|
|
1188 | update_all_los (map, x, y); |
1155 | update_all_los (map, x, y); |
1189 | } |
1156 | } |
1190 | } |
1157 | } |
1191 | |
1158 | |
1192 | /* |
1159 | /* |
… | |
… | |
1216 | esrv_update_item (UPD_NROF, pl, top); |
1183 | esrv_update_item (UPD_NROF, pl, top); |
1217 | |
1184 | |
1218 | op->weight = 0; // cancel the addition above |
1185 | op->weight = 0; // cancel the addition above |
1219 | op->carrying = 0; // must be 0 already |
1186 | op->carrying = 0; // must be 0 already |
1220 | |
1187 | |
1221 | op->destroy (1); |
1188 | op->destroy (); |
1222 | |
1189 | |
1223 | return top; |
1190 | return top; |
1224 | } |
1191 | } |
1225 | |
1192 | |
1226 | return 0; |
1193 | return 0; |
… | |
… | |
1254 | * job preparing multi-part monsters. |
1221 | * job preparing multi-part monsters. |
1255 | */ |
1222 | */ |
1256 | object * |
1223 | object * |
1257 | insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) |
1224 | insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) |
1258 | { |
1225 | { |
|
|
1226 | op->remove (); |
|
|
1227 | |
1259 | for (object *tmp = op->head_ (); tmp; tmp = tmp->more) |
1228 | for (object *tmp = op->head_ (); tmp; tmp = tmp->more) |
1260 | { |
1229 | { |
1261 | tmp->x = x + tmp->arch->x; |
1230 | tmp->x = x + tmp->arch->x; |
1262 | tmp->y = y + tmp->arch->y; |
1231 | tmp->y = y + tmp->arch->y; |
1263 | } |
1232 | } |
… | |
… | |
1286 | * just 'op' otherwise |
1255 | * just 'op' otherwise |
1287 | */ |
1256 | */ |
1288 | object * |
1257 | object * |
1289 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1258 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1290 | { |
1259 | { |
1291 | assert (!op->flag [FLAG_FREED]); |
|
|
1292 | |
|
|
1293 | object *top, *floor = NULL; |
|
|
1294 | |
|
|
1295 | op->remove (); |
1260 | op->remove (); |
|
|
1261 | |
|
|
1262 | if (m == &freed_map)//D TODO: remove soon |
|
|
1263 | {//D |
|
|
1264 | LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D |
|
|
1265 | }//D |
1296 | |
1266 | |
1297 | /* Ideally, the caller figures this out. However, it complicates a lot |
1267 | /* Ideally, the caller figures this out. However, it complicates a lot |
1298 | * of areas of callers (eg, anything that uses find_free_spot would now |
1268 | * of areas of callers (eg, anything that uses find_free_spot would now |
1299 | * need extra work |
1269 | * need extra work |
1300 | */ |
1270 | */ |
|
|
1271 | maptile *newmap = m; |
1301 | if (!xy_normalise (m, op->x, op->y)) |
1272 | if (!xy_normalise (newmap, op->x, op->y)) |
1302 | { |
1273 | { |
1303 | op->destroy (); |
1274 | op->head_ ()->destroy ();// remove head_ once all tail object destroyers found |
1304 | return 0; |
1275 | return 0; |
1305 | } |
1276 | } |
1306 | |
1277 | |
1307 | if (object *more = op->more) |
1278 | if (object *more = op->more) |
1308 | if (!insert_ob_in_map (more, m, originator, flag)) |
1279 | if (!insert_ob_in_map (more, m, originator, flag)) |
1309 | return 0; |
1280 | return 0; |
1310 | |
1281 | |
1311 | CLEAR_FLAG (op, FLAG_REMOVED); |
1282 | op->flag [FLAG_REMOVED] = false; |
1312 | |
1283 | op->env = 0; |
1313 | op->map = m; |
1284 | op->map = newmap; |
|
|
1285 | |
1314 | mapspace &ms = op->ms (); |
1286 | mapspace &ms = op->ms (); |
1315 | |
1287 | |
1316 | /* this has to be done after we translate the coordinates. |
1288 | /* this has to be done after we translate the coordinates. |
1317 | */ |
1289 | */ |
1318 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1290 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1319 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1291 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1320 | if (object::can_merge (op, tmp)) |
1292 | if (object::can_merge (op, tmp)) |
1321 | { |
1293 | { |
|
|
1294 | // TODO: we actually want to update tmp, not op, |
|
|
1295 | // but some caller surely breaks when we return tmp |
|
|
1296 | // from here :/ |
1322 | op->nrof += tmp->nrof; |
1297 | op->nrof += tmp->nrof; |
1323 | tmp->destroy (1); |
1298 | tmp->destroy (); |
1324 | } |
1299 | } |
1325 | |
1300 | |
1326 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1301 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1327 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1302 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1328 | |
1303 | |
… | |
… | |
1335 | { |
1310 | { |
1336 | LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); |
1311 | LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); |
1337 | abort (); |
1312 | abort (); |
1338 | } |
1313 | } |
1339 | |
1314 | |
|
|
1315 | if (!originator->is_on_map ()) |
|
|
1316 | { |
|
|
1317 | LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map", |
|
|
1318 | op->debug_desc (), originator->debug_desc ()); |
|
|
1319 | abort (); |
|
|
1320 | } |
|
|
1321 | |
1340 | op->above = originator; |
1322 | op->above = originator; |
1341 | op->below = originator->below; |
1323 | op->below = originator->below; |
1342 | |
|
|
1343 | if (op->below) |
|
|
1344 | op->below->above = op; |
|
|
1345 | else |
|
|
1346 | ms.bot = op; |
|
|
1347 | |
|
|
1348 | /* since *below* originator, no need to update top */ |
|
|
1349 | originator->below = op; |
1324 | originator->below = op; |
|
|
1325 | |
|
|
1326 | *(op->below ? &op->below->above : &ms.bot) = op; |
1350 | } |
1327 | } |
1351 | else |
1328 | else |
1352 | { |
1329 | { |
1353 | top = ms.bot; |
1330 | object *floor = 0; |
|
|
1331 | object *top = ms.top; |
1354 | |
1332 | |
1355 | /* If there are other objects, then */ |
1333 | /* If there are other objects, then */ |
1356 | if (top) |
1334 | if (top) |
1357 | { |
1335 | { |
1358 | object *last = 0; |
|
|
1359 | |
|
|
1360 | /* |
1336 | /* |
1361 | * If there are multiple objects on this space, we do some trickier handling. |
1337 | * If there are multiple objects on this space, we do some trickier handling. |
1362 | * We've already dealt with merging if appropriate. |
1338 | * We've already dealt with merging if appropriate. |
1363 | * Generally, we want to put the new object on top. But if |
1339 | * Generally, we want to put the new object on top. But if |
1364 | * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last |
1340 | * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last |
… | |
… | |
1367 | * once we get to them. This reduces the need to traverse over all of |
1343 | * once we get to them. This reduces the need to traverse over all of |
1368 | * them when adding another one - this saves quite a bit of cpu time |
1344 | * them when adding another one - this saves quite a bit of cpu time |
1369 | * when lots of spells are cast in one area. Currently, it is presumed |
1345 | * when lots of spells are cast in one area. Currently, it is presumed |
1370 | * that flying non pickable objects are spell objects. |
1346 | * that flying non pickable objects are spell objects. |
1371 | */ |
1347 | */ |
1372 | for (top = ms.bot; top; top = top->above) |
1348 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1373 | { |
1349 | { |
1374 | if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) |
1350 | if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR)) |
1375 | floor = top; |
1351 | floor = tmp; |
1376 | |
1352 | |
1377 | if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) |
1353 | if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR)) |
1378 | { |
1354 | { |
1379 | /* We insert above top, so we want this object below this */ |
1355 | /* We insert above top, so we want this object below this */ |
1380 | top = top->below; |
1356 | top = tmp->below; |
1381 | break; |
1357 | break; |
1382 | } |
1358 | } |
1383 | |
1359 | |
1384 | last = top; |
1360 | top = tmp; |
1385 | } |
1361 | } |
1386 | |
|
|
1387 | /* Don't want top to be NULL, so set it to the last valid object */ |
|
|
1388 | top = last; |
|
|
1389 | |
1362 | |
1390 | /* We let update_position deal with figuring out what the space |
1363 | /* We let update_position deal with figuring out what the space |
1391 | * looks like instead of lots of conditions here. |
1364 | * looks like instead of lots of conditions here. |
1392 | * makes things faster, and effectively the same result. |
1365 | * makes things faster, and effectively the same result. |
1393 | */ |
1366 | */ |
… | |
… | |
1400 | */ |
1373 | */ |
1401 | if (!(flag & INS_ON_TOP) |
1374 | if (!(flag & INS_ON_TOP) |
1402 | && ms.flags () & P_BLOCKSVIEW |
1375 | && ms.flags () & P_BLOCKSVIEW |
1403 | && (op->face && !faces [op->face].visibility)) |
1376 | && (op->face && !faces [op->face].visibility)) |
1404 | { |
1377 | { |
|
|
1378 | object *last; |
|
|
1379 | |
1405 | for (last = top; last != floor; last = last->below) |
1380 | for (last = top; last != floor; last = last->below) |
1406 | if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) |
1381 | if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) |
1407 | break; |
1382 | break; |
1408 | |
1383 | |
1409 | /* Check to see if we found the object that blocks view, |
1384 | /* Check to see if we found the object that blocks view, |
… | |
… | |
1417 | } /* If objects on this space */ |
1392 | } /* If objects on this space */ |
1418 | |
1393 | |
1419 | if (flag & INS_ABOVE_FLOOR_ONLY) |
1394 | if (flag & INS_ABOVE_FLOOR_ONLY) |
1420 | top = floor; |
1395 | top = floor; |
1421 | |
1396 | |
1422 | /* Top is the object that our object (op) is going to get inserted above. |
1397 | // insert object above top, or bottom-most if top = 0 |
1423 | */ |
|
|
1424 | |
|
|
1425 | /* First object on this space */ |
|
|
1426 | if (!top) |
1398 | if (!top) |
1427 | { |
1399 | { |
|
|
1400 | op->below = 0; |
1428 | op->above = ms.bot; |
1401 | op->above = ms.bot; |
1429 | |
|
|
1430 | if (op->above) |
|
|
1431 | op->above->below = op; |
|
|
1432 | |
|
|
1433 | op->below = 0; |
|
|
1434 | ms.bot = op; |
1402 | ms.bot = op; |
|
|
1403 | |
|
|
1404 | *(op->above ? &op->above->below : &ms.top) = op; |
1435 | } |
1405 | } |
1436 | else |
1406 | else |
1437 | { /* get inserted into the stack above top */ |
1407 | { |
1438 | op->above = top->above; |
1408 | op->above = top->above; |
1439 | |
|
|
1440 | if (op->above) |
|
|
1441 | op->above->below = op; |
1409 | top->above = op; |
1442 | |
1410 | |
1443 | op->below = top; |
1411 | op->below = top; |
1444 | top->above = op; |
1412 | *(op->above ? &op->above->below : &ms.top) = op; |
1445 | } |
1413 | } |
|
|
1414 | } |
1446 | |
1415 | |
1447 | if (!op->above) |
1416 | if (op->is_player ()) |
1448 | ms.top = op; |
|
|
1449 | } /* else not INS_BELOW_ORIGINATOR */ |
|
|
1450 | |
|
|
1451 | if (op->type == PLAYER) |
|
|
1452 | { |
1417 | { |
1453 | op->contr->do_los = 1; |
1418 | op->contr->do_los = 1; |
1454 | ++op->map->players; |
1419 | ++op->map->players; |
1455 | op->map->touch (); |
1420 | op->map->touch (); |
1456 | } |
1421 | } |
1457 | |
1422 | |
1458 | op->map->dirty = true; |
1423 | op->map->dirty = true; |
1459 | |
1424 | |
1460 | if (object *pl = ms.player ()) |
1425 | if (object *pl = ms.player ()) |
|
|
1426 | //TODO: the floorbox prev/next might need updating |
|
|
1427 | //esrv_send_item (pl, op); |
|
|
1428 | //TODO: update floorbox to preserve ordering |
|
|
1429 | if (pl->contr->ns) |
1461 | pl->contr->ns->floorbox_update (); |
1430 | pl->contr->ns->floorbox_update (); |
1462 | |
1431 | |
1463 | /* If this object glows, it may affect lighting conditions that are |
1432 | /* If this object glows, it may affect lighting conditions that are |
1464 | * visible to others on this map. But update_all_los is really |
1433 | * visible to others on this map. But update_all_los is really |
1465 | * an inefficient way to do this, as it means los for all players |
1434 | * an inefficient way to do this, as it means los for all players |
1466 | * on the map will get recalculated. The players could very well |
1435 | * on the map will get recalculated. The players could very well |
1467 | * be far away from this change and not affected in any way - |
1436 | * be far away from this change and not affected in any way - |
1468 | * this should get redone to only look for players within range, |
1437 | * this should get redone to only look for players within range, |
1469 | * or just updating the P_UPTODATE for spaces within this area |
1438 | * or just updating the P_UPTODATE for spaces within this area |
1470 | * of effect may be sufficient. |
1439 | * of effect may be sufficient. |
1471 | */ |
1440 | */ |
1472 | if (op->map->darkness && (op->glow_radius != 0)) |
1441 | if (op->affects_los ()) |
|
|
1442 | { |
|
|
1443 | op->ms ().invalidate (); |
1473 | update_all_los (op->map, op->x, op->y); |
1444 | update_all_los (op->map, op->x, op->y); |
|
|
1445 | } |
1474 | |
1446 | |
1475 | /* updates flags (blocked, alive, no magic, etc) for this map space */ |
1447 | /* updates flags (blocked, alive, no magic, etc) for this map space */ |
1476 | update_object (op, UP_OBJ_INSERT); |
1448 | update_object (op, UP_OBJ_INSERT); |
1477 | |
1449 | |
1478 | INVOKE_OBJECT (INSERT, op); |
1450 | INVOKE_OBJECT (INSERT, op); |
… | |
… | |
1485 | * blocked() and wall() work properly), and these flags are updated by |
1457 | * blocked() and wall() work properly), and these flags are updated by |
1486 | * update_object(). |
1458 | * update_object(). |
1487 | */ |
1459 | */ |
1488 | |
1460 | |
1489 | /* if this is not the head or flag has been passed, don't check walk on status */ |
1461 | /* if this is not the head or flag has been passed, don't check walk on status */ |
1490 | if (!(flag & INS_NO_WALK_ON) && op->head_ () == op) |
1462 | if (!(flag & INS_NO_WALK_ON) && op->is_head ()) |
1491 | { |
1463 | { |
1492 | if (check_move_on (op, originator)) |
1464 | if (check_move_on (op, originator)) |
1493 | return 0; |
1465 | return 0; |
1494 | |
1466 | |
1495 | /* If we are a multi part object, lets work our way through the check |
1467 | /* If we are a multi part object, lets work our way through the check |
… | |
… | |
1506 | /* this function inserts an object in the map, but if it |
1478 | /* this function inserts an object in the map, but if it |
1507 | * finds an object of its own type, it'll remove that one first. |
1479 | * finds an object of its own type, it'll remove that one first. |
1508 | * op is the object to insert it under: supplies x and the map. |
1480 | * op is the object to insert it under: supplies x and the map. |
1509 | */ |
1481 | */ |
1510 | void |
1482 | void |
1511 | replace_insert_ob_in_map (const char *arch_string, object *op) |
1483 | replace_insert_ob_in_map (shstr_tmp archname, object *op) |
1512 | { |
1484 | { |
1513 | /* first search for itself and remove any old instances */ |
1485 | /* first search for itself and remove any old instances */ |
1514 | |
1486 | |
1515 | for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) |
1487 | for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) |
1516 | if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ |
1488 | if (tmp->arch->archname == archname) /* same archetype */ |
1517 | tmp->destroy (1); |
1489 | tmp->destroy (); |
1518 | |
1490 | |
1519 | object *tmp = arch_to_object (archetype::find (arch_string)); |
1491 | object *tmp = arch_to_object (archetype::find (archname)); |
1520 | |
1492 | |
1521 | tmp->x = op->x; |
1493 | tmp->x = op->x; |
1522 | tmp->y = op->y; |
1494 | tmp->y = op->y; |
1523 | |
1495 | |
1524 | insert_ob_in_map (tmp, op->map, op, 0); |
1496 | insert_ob_in_map (tmp, op->map, op, 0); |
… | |
… | |
1546 | if (!nr) |
1518 | if (!nr) |
1547 | return true; |
1519 | return true; |
1548 | |
1520 | |
1549 | nr = min (nr, nrof); |
1521 | nr = min (nr, nrof); |
1550 | |
1522 | |
|
|
1523 | if (nrof > nr) |
|
|
1524 | { |
1551 | nrof -= nr; |
1525 | nrof -= nr; |
1552 | |
|
|
1553 | if (nrof) |
|
|
1554 | { |
|
|
1555 | adjust_weight (env, -weight * nr); // carrying == 0 |
1526 | adjust_weight (env, -weight * max (1, nr)); // carrying == 0 |
1556 | |
1527 | |
1557 | if (object *pl = visible_to ()) |
1528 | if (object *pl = visible_to ()) |
1558 | esrv_update_item (UPD_NROF, pl, this); |
1529 | esrv_update_item (UPD_NROF, pl, this); |
1559 | |
1530 | |
1560 | return true; |
1531 | return true; |
1561 | } |
1532 | } |
1562 | else |
1533 | else |
1563 | { |
1534 | { |
1564 | destroy (1); |
1535 | destroy (); |
1565 | return false; |
1536 | return false; |
1566 | } |
1537 | } |
1567 | } |
1538 | } |
1568 | |
1539 | |
1569 | /* |
1540 | /* |
… | |
… | |
1586 | } |
1557 | } |
1587 | else |
1558 | else |
1588 | { |
1559 | { |
1589 | decrease (nr); |
1560 | decrease (nr); |
1590 | |
1561 | |
1591 | object *op = object_create_clone (this); |
1562 | object *op = deep_clone (); |
1592 | op->nrof = nr; |
1563 | op->nrof = nr; |
1593 | return op; |
1564 | return op; |
1594 | } |
1565 | } |
1595 | } |
1566 | } |
1596 | |
1567 | |
… | |
… | |
1646 | if (object *pl = tmp->visible_to ()) |
1617 | if (object *pl = tmp->visible_to ()) |
1647 | esrv_update_item (UPD_NROF, pl, tmp); |
1618 | esrv_update_item (UPD_NROF, pl, tmp); |
1648 | |
1619 | |
1649 | adjust_weight (this, op->total_weight ()); |
1620 | adjust_weight (this, op->total_weight ()); |
1650 | |
1621 | |
1651 | op->destroy (1); |
1622 | op->destroy (); |
1652 | op = tmp; |
1623 | op = tmp; |
1653 | goto inserted; |
1624 | goto inserted; |
1654 | } |
1625 | } |
1655 | |
1626 | |
1656 | op->owner = 0; // it's his/hers now. period. |
1627 | op->owner = 0; // it's his/hers now. period. |
… | |
… | |
1674 | |
1645 | |
1675 | adjust_weight (this, op->total_weight ()); |
1646 | adjust_weight (this, op->total_weight ()); |
1676 | |
1647 | |
1677 | inserted: |
1648 | inserted: |
1678 | /* reset the light list and los of the players on the map */ |
1649 | /* reset the light list and los of the players on the map */ |
1679 | if (op->glow_radius && map && map->darkness) |
1650 | if (op->glow_radius && is_on_map ()) |
|
|
1651 | { |
|
|
1652 | update_stats (); |
1680 | update_all_los (map, x, y); |
1653 | update_all_los (map, x, y); |
1681 | |
1654 | } |
|
|
1655 | else if (is_player () && !flag [FLAG_NO_FIX_PLAYER]) |
1682 | // if this is a player's inventory, update stats |
1656 | // if this is a player's inventory, update stats |
1683 | if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER]) |
|
|
1684 | update_stats (); |
1657 | update_stats (); |
1685 | |
1658 | |
1686 | INVOKE_OBJECT (INSERT, this); |
1659 | INVOKE_OBJECT (INSERT, this); |
1687 | |
1660 | |
1688 | return op; |
1661 | return op; |
… | |
… | |
1709 | * on top. |
1682 | * on top. |
1710 | */ |
1683 | */ |
1711 | int |
1684 | int |
1712 | check_move_on (object *op, object *originator) |
1685 | check_move_on (object *op, object *originator) |
1713 | { |
1686 | { |
|
|
1687 | if (QUERY_FLAG (op, FLAG_NO_APPLY)) |
|
|
1688 | return 0; |
|
|
1689 | |
1714 | object *tmp; |
1690 | object *tmp; |
1715 | maptile *m = op->map; |
1691 | maptile *m = op->map; |
1716 | int x = op->x, y = op->y; |
1692 | int x = op->x, y = op->y; |
1717 | |
1693 | |
1718 | MoveType move_on, move_slow, move_block; |
1694 | mapspace &ms = m->at (x, y); |
1719 | |
1695 | |
1720 | if (QUERY_FLAG (op, FLAG_NO_APPLY)) |
1696 | ms.update (); |
1721 | return 0; |
|
|
1722 | |
1697 | |
1723 | move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); |
1698 | MoveType move_on = ms.move_on; |
1724 | move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); |
1699 | MoveType move_slow = ms.move_slow; |
1725 | move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); |
1700 | MoveType move_block = ms.move_block; |
1726 | |
1701 | |
1727 | /* if nothing on this space will slow op down or be applied, |
1702 | /* if nothing on this space will slow op down or be applied, |
1728 | * no need to do checking below. have to make sure move_type |
1703 | * no need to do checking below. have to make sure move_type |
1729 | * is set, as lots of objects don't have it set - we treat that |
1704 | * is set, as lots of objects don't have it set - we treat that |
1730 | * as walking. |
1705 | * as walking. |
… | |
… | |
1741 | return 0; |
1716 | return 0; |
1742 | |
1717 | |
1743 | /* The objects have to be checked from top to bottom. |
1718 | /* The objects have to be checked from top to bottom. |
1744 | * Hence, we first go to the top: |
1719 | * Hence, we first go to the top: |
1745 | */ |
1720 | */ |
1746 | |
1721 | for (object *next, *tmp = ms.top; tmp; tmp = next) |
1747 | for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above) |
|
|
1748 | { |
|
|
1749 | /* Trim the search when we find the first other spell effect |
|
|
1750 | * this helps performance so that if a space has 50 spell objects, |
|
|
1751 | * we don't need to check all of them. |
|
|
1752 | */ |
|
|
1753 | if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK)) |
|
|
1754 | break; |
|
|
1755 | } |
1722 | { |
|
|
1723 | next = tmp->below; |
1756 | |
1724 | |
1757 | for (; tmp; tmp = tmp->below) |
|
|
1758 | { |
|
|
1759 | if (tmp == op) |
1725 | if (tmp == op) |
1760 | continue; /* Can't apply yourself */ |
1726 | continue; /* Can't apply yourself */ |
1761 | |
1727 | |
1762 | /* Check to see if one of the movement types should be slowed down. |
1728 | /* Check to see if one of the movement types should be slowed down. |
1763 | * Second check makes sure that the movement types not being slowed |
1729 | * Second check makes sure that the movement types not being slowed |
… | |
… | |
1768 | if (!QUERY_FLAG (op, FLAG_WIZPASS)) |
1734 | if (!QUERY_FLAG (op, FLAG_WIZPASS)) |
1769 | { |
1735 | { |
1770 | if ((!op->move_type && tmp->move_slow & MOVE_WALK) || |
1736 | if ((!op->move_type && tmp->move_slow & MOVE_WALK) || |
1771 | ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) |
1737 | ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) |
1772 | { |
1738 | { |
1773 | |
|
|
1774 | float |
|
|
1775 | diff = tmp->move_slow_penalty * fabs (op->speed); |
1739 | float diff = tmp->move_slow_penalty * fabs (op->speed); |
1776 | |
1740 | |
1777 | if (op->type == PLAYER) |
1741 | if (op->is_player ()) |
1778 | if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || |
1742 | if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) || |
1779 | (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) |
1743 | (tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN))) |
1780 | diff /= 4.0; |
1744 | diff /= 4.0; |
1781 | |
1745 | |
1782 | op->speed_left -= diff; |
1746 | op->speed_left -= diff; |
1783 | } |
1747 | } |
1784 | } |
1748 | } |
… | |
… | |
1817 | LOG (llevError, "Present_arch called outside map.\n"); |
1781 | LOG (llevError, "Present_arch called outside map.\n"); |
1818 | return NULL; |
1782 | return NULL; |
1819 | } |
1783 | } |
1820 | |
1784 | |
1821 | for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above) |
1785 | for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above) |
1822 | if (tmp->arch == at) |
1786 | if (tmp->arch->archname == at->archname) |
1823 | return tmp; |
1787 | return tmp; |
1824 | |
1788 | |
1825 | return NULL; |
1789 | return NULL; |
1826 | } |
1790 | } |
1827 | |
1791 | |
… | |
… | |
1891 | * The first matching object is returned, or NULL if none. |
1855 | * The first matching object is returned, or NULL if none. |
1892 | */ |
1856 | */ |
1893 | object * |
1857 | object * |
1894 | present_arch_in_ob (const archetype *at, const object *op) |
1858 | present_arch_in_ob (const archetype *at, const object *op) |
1895 | { |
1859 | { |
1896 | for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1860 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
1897 | if (tmp->arch == at) |
1861 | if (tmp->arch->archname == at->archname) |
1898 | return tmp; |
1862 | return tmp; |
1899 | |
1863 | |
1900 | return NULL; |
1864 | return NULL; |
1901 | } |
1865 | } |
1902 | |
1866 | |
… | |
… | |
1990 | * head of the object should correspond for the entire object. |
1954 | * head of the object should correspond for the entire object. |
1991 | */ |
1955 | */ |
1992 | if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) |
1956 | if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) |
1993 | continue; |
1957 | continue; |
1994 | |
1958 | |
1995 | if (ob->blocked (m, pos.x, pos.y)) |
1959 | if (ob->blocked (pos.m, pos.x, pos.y)) |
1996 | continue; |
1960 | continue; |
1997 | |
1961 | |
1998 | altern [index++] = i; |
1962 | altern [index++] = i; |
1999 | } |
1963 | } |
2000 | |
1964 | |
… | |
… | |
2068 | * there is capable of. |
2032 | * there is capable of. |
2069 | */ |
2033 | */ |
2070 | int |
2034 | int |
2071 | find_dir (maptile *m, int x, int y, object *exclude) |
2035 | find_dir (maptile *m, int x, int y, object *exclude) |
2072 | { |
2036 | { |
2073 | int i, max = SIZEOFFREE, mflags; |
2037 | int max = SIZEOFFREE, mflags; |
2074 | |
|
|
2075 | sint16 nx, ny; |
|
|
2076 | object *tmp; |
|
|
2077 | maptile *mp; |
|
|
2078 | |
|
|
2079 | MoveType blocked, move_type; |
2038 | MoveType move_type; |
2080 | |
2039 | |
2081 | if (exclude && exclude->head_ () != exclude) |
2040 | if (exclude && exclude->head_ () != exclude) |
2082 | { |
2041 | { |
2083 | exclude = exclude->head; |
2042 | exclude = exclude->head; |
2084 | move_type = exclude->move_type; |
2043 | move_type = exclude->move_type; |
… | |
… | |
2087 | { |
2046 | { |
2088 | /* If we don't have anything, presume it can use all movement types. */ |
2047 | /* If we don't have anything, presume it can use all movement types. */ |
2089 | move_type = MOVE_ALL; |
2048 | move_type = MOVE_ALL; |
2090 | } |
2049 | } |
2091 | |
2050 | |
2092 | for (i = 1; i < max; i++) |
2051 | for (int i = 1; i < max; i++) |
2093 | { |
2052 | { |
2094 | mp = m; |
2053 | mapxy pos (m, x, y); |
2095 | nx = x + freearr_x[i]; |
2054 | pos.move (i); |
2096 | ny = y + freearr_y[i]; |
|
|
2097 | |
2055 | |
2098 | mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); |
2056 | if (!pos.normalise ()) |
2099 | |
|
|
2100 | if (mflags & P_OUT_OF_MAP) |
|
|
2101 | max = maxfree[i]; |
2057 | max = maxfree[i]; |
2102 | else |
2058 | else |
2103 | { |
2059 | { |
2104 | mapspace &ms = mp->at (nx, ny); |
2060 | mapspace &ms = *pos; |
2105 | |
2061 | |
2106 | blocked = ms.move_block; |
|
|
2107 | |
|
|
2108 | if ((move_type & blocked) == move_type) |
2062 | if ((move_type & ms.move_block) == move_type) |
2109 | max = maxfree[i]; |
2063 | max = maxfree [i]; |
2110 | else if (mflags & P_IS_ALIVE) |
2064 | else if (ms.flags () & P_IS_ALIVE) |
2111 | { |
2065 | { |
2112 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
2066 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
2113 | if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) |
2067 | if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ()) |
2114 | && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude))) |
2068 | && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude))) |
2115 | break; |
|
|
2116 | |
|
|
2117 | if (tmp) |
|
|
2118 | return freedir[i]; |
2069 | return freedir [i]; |
2119 | } |
2070 | } |
2120 | } |
2071 | } |
2121 | } |
2072 | } |
2122 | |
2073 | |
2123 | return 0; |
2074 | return 0; |
… | |
… | |
2198 | * This basically means that if direction is 15, then it could either go |
2149 | * This basically means that if direction is 15, then it could either go |
2199 | * direction 4, 14, or 16 to get back to where we are. |
2150 | * direction 4, 14, or 16 to get back to where we are. |
2200 | * Moved from spell_util.c to object.c with the other related direction |
2151 | * Moved from spell_util.c to object.c with the other related direction |
2201 | * functions. |
2152 | * functions. |
2202 | */ |
2153 | */ |
2203 | int reduction_dir[SIZEOFFREE][3] = { |
2154 | static const int reduction_dir[SIZEOFFREE][3] = { |
2204 | {0, 0, 0}, /* 0 */ |
2155 | {0, 0, 0}, /* 0 */ |
2205 | {0, 0, 0}, /* 1 */ |
2156 | {0, 0, 0}, /* 1 */ |
2206 | {0, 0, 0}, /* 2 */ |
2157 | {0, 0, 0}, /* 2 */ |
2207 | {0, 0, 0}, /* 3 */ |
2158 | {0, 0, 0}, /* 3 */ |
2208 | {0, 0, 0}, /* 4 */ |
2159 | {0, 0, 0}, /* 4 */ |
… | |
… | |
2304 | int |
2255 | int |
2305 | can_pick (const object *who, const object *item) |
2256 | can_pick (const object *who, const object *item) |
2306 | { |
2257 | { |
2307 | return /*QUERY_FLAG(who,FLAG_WIZ)|| */ |
2258 | return /*QUERY_FLAG(who,FLAG_WIZ)|| */ |
2308 | (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && |
2259 | (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && |
2309 | !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); |
2260 | !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3)); |
2310 | } |
2261 | } |
2311 | |
2262 | |
2312 | /* |
2263 | /* |
2313 | * create clone from object to another |
2264 | * create clone from object to another |
2314 | */ |
2265 | */ |
2315 | object * |
2266 | object * |
2316 | object_create_clone (object *asrc) |
2267 | object::deep_clone () |
2317 | { |
2268 | { |
2318 | object *dst = 0, *tmp, *src, *prev, *item; |
2269 | assert (("deep_clone called on non-head object", is_head ())); |
2319 | |
2270 | |
2320 | if (!asrc) |
2271 | object *dst = clone (); |
2321 | return 0; |
|
|
2322 | |
2272 | |
2323 | src = asrc->head_ (); |
2273 | object *prev = dst; |
2324 | |
|
|
2325 | prev = 0; |
|
|
2326 | for (object *part = src; part; part = part->more) |
2274 | for (object *part = this->more; part; part = part->more) |
2327 | { |
2275 | { |
2328 | tmp = part->clone (); |
2276 | object *tmp = part->clone (); |
2329 | tmp->x -= src->x; |
|
|
2330 | tmp->y -= src->y; |
|
|
2331 | |
|
|
2332 | if (!part->head) |
|
|
2333 | { |
|
|
2334 | dst = tmp; |
|
|
2335 | tmp->head = 0; |
|
|
2336 | } |
|
|
2337 | else |
|
|
2338 | tmp->head = dst; |
2277 | tmp->head = dst; |
2339 | |
|
|
2340 | tmp->more = 0; |
|
|
2341 | |
|
|
2342 | if (prev) |
|
|
2343 | prev->more = tmp; |
2278 | prev->more = tmp; |
2344 | |
|
|
2345 | prev = tmp; |
2279 | prev = tmp; |
2346 | } |
2280 | } |
2347 | |
2281 | |
2348 | for (item = src->inv; item; item = item->below) |
2282 | for (object *item = inv; item; item = item->below) |
2349 | insert_ob_in_ob (object_create_clone (item), dst); |
2283 | insert_ob_in_ob (item->deep_clone (), dst); |
2350 | |
2284 | |
2351 | return dst; |
2285 | return dst; |
2352 | } |
2286 | } |
2353 | |
2287 | |
2354 | /* This returns the first object in who's inventory that |
2288 | /* This returns the first object in who's inventory that |
… | |
… | |
2363 | return tmp; |
2297 | return tmp; |
2364 | |
2298 | |
2365 | return 0; |
2299 | return 0; |
2366 | } |
2300 | } |
2367 | |
2301 | |
2368 | /* If ob has a field named key, return the link from the list, |
2302 | shstr_tmp |
2369 | * otherwise return NULL. |
2303 | object::kv_get (shstr_tmp key) const |
2370 | * |
|
|
2371 | * key must be a passed in shared string - otherwise, this won't |
|
|
2372 | * do the desired thing. |
|
|
2373 | */ |
|
|
2374 | key_value * |
|
|
2375 | get_ob_key_link (const object *ob, const char *key) |
|
|
2376 | { |
2304 | { |
2377 | for (key_value *link = ob->key_values; link; link = link->next) |
2305 | for (key_value *kv = key_values; kv; kv = kv->next) |
2378 | if (link->key == key) |
2306 | if (kv->key == key) |
2379 | return link; |
|
|
2380 | |
|
|
2381 | return 0; |
|
|
2382 | } |
|
|
2383 | |
|
|
2384 | /* |
|
|
2385 | * Returns the value of op has an extra_field for key, or NULL. |
|
|
2386 | * |
|
|
2387 | * The argument doesn't need to be a shared string. |
|
|
2388 | * |
|
|
2389 | * The returned string is shared. |
|
|
2390 | */ |
|
|
2391 | const char * |
|
|
2392 | get_ob_key_value (const object *op, const char *const key) |
|
|
2393 | { |
|
|
2394 | key_value *link; |
|
|
2395 | shstr_cmp canonical_key (key); |
|
|
2396 | |
|
|
2397 | if (!canonical_key) |
|
|
2398 | { |
|
|
2399 | /* 1. There being a field named key on any object |
|
|
2400 | * implies there'd be a shared string to find. |
|
|
2401 | * 2. Since there isn't, no object has this field. |
|
|
2402 | * 3. Therefore, *this* object doesn't have this field. |
|
|
2403 | */ |
|
|
2404 | return 0; |
|
|
2405 | } |
|
|
2406 | |
|
|
2407 | /* This is copied from get_ob_key_link() above - |
|
|
2408 | * only 4 lines, and saves the function call overhead. |
|
|
2409 | */ |
|
|
2410 | for (link = op->key_values; link; link = link->next) |
|
|
2411 | if (link->key == canonical_key) |
|
|
2412 | return link->value; |
2307 | return kv->value; |
2413 | |
2308 | |
2414 | return 0; |
2309 | return shstr (); |
2415 | } |
2310 | } |
2416 | |
2311 | |
2417 | /* |
2312 | void |
2418 | * Updates the canonical_key in op to value. |
2313 | object::kv_set (shstr_tmp key, shstr_tmp value) |
2419 | * |
|
|
2420 | * canonical_key is a shared string (value doesn't have to be). |
|
|
2421 | * |
|
|
2422 | * Unless add_key is TRUE, it won't add fields, only change the value of existing |
|
|
2423 | * keys. |
|
|
2424 | * |
|
|
2425 | * Returns TRUE on success. |
|
|
2426 | */ |
|
|
2427 | int |
|
|
2428 | set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key) |
|
|
2429 | { |
2314 | { |
2430 | key_value *field = NULL, *last = NULL; |
2315 | for (key_value *kv = key_values; kv; kv = kv->next) |
2431 | |
2316 | if (kv->key == key) |
2432 | for (field = op->key_values; field != NULL; field = field->next) |
|
|
2433 | { |
|
|
2434 | if (field->key != canonical_key) |
|
|
2435 | { |
2317 | { |
2436 | last = field; |
2318 | kv->value = value; |
2437 | continue; |
2319 | return; |
2438 | } |
2320 | } |
2439 | |
2321 | |
2440 | if (value) |
2322 | key_value *kv = new key_value; |
2441 | field->value = value; |
2323 | |
2442 | else |
2324 | kv->next = key_values; |
|
|
2325 | kv->key = key; |
|
|
2326 | kv->value = value; |
|
|
2327 | |
|
|
2328 | key_values = kv; |
|
|
2329 | } |
|
|
2330 | |
|
|
2331 | void |
|
|
2332 | object::kv_del (shstr_tmp key) |
|
|
2333 | { |
|
|
2334 | for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next) |
|
|
2335 | if ((*kvp)->key == key) |
2443 | { |
2336 | { |
2444 | /* Basically, if the archetype has this key set, |
2337 | key_value *kv = *kvp; |
2445 | * we need to store the null value so when we save |
2338 | *kvp = (*kvp)->next; |
2446 | * it, we save the empty value so that when we load, |
2339 | delete kv; |
2447 | * we get this value back again. |
2340 | return; |
2448 | */ |
|
|
2449 | if (get_ob_key_link (op->arch, canonical_key)) |
|
|
2450 | field->value = 0; |
|
|
2451 | else |
|
|
2452 | { |
|
|
2453 | if (last) |
|
|
2454 | last->next = field->next; |
|
|
2455 | else |
|
|
2456 | op->key_values = field->next; |
|
|
2457 | |
|
|
2458 | delete field; |
|
|
2459 | } |
|
|
2460 | } |
2341 | } |
2461 | return TRUE; |
|
|
2462 | } |
|
|
2463 | /* IF we get here, key doesn't exist */ |
|
|
2464 | |
|
|
2465 | /* No field, we'll have to add it. */ |
|
|
2466 | |
|
|
2467 | if (!add_key) |
|
|
2468 | return FALSE; |
|
|
2469 | |
|
|
2470 | /* There isn't any good reason to store a null |
|
|
2471 | * value in the key/value list. If the archetype has |
|
|
2472 | * this key, then we should also have it, so shouldn't |
|
|
2473 | * be here. If user wants to store empty strings, |
|
|
2474 | * should pass in "" |
|
|
2475 | */ |
|
|
2476 | if (value == NULL) |
|
|
2477 | return TRUE; |
|
|
2478 | |
|
|
2479 | field = new key_value; |
|
|
2480 | |
|
|
2481 | field->key = canonical_key; |
|
|
2482 | field->value = value; |
|
|
2483 | /* Usual prepend-addition. */ |
|
|
2484 | field->next = op->key_values; |
|
|
2485 | op->key_values = field; |
|
|
2486 | |
|
|
2487 | return TRUE; |
|
|
2488 | } |
|
|
2489 | |
|
|
2490 | /* |
|
|
2491 | * Updates the key in op to value. |
|
|
2492 | * |
|
|
2493 | * If add_key is FALSE, this will only update existing keys, |
|
|
2494 | * and not add new ones. |
|
|
2495 | * In general, should be little reason FALSE is ever passed in for add_key |
|
|
2496 | * |
|
|
2497 | * Returns TRUE on success. |
|
|
2498 | */ |
|
|
2499 | int |
|
|
2500 | set_ob_key_value (object *op, const char *key, const char *value, int add_key) |
|
|
2501 | { |
|
|
2502 | shstr key_ (key); |
|
|
2503 | |
|
|
2504 | return set_ob_key_value_s (op, key_, value, add_key); |
|
|
2505 | } |
2342 | } |
2506 | |
2343 | |
2507 | object::depth_iterator::depth_iterator (object *container) |
2344 | object::depth_iterator::depth_iterator (object *container) |
2508 | : iterator_base (container) |
2345 | : iterator_base (container) |
2509 | { |
2346 | { |
… | |
… | |
2559 | { |
2396 | { |
2560 | char flagdesc[512]; |
2397 | char flagdesc[512]; |
2561 | char info2[256 * 4]; |
2398 | char info2[256 * 4]; |
2562 | char *p = info; |
2399 | char *p = info; |
2563 | |
2400 | |
2564 | p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}", |
2401 | p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}", |
2565 | count, |
2402 | count, |
2566 | uuid.c_str (), |
2403 | uuid.c_str (), |
2567 | &name, |
2404 | &name, |
2568 | title ? "\",title:\"" : "", |
2405 | title ? ",title:\"" : "", |
2569 | title ? (const char *)title : "", |
2406 | title ? (const char *)title : "", |
|
|
2407 | title ? "\"" : "", |
2570 | flag_desc (flagdesc, 512), type); |
2408 | flag_desc (flagdesc, 512), type); |
2571 | |
2409 | |
2572 | if (!this->flag[FLAG_REMOVED] && env) |
2410 | if (!flag[FLAG_REMOVED] && env) |
2573 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2411 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2574 | |
2412 | |
2575 | if (map) |
2413 | if (map) |
2576 | p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); |
2414 | p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); |
2577 | |
2415 | |
… | |
… | |
2607 | object::open_container (object *new_container) |
2445 | object::open_container (object *new_container) |
2608 | { |
2446 | { |
2609 | if (container == new_container) |
2447 | if (container == new_container) |
2610 | return; |
2448 | return; |
2611 | |
2449 | |
2612 | if (object *old_container = container) |
2450 | object *old_container = container; |
|
|
2451 | |
|
|
2452 | if (old_container) |
2613 | { |
2453 | { |
2614 | if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this))) |
2454 | if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this))) |
2615 | return; |
2455 | return; |
2616 | |
2456 | |
2617 | #if 0 |
2457 | #if 0 |
… | |
… | |
2619 | if (object *closer = old_container->inv) |
2459 | if (object *closer = old_container->inv) |
2620 | if (closer->type == CLOSE_CON) |
2460 | if (closer->type == CLOSE_CON) |
2621 | closer->destroy (); |
2461 | closer->destroy (); |
2622 | #endif |
2462 | #endif |
2623 | |
2463 | |
|
|
2464 | // make sure the container is available |
|
|
2465 | esrv_send_item (this, old_container); |
|
|
2466 | |
2624 | old_container->flag [FLAG_APPLIED] = 0; |
2467 | old_container->flag [FLAG_APPLIED] = false; |
2625 | container = 0; |
2468 | container = 0; |
2626 | |
2469 | |
|
|
2470 | // client needs item update to make it work, client bug requires this to be separate |
2627 | esrv_update_item (UPD_FLAGS, this, old_container); |
2471 | esrv_update_item (UPD_FLAGS, this, old_container); |
|
|
2472 | |
2628 | new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); |
2473 | new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ()); |
2629 | play_sound (sound_find ("chest_close")); |
2474 | play_sound (sound_find ("chest_close")); |
2630 | } |
2475 | } |
2631 | |
2476 | |
2632 | if (new_container) |
2477 | if (new_container) |
2633 | { |
2478 | { |
… | |
… | |
2643 | closer->flag [FLAG_NO_MAP_SAVE] = 1; |
2488 | closer->flag [FLAG_NO_MAP_SAVE] = 1; |
2644 | new_container->insert (closer); |
2489 | new_container->insert (closer); |
2645 | } |
2490 | } |
2646 | #endif |
2491 | #endif |
2647 | |
2492 | |
2648 | new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); |
2493 | new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ()); |
2649 | |
2494 | |
|
|
2495 | // make sure the container is available, client bug requires this to be separate |
|
|
2496 | esrv_send_item (this, new_container); |
|
|
2497 | |
2650 | new_container->flag [FLAG_APPLIED] = 1; |
2498 | new_container->flag [FLAG_APPLIED] = true; |
2651 | container = new_container; |
2499 | container = new_container; |
2652 | |
2500 | |
|
|
2501 | // client needs flag change |
2653 | esrv_update_item (UPD_FLAGS, this, new_container); |
2502 | esrv_update_item (UPD_FLAGS, this, new_container); |
2654 | esrv_send_inventory (this, new_container); |
2503 | esrv_send_inventory (this, new_container); |
2655 | play_sound (sound_find ("chest_open")); |
2504 | play_sound (sound_find ("chest_open")); |
2656 | } |
2505 | } |
|
|
2506 | // else if (!old_container->env && contr && contr->ns) |
|
|
2507 | // contr->ns->floorbox_reset (); |
2657 | } |
2508 | } |
2658 | |
2509 | |
2659 | object * |
2510 | object * |
2660 | object::force_find (const shstr name) |
2511 | object::force_find (shstr_tmp name) |
2661 | { |
2512 | { |
2662 | /* cycle through his inventory to look for the MARK we want to |
2513 | /* cycle through his inventory to look for the MARK we want to |
2663 | * place |
2514 | * place |
2664 | */ |
2515 | */ |
2665 | for (object *tmp = inv; tmp; tmp = tmp->below) |
2516 | for (object *tmp = inv; tmp; tmp = tmp->below) |
… | |
… | |
2667 | return splay (tmp); |
2518 | return splay (tmp); |
2668 | |
2519 | |
2669 | return 0; |
2520 | return 0; |
2670 | } |
2521 | } |
2671 | |
2522 | |
|
|
2523 | //-GPL |
|
|
2524 | |
2672 | void |
2525 | void |
|
|
2526 | object::force_set_timer (int duration) |
|
|
2527 | { |
|
|
2528 | this->duration = 1; |
|
|
2529 | this->speed_left = -1.f; |
|
|
2530 | |
|
|
2531 | this->set_speed (duration ? 1.f / duration : 0.f); |
|
|
2532 | } |
|
|
2533 | |
|
|
2534 | object * |
2673 | object::force_add (const shstr name, int duration) |
2535 | object::force_add (shstr_tmp name, int duration) |
2674 | { |
2536 | { |
2675 | if (object *force = force_find (name)) |
2537 | if (object *force = force_find (name)) |
2676 | force->destroy (); |
2538 | force->destroy (); |
2677 | |
2539 | |
2678 | object *force = get_archetype (FORCE_NAME); |
2540 | object *force = get_archetype (FORCE_NAME); |
2679 | |
2541 | |
2680 | force->slaying = name; |
2542 | force->slaying = name; |
2681 | force->stats.food = 1; |
2543 | force->force_set_timer (duration); |
2682 | force->speed_left = -1.f; |
|
|
2683 | |
|
|
2684 | force->set_speed (duration ? 1.f / duration : 0.f); |
|
|
2685 | force->flag [FLAG_IS_USED_UP] = true; |
|
|
2686 | force->flag [FLAG_APPLIED] = true; |
2544 | force->flag [FLAG_APPLIED] = true; |
2687 | |
2545 | |
2688 | insert (force); |
2546 | return insert (force); |
2689 | } |
2547 | } |
2690 | |
2548 | |
2691 | void |
2549 | void |
2692 | object::play_sound (faceidx sound) |
2550 | object::play_sound (faceidx sound) const |
2693 | { |
2551 | { |
2694 | if (!sound) |
2552 | if (!sound) |
2695 | return; |
2553 | return; |
2696 | |
2554 | |
2697 | if (flag [FLAG_REMOVED]) |
2555 | if (is_on_map ()) |
|
|
2556 | map->play_sound (sound, x, y); |
|
|
2557 | else if (object *pl = in_player ()) |
|
|
2558 | pl->contr->play_sound (sound); |
|
|
2559 | } |
|
|
2560 | |
|
|
2561 | void |
|
|
2562 | object::say_msg (const char *msg) const |
|
|
2563 | { |
|
|
2564 | if (is_on_map ()) |
|
|
2565 | map->say_msg (msg, x, y); |
|
|
2566 | else if (object *pl = in_player ()) |
|
|
2567 | pl->contr->play_sound (sound); |
|
|
2568 | } |
|
|
2569 | |
|
|
2570 | void |
|
|
2571 | object::make_noise () |
|
|
2572 | { |
|
|
2573 | // we do not model noise in the map, so instead put |
|
|
2574 | // a temporary light into the noise source |
|
|
2575 | // could use the map instead, but that's less reliable for our |
|
|
2576 | // goal, which is to make invisibility a bit harder to exploit |
|
|
2577 | |
|
|
2578 | // currently only works sensibly for players |
|
|
2579 | if (!is_player ()) |
2698 | return; |
2580 | return; |
2699 | |
2581 | |
2700 | if (env) |
2582 | // find old force, or create new one |
2701 | { |
2583 | object *force = force_find (shstr_noise_force); |
2702 | if (object *pl = in_player ()) |
2584 | |
2703 | pl->contr->play_sound (sound); |
2585 | if (force) |
2704 | } |
2586 | force->speed_left = -1.f; // patch old speed up |
2705 | else |
2587 | else |
2706 | map->play_sound (sound, x, y); |
2588 | { |
2707 | } |
2589 | force = archetype::get (shstr_noise_force); |
2708 | |
2590 | |
|
|
2591 | force->slaying = shstr_noise_force; |
|
|
2592 | force->stats.food = 1; |
|
|
2593 | force->speed_left = -1.f; |
|
|
2594 | |
|
|
2595 | force->set_speed (1.f / 4.f); |
|
|
2596 | force->flag [FLAG_IS_USED_UP] = true; |
|
|
2597 | force->flag [FLAG_APPLIED] = true; |
|
|
2598 | |
|
|
2599 | insert (force); |
|
|
2600 | } |
|
|
2601 | } |
|
|
2602 | |