| … | |
… | |
| 204 | if (object *golem = contr->golem) |
204 | if (object *golem = contr->golem) |
| 205 | { |
205 | { |
| 206 | int i = find_free_spot (golem, newmap, x, y, 1, SIZEOFFREE); |
206 | int i = find_free_spot (golem, newmap, x, y, 1, SIZEOFFREE); |
| 207 | |
207 | |
| 208 | if (i < 0) |
208 | if (i < 0) |
|
|
209 | { |
|
|
210 | golem->destroy_inv (true); // be explicit about dropping |
| 209 | golem->destroy (); |
211 | golem->destroy (true); |
|
|
212 | } |
| 210 | else |
213 | else |
| 211 | { |
214 | { |
| 212 | newmap->insert (golem, x + freearr_x[i], y + freearr_y[i]); |
215 | newmap->insert (golem, x + freearr_x[i], y + freearr_y[i]); |
| 213 | golem->direction = find_dir_2 (x - golem->x, y - golem->y); |
216 | golem->direction = find_dir_2 (x - golem->x, y - golem->y); |
| 214 | } |
217 | } |
| … | |
… | |
| 497 | } |
500 | } |
| 498 | } |
501 | } |
| 499 | |
502 | |
| 500 | #else |
503 | #else |
| 501 | |
504 | |
|
|
505 | #if 0 // just goofing around, look elsewhere |
|
|
506 | |
|
|
507 | #include <malloc.h> |
|
|
508 | #include <execinfo.h> |
|
|
509 | |
|
|
510 | static void tr_on (); |
|
|
511 | static void tr_off (); |
|
|
512 | |
|
|
513 | static SMUTEX(tr_mutex); |
|
|
514 | |
|
|
515 | #define ltr_off() SMUTEX_LOCK (tr_mutex); tr_off () |
|
|
516 | #define ltr_on() tr_on (); SMUTEX_UNLOCK (tr_mutex); |
|
|
517 | |
|
|
518 | static void * |
|
|
519 | tr_malloc (size_t size, const void *caller) |
|
|
520 | { |
|
|
521 | ltr_off (); |
|
|
522 | |
|
|
523 | void *bt [8]; |
|
|
524 | backtrace (bt, 8); |
|
|
525 | |
|
|
526 | void *ptr = malloc (size); |
|
|
527 | |
|
|
528 | ltr_on (); |
|
|
529 | return (char *)ptr; |
|
|
530 | } |
|
|
531 | |
|
|
532 | static void |
|
|
533 | tr_free (void *ptr, const void *caller) |
|
|
534 | { |
|
|
535 | ltr_off (); |
|
|
536 | |
|
|
537 | free (ptr); |
|
|
538 | |
|
|
539 | ltr_on (); |
|
|
540 | } |
|
|
541 | |
|
|
542 | void static * |
|
|
543 | tr_realloc (void *ptr, size_t size, const void *caller) |
|
|
544 | { |
|
|
545 | ltr_off (); |
|
|
546 | |
|
|
547 | void *nptr = realloc (ptr, size); |
|
|
548 | |
|
|
549 | ltr_on (); |
|
|
550 | return nptr; |
|
|
551 | } |
|
|
552 | |
|
|
553 | static void * |
|
|
554 | tr_memalign (size_t size, size_t alignment, const void *caller) |
|
|
555 | { |
|
|
556 | ltr_off (); |
|
|
557 | |
|
|
558 | void *ptr = memalign (size, alignment < 16 ? 16 : alignment); |
|
|
559 | |
|
|
560 | ltr_on (); |
|
|
561 | return ptr; |
|
|
562 | } |
|
|
563 | |
|
|
564 | static void |
|
|
565 | tr_on () |
|
|
566 | { |
|
|
567 | __malloc_hook = tr_malloc; |
|
|
568 | __realloc_hook = tr_realloc; |
|
|
569 | __free_hook = tr_free; |
|
|
570 | __memalign_hook = tr_memalign; |
|
|
571 | } |
|
|
572 | |
|
|
573 | static void |
|
|
574 | tr_off () |
|
|
575 | { |
|
|
576 | __malloc_hook = 0; |
|
|
577 | __realloc_hook = 0; |
|
|
578 | __free_hook = 0; |
|
|
579 | __memalign_hook = 0; |
|
|
580 | } |
|
|
581 | |
|
|
582 | void (*__malloc_initialize_hook)(void) = tr_on; |
|
|
583 | |
|
|
584 | #endif |
|
|
585 | |
| 502 | // normal main |
586 | // normal main |
| 503 | int |
587 | int |
| 504 | main (int argc, char **argv) |
588 | main (int argc, char **argv) |
| 505 | { |
589 | { |
| 506 | settings.argc = argc; |
590 | settings.argc = argc; |
