… | |
… | |
27 | |
27 | |
28 | #include <global.h> |
28 | #include <global.h> |
29 | #include <funcpoint.h> |
29 | #include <funcpoint.h> |
30 | #include <material.h> |
30 | #include <material.h> |
31 | |
31 | |
|
|
32 | #include <sys/time.h> |
|
|
33 | #include <time.h> |
32 | #include <glib.h> |
34 | #include <glib.h> |
33 | |
35 | |
34 | /* |
36 | /* |
35 | * The random functions here take luck into account when rolling random |
37 | * The random functions here take luck into account when rolling random |
36 | * dice or numbers. This function has less of an impact the larger the |
38 | * dice or numbers. This function has less of an impact the larger the |
… | |
… | |
254 | if (op->material & M_ICE && MAP_TEMP (m) > 32) |
256 | if (op->material & M_ICE && MAP_TEMP (m) > 32) |
255 | destroy = 1; |
257 | destroy = 1; |
256 | } |
258 | } |
257 | /* adjust overall chance below */ |
259 | /* adjust overall chance below */ |
258 | if (destroy && rndm (0, 1)) |
260 | if (destroy && rndm (0, 1)) |
259 | { |
261 | op->destroy (); |
260 | remove_ob (op); |
|
|
261 | free_object (op); |
|
|
262 | } |
|
|
263 | } |
262 | } |
264 | } |
263 | } |
265 | |
264 | |
266 | /* convert materialname to materialtype_t */ |
265 | /* convert materialname to materialtype_t */ |
267 | |
266 | |
… | |
… | |
558 | assert (!rc_next); |
557 | assert (!rc_next); |
559 | assert (!refcnt); |
558 | assert (!refcnt); |
560 | } |
559 | } |
561 | #endif |
560 | #endif |
562 | |
561 | |
563 | void *alloc (int s) throw (std::bad_alloc) |
562 | void *salloc (int size) throw (std::bad_alloc) |
564 | { |
563 | { |
565 | void *p = g_slice_alloc (s); |
564 | void *ptr = g_slice_alloc (size); |
566 | |
565 | |
567 | if (!p) |
566 | if (!ptr) |
568 | throw std::bad_alloc (); |
567 | throw std::bad_alloc (); |
569 | |
568 | |
570 | return p; |
569 | return ptr; |
|
|
570 | } |
|
|
571 | |
|
|
572 | void *salloc (int size, void *src) throw (std::bad_alloc) |
|
|
573 | { |
|
|
574 | void *ptr = salloc (size); |
|
|
575 | |
|
|
576 | memcpy (ptr, src, size); |
|
|
577 | |
|
|
578 | return ptr; |
571 | } |
579 | } |
572 | |
580 | |
573 | void assign (char *dst, const char *src, int maxlen) |
581 | void assign (char *dst, const char *src, int maxlen) |
574 | { |
582 | { |
575 | if (!src) |
583 | if (!src) |
… | |
… | |
592 | } |
600 | } |
593 | else |
601 | else |
594 | memcpy (dst, src, len + 1); |
602 | memcpy (dst, src, len + 1); |
595 | } |
603 | } |
596 | |
604 | |
|
|
605 | tstamp now () |
|
|
606 | { |
|
|
607 | struct timeval tv; |
597 | |
608 | |
|
|
609 | gettimeofday (&tv, 0); |
|
|
610 | return tstamp (tv.tv_sec) + tstamp (tv.tv_usec) * tstamp (1e-6); |
|
|
611 | } |
|
|
612 | |