1 | |
|
|
2 | /* |
1 | /* |
3 | CrossFire, A Multiplayer game for X-windows |
2 | CrossFire, A Multiplayer game for X-windows |
4 | |
3 | |
5 | Copyright (C) 2001 Mark Wedel & Crossfire Development Team |
4 | Copyright (C) 2001 Mark Wedel & Crossfire Development Team |
6 | Copyright (C) 1992 Frank Tore Johansen |
5 | Copyright (C) 1992 Frank Tore Johansen |
… | |
… | |
17 | |
16 | |
18 | You should have received a copy of the GNU General Public License |
17 | You should have received a copy of the GNU General Public License |
19 | along with this program; if not, write to the Free Software |
18 | along with this program; if not, write to the Free Software |
20 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
19 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
21 | |
20 | |
22 | The authors can be reached via e-mail at crossfire-devel@real-time.com |
21 | The authors can be reached via e-mail at <crossfire@schmorp.de> |
23 | */ |
22 | */ |
24 | |
23 | |
25 | /* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. |
24 | /* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. |
26 | sub/add_weight will transcend the environment updating the carrying |
25 | sub/add_weight will transcend the environment updating the carrying |
27 | variable. */ |
26 | variable. */ |
… | |
… | |
31 | #include <sys/uio.h> |
30 | #include <sys/uio.h> |
32 | #include <object.h> |
31 | #include <object.h> |
33 | #include <funcpoint.h> |
32 | #include <funcpoint.h> |
34 | #include <loader.h> |
33 | #include <loader.h> |
35 | |
34 | |
|
|
35 | #include <bitset> |
|
|
36 | |
36 | int nrofallocobjects = 0; |
37 | int nrofallocobjects = 0; |
37 | static UUID uuid; |
38 | static UUID uuid; |
38 | const uint64 UUID_SKIP = 1<<19; |
39 | const uint64 UUID_SKIP = 1<<19; |
39 | |
40 | |
40 | object *objects; /* Pointer to the list of used objects */ |
|
|
41 | object *active_objects; /* List of active objects that need to be processed */ |
41 | object *active_objects; /* List of active objects that need to be processed */ |
42 | |
42 | |
43 | short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, |
43 | short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, |
44 | 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1 |
44 | 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1 |
45 | }; |
45 | }; |
… | |
… | |
106 | _exit (1); |
106 | _exit (1); |
107 | } |
107 | } |
108 | |
108 | |
109 | uuid.seq = uid; |
109 | uuid.seq = uid; |
110 | write_uuid (); |
110 | write_uuid (); |
111 | LOG (llevDebug, "read UID: %lld\n", uid); |
111 | LOG (llevDebug, "read UID: %" PRId64 "\n", uid); |
112 | fclose (fp); |
112 | fclose (fp); |
113 | } |
113 | } |
114 | |
114 | |
115 | UUID |
115 | UUID |
116 | gen_uuid () |
116 | gen_uuid () |
… | |
… | |
185 | * |
185 | * |
186 | * Note that this function appears a lot longer than the macro it |
186 | * Note that this function appears a lot longer than the macro it |
187 | * replaces - this is mostly for clarity - a decent compiler should hopefully |
187 | * replaces - this is mostly for clarity - a decent compiler should hopefully |
188 | * reduce this to the same efficiency. |
188 | * reduce this to the same efficiency. |
189 | * |
189 | * |
190 | * Check nrof variable *before* calling CAN_MERGE() |
190 | * Check nrof variable *before* calling can_merge() |
191 | * |
191 | * |
192 | * Improvements made with merge: Better checking on potion, and also |
192 | * Improvements made with merge: Better checking on potion, and also |
193 | * check weight |
193 | * check weight |
194 | */ |
194 | */ |
195 | |
195 | |
196 | bool object::can_merge (object *ob1, object *ob2) |
196 | bool object::can_merge_slow (object *ob1, object *ob2) |
197 | { |
197 | { |
198 | /* A couple quicksanity checks */ |
198 | /* A couple quicksanity checks */ |
199 | if ((ob1 == ob2) || (ob1->type != ob2->type)) |
199 | if (ob1 == ob2 |
|
|
200 | || ob1->type != ob2->type |
|
|
201 | || ob1->speed != ob2->speed |
|
|
202 | || ob1->value != ob2->value |
|
|
203 | || ob1->name != ob2->name) |
200 | return 0; |
204 | return 0; |
201 | |
205 | |
202 | if (ob1->speed != ob2->speed) |
206 | //TODO: this ain't working well, use nicer and correct overflow check |
203 | return 0; |
|
|
204 | |
|
|
205 | /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that |
207 | /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that |
206 | * value could not be stored in a sint32 (which unfortunately sometimes is |
208 | * value could not be stored in a sint32 (which unfortunately sometimes is |
207 | * used to store nrof). |
209 | * used to store nrof). |
208 | */ |
210 | */ |
209 | if (ob1->nrof + ob2->nrof >= 1UL << 31) |
211 | if (ob1->nrof + ob2->nrof >= 1UL << 31) |
… | |
… | |
219 | SET_FLAG (ob1, FLAG_BEEN_APPLIED); |
221 | SET_FLAG (ob1, FLAG_BEEN_APPLIED); |
220 | |
222 | |
221 | if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) |
223 | if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) |
222 | SET_FLAG (ob2, FLAG_BEEN_APPLIED); |
224 | SET_FLAG (ob2, FLAG_BEEN_APPLIED); |
223 | |
225 | |
224 | |
226 | if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any () |
225 | /* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something |
227 | || ob1->arch != ob2->arch |
226 | * being locked in inventory should prevent merging. |
|
|
227 | * 0x4 in flags3 is CLIENT_SENT |
|
|
228 | */ |
|
|
229 | if ((ob1->arch != ob2->arch) || |
|
|
230 | (ob1->flags[0] != ob2->flags[0]) || |
|
|
231 | (ob1->flags[1] != ob2->flags[1]) || |
|
|
232 | ((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~0x400000)) || |
|
|
233 | ((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) || |
|
|
234 | (ob1->name != ob2->name) || |
228 | || ob1->name != ob2->name |
235 | (ob1->title != ob2->title) || |
229 | || ob1->title != ob2->title |
236 | (ob1->msg != ob2->msg) || |
230 | || ob1->msg != ob2->msg |
237 | (ob1->weight != ob2->weight) || |
231 | || ob1->weight != ob2->weight |
238 | (memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) || |
232 | || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) |
239 | (memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) || |
233 | || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) ) |
240 | (ob1->attacktype != ob2->attacktype) || |
234 | || ob1->attacktype != ob2->attacktype |
241 | (ob1->magic != ob2->magic) || |
235 | || ob1->magic != ob2->magic |
242 | (ob1->slaying != ob2->slaying) || |
236 | || ob1->slaying != ob2->slaying |
243 | (ob1->skill != ob2->skill) || |
237 | || ob1->skill != ob2->skill |
244 | (ob1->value != ob2->value) || |
238 | || ob1->value != ob2->value |
245 | (ob1->animation_id != ob2->animation_id) || |
239 | || ob1->animation_id != ob2->animation_id |
246 | (ob1->client_type != ob2->client_type) || |
240 | || ob1->client_type != ob2->client_type |
247 | (ob1->materialname != ob2->materialname) || |
241 | || ob1->materialname != ob2->materialname |
248 | (ob1->lore != ob2->lore) || |
242 | || ob1->lore != ob2->lore |
249 | (ob1->subtype != ob2->subtype) || |
243 | || ob1->subtype != ob2->subtype |
250 | (ob1->move_type != ob2->move_type) || |
244 | || ob1->move_type != ob2->move_type |
251 | (ob1->move_block != ob2->move_block) || |
245 | || ob1->move_block != ob2->move_block |
252 | (ob1->move_allow != ob2->move_allow) || |
246 | || ob1->move_allow != ob2->move_allow |
253 | (ob1->move_on != ob2->move_on) || |
247 | || ob1->move_on != ob2->move_on |
254 | (ob1->move_off != ob2->move_off) || (ob1->move_slow != ob2->move_slow) || (ob1->move_slow_penalty != ob2->move_slow_penalty)) |
248 | || ob1->move_off != ob2->move_off |
|
|
249 | || ob1->move_slow != ob2->move_slow |
|
|
250 | || ob1->move_slow_penalty != ob2->move_slow_penalty) |
255 | return 0; |
251 | return 0; |
256 | |
252 | |
257 | /* This is really a spellbook check - really, we should |
253 | /* This is really a spellbook check - really, we should |
258 | * check all objects in the inventory. |
254 | * check all objects in the inventory. |
259 | */ |
255 | */ |
… | |
… | |
262 | /* if one object has inventory but the other doesn't, not equiv */ |
258 | /* if one object has inventory but the other doesn't, not equiv */ |
263 | if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) |
259 | if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) |
264 | return 0; |
260 | return 0; |
265 | |
261 | |
266 | /* Now check to see if the two inventory objects could merge */ |
262 | /* Now check to see if the two inventory objects could merge */ |
267 | if (!CAN_MERGE (ob1->inv, ob2->inv)) |
263 | if (!object::can_merge (ob1->inv, ob2->inv)) |
268 | return 0; |
264 | return 0; |
269 | |
265 | |
270 | /* inventory ok - still need to check rest of this object to see |
266 | /* inventory ok - still need to check rest of this object to see |
271 | * if it is valid. |
267 | * if it is valid. |
272 | */ |
268 | */ |
… | |
… | |
356 | op = op->env; |
352 | op = op->env; |
357 | return op; |
353 | return op; |
358 | } |
354 | } |
359 | |
355 | |
360 | /* |
356 | /* |
361 | * Eneq(@csd.uu.se): Since we can have items buried in a character we need |
|
|
362 | * a better check. We basically keeping traversing up until we can't |
|
|
363 | * or find a player. |
|
|
364 | */ |
|
|
365 | |
|
|
366 | object * |
|
|
367 | is_player_inv (object *op) |
|
|
368 | { |
|
|
369 | for (; op != NULL && op->type != PLAYER; op = op->env) |
|
|
370 | if (op->env == op) |
|
|
371 | op->env = NULL; |
|
|
372 | return op; |
|
|
373 | } |
|
|
374 | |
|
|
375 | /* |
|
|
376 | * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. |
357 | * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. |
377 | * Some error messages. |
358 | * Some error messages. |
378 | * The result of the dump is stored in the static global errmsg array. |
359 | * The result of the dump is stored in the static global errmsg array. |
379 | */ |
360 | */ |
380 | |
361 | |
381 | void |
362 | char * |
382 | dump_object2 (object *op) |
|
|
383 | { |
|
|
384 | errmsg[0] = 0; |
|
|
385 | return; |
|
|
386 | //TODO//D#d# |
|
|
387 | #if 0 |
|
|
388 | char *cp; |
|
|
389 | |
|
|
390 | /* object *tmp;*/ |
|
|
391 | |
|
|
392 | if (op->arch != NULL) |
|
|
393 | { |
|
|
394 | strcat (errmsg, "arch "); |
|
|
395 | strcat (errmsg, op->arch->name ? op->arch->name : "(null)"); |
|
|
396 | strcat (errmsg, "\n"); |
|
|
397 | if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL) |
|
|
398 | strcat (errmsg, cp); |
|
|
399 | # if 0 |
|
|
400 | /* Don't dump player diffs - they are too long, mostly meaningless, and |
|
|
401 | * will overflow the buffer. |
|
|
402 | * Changed so that we don't dump inventory either. This may |
|
|
403 | * also overflow the buffer. |
|
|
404 | */ |
|
|
405 | if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL) |
|
|
406 | strcat (errmsg, cp); |
|
|
407 | for (tmp = op->inv; tmp; tmp = tmp->below) |
|
|
408 | dump_object2 (tmp); |
|
|
409 | # endif |
|
|
410 | strcat (errmsg, "end\n"); |
|
|
411 | } |
|
|
412 | else |
|
|
413 | { |
|
|
414 | strcat (errmsg, "Object "); |
|
|
415 | if (op->name == NULL) |
|
|
416 | strcat (errmsg, "(null)"); |
|
|
417 | else |
|
|
418 | strcat (errmsg, op->name); |
|
|
419 | strcat (errmsg, "\n"); |
|
|
420 | # if 0 |
|
|
421 | if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL) |
|
|
422 | strcat (errmsg, cp); |
|
|
423 | for (tmp = op->inv; tmp; tmp = tmp->below) |
|
|
424 | dump_object2 (tmp); |
|
|
425 | # endif |
|
|
426 | strcat (errmsg, "end\n"); |
|
|
427 | } |
|
|
428 | #endif |
|
|
429 | } |
|
|
430 | |
|
|
431 | /* |
|
|
432 | * Dumps an object. Returns output in the static global errmsg array. |
|
|
433 | */ |
|
|
434 | |
|
|
435 | void |
|
|
436 | dump_object (object *op) |
363 | dump_object (object *op) |
437 | { |
364 | { |
438 | if (op == NULL) |
365 | if (!op) |
439 | { |
366 | return strdup ("[NULLOBJ]"); |
440 | strcpy (errmsg, "[NULL pointer]"); |
|
|
441 | return; |
|
|
442 | } |
|
|
443 | errmsg[0] = '\0'; |
|
|
444 | dump_object2 (op); |
|
|
445 | } |
|
|
446 | |
367 | |
447 | void |
368 | object_freezer freezer; |
448 | dump_all_objects (void) |
369 | save_object (freezer, op, 1); |
449 | { |
370 | return freezer.as_string (); |
450 | object *op; |
|
|
451 | |
|
|
452 | for (op = objects; op != NULL; op = op->next) |
|
|
453 | { |
|
|
454 | dump_object (op); |
|
|
455 | fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg); |
|
|
456 | } |
|
|
457 | } |
371 | } |
458 | |
372 | |
459 | /* |
373 | /* |
460 | * get_nearest_part(multi-object, object 2) returns the part of the |
374 | * get_nearest_part(multi-object, object 2) returns the part of the |
461 | * multi-object 1 which is closest to the second object. |
375 | * multi-object 1 which is closest to the second object. |
… | |
… | |
481 | */ |
395 | */ |
482 | |
396 | |
483 | object * |
397 | object * |
484 | find_object (tag_t i) |
398 | find_object (tag_t i) |
485 | { |
399 | { |
486 | object *op; |
400 | for (object *op = object::first; op; op = op->next) |
487 | |
|
|
488 | for (op = objects; op != NULL; op = op->next) |
|
|
489 | if (op->count == i) |
401 | if (op->count == i) |
490 | break; |
402 | return op; |
|
|
403 | |
491 | return op; |
404 | return 0; |
492 | } |
405 | } |
493 | |
406 | |
494 | /* |
407 | /* |
495 | * Returns the first object which has a name equal to the argument. |
408 | * Returns the first object which has a name equal to the argument. |
496 | * Used only by the patch command, but not all that useful. |
409 | * Used only by the patch command, but not all that useful. |
… | |
… | |
501 | find_object_name (const char *str) |
414 | find_object_name (const char *str) |
502 | { |
415 | { |
503 | shstr_cmp str_ (str); |
416 | shstr_cmp str_ (str); |
504 | object *op; |
417 | object *op; |
505 | |
418 | |
506 | for (op = objects; op != NULL; op = op->next) |
419 | for (op = object::first; op != NULL; op = op->next) |
507 | if (op->name == str_) |
420 | if (op->name == str_) |
508 | break; |
421 | break; |
509 | |
422 | |
510 | return op; |
423 | return op; |
511 | } |
424 | } |
512 | |
425 | |
513 | void |
426 | void |
514 | free_all_object_data () |
427 | free_all_object_data () |
515 | { |
428 | { |
516 | LOG (llevDebug, "%d allocated objects\n", nrofallocobjects); |
429 | LOG (llevDebug, "%d allocated objects\n", nrofallocobjects); |
517 | } |
|
|
518 | |
|
|
519 | /* |
|
|
520 | * Returns the object which this object marks as being the owner. |
|
|
521 | * A id-scheme is used to avoid pointing to objects which have been |
|
|
522 | * freed and are now reused. If this is detected, the owner is |
|
|
523 | * set to NULL, and NULL is returned. |
|
|
524 | * Changed 2004-02-12 - if the player is setting at the play again |
|
|
525 | * prompt, he is removed, and we don't want to treat him as an owner of |
|
|
526 | * anything, so check removed flag. I don't expect that this should break |
|
|
527 | * anything - once an object is removed, it is basically dead anyways. |
|
|
528 | */ |
|
|
529 | object * |
|
|
530 | object::get_owner () |
|
|
531 | { |
|
|
532 | if (!owner |
|
|
533 | || QUERY_FLAG (owner, FLAG_FREED) |
|
|
534 | || QUERY_FLAG (owner, FLAG_REMOVED)) |
|
|
535 | owner = 0; |
|
|
536 | |
|
|
537 | return owner; |
|
|
538 | } |
430 | } |
539 | |
431 | |
540 | /* |
432 | /* |
541 | * Sets the owner and sets the skill and exp pointers to owner's current |
433 | * Sets the owner and sets the skill and exp pointers to owner's current |
542 | * skill and experience objects. |
434 | * skill and experience objects. |
… | |
… | |
575 | } |
467 | } |
576 | |
468 | |
577 | op->key_values = 0; |
469 | op->key_values = 0; |
578 | } |
470 | } |
579 | |
471 | |
580 | void object::clear () |
|
|
581 | { |
|
|
582 | attachable_base::clear (); |
|
|
583 | |
|
|
584 | free_key_values (this); |
|
|
585 | |
|
|
586 | owner = 0; |
|
|
587 | name = 0; |
|
|
588 | name_pl = 0; |
|
|
589 | title = 0; |
|
|
590 | race = 0; |
|
|
591 | slaying = 0; |
|
|
592 | skill = 0; |
|
|
593 | msg = 0; |
|
|
594 | lore = 0; |
|
|
595 | custom_name = 0; |
|
|
596 | materialname = 0; |
|
|
597 | contr = 0; |
|
|
598 | below = 0; |
|
|
599 | above = 0; |
|
|
600 | inv = 0; |
|
|
601 | container = 0; |
|
|
602 | env = 0; |
|
|
603 | more = 0; |
|
|
604 | head = 0; |
|
|
605 | map = 0; |
|
|
606 | active_next = 0; |
|
|
607 | active_prev = 0; |
|
|
608 | |
|
|
609 | memset (static_cast<object_pod *>(this), 0, sizeof (object_pod)); |
|
|
610 | |
|
|
611 | SET_FLAG (this, FLAG_REMOVED); |
|
|
612 | |
|
|
613 | /* What is not cleared is next, prev, and count */ |
|
|
614 | |
|
|
615 | expmul = 1.0; |
|
|
616 | face = blank_face; |
|
|
617 | attacked_by_count = -1; |
|
|
618 | |
|
|
619 | if (settings.casting_time) |
|
|
620 | casting_time = -1; |
|
|
621 | } |
|
|
622 | |
|
|
623 | void object::clone (object *destination) |
|
|
624 | { |
|
|
625 | *(object_copy *)destination = *this; |
|
|
626 | *(object_pod *)destination = *this; |
|
|
627 | |
|
|
628 | if (self || cb) |
|
|
629 | INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination)); |
|
|
630 | } |
|
|
631 | |
|
|
632 | /* |
472 | /* |
633 | * copy object first frees everything allocated by the second object, |
473 | * copy_to first frees everything allocated by the dst object, |
634 | * and then copies the contends of the first object into the second |
474 | * and then copies the contents of itself into the second |
635 | * object, allocating what needs to be allocated. Basically, any |
475 | * object, allocating what needs to be allocated. Basically, any |
636 | * data that is malloc'd needs to be re-malloc/copied. Otherwise, |
476 | * data that is malloc'd needs to be re-malloc/copied. Otherwise, |
637 | * if the first object is freed, the pointers in the new object |
477 | * if the first object is freed, the pointers in the new object |
638 | * will point at garbage. |
478 | * will point at garbage. |
639 | */ |
479 | */ |
640 | void |
480 | void |
641 | copy_object (object *op2, object *op) |
481 | object::copy_to (object *dst) |
642 | { |
482 | { |
643 | bool is_freed = QUERY_FLAG (op, FLAG_FREED); |
483 | bool is_freed = QUERY_FLAG (dst, FLAG_FREED); |
644 | bool is_removed = QUERY_FLAG (op, FLAG_REMOVED); |
484 | bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); |
645 | |
485 | |
646 | op2->clone (op); |
486 | *(object_copy *)dst = *this; |
647 | |
487 | |
648 | if (is_freed) |
488 | if (is_freed) |
649 | SET_FLAG (op, FLAG_FREED); |
489 | SET_FLAG (dst, FLAG_FREED); |
|
|
490 | |
650 | if (is_removed) |
491 | if (is_removed) |
651 | SET_FLAG (op, FLAG_REMOVED); |
492 | SET_FLAG (dst, FLAG_REMOVED); |
652 | |
493 | |
653 | if (op2->speed < 0) |
494 | if (speed < 0) |
654 | op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0; |
495 | dst->speed_left = speed_left - RANDOM () % 200 / 100.0; |
655 | |
496 | |
656 | /* Copy over key_values, if any. */ |
497 | /* Copy over key_values, if any. */ |
657 | if (op2->key_values) |
498 | if (key_values) |
658 | { |
499 | { |
659 | key_value *tail = 0; |
500 | key_value *tail = 0; |
660 | key_value *i; |
501 | key_value *i; |
661 | |
502 | |
662 | op->key_values = 0; |
503 | dst->key_values = 0; |
663 | |
504 | |
664 | for (i = op2->key_values; i; i = i->next) |
505 | for (i = key_values; i; i = i->next) |
665 | { |
506 | { |
666 | key_value *new_link = new key_value; |
507 | key_value *new_link = new key_value; |
667 | |
508 | |
668 | new_link->next = 0; |
509 | new_link->next = 0; |
669 | new_link->key = i->key; |
510 | new_link->key = i->key; |
670 | new_link->value = i->value; |
511 | new_link->value = i->value; |
671 | |
512 | |
672 | /* Try and be clever here, too. */ |
513 | /* Try and be clever here, too. */ |
673 | if (!op->key_values) |
514 | if (!dst->key_values) |
674 | { |
515 | { |
675 | op->key_values = new_link; |
516 | dst->key_values = new_link; |
676 | tail = new_link; |
517 | tail = new_link; |
677 | } |
518 | } |
678 | else |
519 | else |
679 | { |
520 | { |
680 | tail->next = new_link; |
521 | tail->next = new_link; |
681 | tail = new_link; |
522 | tail = new_link; |
682 | } |
523 | } |
683 | } |
524 | } |
684 | } |
525 | } |
685 | |
526 | |
686 | update_ob_speed (op); |
527 | update_ob_speed (dst); |
|
|
528 | } |
|
|
529 | |
|
|
530 | object * |
|
|
531 | object::clone () |
|
|
532 | { |
|
|
533 | object *neu = create (); |
|
|
534 | copy_to (neu); |
|
|
535 | return neu; |
687 | } |
536 | } |
688 | |
537 | |
689 | /* |
538 | /* |
690 | * If an object with the IS_TURNABLE() flag needs to be turned due |
539 | * If an object with the IS_TURNABLE() flag needs to be turned due |
691 | * to the closest player being on the other side, this function can |
540 | * to the closest player being on the other side, this function can |
… | |
… | |
799 | op->active_next = NULL; |
648 | op->active_next = NULL; |
800 | op->active_prev = NULL; |
649 | op->active_prev = NULL; |
801 | } |
650 | } |
802 | |
651 | |
803 | /* |
652 | /* |
804 | * update_object() updates the array which represents the map. |
653 | * update_object() updates the the map. |
805 | * It takes into account invisible objects (and represent squares covered |
654 | * It takes into account invisible objects (and represent squares covered |
806 | * by invisible objects by whatever is below them (unless it's another |
655 | * by invisible objects by whatever is below them (unless it's another |
807 | * invisible object, etc...) |
656 | * invisible object, etc...) |
808 | * If the object being updated is beneath a player, the look-window |
657 | * If the object being updated is beneath a player, the look-window |
809 | * of that player is updated (this might be a suboptimal way of |
658 | * of that player is updated (this might be a suboptimal way of |
810 | * updating that window, though, since update_object() is called _often_) |
659 | * updating that window, though, since update_object() is called _often_) |
811 | * |
660 | * |
812 | * action is a hint of what the caller believes need to be done. |
661 | * action is a hint of what the caller believes need to be done. |
813 | * For example, if the only thing that has changed is the face (due to |
|
|
814 | * an animation), we don't need to call update_position until that actually |
|
|
815 | * comes into view of a player. OTOH, many other things, like addition/removal |
|
|
816 | * of walls or living creatures may need us to update the flags now. |
|
|
817 | * current action are: |
662 | * current action are: |
818 | * UP_OBJ_INSERT: op was inserted |
663 | * UP_OBJ_INSERT: op was inserted |
819 | * UP_OBJ_REMOVE: op was removed |
664 | * UP_OBJ_REMOVE: op was removed |
820 | * UP_OBJ_CHANGE: object has somehow changed. In this case, we always update |
665 | * UP_OBJ_CHANGE: object has somehow changed. In this case, we always update |
821 | * as that is easier than trying to look at what may have changed. |
666 | * as that is easier than trying to look at what may have changed. |
822 | * UP_OBJ_FACE: only the objects face has changed. |
667 | * UP_OBJ_FACE: only the objects face has changed. |
823 | */ |
668 | */ |
824 | |
|
|
825 | void |
669 | void |
826 | update_object (object *op, int action) |
670 | update_object (object *op, int action) |
827 | { |
671 | { |
828 | int update_now = 0, flags; |
|
|
829 | MoveType move_on, move_off, move_block, move_slow; |
672 | MoveType move_on, move_off, move_block, move_slow; |
830 | |
673 | |
831 | if (op == NULL) |
674 | if (op == NULL) |
832 | { |
675 | { |
833 | /* this should never happen */ |
676 | /* this should never happen */ |
834 | LOG (llevDebug, "update_object() called for NULL object.\n"); |
677 | LOG (llevDebug, "update_object() called for NULL object.\n"); |
835 | return; |
678 | return; |
836 | } |
679 | } |
837 | |
680 | |
838 | if (op->env != NULL) |
681 | if (op->env) |
839 | { |
682 | { |
840 | /* Animation is currently handled by client, so nothing |
683 | /* Animation is currently handled by client, so nothing |
841 | * to do in this case. |
684 | * to do in this case. |
842 | */ |
685 | */ |
843 | return; |
686 | return; |
… | |
… | |
848 | */ |
691 | */ |
849 | if (!op->map || op->map->in_memory == MAP_SAVING) |
692 | if (!op->map || op->map->in_memory == MAP_SAVING) |
850 | return; |
693 | return; |
851 | |
694 | |
852 | /* make sure the object is within map boundaries */ |
695 | /* make sure the object is within map boundaries */ |
853 | if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map)) |
696 | if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height) |
854 | { |
697 | { |
855 | LOG (llevError, "update_object() called for object out of map!\n"); |
698 | LOG (llevError, "update_object() called for object out of map!\n"); |
856 | #ifdef MANY_CORES |
699 | #ifdef MANY_CORES |
857 | abort (); |
700 | abort (); |
858 | #endif |
701 | #endif |
859 | return; |
702 | return; |
860 | } |
703 | } |
861 | |
704 | |
862 | flags = GET_MAP_FLAGS (op->map, op->x, op->y); |
705 | mapspace &m = op->ms (); |
863 | SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE); |
|
|
864 | move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); |
|
|
865 | move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); |
|
|
866 | move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); |
|
|
867 | move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y); |
|
|
868 | |
706 | |
|
|
707 | if (m.flags_ & P_NEED_UPDATE) |
|
|
708 | /* nop */; |
869 | if (action == UP_OBJ_INSERT) |
709 | else if (action == UP_OBJ_INSERT) |
870 | { |
710 | { |
|
|
711 | // this is likely overkill, TODO: revisit (schmorp) |
871 | if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW)) |
712 | if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) |
872 | update_now = 1; |
|
|
873 | |
|
|
874 | if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC)) |
713 | || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) |
875 | update_now = 1; |
714 | || (op->type == PLAYER && !(m.flags_ & P_PLAYER)) |
876 | |
715 | || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) |
|
|
716 | || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) |
877 | if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC)) |
717 | || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) |
878 | update_now = 1; |
|
|
879 | |
|
|
880 | if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE)) |
|
|
881 | update_now = 1; |
|
|
882 | |
|
|
883 | if (op->type == SAFE_GROUND && !(flags & P_SAFE)) |
|
|
884 | update_now = 1; |
|
|
885 | |
|
|
886 | if ((move_on | op->move_on) != move_on) |
718 | || (m.move_on | op->move_on ) != m.move_on |
887 | update_now = 1; |
|
|
888 | |
|
|
889 | if ((move_off | op->move_off) != move_off) |
719 | || (m.move_off | op->move_off ) != m.move_off |
890 | update_now = 1; |
720 | || (m.move_slow | op->move_slow) != m.move_slow |
891 | |
|
|
892 | /* This isn't perfect, but I don't expect a lot of objects to |
721 | /* This isn't perfect, but I don't expect a lot of objects to |
893 | * to have move_allow right now. |
722 | * to have move_allow right now. |
894 | */ |
723 | */ |
895 | if (((move_block | op->move_block) & ~op->move_allow) != move_block) |
724 | || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block |
896 | update_now = 1; |
725 | || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) |
897 | |
726 | m.flags_ = P_NEED_UPDATE; |
898 | if ((move_slow | op->move_slow) != move_slow) |
|
|
899 | update_now = 1; |
|
|
900 | } |
727 | } |
901 | /* if the object is being removed, we can't make intelligent |
728 | /* if the object is being removed, we can't make intelligent |
902 | * decisions, because remove_ob can't really pass the object |
729 | * decisions, because remove_ob can't really pass the object |
903 | * that is being removed. |
730 | * that is being removed. |
904 | */ |
731 | */ |
905 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
732 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
906 | update_now = 1; |
733 | m.flags_ = P_NEED_UPDATE; |
907 | else if (action == UP_OBJ_FACE) |
734 | else if (action == UP_OBJ_FACE) |
908 | /* Nothing to do for that case */ ; |
735 | /* Nothing to do for that case */ ; |
909 | else |
736 | else |
910 | LOG (llevError, "update_object called with invalid action: %d\n", action); |
737 | LOG (llevError, "update_object called with invalid action: %d\n", action); |
911 | |
738 | |
912 | if (update_now) |
|
|
913 | { |
|
|
914 | SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE); |
|
|
915 | update_position (op->map, op->x, op->y); |
|
|
916 | } |
|
|
917 | |
|
|
918 | if (op->more != NULL) |
739 | if (op->more) |
919 | update_object (op->more, action); |
740 | update_object (op->more, action); |
920 | } |
741 | } |
921 | |
742 | |
922 | static unordered_vector<object *> mortals; |
743 | object::vector object::objects; // not yet used |
923 | static std::vector<object *, slice_allocator <object *> > freed; |
744 | object *object::first; |
924 | |
|
|
925 | void object::free_mortals () |
|
|
926 | { |
|
|
927 | for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();) |
|
|
928 | if ((*i)->refcnt) |
|
|
929 | ++i; // further delay freeing |
|
|
930 | else |
|
|
931 | { |
|
|
932 | freed.push_back (*i);//D |
|
|
933 | //delete *i; |
|
|
934 | mortals.erase (i); |
|
|
935 | } |
|
|
936 | |
|
|
937 | if (mortals.size() && 0)//D |
|
|
938 | LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D |
|
|
939 | } |
|
|
940 | |
745 | |
941 | object::object () |
746 | object::object () |
942 | { |
747 | { |
943 | SET_FLAG (this, FLAG_REMOVED); |
748 | SET_FLAG (this, FLAG_REMOVED); |
944 | |
749 | |
945 | expmul = 1.0; |
750 | expmul = 1.0; |
946 | face = blank_face; |
751 | face = blank_face; |
947 | attacked_by_count = -1; |
|
|
948 | } |
752 | } |
949 | |
753 | |
950 | object::~object () |
754 | object::~object () |
951 | { |
755 | { |
952 | free_key_values (this); |
756 | free_key_values (this); |
953 | } |
757 | } |
954 | |
758 | |
955 | void object::link () |
759 | void object::link () |
956 | { |
760 | { |
957 | count = ++ob_count; |
761 | count = ++ob_count; |
|
|
762 | uuid = gen_uuid (); |
958 | |
763 | |
959 | prev = 0; |
764 | prev = 0; |
960 | next = objects; |
765 | next = object::first; |
961 | |
766 | |
962 | if (objects) |
767 | if (object::first) |
963 | objects->prev = this; |
768 | object::first->prev = this; |
964 | |
769 | |
965 | objects = this; |
770 | object::first = this; |
966 | } |
771 | } |
967 | |
772 | |
968 | void object::unlink () |
773 | void object::unlink () |
969 | { |
774 | { |
970 | count = 0; |
|
|
971 | uuid = gen_uuid (); |
|
|
972 | |
|
|
973 | if (this == objects) |
775 | if (this == object::first) |
974 | objects = next; |
776 | object::first = next; |
975 | |
777 | |
976 | /* Remove this object from the list of used objects */ |
778 | /* Remove this object from the list of used objects */ |
977 | if (prev) |
|
|
978 | { |
|
|
979 | prev->next = next; |
779 | if (prev) prev->next = next; |
|
|
780 | if (next) next->prev = prev; |
|
|
781 | |
980 | prev = 0; |
782 | prev = 0; |
981 | } |
|
|
982 | |
|
|
983 | if (next) |
|
|
984 | { |
|
|
985 | next->prev = prev; |
|
|
986 | next = 0; |
783 | next = 0; |
987 | } |
|
|
988 | } |
784 | } |
989 | |
785 | |
990 | object *object::create () |
786 | object *object::create () |
991 | { |
787 | { |
992 | object *op; |
|
|
993 | |
|
|
994 | if (freed.empty ()) |
|
|
995 | op = new object; |
788 | object *op = new object; |
996 | else |
|
|
997 | { |
|
|
998 | // highly annoying, but the only way to get it stable right now |
|
|
999 | op = freed.back (); |
|
|
1000 | freed.pop_back (); |
|
|
1001 | op->~object (); |
|
|
1002 | new ((void *) op) object; |
|
|
1003 | } |
|
|
1004 | |
|
|
1005 | op->link (); |
789 | op->link (); |
1006 | return op; |
790 | return op; |
1007 | } |
791 | } |
1008 | |
792 | |
1009 | /* |
793 | /* |
… | |
… | |
1011 | * it from the list of used objects, and puts it on the list of |
795 | * it from the list of used objects, and puts it on the list of |
1012 | * free objects. The IS_FREED() flag is set in the object. |
796 | * free objects. The IS_FREED() flag is set in the object. |
1013 | * The object must have been removed by remove_ob() first for |
797 | * The object must have been removed by remove_ob() first for |
1014 | * this function to succeed. |
798 | * this function to succeed. |
1015 | * |
799 | * |
1016 | * If free_inventory is set, free inventory as well. Else drop items in |
800 | * If destroy_inventory is set, free inventory as well. Else drop items in |
1017 | * inventory to the ground. |
801 | * inventory to the ground. |
1018 | */ |
802 | */ |
1019 | void object::free (bool free_inventory) |
803 | void |
|
|
804 | object::do_destroy () |
1020 | { |
805 | { |
1021 | if (QUERY_FLAG (this, FLAG_FREED)) |
806 | attachable::do_destroy (); |
|
|
807 | |
|
|
808 | if (flag [FLAG_IS_LINKED]) |
|
|
809 | remove_button_link (this); |
|
|
810 | |
|
|
811 | if (flag [FLAG_FRIENDLY]) |
|
|
812 | remove_friendly_object (this); |
|
|
813 | |
|
|
814 | if (!flag [FLAG_REMOVED]) |
|
|
815 | remove (); |
|
|
816 | |
|
|
817 | if (flag [FLAG_FREED]) |
1022 | return; |
818 | return; |
1023 | |
819 | |
1024 | if (QUERY_FLAG (this, FLAG_FRIENDLY)) |
820 | flag [FLAG_FREED] = 1; |
1025 | remove_friendly_object (this); |
|
|
1026 | |
821 | |
1027 | if (!QUERY_FLAG (this, FLAG_REMOVED)) |
822 | // hack to ensure that freed objects still have a valid map |
1028 | remove_ob (this); |
|
|
1029 | |
|
|
1030 | SET_FLAG (this, FLAG_FREED); |
|
|
1031 | |
|
|
1032 | if (more) |
|
|
1033 | { |
823 | { |
1034 | more->free (free_inventory); |
824 | static maptile *freed_map; // freed objects are moved here to avoid crashes |
1035 | more = 0; |
|
|
1036 | } |
|
|
1037 | |
825 | |
1038 | if (inv) |
826 | if (!freed_map) |
1039 | { |
|
|
1040 | /* Only if the space blocks everything do we not process - |
|
|
1041 | * if some form of movement is allowed, let objects |
|
|
1042 | * drop on that space. |
|
|
1043 | */ |
|
|
1044 | if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL) |
|
|
1045 | { |
827 | { |
1046 | object *op = inv; |
828 | freed_map = new maptile; |
1047 | |
829 | |
1048 | while (op) |
830 | freed_map->name = "/internal/freed_objects_map"; |
1049 | { |
831 | freed_map->width = 3; |
1050 | object *tmp = op->below; |
832 | freed_map->height = 3; |
1051 | op->free (free_inventory); |
833 | |
1052 | op = tmp; |
834 | freed_map->allocate (); |
1053 | } |
|
|
1054 | } |
835 | } |
1055 | else |
|
|
1056 | { /* Put objects in inventory onto this space */ |
|
|
1057 | object *op = inv; |
|
|
1058 | |
836 | |
1059 | while (op) |
837 | map = freed_map; |
1060 | { |
838 | x = 1; |
1061 | object *tmp = op->below; |
839 | y = 1; |
1062 | |
|
|
1063 | remove_ob (op); |
|
|
1064 | |
|
|
1065 | if (QUERY_FLAG (op, FLAG_STARTEQUIP) |
|
|
1066 | || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) |
|
|
1067 | free_object (op); |
|
|
1068 | else |
|
|
1069 | { |
|
|
1070 | op->x = x; |
|
|
1071 | op->y = y; |
|
|
1072 | insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */ |
|
|
1073 | } |
|
|
1074 | |
|
|
1075 | op = tmp; |
|
|
1076 | } |
|
|
1077 | } |
|
|
1078 | } |
840 | } |
1079 | |
841 | |
|
|
842 | more = 0; |
|
|
843 | head = 0; |
|
|
844 | inv = 0; |
|
|
845 | |
|
|
846 | // clear those pointers that likely might have circular references to us |
1080 | owner = 0; |
847 | owner = 0; |
|
|
848 | enemy = 0; |
|
|
849 | attacked_by = 0; |
|
|
850 | |
|
|
851 | // only relevant for players(?), but make sure of it anyways |
|
|
852 | contr = 0; |
1081 | |
853 | |
1082 | /* Remove object from the active list */ |
854 | /* Remove object from the active list */ |
1083 | speed = 0; |
855 | speed = 0; |
1084 | update_ob_speed (this); |
856 | update_ob_speed (this); |
1085 | |
857 | |
1086 | unlink (); |
858 | unlink (); |
|
|
859 | } |
1087 | |
860 | |
1088 | mortals.push_back (this); |
861 | /* |
|
|
862 | * Remove and free all objects in the inventory of the given object. |
|
|
863 | * object.c ? |
|
|
864 | */ |
|
|
865 | void |
|
|
866 | object::destroy_inv (bool drop_to_ground) |
|
|
867 | { |
|
|
868 | if (!inv) |
|
|
869 | return; |
|
|
870 | |
|
|
871 | /* Only if the space blocks everything do we not process - |
|
|
872 | * if some form of movement is allowed, let objects |
|
|
873 | * drop on that space. |
|
|
874 | */ |
|
|
875 | if (!drop_to_ground || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL) |
|
|
876 | { |
|
|
877 | while (inv) |
|
|
878 | { |
|
|
879 | inv->destroy_inv (drop_to_ground); |
|
|
880 | inv->destroy (); |
|
|
881 | } |
|
|
882 | } |
|
|
883 | else |
|
|
884 | { /* Put objects in inventory onto this space */ |
|
|
885 | while (inv) |
|
|
886 | { |
|
|
887 | object *op = inv; |
|
|
888 | |
|
|
889 | if (op->flag [FLAG_STARTEQUIP] |
|
|
890 | || op->flag [FLAG_NO_DROP] |
|
|
891 | || op->type == RUNE |
|
|
892 | || op->type == TRAP |
|
|
893 | || op->flag [FLAG_IS_A_TEMPLATE]) |
|
|
894 | op->destroy (); |
|
|
895 | else |
|
|
896 | { |
|
|
897 | op->remove (); |
|
|
898 | op->x = x; |
|
|
899 | op->y = y; |
|
|
900 | insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */ |
|
|
901 | } |
|
|
902 | } |
|
|
903 | } |
|
|
904 | } |
|
|
905 | |
|
|
906 | void |
|
|
907 | object::destroy (bool destroy_inventory) |
|
|
908 | { |
|
|
909 | if (destroyed ()) |
|
|
910 | return; |
|
|
911 | |
|
|
912 | if (more) |
|
|
913 | { |
|
|
914 | //TODO: non-head objects must not have inventory |
|
|
915 | more->destroy (destroy_inventory); |
|
|
916 | more = 0; |
|
|
917 | } |
|
|
918 | |
|
|
919 | if (destroy_inventory) |
|
|
920 | destroy_inv (true); |
|
|
921 | |
|
|
922 | attachable::destroy (); |
1089 | } |
923 | } |
1090 | |
924 | |
1091 | /* |
925 | /* |
1092 | * sub_weight() recursively (outwards) subtracts a number from the |
926 | * sub_weight() recursively (outwards) subtracts a number from the |
1093 | * weight of an object (and what is carried by it's environment(s)). |
927 | * weight of an object (and what is carried by it's environment(s)). |
1094 | */ |
928 | */ |
1095 | |
|
|
1096 | void |
929 | void |
1097 | sub_weight (object *op, signed long weight) |
930 | sub_weight (object *op, signed long weight) |
1098 | { |
931 | { |
1099 | while (op != NULL) |
932 | while (op != NULL) |
1100 | { |
933 | { |
1101 | if (op->type == CONTAINER) |
934 | if (op->type == CONTAINER) |
1102 | { |
|
|
1103 | weight = (signed long) (weight * (100 - op->stats.Str) / 100); |
935 | weight = (signed long) (weight * (100 - op->stats.Str) / 100); |
1104 | } |
936 | |
1105 | op->carrying -= weight; |
937 | op->carrying -= weight; |
1106 | op = op->env; |
938 | op = op->env; |
1107 | } |
939 | } |
1108 | } |
940 | } |
1109 | |
941 | |
1110 | /* remove_ob(op): |
942 | /* op->remove (): |
1111 | * This function removes the object op from the linked list of objects |
943 | * This function removes the object op from the linked list of objects |
1112 | * which it is currently tied to. When this function is done, the |
944 | * which it is currently tied to. When this function is done, the |
1113 | * object will have no environment. If the object previously had an |
945 | * object will have no environment. If the object previously had an |
1114 | * environment, the x and y coordinates will be updated to |
946 | * environment, the x and y coordinates will be updated to |
1115 | * the previous environment. |
947 | * the previous environment. |
1116 | * Beware: This function is called from the editor as well! |
948 | * Beware: This function is called from the editor as well! |
1117 | */ |
949 | */ |
1118 | |
|
|
1119 | void |
950 | void |
1120 | remove_ob (object *op) |
951 | object::remove () |
1121 | { |
952 | { |
|
|
953 | object *tmp, *last = 0; |
1122 | object * |
954 | object *otmp; |
1123 | tmp, * |
|
|
1124 | last = NULL; |
|
|
1125 | object * |
|
|
1126 | otmp; |
|
|
1127 | |
955 | |
1128 | tag_t |
|
|
1129 | tag; |
|
|
1130 | int |
|
|
1131 | check_walk_off; |
|
|
1132 | mapstruct * |
|
|
1133 | m; |
|
|
1134 | |
|
|
1135 | sint16 |
|
|
1136 | x, |
|
|
1137 | y; |
|
|
1138 | |
|
|
1139 | if (QUERY_FLAG (op, FLAG_REMOVED)) |
956 | if (QUERY_FLAG (this, FLAG_REMOVED)) |
1140 | return; |
957 | return; |
1141 | |
958 | |
1142 | SET_FLAG (op, FLAG_REMOVED); |
959 | SET_FLAG (this, FLAG_REMOVED); |
|
|
960 | INVOKE_OBJECT (REMOVE, this); |
1143 | |
961 | |
1144 | if (op->more != NULL) |
962 | if (more) |
1145 | remove_ob (op->more); |
963 | more->remove (); |
1146 | |
964 | |
1147 | /* |
965 | /* |
1148 | * In this case, the object to be removed is in someones |
966 | * In this case, the object to be removed is in someones |
1149 | * inventory. |
967 | * inventory. |
1150 | */ |
968 | */ |
1151 | if (op->env != NULL) |
969 | if (env) |
1152 | { |
970 | { |
1153 | if (op->nrof) |
971 | if (nrof) |
1154 | sub_weight (op->env, op->weight * op->nrof); |
972 | sub_weight (env, weight * nrof); |
1155 | else |
973 | else |
1156 | sub_weight (op->env, op->weight + op->carrying); |
974 | sub_weight (env, weight + carrying); |
1157 | |
975 | |
1158 | /* NO_FIX_PLAYER is set when a great many changes are being |
976 | /* NO_FIX_PLAYER is set when a great many changes are being |
1159 | * made to players inventory. If set, avoiding the call |
977 | * made to players inventory. If set, avoiding the call |
1160 | * to save cpu time. |
978 | * to save cpu time. |
1161 | */ |
979 | */ |
1162 | if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
980 | if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1163 | fix_player (otmp); |
981 | otmp->update_stats (); |
1164 | |
982 | |
1165 | if (op->above != NULL) |
983 | if (above != NULL) |
1166 | op->above->below = op->below; |
984 | above->below = below; |
1167 | else |
985 | else |
1168 | op->env->inv = op->below; |
986 | env->inv = below; |
1169 | |
987 | |
1170 | if (op->below != NULL) |
988 | if (below != NULL) |
1171 | op->below->above = op->above; |
989 | below->above = above; |
1172 | |
990 | |
1173 | /* we set up values so that it could be inserted into |
991 | /* we set up values so that it could be inserted into |
1174 | * the map, but we don't actually do that - it is up |
992 | * the map, but we don't actually do that - it is up |
1175 | * to the caller to decide what we want to do. |
993 | * to the caller to decide what we want to do. |
1176 | */ |
994 | */ |
1177 | op->x = op->env->x, op->y = op->env->y; |
995 | x = env->x, y = env->y; |
1178 | op->map = op->env->map; |
996 | map = env->map; |
1179 | op->above = NULL, op->below = NULL; |
997 | above = 0, below = 0; |
1180 | op->env = NULL; |
998 | env = 0; |
1181 | } |
999 | } |
1182 | else if (op->map) |
1000 | else if (map) |
1183 | { |
1001 | { |
1184 | x = op->x; |
|
|
1185 | y = op->y; |
|
|
1186 | m = get_map_from_coord (op->map, &x, &y); |
|
|
1187 | |
|
|
1188 | if (!m) |
|
|
1189 | { |
|
|
1190 | LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n", |
|
|
1191 | op->map->path, op->x, op->y); |
|
|
1192 | /* in old days, we used to set x and y to 0 and continue. |
|
|
1193 | * it seems if we get into this case, something is probablye |
|
|
1194 | * screwed up and should be fixed. |
|
|
1195 | */ |
|
|
1196 | abort (); |
|
|
1197 | } |
|
|
1198 | |
|
|
1199 | if (op->map != m) |
|
|
1200 | LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n", |
|
|
1201 | op->map->path, m->path, op->x, op->y, x, y); |
|
|
1202 | |
|
|
1203 | /* Re did the following section of code - it looks like it had |
1002 | /* Re did the following section of code - it looks like it had |
1204 | * lots of logic for things we no longer care about |
1003 | * lots of logic for things we no longer care about |
1205 | */ |
1004 | */ |
1206 | |
1005 | |
1207 | /* link the object above us */ |
1006 | /* link the object above us */ |
1208 | if (op->above) |
1007 | if (above) |
1209 | op->above->below = op->below; |
1008 | above->below = below; |
1210 | else |
1009 | else |
1211 | SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */ |
1010 | map->at (x, y).top = below; /* we were top, set new top */ |
1212 | |
1011 | |
1213 | /* Relink the object below us, if there is one */ |
1012 | /* Relink the object below us, if there is one */ |
1214 | if (op->below) |
1013 | if (below) |
1215 | op->below->above = op->above; |
1014 | below->above = above; |
1216 | else |
1015 | else |
1217 | { |
1016 | { |
1218 | /* Nothing below, which means we need to relink map object for this space |
1017 | /* Nothing below, which means we need to relink map object for this space |
1219 | * use translated coordinates in case some oddness with map tiling is |
1018 | * use translated coordinates in case some oddness with map tiling is |
1220 | * evident |
1019 | * evident |
1221 | */ |
1020 | */ |
1222 | if (GET_MAP_OB (m, x, y) != op) |
1021 | if (GET_MAP_OB (map, x, y) != this) |
1223 | { |
1022 | { |
1224 | dump_object (op); |
1023 | char *dump = dump_object (this); |
1225 | LOG (llevError, |
1024 | LOG (llevError, |
1226 | "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", errmsg); |
1025 | "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump); |
|
|
1026 | free (dump); |
1227 | dump_object (GET_MAP_OB (m, x, y)); |
1027 | dump = dump_object (GET_MAP_OB (map, x, y)); |
1228 | LOG (llevError, "%s\n", errmsg); |
1028 | LOG (llevError, "%s\n", dump); |
|
|
1029 | free (dump); |
1229 | } |
1030 | } |
1230 | |
1031 | |
1231 | SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ |
1032 | map->at (x, y).bot = above; /* goes on above it. */ |
1232 | } |
1033 | } |
1233 | |
1034 | |
1234 | op->above = 0; |
1035 | above = 0; |
1235 | op->below = 0; |
1036 | below = 0; |
1236 | |
1037 | |
1237 | if (op->map->in_memory == MAP_SAVING) |
1038 | if (map->in_memory == MAP_SAVING) |
1238 | return; |
1039 | return; |
1239 | |
1040 | |
1240 | tag = op->count; |
1041 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1241 | check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); |
|
|
1242 | |
1042 | |
1243 | for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) |
1043 | for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above) |
1244 | { |
1044 | { |
1245 | /* No point updating the players look faces if he is the object |
1045 | /* No point updating the players look faces if he is the object |
1246 | * being removed. |
1046 | * being removed. |
1247 | */ |
1047 | */ |
1248 | |
1048 | |
1249 | if (tmp->type == PLAYER && tmp != op) |
1049 | if (tmp->type == PLAYER && tmp != this) |
1250 | { |
1050 | { |
1251 | /* If a container that the player is currently using somehow gets |
1051 | /* If a container that the player is currently using somehow gets |
1252 | * removed (most likely destroyed), update the player view |
1052 | * removed (most likely destroyed), update the player view |
1253 | * appropriately. |
1053 | * appropriately. |
1254 | */ |
1054 | */ |
1255 | if (tmp->container == op) |
1055 | if (tmp->container == this) |
1256 | { |
1056 | { |
1257 | CLEAR_FLAG (op, FLAG_APPLIED); |
1057 | flag [FLAG_APPLIED] = 0; |
1258 | tmp->container = NULL; |
1058 | tmp->container = 0; |
1259 | } |
1059 | } |
1260 | |
1060 | |
1261 | tmp->contr->socket.update_look = 1; |
1061 | if (tmp->contr->ns) |
|
|
1062 | tmp->contr->ns->floorbox_update (); |
1262 | } |
1063 | } |
1263 | |
1064 | |
1264 | /* See if player moving off should effect something */ |
1065 | /* See if player moving off should effect something */ |
1265 | if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1066 | if (check_walk_off |
|
|
1067 | && ((move_type & tmp->move_off) |
|
|
1068 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1266 | { |
1069 | { |
1267 | move_apply (tmp, op, NULL); |
1070 | move_apply (tmp, this, 0); |
1268 | |
1071 | |
1269 | if (was_destroyed (op, tag)) |
1072 | if (destroyed ()) |
1270 | { |
|
|
1271 | LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name); |
1073 | LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); |
1272 | } |
|
|
1273 | } |
1074 | } |
1274 | |
1075 | |
1275 | /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ |
1076 | /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ |
1276 | |
1077 | |
1277 | if (tmp->above == tmp) |
1078 | if (tmp->above == tmp) |
1278 | tmp->above = NULL; |
1079 | tmp->above = 0; |
1279 | |
1080 | |
1280 | last = tmp; |
1081 | last = tmp; |
1281 | } |
1082 | } |
1282 | |
1083 | |
1283 | /* last == NULL of there are no objects on this space */ |
1084 | /* last == NULL of there are no objects on this space */ |
1284 | if (last == NULL) |
1085 | if (!last) |
1285 | { |
1086 | map->at (x, y).flags_ = P_NEED_UPDATE; |
1286 | /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, |
|
|
1287 | * we could preserve the flags (GET_MAP_FLAGS), but update_position figures |
|
|
1288 | * those out anyways, and if there are any flags set right now, they won't |
|
|
1289 | * be correct anyways. |
|
|
1290 | */ |
|
|
1291 | SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE); |
|
|
1292 | update_position (op->map, op->x, op->y); |
|
|
1293 | } |
|
|
1294 | else |
1087 | else |
1295 | update_object (last, UP_OBJ_REMOVE); |
1088 | update_object (last, UP_OBJ_REMOVE); |
1296 | |
1089 | |
1297 | if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) |
1090 | if (flag [FLAG_BLOCKSVIEW] || glow_radius) |
1298 | update_all_los (op->map, op->x, op->y); |
1091 | update_all_los (map, x, y); |
1299 | } |
1092 | } |
1300 | } |
1093 | } |
1301 | |
1094 | |
1302 | /* |
1095 | /* |
1303 | * merge_ob(op,top): |
1096 | * merge_ob(op,top): |
… | |
… | |
1311 | merge_ob (object *op, object *top) |
1104 | merge_ob (object *op, object *top) |
1312 | { |
1105 | { |
1313 | if (!op->nrof) |
1106 | if (!op->nrof) |
1314 | return 0; |
1107 | return 0; |
1315 | |
1108 | |
1316 | if (top == NULL) |
1109 | if (top) |
1317 | for (top = op; top != NULL && top->above != NULL; top = top->above); |
1110 | for (top = op; top && top->above; top = top->above) |
|
|
1111 | ; |
1318 | |
1112 | |
1319 | for (; top != NULL; top = top->below) |
1113 | for (; top; top = top->below) |
1320 | { |
1114 | { |
1321 | if (top == op) |
1115 | if (top == op) |
1322 | continue; |
1116 | continue; |
1323 | if (CAN_MERGE (op, top)) |
1117 | |
|
|
1118 | if (object::can_merge (op, top)) |
1324 | { |
1119 | { |
1325 | top->nrof += op->nrof; |
1120 | top->nrof += op->nrof; |
1326 | |
1121 | |
1327 | /* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ |
1122 | /* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ |
1328 | op->weight = 0; /* Don't want any adjustements now */ |
1123 | op->weight = 0; /* Don't want any adjustements now */ |
1329 | remove_ob (op); |
1124 | op->destroy (); |
1330 | free_object (op); |
|
|
1331 | return top; |
1125 | return top; |
1332 | } |
1126 | } |
1333 | } |
1127 | } |
1334 | |
1128 | |
1335 | return NULL; |
1129 | return 0; |
1336 | } |
1130 | } |
1337 | |
1131 | |
1338 | /* |
1132 | /* |
1339 | * same as insert_ob_in_map except it handle separate coordinates and do a clean |
1133 | * same as insert_ob_in_map except it handle separate coordinates and do a clean |
1340 | * job preparing multi-part monsters |
1134 | * job preparing multi-part monsters |
1341 | */ |
1135 | */ |
1342 | object * |
1136 | object * |
1343 | insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y) |
1137 | insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) |
1344 | { |
1138 | { |
1345 | object *tmp; |
1139 | object *tmp; |
1346 | |
1140 | |
1347 | if (op->head) |
1141 | if (op->head) |
1348 | op = op->head; |
1142 | op = op->head; |
… | |
… | |
1374 | * Return value: |
1168 | * Return value: |
1375 | * new object if 'op' was merged with other object |
1169 | * new object if 'op' was merged with other object |
1376 | * NULL if 'op' was destroyed |
1170 | * NULL if 'op' was destroyed |
1377 | * just 'op' otherwise |
1171 | * just 'op' otherwise |
1378 | */ |
1172 | */ |
1379 | |
|
|
1380 | object * |
1173 | object * |
1381 | insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag) |
1174 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1382 | { |
1175 | { |
1383 | object *tmp, *top, *floor = NULL; |
1176 | object *tmp, *top, *floor = NULL; |
1384 | sint16 x, y; |
1177 | sint16 x, y; |
1385 | |
1178 | |
1386 | if (QUERY_FLAG (op, FLAG_FREED)) |
1179 | if (QUERY_FLAG (op, FLAG_FREED)) |
… | |
… | |
1389 | return NULL; |
1182 | return NULL; |
1390 | } |
1183 | } |
1391 | |
1184 | |
1392 | if (m == NULL) |
1185 | if (m == NULL) |
1393 | { |
1186 | { |
1394 | dump_object (op); |
1187 | char *dump = dump_object (op); |
1395 | LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg); |
1188 | LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); |
|
|
1189 | free (dump); |
1396 | return op; |
1190 | return op; |
1397 | } |
1191 | } |
1398 | |
1192 | |
1399 | if (out_of_map (m, op->x, op->y)) |
1193 | if (out_of_map (m, op->x, op->y)) |
1400 | { |
1194 | { |
1401 | dump_object (op); |
1195 | char *dump = dump_object (op); |
1402 | LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg); |
1196 | LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump); |
1403 | #ifdef MANY_CORES |
1197 | #ifdef MANY_CORES |
1404 | /* Better to catch this here, as otherwise the next use of this object |
1198 | /* Better to catch this here, as otherwise the next use of this object |
1405 | * is likely to cause a crash. Better to find out where it is getting |
1199 | * is likely to cause a crash. Better to find out where it is getting |
1406 | * improperly inserted. |
1200 | * improperly inserted. |
1407 | */ |
1201 | */ |
1408 | abort (); |
1202 | abort (); |
1409 | #endif |
1203 | #endif |
|
|
1204 | free (dump); |
1410 | return op; |
1205 | return op; |
1411 | } |
1206 | } |
1412 | |
1207 | |
1413 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
1208 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
1414 | { |
1209 | { |
1415 | dump_object (op); |
1210 | char *dump = dump_object (op); |
1416 | LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg); |
1211 | LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump); |
|
|
1212 | free (dump); |
1417 | return op; |
1213 | return op; |
1418 | } |
1214 | } |
1419 | |
1215 | |
1420 | if (op->more != NULL) |
1216 | if (op->more) |
1421 | { |
1217 | { |
1422 | /* The part may be on a different map. */ |
1218 | /* The part may be on a different map. */ |
1423 | |
1219 | |
1424 | object *more = op->more; |
1220 | object *more = op->more; |
1425 | |
1221 | |
… | |
… | |
1441 | if (insert_ob_in_map (more, more->map, originator, flag) == NULL) |
1237 | if (insert_ob_in_map (more, more->map, originator, flag) == NULL) |
1442 | { |
1238 | { |
1443 | if (!op->head) |
1239 | if (!op->head) |
1444 | LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); |
1240 | LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); |
1445 | |
1241 | |
1446 | return NULL; |
1242 | return 0; |
1447 | } |
1243 | } |
1448 | } |
1244 | } |
1449 | |
1245 | |
1450 | CLEAR_FLAG (op, FLAG_REMOVED); |
1246 | CLEAR_FLAG (op, FLAG_REMOVED); |
1451 | |
1247 | |
… | |
… | |
1459 | |
1255 | |
1460 | /* this has to be done after we translate the coordinates. |
1256 | /* this has to be done after we translate the coordinates. |
1461 | */ |
1257 | */ |
1462 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1258 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1463 | for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) |
1259 | for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) |
1464 | if (CAN_MERGE (op, tmp)) |
1260 | if (object::can_merge (op, tmp)) |
1465 | { |
1261 | { |
1466 | op->nrof += tmp->nrof; |
1262 | op->nrof += tmp->nrof; |
1467 | remove_ob (tmp); |
1263 | tmp->destroy (); |
1468 | free_object (tmp); |
|
|
1469 | } |
1264 | } |
1470 | |
1265 | |
1471 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1266 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1472 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1267 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1473 | |
1268 | |
… | |
… | |
1486 | op->below = originator->below; |
1281 | op->below = originator->below; |
1487 | |
1282 | |
1488 | if (op->below) |
1283 | if (op->below) |
1489 | op->below->above = op; |
1284 | op->below->above = op; |
1490 | else |
1285 | else |
1491 | SET_MAP_OB (op->map, op->x, op->y, op); |
1286 | op->ms ().bot = op; |
1492 | |
1287 | |
1493 | /* since *below* originator, no need to update top */ |
1288 | /* since *below* originator, no need to update top */ |
1494 | originator->below = op; |
1289 | originator->below = op; |
1495 | } |
1290 | } |
1496 | else |
1291 | else |
… | |
… | |
1542 | * If INS_ON_TOP is used, don't do this processing |
1337 | * If INS_ON_TOP is used, don't do this processing |
1543 | * Need to find the object that in fact blocks view, otherwise |
1338 | * Need to find the object that in fact blocks view, otherwise |
1544 | * stacking is a bit odd. |
1339 | * stacking is a bit odd. |
1545 | */ |
1340 | */ |
1546 | if (!(flag & INS_ON_TOP) && |
1341 | if (!(flag & INS_ON_TOP) && |
1547 | (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) |
1342 | (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) |
1548 | { |
1343 | { |
1549 | for (last = top; last != floor; last = last->below) |
1344 | for (last = top; last != floor; last = last->below) |
1550 | if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) |
1345 | if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) |
1551 | break; |
1346 | break; |
1552 | /* Check to see if we found the object that blocks view, |
1347 | /* Check to see if we found the object that blocks view, |
… | |
… | |
1575 | |
1370 | |
1576 | if (op->above) |
1371 | if (op->above) |
1577 | op->above->below = op; |
1372 | op->above->below = op; |
1578 | |
1373 | |
1579 | op->below = NULL; |
1374 | op->below = NULL; |
1580 | SET_MAP_OB (op->map, op->x, op->y, op); |
1375 | op->ms ().bot = op; |
1581 | } |
1376 | } |
1582 | else |
1377 | else |
1583 | { /* get inserted into the stack above top */ |
1378 | { /* get inserted into the stack above top */ |
1584 | op->above = top->above; |
1379 | op->above = top->above; |
1585 | |
1380 | |
… | |
… | |
1589 | op->below = top; |
1384 | op->below = top; |
1590 | top->above = op; |
1385 | top->above = op; |
1591 | } |
1386 | } |
1592 | |
1387 | |
1593 | if (op->above == NULL) |
1388 | if (op->above == NULL) |
1594 | SET_MAP_TOP (op->map, op->x, op->y, op); |
1389 | op->ms ().top = op; |
1595 | } /* else not INS_BELOW_ORIGINATOR */ |
1390 | } /* else not INS_BELOW_ORIGINATOR */ |
1596 | |
1391 | |
1597 | if (op->type == PLAYER) |
1392 | if (op->type == PLAYER) |
1598 | op->contr->do_los = 1; |
1393 | op->contr->do_los = 1; |
1599 | |
1394 | |
1600 | /* If we have a floor, we know the player, if any, will be above |
1395 | /* If we have a floor, we know the player, if any, will be above |
1601 | * it, so save a few ticks and start from there. |
1396 | * it, so save a few ticks and start from there. |
1602 | */ |
1397 | */ |
1603 | if (!(flag & INS_MAP_LOAD)) |
1398 | if (!(flag & INS_MAP_LOAD)) |
1604 | for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) |
1399 | if (object *pl = op->ms ().player ()) |
1605 | if (tmp->type == PLAYER) |
1400 | if (pl->contr->ns) |
1606 | tmp->contr->socket.update_look = 1; |
1401 | pl->contr->ns->floorbox_update (); |
1607 | |
1402 | |
1608 | /* If this object glows, it may affect lighting conditions that are |
1403 | /* If this object glows, it may affect lighting conditions that are |
1609 | * visible to others on this map. But update_all_los is really |
1404 | * visible to others on this map. But update_all_los is really |
1610 | * an inefficient way to do this, as it means los for all players |
1405 | * an inefficient way to do this, as it means los for all players |
1611 | * on the map will get recalculated. The players could very well |
1406 | * on the map will get recalculated. The players could very well |
1612 | * be far away from this change and not affected in any way - |
1407 | * be far away from this change and not affected in any way - |
1613 | * this should get redone to only look for players within range, |
1408 | * this should get redone to only look for players within range, |
1614 | * or just updating the P_NEED_UPDATE for spaces within this area |
1409 | * or just updating the P_NEED_UPDATE for spaces within this area |
1615 | * of effect may be sufficient. |
1410 | * of effect may be sufficient. |
1616 | */ |
1411 | */ |
1617 | if (MAP_DARKNESS (op->map) && (op->glow_radius != 0)) |
1412 | if (op->map->darkness && (op->glow_radius != 0)) |
1618 | update_all_los (op->map, op->x, op->y); |
1413 | update_all_los (op->map, op->x, op->y); |
1619 | |
1414 | |
1620 | /* updates flags (blocked, alive, no magic, etc) for this map space */ |
1415 | /* updates flags (blocked, alive, no magic, etc) for this map space */ |
1621 | update_object (op, UP_OBJ_INSERT); |
1416 | update_object (op, UP_OBJ_INSERT); |
1622 | |
1417 | |
|
|
1418 | INVOKE_OBJECT (INSERT, op); |
|
|
1419 | |
1623 | /* Don't know if moving this to the end will break anything. However, |
1420 | /* Don't know if moving this to the end will break anything. However, |
1624 | * we want to have update_look set above before calling this. |
1421 | * we want to have floorbox_update called before calling this. |
1625 | * |
1422 | * |
1626 | * check_move_on() must be after this because code called from |
1423 | * check_move_on() must be after this because code called from |
1627 | * check_move_on() depends on correct map flags (so functions like |
1424 | * check_move_on() depends on correct map flags (so functions like |
1628 | * blocked() and wall() work properly), and these flags are updated by |
1425 | * blocked() and wall() work properly), and these flags are updated by |
1629 | * update_object(). |
1426 | * update_object(). |
… | |
… | |
1631 | |
1428 | |
1632 | /* if this is not the head or flag has been passed, don't check walk on status */ |
1429 | /* if this is not the head or flag has been passed, don't check walk on status */ |
1633 | if (!(flag & INS_NO_WALK_ON) && !op->head) |
1430 | if (!(flag & INS_NO_WALK_ON) && !op->head) |
1634 | { |
1431 | { |
1635 | if (check_move_on (op, originator)) |
1432 | if (check_move_on (op, originator)) |
1636 | return NULL; |
1433 | return 0; |
1637 | |
1434 | |
1638 | /* If we are a multi part object, lets work our way through the check |
1435 | /* If we are a multi part object, lets work our way through the check |
1639 | * walk on's. |
1436 | * walk on's. |
1640 | */ |
1437 | */ |
1641 | for (tmp = op->more; tmp != NULL; tmp = tmp->more) |
1438 | for (tmp = op->more; tmp != NULL; tmp = tmp->more) |
1642 | if (check_move_on (tmp, originator)) |
1439 | if (check_move_on (tmp, originator)) |
1643 | return NULL; |
1440 | return 0; |
1644 | } |
1441 | } |
1645 | |
1442 | |
1646 | return op; |
1443 | return op; |
1647 | } |
1444 | } |
1648 | |
1445 | |
1649 | /* this function inserts an object in the map, but if it |
1446 | /* this function inserts an object in the map, but if it |
1650 | * finds an object of its own type, it'll remove that one first. |
1447 | * finds an object of its own type, it'll remove that one first. |
1651 | * op is the object to insert it under: supplies x and the map. |
1448 | * op is the object to insert it under: supplies x and the map. |
1652 | */ |
1449 | */ |
1653 | void |
1450 | void |
1654 | replace_insert_ob_in_map (const char *arch_string, object *op) |
1451 | replace_insert_ob_in_map (const char *arch_string, object *op) |
1655 | { |
1452 | { |
1656 | object * |
1453 | object *tmp, *tmp1; |
1657 | tmp; |
|
|
1658 | object * |
|
|
1659 | tmp1; |
|
|
1660 | |
1454 | |
1661 | /* first search for itself and remove any old instances */ |
1455 | /* first search for itself and remove any old instances */ |
1662 | |
1456 | |
1663 | for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) |
1457 | for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) |
1664 | { |
|
|
1665 | if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ |
1458 | if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ |
1666 | { |
1459 | tmp->destroy (); |
1667 | remove_ob (tmp); |
|
|
1668 | free_object (tmp); |
|
|
1669 | } |
|
|
1670 | } |
|
|
1671 | |
1460 | |
1672 | tmp1 = arch_to_object (find_archetype (arch_string)); |
1461 | tmp1 = arch_to_object (archetype::find (arch_string)); |
1673 | |
1462 | |
1674 | tmp1->x = op->x; |
1463 | tmp1->x = op->x; |
1675 | tmp1->y = op->y; |
1464 | tmp1->y = op->y; |
1676 | insert_ob_in_map (tmp1, op->map, op, 0); |
1465 | insert_ob_in_map (tmp1, op->map, op, 0); |
1677 | } |
1466 | } |
… | |
… | |
1685 | */ |
1474 | */ |
1686 | |
1475 | |
1687 | object * |
1476 | object * |
1688 | get_split_ob (object *orig_ob, uint32 nr) |
1477 | get_split_ob (object *orig_ob, uint32 nr) |
1689 | { |
1478 | { |
1690 | object * |
1479 | object *newob; |
1691 | newob; |
|
|
1692 | int |
|
|
1693 | is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); |
1480 | int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); |
1694 | |
1481 | |
1695 | if (orig_ob->nrof < nr) |
1482 | if (orig_ob->nrof < nr) |
1696 | { |
1483 | { |
1697 | sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name); |
1484 | sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name); |
1698 | return NULL; |
1485 | return NULL; |
1699 | } |
1486 | } |
1700 | |
1487 | |
1701 | newob = object_create_clone (orig_ob); |
1488 | newob = object_create_clone (orig_ob); |
1702 | |
1489 | |
1703 | if ((orig_ob->nrof -= nr) < 1) |
1490 | if ((orig_ob->nrof -= nr) < 1) |
1704 | { |
1491 | orig_ob->destroy (1); |
1705 | if (!is_removed) |
|
|
1706 | remove_ob (orig_ob); |
|
|
1707 | free_object2 (orig_ob, 1); |
|
|
1708 | } |
|
|
1709 | else if (!is_removed) |
1492 | else if (!is_removed) |
1710 | { |
1493 | { |
1711 | if (orig_ob->env != NULL) |
1494 | if (orig_ob->env != NULL) |
1712 | sub_weight (orig_ob->env, orig_ob->weight * nr); |
1495 | sub_weight (orig_ob->env, orig_ob->weight * nr); |
1713 | if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY) |
1496 | if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY) |
… | |
… | |
1733 | |
1516 | |
1734 | object * |
1517 | object * |
1735 | decrease_ob_nr (object *op, uint32 i) |
1518 | decrease_ob_nr (object *op, uint32 i) |
1736 | { |
1519 | { |
1737 | object *tmp; |
1520 | object *tmp; |
1738 | player *pl; |
|
|
1739 | |
1521 | |
1740 | if (i == 0) /* objects with op->nrof require this check */ |
1522 | if (i == 0) /* objects with op->nrof require this check */ |
1741 | return op; |
1523 | return op; |
1742 | |
1524 | |
1743 | if (i > op->nrof) |
1525 | if (i > op->nrof) |
1744 | i = op->nrof; |
1526 | i = op->nrof; |
1745 | |
1527 | |
1746 | if (QUERY_FLAG (op, FLAG_REMOVED)) |
1528 | if (QUERY_FLAG (op, FLAG_REMOVED)) |
1747 | op->nrof -= i; |
1529 | op->nrof -= i; |
1748 | else if (op->env != NULL) |
1530 | else if (op->env) |
1749 | { |
1531 | { |
1750 | /* is this object in the players inventory, or sub container |
1532 | /* is this object in the players inventory, or sub container |
1751 | * therein? |
1533 | * therein? |
1752 | */ |
1534 | */ |
1753 | tmp = is_player_inv (op->env); |
1535 | tmp = op->in_player (); |
1754 | /* nope. Is this a container the player has opened? |
1536 | /* nope. Is this a container the player has opened? |
1755 | * If so, set tmp to that player. |
1537 | * If so, set tmp to that player. |
1756 | * IMO, searching through all the players will mostly |
1538 | * IMO, searching through all the players will mostly |
1757 | * likely be quicker than following op->env to the map, |
1539 | * likely be quicker than following op->env to the map, |
1758 | * and then searching the map for a player. |
1540 | * and then searching the map for a player. |
1759 | */ |
1541 | */ |
1760 | if (!tmp) |
1542 | if (!tmp) |
1761 | { |
1543 | for_all_players (pl) |
1762 | for (pl = first_player; pl; pl = pl->next) |
|
|
1763 | if (pl->ob->container == op->env) |
1544 | if (pl->ob->container == op->env) |
|
|
1545 | { |
|
|
1546 | tmp = pl->ob; |
1764 | break; |
1547 | break; |
1765 | if (pl) |
|
|
1766 | tmp = pl->ob; |
|
|
1767 | else |
|
|
1768 | tmp = NULL; |
|
|
1769 | } |
1548 | } |
1770 | |
1549 | |
1771 | if (i < op->nrof) |
1550 | if (i < op->nrof) |
1772 | { |
1551 | { |
1773 | sub_weight (op->env, op->weight * i); |
1552 | sub_weight (op->env, op->weight * i); |
1774 | op->nrof -= i; |
1553 | op->nrof -= i; |
1775 | if (tmp) |
1554 | if (tmp) |
1776 | { |
|
|
1777 | esrv_send_item (tmp, op); |
1555 | esrv_send_item (tmp, op); |
1778 | } |
|
|
1779 | } |
1556 | } |
1780 | else |
1557 | else |
1781 | { |
1558 | { |
1782 | remove_ob (op); |
1559 | op->remove (); |
1783 | op->nrof = 0; |
1560 | op->nrof = 0; |
1784 | if (tmp) |
1561 | if (tmp) |
1785 | { |
|
|
1786 | esrv_del_item (tmp->contr, op->count); |
1562 | esrv_del_item (tmp->contr, op->count); |
1787 | } |
|
|
1788 | } |
1563 | } |
1789 | } |
1564 | } |
1790 | else |
1565 | else |
1791 | { |
1566 | { |
1792 | object *above = op->above; |
1567 | object *above = op->above; |
1793 | |
1568 | |
1794 | if (i < op->nrof) |
1569 | if (i < op->nrof) |
1795 | op->nrof -= i; |
1570 | op->nrof -= i; |
1796 | else |
1571 | else |
1797 | { |
1572 | { |
1798 | remove_ob (op); |
1573 | op->remove (); |
1799 | op->nrof = 0; |
1574 | op->nrof = 0; |
1800 | } |
1575 | } |
1801 | |
1576 | |
1802 | /* Since we just removed op, op->above is null */ |
1577 | /* Since we just removed op, op->above is null */ |
1803 | for (tmp = above; tmp != NULL; tmp = tmp->above) |
1578 | for (tmp = above; tmp; tmp = tmp->above) |
1804 | if (tmp->type == PLAYER) |
1579 | if (tmp->type == PLAYER) |
1805 | { |
1580 | { |
1806 | if (op->nrof) |
1581 | if (op->nrof) |
1807 | esrv_send_item (tmp, op); |
1582 | esrv_send_item (tmp, op); |
1808 | else |
1583 | else |
… | |
… | |
1812 | |
1587 | |
1813 | if (op->nrof) |
1588 | if (op->nrof) |
1814 | return op; |
1589 | return op; |
1815 | else |
1590 | else |
1816 | { |
1591 | { |
1817 | free_object (op); |
1592 | op->destroy (); |
1818 | return NULL; |
1593 | return 0; |
1819 | } |
1594 | } |
1820 | } |
1595 | } |
1821 | |
1596 | |
1822 | /* |
1597 | /* |
1823 | * add_weight(object, weight) adds the specified weight to an object, |
1598 | * add_weight(object, weight) adds the specified weight to an object, |
… | |
… | |
1835 | op->carrying += weight; |
1610 | op->carrying += weight; |
1836 | op = op->env; |
1611 | op = op->env; |
1837 | } |
1612 | } |
1838 | } |
1613 | } |
1839 | |
1614 | |
|
|
1615 | object * |
|
|
1616 | insert_ob_in_ob (object *op, object *where) |
|
|
1617 | { |
|
|
1618 | if (!where) |
|
|
1619 | { |
|
|
1620 | char *dump = dump_object (op); |
|
|
1621 | LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); |
|
|
1622 | free (dump); |
|
|
1623 | return op; |
|
|
1624 | } |
|
|
1625 | |
|
|
1626 | if (where->head) |
|
|
1627 | { |
|
|
1628 | LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n"); |
|
|
1629 | where = where->head; |
|
|
1630 | } |
|
|
1631 | |
|
|
1632 | return where->insert (op); |
|
|
1633 | } |
|
|
1634 | |
1840 | /* |
1635 | /* |
1841 | * insert_ob_in_ob(op,environment): |
1636 | * env->insert (op) |
1842 | * This function inserts the object op in the linked list |
1637 | * This function inserts the object op in the linked list |
1843 | * inside the object environment. |
1638 | * inside the object environment. |
1844 | * |
1639 | * |
1845 | * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter |
|
|
1846 | * the inventory at the last position or next to other objects of the same |
|
|
1847 | * type. |
|
|
1848 | * Frank: Now sorted by type, archetype and magic! |
|
|
1849 | * |
|
|
1850 | * The function returns now pointer to inserted item, and return value can |
1640 | * The function returns now pointer to inserted item, and return value can |
1851 | * be != op, if items are merged. -Tero |
1641 | * be != op, if items are merged. -Tero |
1852 | */ |
1642 | */ |
1853 | |
1643 | |
1854 | object * |
1644 | object * |
1855 | insert_ob_in_ob (object *op, object *where) |
1645 | object::insert (object *op) |
1856 | { |
1646 | { |
1857 | object * |
1647 | object *tmp, *otmp; |
1858 | tmp, * |
|
|
1859 | otmp; |
|
|
1860 | |
1648 | |
1861 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
1649 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
1862 | { |
1650 | op->remove (); |
1863 | dump_object (op); |
|
|
1864 | LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg); |
|
|
1865 | return op; |
|
|
1866 | } |
|
|
1867 | |
|
|
1868 | if (where == NULL) |
|
|
1869 | { |
|
|
1870 | dump_object (op); |
|
|
1871 | LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg); |
|
|
1872 | return op; |
|
|
1873 | } |
|
|
1874 | |
|
|
1875 | if (where->head) |
|
|
1876 | { |
|
|
1877 | LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n"); |
|
|
1878 | where = where->head; |
|
|
1879 | } |
|
|
1880 | |
1651 | |
1881 | if (op->more) |
1652 | if (op->more) |
1882 | { |
1653 | { |
1883 | LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); |
1654 | LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); |
1884 | return op; |
1655 | return op; |
… | |
… | |
1886 | |
1657 | |
1887 | CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); |
1658 | CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); |
1888 | CLEAR_FLAG (op, FLAG_REMOVED); |
1659 | CLEAR_FLAG (op, FLAG_REMOVED); |
1889 | if (op->nrof) |
1660 | if (op->nrof) |
1890 | { |
1661 | { |
1891 | for (tmp = where->inv; tmp != NULL; tmp = tmp->below) |
1662 | for (tmp = inv; tmp != NULL; tmp = tmp->below) |
1892 | if (CAN_MERGE (tmp, op)) |
1663 | if (object::can_merge (tmp, op)) |
1893 | { |
1664 | { |
1894 | /* return the original object and remove inserted object |
1665 | /* return the original object and remove inserted object |
1895 | (client needs the original object) */ |
1666 | (client needs the original object) */ |
1896 | tmp->nrof += op->nrof; |
1667 | tmp->nrof += op->nrof; |
1897 | /* Weight handling gets pretty funky. Since we are adding to |
1668 | /* Weight handling gets pretty funky. Since we are adding to |
1898 | * tmp->nrof, we need to increase the weight. |
1669 | * tmp->nrof, we need to increase the weight. |
1899 | */ |
1670 | */ |
1900 | add_weight (where, op->weight * op->nrof); |
1671 | add_weight (this, op->weight * op->nrof); |
1901 | SET_FLAG (op, FLAG_REMOVED); |
1672 | SET_FLAG (op, FLAG_REMOVED); |
1902 | free_object (op); /* free the inserted object */ |
1673 | op->destroy (); /* free the inserted object */ |
1903 | op = tmp; |
1674 | op = tmp; |
1904 | remove_ob (op); /* and fix old object's links */ |
1675 | op->remove (); /* and fix old object's links */ |
1905 | CLEAR_FLAG (op, FLAG_REMOVED); |
1676 | CLEAR_FLAG (op, FLAG_REMOVED); |
1906 | break; |
1677 | break; |
1907 | } |
1678 | } |
1908 | |
1679 | |
1909 | /* I assume combined objects have no inventory |
1680 | /* I assume combined objects have no inventory |
1910 | * We add the weight - this object could have just been removed |
1681 | * We add the weight - this object could have just been removed |
1911 | * (if it was possible to merge). calling remove_ob will subtract |
1682 | * (if it was possible to merge). calling remove_ob will subtract |
1912 | * the weight, so we need to add it in again, since we actually do |
1683 | * the weight, so we need to add it in again, since we actually do |
1913 | * the linking below |
1684 | * the linking below |
1914 | */ |
1685 | */ |
1915 | add_weight (where, op->weight * op->nrof); |
1686 | add_weight (this, op->weight * op->nrof); |
1916 | } |
1687 | } |
1917 | else |
1688 | else |
1918 | add_weight (where, (op->weight + op->carrying)); |
1689 | add_weight (this, (op->weight + op->carrying)); |
1919 | |
1690 | |
1920 | otmp = is_player_inv (where); |
1691 | otmp = this->in_player (); |
1921 | if (otmp && otmp->contr != NULL) |
1692 | if (otmp && otmp->contr) |
1922 | { |
|
|
1923 | if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1693 | if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1924 | fix_player (otmp); |
1694 | otmp->update_stats (); |
1925 | } |
|
|
1926 | |
1695 | |
1927 | op->map = NULL; |
1696 | op->map = 0; |
1928 | op->env = where; |
1697 | op->env = this; |
1929 | op->above = NULL; |
1698 | op->above = 0; |
1930 | op->below = NULL; |
1699 | op->below = 0; |
1931 | op->x = 0, op->y = 0; |
1700 | op->x = 0, op->y = 0; |
1932 | |
1701 | |
1933 | /* reset the light list and los of the players on the map */ |
1702 | /* reset the light list and los of the players on the map */ |
1934 | if ((op->glow_radius != 0) && where->map) |
1703 | if ((op->glow_radius != 0) && map) |
1935 | { |
1704 | { |
1936 | #ifdef DEBUG_LIGHTS |
1705 | #ifdef DEBUG_LIGHTS |
1937 | LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); |
1706 | LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); |
1938 | #endif /* DEBUG_LIGHTS */ |
1707 | #endif /* DEBUG_LIGHTS */ |
1939 | if (MAP_DARKNESS (where->map)) |
1708 | if (map->darkness) |
1940 | update_all_los (where->map, where->x, where->y); |
1709 | update_all_los (map, x, y); |
1941 | } |
1710 | } |
1942 | |
1711 | |
1943 | /* Client has no idea of ordering so lets not bother ordering it here. |
1712 | /* Client has no idea of ordering so lets not bother ordering it here. |
1944 | * It sure simplifies this function... |
1713 | * It sure simplifies this function... |
1945 | */ |
1714 | */ |
1946 | if (where->inv == NULL) |
1715 | if (!inv) |
1947 | where->inv = op; |
1716 | inv = op; |
1948 | else |
1717 | else |
1949 | { |
1718 | { |
1950 | op->below = where->inv; |
1719 | op->below = inv; |
1951 | op->below->above = op; |
1720 | op->below->above = op; |
1952 | where->inv = op; |
1721 | inv = op; |
1953 | } |
1722 | } |
|
|
1723 | |
|
|
1724 | INVOKE_OBJECT (INSERT, this); |
|
|
1725 | |
1954 | return op; |
1726 | return op; |
1955 | } |
1727 | } |
1956 | |
1728 | |
1957 | /* |
1729 | /* |
1958 | * Checks if any objects has a move_type that matches objects |
1730 | * Checks if any objects has a move_type that matches objects |
… | |
… | |
1976 | */ |
1748 | */ |
1977 | |
1749 | |
1978 | int |
1750 | int |
1979 | check_move_on (object *op, object *originator) |
1751 | check_move_on (object *op, object *originator) |
1980 | { |
1752 | { |
1981 | object * |
1753 | object *tmp; |
1982 | tmp; |
1754 | maptile *m = op->map; |
1983 | tag_t |
|
|
1984 | tag; |
|
|
1985 | mapstruct * |
|
|
1986 | m = op->map; |
|
|
1987 | int |
|
|
1988 | x = op->x, y = op->y; |
1755 | int x = op->x, y = op->y; |
1989 | |
1756 | |
1990 | MoveType |
1757 | MoveType move_on, move_slow, move_block; |
1991 | move_on, |
|
|
1992 | move_slow, |
|
|
1993 | move_block; |
|
|
1994 | |
1758 | |
1995 | if (QUERY_FLAG (op, FLAG_NO_APPLY)) |
1759 | if (QUERY_FLAG (op, FLAG_NO_APPLY)) |
1996 | return 0; |
1760 | return 0; |
1997 | |
|
|
1998 | tag = op->count; |
|
|
1999 | |
1761 | |
2000 | move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); |
1762 | move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); |
2001 | move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); |
1763 | move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); |
2002 | move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); |
1764 | move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); |
2003 | |
1765 | |
… | |
… | |
2019 | |
1781 | |
2020 | /* The objects have to be checked from top to bottom. |
1782 | /* The objects have to be checked from top to bottom. |
2021 | * Hence, we first go to the top: |
1783 | * Hence, we first go to the top: |
2022 | */ |
1784 | */ |
2023 | |
1785 | |
2024 | for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above) |
1786 | for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above) |
2025 | { |
1787 | { |
2026 | /* Trim the search when we find the first other spell effect |
1788 | /* Trim the search when we find the first other spell effect |
2027 | * this helps performance so that if a space has 50 spell objects, |
1789 | * this helps performance so that if a space has 50 spell objects, |
2028 | * we don't need to check all of them. |
1790 | * we don't need to check all of them. |
2029 | */ |
1791 | */ |
… | |
… | |
2064 | if ((!op->move_type && tmp->move_on & MOVE_WALK) || |
1826 | if ((!op->move_type && tmp->move_on & MOVE_WALK) || |
2065 | ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0)) |
1827 | ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0)) |
2066 | { |
1828 | { |
2067 | move_apply (tmp, op, originator); |
1829 | move_apply (tmp, op, originator); |
2068 | |
1830 | |
2069 | if (was_destroyed (op, tag)) |
1831 | if (op->destroyed ()) |
2070 | return 1; |
1832 | return 1; |
2071 | |
1833 | |
2072 | /* what the person/creature stepped onto has moved the object |
1834 | /* what the person/creature stepped onto has moved the object |
2073 | * someplace new. Don't process any further - if we did, |
1835 | * someplace new. Don't process any further - if we did, |
2074 | * have a feeling strange problems would result. |
1836 | * have a feeling strange problems would result. |
… | |
… | |
2084 | /* |
1846 | /* |
2085 | * present_arch(arch, map, x, y) searches for any objects with |
1847 | * present_arch(arch, map, x, y) searches for any objects with |
2086 | * a matching archetype at the given map and coordinates. |
1848 | * a matching archetype at the given map and coordinates. |
2087 | * The first matching object is returned, or NULL if none. |
1849 | * The first matching object is returned, or NULL if none. |
2088 | */ |
1850 | */ |
2089 | |
|
|
2090 | object * |
1851 | object * |
2091 | present_arch (const archetype *at, mapstruct *m, int x, int y) |
1852 | present_arch (const archetype *at, maptile *m, int x, int y) |
2092 | { |
1853 | { |
2093 | object * |
|
|
2094 | tmp; |
|
|
2095 | |
|
|
2096 | if (m == NULL || out_of_map (m, x, y)) |
1854 | if (m == NULL || out_of_map (m, x, y)) |
2097 | { |
1855 | { |
2098 | LOG (llevError, "Present_arch called outside map.\n"); |
1856 | LOG (llevError, "Present_arch called outside map.\n"); |
2099 | return NULL; |
1857 | return NULL; |
2100 | } |
1858 | } |
|
|
1859 | |
2101 | for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) |
1860 | for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) |
2102 | if (tmp->arch == at) |
1861 | if (tmp->arch == at) |
2103 | return tmp; |
1862 | return tmp; |
|
|
1863 | |
2104 | return NULL; |
1864 | return NULL; |
2105 | } |
1865 | } |
2106 | |
1866 | |
2107 | /* |
1867 | /* |
2108 | * present(type, map, x, y) searches for any objects with |
1868 | * present(type, map, x, y) searches for any objects with |
2109 | * a matching type variable at the given map and coordinates. |
1869 | * a matching type variable at the given map and coordinates. |
2110 | * The first matching object is returned, or NULL if none. |
1870 | * The first matching object is returned, or NULL if none. |
2111 | */ |
1871 | */ |
2112 | |
|
|
2113 | object * |
1872 | object * |
2114 | present (unsigned char type, mapstruct *m, int x, int y) |
1873 | present (unsigned char type, maptile *m, int x, int y) |
2115 | { |
1874 | { |
2116 | object * |
|
|
2117 | tmp; |
|
|
2118 | |
|
|
2119 | if (out_of_map (m, x, y)) |
1875 | if (out_of_map (m, x, y)) |
2120 | { |
1876 | { |
2121 | LOG (llevError, "Present called outside map.\n"); |
1877 | LOG (llevError, "Present called outside map.\n"); |
2122 | return NULL; |
1878 | return NULL; |
2123 | } |
1879 | } |
|
|
1880 | |
2124 | for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) |
1881 | for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) |
2125 | if (tmp->type == type) |
1882 | if (tmp->type == type) |
2126 | return tmp; |
1883 | return tmp; |
|
|
1884 | |
2127 | return NULL; |
1885 | return NULL; |
2128 | } |
1886 | } |
2129 | |
1887 | |
2130 | /* |
1888 | /* |
2131 | * present_in_ob(type, object) searches for any objects with |
1889 | * present_in_ob(type, object) searches for any objects with |
2132 | * a matching type variable in the inventory of the given object. |
1890 | * a matching type variable in the inventory of the given object. |
2133 | * The first matching object is returned, or NULL if none. |
1891 | * The first matching object is returned, or NULL if none. |
2134 | */ |
1892 | */ |
2135 | |
|
|
2136 | object * |
1893 | object * |
2137 | present_in_ob (unsigned char type, const object *op) |
1894 | present_in_ob (unsigned char type, const object *op) |
2138 | { |
1895 | { |
2139 | object * |
|
|
2140 | tmp; |
|
|
2141 | |
|
|
2142 | for (tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1896 | for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) |
2143 | if (tmp->type == type) |
1897 | if (tmp->type == type) |
2144 | return tmp; |
1898 | return tmp; |
|
|
1899 | |
2145 | return NULL; |
1900 | return NULL; |
2146 | } |
1901 | } |
2147 | |
1902 | |
2148 | /* |
1903 | /* |
2149 | * present_in_ob (type, str, object) searches for any objects with |
1904 | * present_in_ob (type, str, object) searches for any objects with |
… | |
… | |
2157 | * str is the string to match against. Note that we match against |
1912 | * str is the string to match against. Note that we match against |
2158 | * the object name, not the archetype name. this is so that the |
1913 | * the object name, not the archetype name. this is so that the |
2159 | * spell code can use one object type (force), but change it's name |
1914 | * spell code can use one object type (force), but change it's name |
2160 | * to be unique. |
1915 | * to be unique. |
2161 | */ |
1916 | */ |
2162 | |
|
|
2163 | object * |
1917 | object * |
2164 | present_in_ob_by_name (int type, const char *str, const object *op) |
1918 | present_in_ob_by_name (int type, const char *str, const object *op) |
2165 | { |
1919 | { |
2166 | object * |
|
|
2167 | tmp; |
|
|
2168 | |
|
|
2169 | for (tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1920 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
2170 | { |
|
|
2171 | if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name))) |
1921 | if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name))) |
2172 | return tmp; |
1922 | return tmp; |
2173 | } |
1923 | |
2174 | return NULL; |
1924 | return 0; |
2175 | } |
1925 | } |
2176 | |
1926 | |
2177 | /* |
1927 | /* |
2178 | * present_arch_in_ob(archetype, object) searches for any objects with |
1928 | * present_arch_in_ob(archetype, object) searches for any objects with |
2179 | * a matching archetype in the inventory of the given object. |
1929 | * a matching archetype in the inventory of the given object. |
2180 | * The first matching object is returned, or NULL if none. |
1930 | * The first matching object is returned, or NULL if none. |
2181 | */ |
1931 | */ |
2182 | |
|
|
2183 | object * |
1932 | object * |
2184 | present_arch_in_ob (const archetype *at, const object *op) |
1933 | present_arch_in_ob (const archetype *at, const object *op) |
2185 | { |
1934 | { |
2186 | object * |
|
|
2187 | tmp; |
|
|
2188 | |
|
|
2189 | for (tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1935 | for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) |
2190 | if (tmp->arch == at) |
1936 | if (tmp->arch == at) |
2191 | return tmp; |
1937 | return tmp; |
|
|
1938 | |
2192 | return NULL; |
1939 | return NULL; |
2193 | } |
1940 | } |
2194 | |
1941 | |
2195 | /* |
1942 | /* |
2196 | * activate recursively a flag on an object inventory |
1943 | * activate recursively a flag on an object inventory |
2197 | */ |
1944 | */ |
2198 | void |
1945 | void |
2199 | flag_inv (object *op, int flag) |
1946 | flag_inv (object *op, int flag) |
2200 | { |
1947 | { |
2201 | object * |
|
|
2202 | tmp; |
|
|
2203 | |
|
|
2204 | if (op->inv) |
1948 | if (op->inv) |
2205 | for (tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1949 | for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) |
2206 | { |
1950 | { |
2207 | SET_FLAG (tmp, flag); |
1951 | SET_FLAG (tmp, flag); |
2208 | flag_inv (tmp, flag); |
1952 | flag_inv (tmp, flag); |
2209 | } |
1953 | } |
2210 | } /* |
1954 | } |
|
|
1955 | |
|
|
1956 | /* |
2211 | * desactivate recursively a flag on an object inventory |
1957 | * deactivate recursively a flag on an object inventory |
2212 | */ |
1958 | */ |
2213 | void |
1959 | void |
2214 | unflag_inv (object *op, int flag) |
1960 | unflag_inv (object *op, int flag) |
2215 | { |
1961 | { |
2216 | object * |
|
|
2217 | tmp; |
|
|
2218 | |
|
|
2219 | if (op->inv) |
1962 | if (op->inv) |
2220 | for (tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1963 | for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) |
2221 | { |
1964 | { |
2222 | CLEAR_FLAG (tmp, flag); |
1965 | CLEAR_FLAG (tmp, flag); |
2223 | unflag_inv (tmp, flag); |
1966 | unflag_inv (tmp, flag); |
2224 | } |
1967 | } |
2225 | } |
1968 | } |
… | |
… | |
2228 | * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in |
1971 | * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in |
2229 | * all it's inventory (recursively). |
1972 | * all it's inventory (recursively). |
2230 | * If checksums are used, a player will get set_cheat called for |
1973 | * If checksums are used, a player will get set_cheat called for |
2231 | * him/her-self and all object carried by a call to this function. |
1974 | * him/her-self and all object carried by a call to this function. |
2232 | */ |
1975 | */ |
2233 | |
|
|
2234 | void |
1976 | void |
2235 | set_cheat (object *op) |
1977 | set_cheat (object *op) |
2236 | { |
1978 | { |
2237 | SET_FLAG (op, FLAG_WAS_WIZ); |
1979 | SET_FLAG (op, FLAG_WAS_WIZ); |
2238 | flag_inv (op, FLAG_WAS_WIZ); |
1980 | flag_inv (op, FLAG_WAS_WIZ); |
… | |
… | |
2257 | * because arch_blocked (now ob_blocked) needs to know the movement type |
1999 | * because arch_blocked (now ob_blocked) needs to know the movement type |
2258 | * to know if the space in question will block the object. We can't use |
2000 | * to know if the space in question will block the object. We can't use |
2259 | * the archetype because that isn't correct if the monster has been |
2001 | * the archetype because that isn't correct if the monster has been |
2260 | * customized, changed states, etc. |
2002 | * customized, changed states, etc. |
2261 | */ |
2003 | */ |
2262 | |
|
|
2263 | int |
2004 | int |
2264 | find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop) |
2005 | find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) |
2265 | { |
2006 | { |
2266 | int |
|
|
2267 | i, |
|
|
2268 | index = 0, flag; |
2007 | int index = 0, flag; |
2269 | static int |
|
|
2270 | altern[SIZEOFFREE]; |
2008 | int altern[SIZEOFFREE]; |
2271 | |
2009 | |
2272 | for (i = start; i < stop; i++) |
2010 | for (int i = start; i < stop; i++) |
2273 | { |
2011 | { |
2274 | flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); |
2012 | flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); |
2275 | if (!flag) |
2013 | if (!flag) |
2276 | altern[index++] = i; |
2014 | altern [index++] = i; |
2277 | |
2015 | |
2278 | /* Basically, if we find a wall on a space, we cut down the search size. |
2016 | /* Basically, if we find a wall on a space, we cut down the search size. |
2279 | * In this way, we won't return spaces that are on another side of a wall. |
2017 | * In this way, we won't return spaces that are on another side of a wall. |
2280 | * This mostly work, but it cuts down the search size in all directions - |
2018 | * This mostly work, but it cuts down the search size in all directions - |
2281 | * if the space being examined only has a wall to the north and empty |
2019 | * if the space being examined only has a wall to the north and empty |
2282 | * spaces in all the other directions, this will reduce the search space |
2020 | * spaces in all the other directions, this will reduce the search space |
2283 | * to only the spaces immediately surrounding the target area, and |
2021 | * to only the spaces immediately surrounding the target area, and |
2284 | * won't look 2 spaces south of the target space. |
2022 | * won't look 2 spaces south of the target space. |
2285 | */ |
2023 | */ |
2286 | else if ((flag & AB_NO_PASS) && maxfree[i] < stop) |
2024 | else if ((flag & P_NO_PASS) && maxfree[i] < stop) |
2287 | stop = maxfree[i]; |
2025 | stop = maxfree[i]; |
2288 | } |
2026 | } |
|
|
2027 | |
2289 | if (!index) |
2028 | if (!index) |
2290 | return -1; |
2029 | return -1; |
|
|
2030 | |
2291 | return altern[RANDOM () % index]; |
2031 | return altern[RANDOM () % index]; |
2292 | } |
2032 | } |
2293 | |
2033 | |
2294 | /* |
2034 | /* |
2295 | * find_first_free_spot(archetype, mapstruct, x, y) works like |
2035 | * find_first_free_spot(archetype, maptile, x, y) works like |
2296 | * find_free_spot(), but it will search max number of squares. |
2036 | * find_free_spot(), but it will search max number of squares. |
2297 | * But it will return the first available spot, not a random choice. |
2037 | * But it will return the first available spot, not a random choice. |
2298 | * Changed 0.93.2: Have it return -1 if there is no free spot available. |
2038 | * Changed 0.93.2: Have it return -1 if there is no free spot available. |
2299 | */ |
2039 | */ |
2300 | |
|
|
2301 | int |
2040 | int |
2302 | find_first_free_spot (const object *ob, mapstruct *m, int x, int y) |
2041 | find_first_free_spot (const object *ob, maptile *m, int x, int y) |
2303 | { |
2042 | { |
2304 | int |
|
|
2305 | i; |
|
|
2306 | |
|
|
2307 | for (i = 0; i < SIZEOFFREE; i++) |
2043 | for (int i = 0; i < SIZEOFFREE; i++) |
2308 | { |
|
|
2309 | if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) |
2044 | if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) |
2310 | return i; |
2045 | return i; |
2311 | } |
2046 | |
2312 | return -1; |
2047 | return -1; |
2313 | } |
2048 | } |
2314 | |
2049 | |
2315 | /* |
2050 | /* |
2316 | * The function permute(arr, begin, end) randomly reorders the array |
2051 | * The function permute(arr, begin, end) randomly reorders the array |
2317 | * arr[begin..end-1]. |
2052 | * arr[begin..end-1]. |
|
|
2053 | * now uses a fisher-yates shuffle, old permute was broken |
2318 | */ |
2054 | */ |
2319 | static void |
2055 | static void |
2320 | permute (int *arr, int begin, int end) |
2056 | permute (int *arr, int begin, int end) |
2321 | { |
2057 | { |
2322 | int |
2058 | arr += begin; |
2323 | i, |
|
|
2324 | j, |
|
|
2325 | tmp, |
|
|
2326 | len; |
|
|
2327 | |
|
|
2328 | len = end - begin; |
2059 | end -= begin; |
2329 | for (i = begin; i < end; i++) |
|
|
2330 | { |
|
|
2331 | j = begin + RANDOM () % len; |
|
|
2332 | |
2060 | |
2333 | tmp = arr[i]; |
2061 | while (--end) |
2334 | arr[i] = arr[j]; |
2062 | swap (arr [end], arr [RANDOM () % (end + 1)]); |
2335 | arr[j] = tmp; |
|
|
2336 | } |
|
|
2337 | } |
2063 | } |
2338 | |
2064 | |
2339 | /* new function to make monster searching more efficient, and effective! |
2065 | /* new function to make monster searching more efficient, and effective! |
2340 | * This basically returns a randomized array (in the passed pointer) of |
2066 | * This basically returns a randomized array (in the passed pointer) of |
2341 | * the spaces to find monsters. In this way, it won't always look for |
2067 | * the spaces to find monsters. In this way, it won't always look for |
… | |
… | |
2344 | * the 3x3 area will be searched, just not in a predictable order. |
2070 | * the 3x3 area will be searched, just not in a predictable order. |
2345 | */ |
2071 | */ |
2346 | void |
2072 | void |
2347 | get_search_arr (int *search_arr) |
2073 | get_search_arr (int *search_arr) |
2348 | { |
2074 | { |
2349 | int |
2075 | int i; |
2350 | i; |
|
|
2351 | |
2076 | |
2352 | for (i = 0; i < SIZEOFFREE; i++) |
2077 | for (i = 0; i < SIZEOFFREE; i++) |
2353 | { |
|
|
2354 | search_arr[i] = i; |
2078 | search_arr[i] = i; |
2355 | } |
|
|
2356 | |
2079 | |
2357 | permute (search_arr, 1, SIZEOFFREE1 + 1); |
2080 | permute (search_arr, 1, SIZEOFFREE1 + 1); |
2358 | permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1); |
2081 | permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1); |
2359 | permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE); |
2082 | permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE); |
2360 | } |
2083 | } |
… | |
… | |
2369 | * Perhaps incorrectly, but I'm making the assumption that exclude |
2092 | * Perhaps incorrectly, but I'm making the assumption that exclude |
2370 | * is actually want is going to try and move there. We need this info |
2093 | * is actually want is going to try and move there. We need this info |
2371 | * because we have to know what movement the thing looking to move |
2094 | * because we have to know what movement the thing looking to move |
2372 | * there is capable of. |
2095 | * there is capable of. |
2373 | */ |
2096 | */ |
2374 | |
|
|
2375 | int |
2097 | int |
2376 | find_dir (mapstruct *m, int x, int y, object *exclude) |
2098 | find_dir (maptile *m, int x, int y, object *exclude) |
2377 | { |
2099 | { |
2378 | int |
|
|
2379 | i, |
|
|
2380 | max = SIZEOFFREE, mflags; |
2100 | int i, max = SIZEOFFREE, mflags; |
2381 | |
2101 | |
2382 | sint16 nx, ny; |
2102 | sint16 nx, ny; |
2383 | object * |
2103 | object *tmp; |
2384 | tmp; |
2104 | maptile *mp; |
2385 | mapstruct * |
|
|
2386 | mp; |
|
|
2387 | |
2105 | |
2388 | MoveType blocked, move_type; |
2106 | MoveType blocked, move_type; |
2389 | |
2107 | |
2390 | if (exclude && exclude->head) |
2108 | if (exclude && exclude->head) |
2391 | { |
2109 | { |
… | |
… | |
2403 | mp = m; |
2121 | mp = m; |
2404 | nx = x + freearr_x[i]; |
2122 | nx = x + freearr_x[i]; |
2405 | ny = y + freearr_y[i]; |
2123 | ny = y + freearr_y[i]; |
2406 | |
2124 | |
2407 | mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); |
2125 | mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); |
|
|
2126 | |
2408 | if (mflags & P_OUT_OF_MAP) |
2127 | if (mflags & P_OUT_OF_MAP) |
2409 | { |
|
|
2410 | max = maxfree[i]; |
2128 | max = maxfree[i]; |
2411 | } |
|
|
2412 | else |
2129 | else |
2413 | { |
2130 | { |
2414 | blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny); |
2131 | mapspace &ms = mp->at (nx, ny); |
|
|
2132 | |
|
|
2133 | blocked = ms.move_block; |
2415 | |
2134 | |
2416 | if ((move_type & blocked) == move_type) |
2135 | if ((move_type & blocked) == move_type) |
2417 | { |
|
|
2418 | max = maxfree[i]; |
2136 | max = maxfree[i]; |
2419 | } |
|
|
2420 | else if (mflags & P_IS_ALIVE) |
2137 | else if (mflags & P_IS_ALIVE) |
2421 | { |
2138 | { |
2422 | for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above) |
2139 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
2423 | { |
2140 | if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) |
2424 | if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude))) |
2141 | && (tmp != exclude || (tmp->head && tmp->head != exclude))) |
2425 | { |
|
|
2426 | break; |
2142 | break; |
2427 | } |
2143 | |
2428 | } |
|
|
2429 | if (tmp) |
2144 | if (tmp) |
2430 | { |
|
|
2431 | return freedir[i]; |
2145 | return freedir[i]; |
2432 | } |
|
|
2433 | } |
2146 | } |
2434 | } |
2147 | } |
2435 | } |
2148 | } |
|
|
2149 | |
2436 | return 0; |
2150 | return 0; |
2437 | } |
2151 | } |
2438 | |
2152 | |
2439 | /* |
2153 | /* |
2440 | * distance(object 1, object 2) will return the square of the |
2154 | * distance(object 1, object 2) will return the square of the |
2441 | * distance between the two given objects. |
2155 | * distance between the two given objects. |
2442 | */ |
2156 | */ |
2443 | |
|
|
2444 | int |
2157 | int |
2445 | distance (const object *ob1, const object *ob2) |
2158 | distance (const object *ob1, const object *ob2) |
2446 | { |
2159 | { |
2447 | int |
|
|
2448 | i; |
|
|
2449 | |
|
|
2450 | i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); |
2160 | return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); |
2451 | return i; |
|
|
2452 | } |
2161 | } |
2453 | |
2162 | |
2454 | /* |
2163 | /* |
2455 | * find_dir_2(delta-x,delta-y) will return a direction in which |
2164 | * find_dir_2(delta-x,delta-y) will return a direction in which |
2456 | * an object which has subtracted the x and y coordinates of another |
2165 | * an object which has subtracted the x and y coordinates of another |
2457 | * object, needs to travel toward it. |
2166 | * object, needs to travel toward it. |
2458 | */ |
2167 | */ |
2459 | |
|
|
2460 | int |
2168 | int |
2461 | find_dir_2 (int x, int y) |
2169 | find_dir_2 (int x, int y) |
2462 | { |
2170 | { |
2463 | int |
2171 | int q; |
2464 | q; |
|
|
2465 | |
2172 | |
2466 | if (y) |
2173 | if (y) |
2467 | q = x * 100 / y; |
2174 | q = x * 100 / y; |
2468 | else if (x) |
2175 | else if (x) |
2469 | q = -300 * x; |
2176 | q = -300 * x; |
… | |
… | |
2504 | int |
2211 | int |
2505 | absdir (int d) |
2212 | absdir (int d) |
2506 | { |
2213 | { |
2507 | while (d < 1) |
2214 | while (d < 1) |
2508 | d += 8; |
2215 | d += 8; |
|
|
2216 | |
2509 | while (d > 8) |
2217 | while (d > 8) |
2510 | d -= 8; |
2218 | d -= 8; |
|
|
2219 | |
2511 | return d; |
2220 | return d; |
2512 | } |
2221 | } |
2513 | |
2222 | |
2514 | /* |
2223 | /* |
2515 | * dirdiff(dir1, dir2) returns how many 45-degrees differences there is |
2224 | * dirdiff(dir1, dir2) returns how many 45-degrees differences there is |
… | |
… | |
2517 | */ |
2226 | */ |
2518 | |
2227 | |
2519 | int |
2228 | int |
2520 | dirdiff (int dir1, int dir2) |
2229 | dirdiff (int dir1, int dir2) |
2521 | { |
2230 | { |
2522 | int |
2231 | int d; |
2523 | d; |
|
|
2524 | |
2232 | |
2525 | d = abs (dir1 - dir2); |
2233 | d = abs (dir1 - dir2); |
2526 | if (d > 4) |
2234 | if (d > 4) |
2527 | d = 8 - d; |
2235 | d = 8 - d; |
|
|
2236 | |
2528 | return d; |
2237 | return d; |
2529 | } |
2238 | } |
2530 | |
2239 | |
2531 | /* peterm: |
2240 | /* peterm: |
2532 | * do LOS stuff for ball lightning. Go after the closest VISIBLE monster. |
2241 | * do LOS stuff for ball lightning. Go after the closest VISIBLE monster. |
… | |
… | |
2535 | * This basically means that if direction is 15, then it could either go |
2244 | * This basically means that if direction is 15, then it could either go |
2536 | * direction 4, 14, or 16 to get back to where we are. |
2245 | * direction 4, 14, or 16 to get back to where we are. |
2537 | * Moved from spell_util.c to object.c with the other related direction |
2246 | * Moved from spell_util.c to object.c with the other related direction |
2538 | * functions. |
2247 | * functions. |
2539 | */ |
2248 | */ |
2540 | |
|
|
2541 | int |
|
|
2542 | reduction_dir[SIZEOFFREE][3] = { |
2249 | int reduction_dir[SIZEOFFREE][3] = { |
2543 | {0, 0, 0}, /* 0 */ |
2250 | {0, 0, 0}, /* 0 */ |
2544 | {0, 0, 0}, /* 1 */ |
2251 | {0, 0, 0}, /* 1 */ |
2545 | {0, 0, 0}, /* 2 */ |
2252 | {0, 0, 0}, /* 2 */ |
2546 | {0, 0, 0}, /* 3 */ |
2253 | {0, 0, 0}, /* 3 */ |
2547 | {0, 0, 0}, /* 4 */ |
2254 | {0, 0, 0}, /* 4 */ |
… | |
… | |
2595 | * find a path to that monster that we found. If not, |
2302 | * find a path to that monster that we found. If not, |
2596 | * we don't bother going toward it. Returns 1 if we |
2303 | * we don't bother going toward it. Returns 1 if we |
2597 | * can see a direct way to get it |
2304 | * can see a direct way to get it |
2598 | * Modified to be map tile aware -.MSW |
2305 | * Modified to be map tile aware -.MSW |
2599 | */ |
2306 | */ |
2600 | |
|
|
2601 | |
|
|
2602 | int |
2307 | int |
2603 | can_see_monsterP (mapstruct *m, int x, int y, int dir) |
2308 | can_see_monsterP (maptile *m, int x, int y, int dir) |
2604 | { |
2309 | { |
2605 | sint16 dx, dy; |
2310 | sint16 dx, dy; |
2606 | int |
|
|
2607 | mflags; |
2311 | int mflags; |
2608 | |
2312 | |
2609 | if (dir < 0) |
2313 | if (dir < 0) |
2610 | return 0; /* exit condition: invalid direction */ |
2314 | return 0; /* exit condition: invalid direction */ |
2611 | |
2315 | |
2612 | dx = x + freearr_x[dir]; |
2316 | dx = x + freearr_x[dir]; |
… | |
… | |
2625 | return 0; |
2329 | return 0; |
2626 | |
2330 | |
2627 | /* yes, can see. */ |
2331 | /* yes, can see. */ |
2628 | if (dir < 9) |
2332 | if (dir < 9) |
2629 | return 1; |
2333 | return 1; |
|
|
2334 | |
2630 | return can_see_monsterP (m, x, y, reduction_dir[dir][0]) | |
2335 | return can_see_monsterP (m, x, y, reduction_dir[dir][0]) |
2631 | can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]); |
2336 | | can_see_monsterP (m, x, y, reduction_dir[dir][1]) |
|
|
2337 | | can_see_monsterP (m, x, y, reduction_dir[dir][2]); |
2632 | } |
2338 | } |
2633 | |
|
|
2634 | |
|
|
2635 | |
2339 | |
2636 | /* |
2340 | /* |
2637 | * can_pick(picker, item): finds out if an object is possible to be |
2341 | * can_pick(picker, item): finds out if an object is possible to be |
2638 | * picked up by the picker. Returnes 1 if it can be |
2342 | * picked up by the picker. Returnes 1 if it can be |
2639 | * picked up, otherwise 0. |
2343 | * picked up, otherwise 0. |
… | |
… | |
2650 | return /*QUERY_FLAG(who,FLAG_WIZ)|| */ |
2354 | return /*QUERY_FLAG(who,FLAG_WIZ)|| */ |
2651 | (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && |
2355 | (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && |
2652 | !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); |
2356 | !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); |
2653 | } |
2357 | } |
2654 | |
2358 | |
2655 | |
|
|
2656 | /* |
2359 | /* |
2657 | * create clone from object to another |
2360 | * create clone from object to another |
2658 | */ |
2361 | */ |
2659 | object * |
2362 | object * |
2660 | object_create_clone (object *asrc) |
2363 | object_create_clone (object *asrc) |
2661 | { |
2364 | { |
2662 | object * |
|
|
2663 | dst = NULL, *tmp, *src, *part, *prev, *item; |
2365 | object *dst = 0, *tmp, *src, *part, *prev, *item; |
2664 | |
2366 | |
2665 | if (!asrc) |
2367 | if (!asrc) |
2666 | return NULL; |
2368 | return 0; |
|
|
2369 | |
2667 | src = asrc; |
2370 | src = asrc; |
2668 | if (src->head) |
2371 | if (src->head) |
2669 | src = src->head; |
2372 | src = src->head; |
2670 | |
2373 | |
2671 | prev = NULL; |
2374 | prev = 0; |
2672 | for (part = src; part; part = part->more) |
2375 | for (part = src; part; part = part->more) |
2673 | { |
2376 | { |
2674 | tmp = get_object (); |
2377 | tmp = part->clone (); |
2675 | copy_object (part, tmp); |
|
|
2676 | tmp->x -= src->x; |
2378 | tmp->x -= src->x; |
2677 | tmp->y -= src->y; |
2379 | tmp->y -= src->y; |
|
|
2380 | |
2678 | if (!part->head) |
2381 | if (!part->head) |
2679 | { |
2382 | { |
2680 | dst = tmp; |
2383 | dst = tmp; |
2681 | tmp->head = NULL; |
2384 | tmp->head = 0; |
2682 | } |
2385 | } |
2683 | else |
2386 | else |
2684 | { |
|
|
2685 | tmp->head = dst; |
2387 | tmp->head = dst; |
2686 | } |
2388 | |
2687 | tmp->more = NULL; |
2389 | tmp->more = 0; |
|
|
2390 | |
2688 | if (prev) |
2391 | if (prev) |
2689 | prev->more = tmp; |
2392 | prev->more = tmp; |
|
|
2393 | |
2690 | prev = tmp; |
2394 | prev = tmp; |
2691 | } |
2395 | } |
2692 | |
2396 | |
2693 | /*** copy inventory ***/ |
|
|
2694 | for (item = src->inv; item; item = item->below) |
2397 | for (item = src->inv; item; item = item->below) |
2695 | { |
|
|
2696 | (void) insert_ob_in_ob (object_create_clone (item), dst); |
2398 | insert_ob_in_ob (object_create_clone (item), dst); |
2697 | } |
|
|
2698 | |
2399 | |
2699 | return dst; |
2400 | return dst; |
2700 | } |
2401 | } |
2701 | |
2402 | |
2702 | /* return true if the object was destroyed, 0 otherwise */ |
|
|
2703 | int |
|
|
2704 | was_destroyed (const object *op, tag_t old_tag) |
|
|
2705 | { |
|
|
2706 | /* checking for FLAG_FREED isn't necessary, but makes this function more |
|
|
2707 | * robust */ |
|
|
2708 | return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED); |
|
|
2709 | } |
|
|
2710 | |
|
|
2711 | /* GROS - Creates an object using a string representing its content. */ |
2403 | /* GROS - Creates an object using a string representing its content. */ |
2712 | |
|
|
2713 | /* Basically, we save the content of the string to a temp file, then call */ |
2404 | /* Basically, we save the content of the string to a temp file, then call */ |
2714 | |
|
|
2715 | /* load_object on it. I admit it is a highly inefficient way to make things, */ |
2405 | /* load_object on it. I admit it is a highly inefficient way to make things, */ |
2716 | |
|
|
2717 | /* but it was simple to make and allows reusing the load_object function. */ |
2406 | /* but it was simple to make and allows reusing the load_object function. */ |
2718 | |
|
|
2719 | /* Remember not to use load_object_str in a time-critical situation. */ |
2407 | /* Remember not to use load_object_str in a time-critical situation. */ |
2720 | |
|
|
2721 | /* Also remember that multiparts objects are not supported for now. */ |
2408 | /* Also remember that multiparts objects are not supported for now. */ |
2722 | |
|
|
2723 | object * |
2409 | object * |
2724 | load_object_str (const char *obstr) |
2410 | load_object_str (const char *obstr) |
2725 | { |
2411 | { |
2726 | object * |
2412 | object *op; |
2727 | op; |
|
|
2728 | char |
|
|
2729 | filename[MAX_BUF]; |
2413 | char filename[MAX_BUF]; |
2730 | |
2414 | |
2731 | sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); |
2415 | sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); |
2732 | |
2416 | |
2733 | FILE * |
|
|
2734 | tempfile = fopen (filename, "w"); |
2417 | FILE *tempfile = fopen (filename, "w"); |
2735 | |
2418 | |
2736 | if (tempfile == NULL) |
2419 | if (tempfile == NULL) |
2737 | { |
2420 | { |
2738 | LOG (llevError, "Error - Unable to access load object temp file\n"); |
2421 | LOG (llevError, "Error - Unable to access load object temp file\n"); |
2739 | return NULL; |
2422 | return NULL; |
2740 | }; |
2423 | } |
|
|
2424 | |
2741 | fprintf (tempfile, obstr); |
2425 | fprintf (tempfile, obstr); |
2742 | fclose (tempfile); |
2426 | fclose (tempfile); |
2743 | |
2427 | |
2744 | op = get_object (); |
2428 | op = object::create (); |
2745 | |
2429 | |
2746 | object_thawer thawer (filename); |
2430 | object_thawer thawer (filename); |
2747 | |
2431 | |
2748 | if (thawer) |
2432 | if (thawer) |
2749 | load_object (thawer, op, 0); |
2433 | load_object (thawer, op, 0); |
… | |
… | |
2759 | * returns NULL if no match. |
2443 | * returns NULL if no match. |
2760 | */ |
2444 | */ |
2761 | object * |
2445 | object * |
2762 | find_obj_by_type_subtype (const object *who, int type, int subtype) |
2446 | find_obj_by_type_subtype (const object *who, int type, int subtype) |
2763 | { |
2447 | { |
2764 | object * |
|
|
2765 | tmp; |
|
|
2766 | |
|
|
2767 | for (tmp = who->inv; tmp; tmp = tmp->below) |
2448 | for (object *tmp = who->inv; tmp; tmp = tmp->below) |
2768 | if (tmp->type == type && tmp->subtype == subtype) |
2449 | if (tmp->type == type && tmp->subtype == subtype) |
2769 | return tmp; |
2450 | return tmp; |
2770 | |
2451 | |
2771 | return NULL; |
2452 | return 0; |
2772 | } |
2453 | } |
2773 | |
2454 | |
2774 | /* If ob has a field named key, return the link from the list, |
2455 | /* If ob has a field named key, return the link from the list, |
2775 | * otherwise return NULL. |
2456 | * otherwise return NULL. |
2776 | * |
2457 | * |
… | |
… | |
2778 | * do the desired thing. |
2459 | * do the desired thing. |
2779 | */ |
2460 | */ |
2780 | key_value * |
2461 | key_value * |
2781 | get_ob_key_link (const object *ob, const char *key) |
2462 | get_ob_key_link (const object *ob, const char *key) |
2782 | { |
2463 | { |
2783 | key_value * |
|
|
2784 | link; |
|
|
2785 | |
|
|
2786 | for (link = ob->key_values; link != NULL; link = link->next) |
2464 | for (key_value *link = ob->key_values; link; link = link->next) |
2787 | { |
|
|
2788 | if (link->key == key) |
2465 | if (link->key == key) |
2789 | { |
|
|
2790 | return link; |
2466 | return link; |
2791 | } |
|
|
2792 | } |
|
|
2793 | |
2467 | |
2794 | return NULL; |
2468 | return 0; |
2795 | } |
2469 | } |
2796 | |
2470 | |
2797 | /* |
2471 | /* |
2798 | * Returns the value of op has an extra_field for key, or NULL. |
2472 | * Returns the value of op has an extra_field for key, or NULL. |
2799 | * |
2473 | * |
… | |
… | |
2839 | * Returns TRUE on success. |
2513 | * Returns TRUE on success. |
2840 | */ |
2514 | */ |
2841 | int |
2515 | int |
2842 | set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key) |
2516 | set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key) |
2843 | { |
2517 | { |
2844 | key_value * |
|
|
2845 | field = NULL, *last = NULL; |
2518 | key_value *field = NULL, *last = NULL; |
2846 | |
2519 | |
2847 | for (field = op->key_values; field != NULL; field = field->next) |
2520 | for (field = op->key_values; field != NULL; field = field->next) |
2848 | { |
2521 | { |
2849 | if (field->key != canonical_key) |
2522 | if (field->key != canonical_key) |
2850 | { |
2523 | { |
… | |
… | |
2878 | /* IF we get here, key doesn't exist */ |
2551 | /* IF we get here, key doesn't exist */ |
2879 | |
2552 | |
2880 | /* No field, we'll have to add it. */ |
2553 | /* No field, we'll have to add it. */ |
2881 | |
2554 | |
2882 | if (!add_key) |
2555 | if (!add_key) |
2883 | { |
|
|
2884 | return FALSE; |
2556 | return FALSE; |
2885 | } |
2557 | |
2886 | /* There isn't any good reason to store a null |
2558 | /* There isn't any good reason to store a null |
2887 | * value in the key/value list. If the archetype has |
2559 | * value in the key/value list. If the archetype has |
2888 | * this key, then we should also have it, so shouldn't |
2560 | * this key, then we should also have it, so shouldn't |
2889 | * be here. If user wants to store empty strings, |
2561 | * be here. If user wants to store empty strings, |
2890 | * should pass in "" |
2562 | * should pass in "" |