--- deliantra/server/common/utils.C 2006/12/17 23:10:34 1.25 +++ deliantra/server/common/utils.C 2007/02/05 01:47:22 1.46 @@ -1,38 +1,82 @@ /* - CrossFire, A Multiplayer game for X-windows - - Copyright (C) 2002 Mark Wedel & Crossfire Development Team - Copyright (C) 1992 Frank Tore Johansen - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - The authors can be reached via e-mail at -*/ + * CrossFire, A Multiplayer game for X-windows + * + * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team + * Copyright (C) 2002 Mark Wedel & Crossfire Development Team + * Copyright (C) 1992 Frank Tore Johansen + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * The authors can be reached via e-mail at + */ /* * General convenience functions for crossfire. */ +#include +#include +#include +#include +#include +#include + #include #include #include -#include -#include #include +rand_gen rndm; + +void +tausworthe_random_generator::seed (uint32_t seed) +{ + state [0] = max ( 2U, seed * 69069U); + state [1] = max ( 8U, state [0] * 69069U); + state [2] = max ( 16U, state [1] * 69069U); + state [3] = max (128U, state [2] * 69069U); + + for (int i = 11; --i; ) + operator ()(); +} + +uint32_t +tausworthe_random_generator::next () +{ + state [0] = ((state [0] & 0xFFFFFFFEU) << 18U) ^ (((state [0] << 6U) ^ state [0]) >> 13U); + state [1] = ((state [1] & 0xFFFFFFF8U) << 2U) ^ (((state [1] << 2U) ^ state [1]) >> 27U); + state [2] = ((state [2] & 0xFFFFFFF0U) << 7U) ^ (((state [2] << 13U) ^ state [2]) >> 21U); + state [3] = ((state [3] & 0xFFFFFF80U) << 13U) ^ (((state [3] << 3U) ^ state [3]) >> 12U); + + return state [0] ^ state [1] ^ state [2] ^ state [3]; +} + +uint32_t +tausworthe_random_generator::get_range (uint32_t r_max) +{ + return next () % r_max; +} + +// return a number within (min .. max) +int +tausworthe_random_generator::get_range (int r_min, int r_max) +{ + return r_min + (*this) (max (r_max - r_min + 1, 1)); +} + /* * The random functions here take luck into account when rolling random * dice or numbers. This function has less of an impact the larger the @@ -48,47 +92,34 @@ * Generally, op should be the player/caster/hitter requesting the roll, * not the recipient (ie, the poor slob getting hit). [garbled 20010916] */ - int -random_roll (int min, int max, const object *op, int goodbad) +random_roll (int r_min, int r_max, const object *op, int goodbad) { - int omin, diff, luck, base, ran; - - omin = min; - diff = max - min + 1; - ((diff > 2) ? (base = 20) : (base = 50)); /* d2 and d3 are corner cases */ + int base = r_max - r_min > 1 ? 20 : 50; /* d2 and d3 are corner cases */ - if (max < 1 || diff < 1) + if (r_max < 1 || r_max < r_min) { - LOG (llevError, "Calling random_roll with min=%d max=%d\n", min, max); - return (min); /* avoids a float exception */ + LOG (llevError, "Calling random_roll with min=%d max=%d\n", r_min, r_max); + return r_min; } - ran = RANDOM (); - - if (op->type != PLAYER) - return ((ran % diff) + min); - - luck = op->stats.luck; - if (RANDOM () % base < MIN (10, abs (luck))) + if (op->type == PLAYER) { - /* we have a winner */ - ((luck > 0) ? (luck = 1) : (luck = -1)); - diff -= luck; - if (diff < 1) - return (omin); /*check again */ - ((goodbad) ? (min += luck) : (diff)); + int luck = op->stats.luck; - return (MAX (omin, MIN (max, (ran % diff) + min))); + if (rndm (base) < min (10, abs (luck))) + { + //TODO: take luck into account + } } - return ((ran % diff) + min); + + return rndm (r_min, r_max); } /* * This is a 64 bit version of random_roll above. This is needed * for exp loss calculations for players changing religions. */ - sint64 random_roll64 (sint64 min, sint64 max, const object *op, int goodbad) { @@ -105,18 +136,17 @@ return (min); /* avoids a float exception */ } - /* Don't know of a portable call to get 64 bit random values. - * So make a call to get two 32 bit random numbers, and just to - * a little byteshifting. Do make sure the first one is only - * 32 bit, so we don't get skewed results + /* + * Make a call to get two 32 bit unsigned random numbers, and just to + * a little bitshifting. */ - ran = (RANDOM () & 0xffffffff) | ((sint64) RANDOM () << 32); + ran = (sint64) rndm.next () ^ ((sint64) rndm.next () << 31); if (op->type != PLAYER) return ((ran % diff) + min); luck = op->stats.luck; - if (RANDOM () % base < MIN (10, abs (luck))) + if (rndm (base) < MIN (10, abs (luck))) { /* we have a winner */ ((luck > 0) ? (luck = 1) : (luck = -1)); @@ -127,6 +157,7 @@ return (MAX (omin, MIN (max, (ran % diff) + min))); } + return ((ran % diff) + min); } @@ -141,7 +172,7 @@ int die_roll (int num, int size, const object *op, int goodbad) { - int min, diff, luck, total, i, gotlucky, base, ran; + int min, diff, luck, total, i, gotlucky, base; diff = size; min = 1; @@ -158,7 +189,7 @@ for (i = 0; i < num; i++) { - if (RANDOM () % base < MIN (10, abs (luck)) && !gotlucky) + if (rndm (base) < MIN (10, abs (luck)) && !gotlucky) { /* we have a winner */ gotlucky++; @@ -167,99 +198,81 @@ if (diff < 1) return (num); /*check again */ ((goodbad) ? (min += luck) : (diff)); - ran = RANDOM (); - total += MAX (1, MIN (size, (ran % diff) + min)); + total += MAX (1, MIN (size, rndm (diff) + min)); } else - { - total += RANDOM () % size + 1; - } + total += rndm (size) + 1; } - return (total); -} - -/* - * Another convenience function. Returns a number between min and max. - * It is suggested one use these functions rather than RANDOM()%, as it - * would appear that a number of off-by-one-errors exist due to improper - * use of %. This should also prevent SIGFPE. - */ - -int -rndm (int min, int max) -{ - int diff; - diff = max - min + 1; - if (max < 1 || diff < 1) - return (min); - - return (RANDOM () % diff + min); + return total; } -/* decay and destroy persihable items in a map */ - +/* decay and destroy perishable items in a map */ void -decay_objects (maptile *m) +maptile::decay_objects () { - int x, y, destroy; - object *op, *otmp; - - if (m->unique) + if (!spaces) return; - for (x = 0; x < MAP_WIDTH (m); x++) - for (y = 0; y < MAP_HEIGHT (m); y++) - for (op = get_map_ob (m, x, y); op; op = otmp) - { - destroy = 0; - otmp = op->above; - if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) - break; - if (QUERY_FLAG (op, FLAG_IS_FLOOR) || - QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) || - QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL) || - QUERY_FLAG (op, FLAG_UNIQUE) || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR) || QUERY_FLAG (op, FLAG_UNPAID) || IS_LIVE (op)) - continue; - /* otherwise, we decay and destroy */ - if (IS_WEAPON (op)) - { - op->stats.dam--; - if (op->stats.dam < 0) - destroy = 1; - } - else if (IS_ARMOR (op)) - { - op->stats.ac--; - if (op->stats.ac < 0) - destroy = 1; - } - else if (op->type == FOOD) - { - op->stats.food -= rndm (5, 20); - if (op->stats.food < 0) - destroy = 1; - } - else - { - if (op->material & M_PAPER || op->material & M_LEATHER || - op->material & M_WOOD || op->material & M_ORGANIC || op->material & M_CLOTH || op->material & M_LIQUID) - destroy = 1; - if (op->material & M_IRON && rndm (1, 5) == 1) - destroy = 1; - if (op->material & M_GLASS && rndm (1, 2) == 1) - destroy = 1; - if ((op->material & M_STONE || op->material & M_ADAMANT) && rndm (1, 10) == 1) - destroy = 1; - if ((op->material & M_SOFT_METAL || op->material & M_BONE) && rndm (1, 3) == 1) - destroy = 1; - if (op->material & M_ICE && MAP_TEMP (m) > 32) - destroy = 1; - } - /* adjust overall chance below */ - if (destroy && rndm (0, 1)) - op->destroy (); - } + for (mapspace *ms = spaces + size (); ms-- > spaces; ) + for (object *above, *op = ms->bot; op; op = above) + { + above = op->above; + + bool destroy = 0; + + // do not decay anything above unique floor tiles (yet :) + if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) + break; + + if (QUERY_FLAG (op, FLAG_IS_FLOOR) + || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) + || QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL) + || QUERY_FLAG (op, FLAG_UNIQUE) + || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR) + || QUERY_FLAG (op, FLAG_UNPAID) + || op->is_alive ()) + ; // do not decay + else if (op->is_weapon ()) + { + op->stats.dam--; + if (op->stats.dam < 0) + destroy = 1; + } + else if (op->is_armor ()) + { + op->stats.ac--; + if (op->stats.ac < 0) + destroy = 1; + } + else if (op->type == FOOD) + { + op->stats.food -= rndm (5, 20); + if (op->stats.food < 0) + destroy = 1; + } + else + { + int mat = op->material; + + if (mat & M_PAPER + || mat & M_LEATHER + || mat & M_WOOD + || mat & M_ORGANIC + || mat & M_CLOTH + || mat & M_LIQUID + || (mat & M_IRON && rndm (1, 5) == 1) + || (mat & M_GLASS && rndm (1, 2) == 1) + || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1) + || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1) + || (mat & M_ICE && temp > 32)) + destroy = 1; + } + + /* adjust overall chance below */ + if (destroy && rndm (0, 1)) + op->destroy (); + } } /* convert materialname to materialtype_t */ @@ -297,7 +310,7 @@ if (change->materialname != NULL && strcmp (op->materialname, change->materialname)) return; - if (!IS_ARMOR (op)) + if (!op->is_armor ()) return; mt = name_to_material (op->materialname); @@ -353,7 +366,7 @@ difficulty >= mt->difficulty && (op->magic >= mt->magic || mt->magic == 0)) { lmt = mt; - if (!(IS_WEAPON (op) || IS_ARMOR (op))) + if (!(op->is_weapon () || op->is_armor ())) break; } } @@ -371,17 +384,18 @@ return; #else - if (op->stats.dam && IS_WEAPON (op)) + if (op->stats.dam && op->is_weapon ()) { op->stats.dam += lmt->damage; if (op->stats.dam < 1) op->stats.dam = 1; } + if (op->stats.sp && op->type == BOW) op->stats.sp += lmt->sp; - if (op->stats.wc && IS_WEAPON (op)) + if (op->stats.wc && op->is_weapon ()) op->stats.wc += lmt->wc; - if (IS_ARMOR (op)) + if (op->is_armor ()) { if (op->stats.ac) op->stats.ac += lmt->ac; @@ -395,9 +409,9 @@ op->resist[j] = -100; } } - op->materialname = add_string (lmt->name); + op->materialname = lmt->name; /* dont make it unstackable if it doesn't need to be */ - if (IS_WEAPON (op) || IS_ARMOR (op)) + if (op->is_weapon () || op->is_armor ()) { op->weight = (op->weight * lmt->weight) / 100; op->value = (op->value * lmt->value) / 100; @@ -542,26 +556,25 @@ ///////////////////////////////////////////////////////////////////////////// -#if 0 -refcounted *refcounted::rc_first; - -refcounted::refcounted () +void +fork_abort (const char *msg) { - refcnt = 0; - rc_next = rc_first; - rc_first = this; -} + if (!fork ()) + { + signal (SIGABRT, SIG_DFL); + abort (); + } -refcounted::~refcounted () -{ - assert (!rc_next); - assert (!refcnt); + LOG (llevError, "fork abort: %s\n", msg); } -#endif void *salloc_ (int n) throw (std::bad_alloc) { +#ifdef PREFER_MALLOC + void *ptr = malloc (n); +#else void *ptr = g_slice_alloc (n); +#endif if (!ptr) throw std::bad_alloc (); @@ -613,3 +626,13 @@ return tstamp (tv.tv_sec) + tstamp (tv.tv_usec) * tstamp (1e-6); } +int +similar_direction (int a, int b) +{ + if (!a || !b) + return 0; + + int diff = (b - a) & 7; + return diff <= 1 || diff >= 7; +} +