--- deliantra/server/common/utils.C 2007/01/19 15:15:49 1.42 +++ deliantra/server/common/utils.C 2007/01/25 03:54:44 1.44 @@ -44,10 +44,10 @@ void tausworthe_random_generator::seed (uint32_t seed) { - state [0] = max ( 2, seed * 69069U); - state [1] = max ( 8, state [0] * 69069U); - state [2] = max ( 16, state [1] * 69069U); - state [3] = max (128, state [2] * 69069U); + 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 ()(); @@ -572,7 +572,11 @@ 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 ();