ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/utils.C
(Generate patch)

Comparing deliantra/server/common/utils.C (file contents):
Revision 1.17 by root, Fri Nov 17 19:40:53 2006 UTC vs.
Revision 1.35 by root, Mon Jan 1 13:31:46 2007 UTC

… …
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
… …
97 diff = max - min + 1; 99 diff = max - min + 1;
98 ((diff > 2) ? (base = 20) : (base = 50)); /* d2 and d3 are corner cases */ 100 ((diff > 2) ? (base = 20) : (base = 50)); /* d2 and d3 are corner cases */
99 101
100 if (max < 1 || diff < 1) 102 if (max < 1 || diff < 1)
101 { 103 {
102#ifndef WIN32
103 LOG (llevError, "Calling random_roll with min=%lld max=%lld\n", min, max);
104#else
105 LOG (llevError, "Calling random_roll with min=%I64d max=%I64d\n", min, max); 104 LOG (llevError, "Calling random_roll with min=%" PRId64 " max=%" PRId64 "\n", min, max);
106#endif
107 return (min); /* avoids a float exception */ 105 return (min); /* avoids a float exception */
108 } 106 }
109 107
110 /* Don't know of a portable call to get 64 bit random values. 108 /* Don't know of a portable call to get 64 bit random values.
111 * So make a call to get two 32 bit random numbers, and just to 109 * So make a call to get two 32 bit random numbers, and just to
… …
197 return (min); 195 return (min);
198 196
199 return (RANDOM () % diff + min); 197 return (RANDOM () % diff + min);
200} 198}
201 199
202/* decay and destroy persihable items in a map */ 200/* decay and destroy perishable items in a map */
203
204void 201void
205decay_objects (maptile *m) 202maptile::decay_objects ()
206{ 203{
207 int x, y, destroy; 204 if (!spaces)
208 object *op, *otmp;
209
210 if (m->unique)
211 return; 205 return;
212 206
213 for (x = 0; x < MAP_WIDTH (m); x++) 207 for (mapspace *ms = spaces + size (); ms-- > spaces; )
214 for (y = 0; y < MAP_HEIGHT (m); y++) 208 for (object *above, *op = ms->bot; op; op = above)
215 for (op = get_map_ob (m, x, y); op; op = otmp)
216 { 209 {
210 above = op->above;
211
217 destroy = 0; 212 bool destroy = 0;
218 otmp = op->above; 213
214 // do not decay anything above unique floor tiles (yet :)
219 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 215 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
220 break; 216 break;
217
221 if (QUERY_FLAG (op, FLAG_IS_FLOOR) || 218 if (QUERY_FLAG (op, FLAG_IS_FLOOR)
222 QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) || 219 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
223 QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL) || 220 || QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL)
224 QUERY_FLAG (op, FLAG_UNIQUE) || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR) || QUERY_FLAG (op, FLAG_UNPAID) || IS_LIVE (op)) 221 || QUERY_FLAG (op, FLAG_UNIQUE)
225 continue; 222 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
226 /* otherwise, we decay and destroy */ 223 || QUERY_FLAG (op, FLAG_UNPAID)
227 if (IS_WEAPON (op)) 224 || op->is_alive ())
225 ; // do not decay
226 else if (op->is_weapon ())
228 { 227 {
229 op->stats.dam--; 228 op->stats.dam--;
230 if (op->stats.dam < 0) 229 if (op->stats.dam < 0)
231 destroy = 1; 230 destroy = 1;
232 } 231 }
233 else if (IS_ARMOR (op)) 232 else if (op->is_armor ())
234 { 233 {
235 op->stats.ac--; 234 op->stats.ac--;
236 if (op->stats.ac < 0) 235 if (op->stats.ac < 0)
237 destroy = 1; 236 destroy = 1;
238 } 237 }
239 else if (op->type == FOOD) 238 else if (op->type == FOOD)
240 { 239 {
241 op->stats.food -= rndm (5, 20); 240 op->stats.food -= rndm (5, 20);
242 if (op->stats.food < 0) 241 if (op->stats.food < 0)
243 destroy = 1; 242 destroy = 1;
244 } 243 }
245 else 244 else
246 { 245 {
247 if (op->material & M_PAPER || op->material & M_LEATHER || 246 int mat = op->material;
248 op->material & M_WOOD || op->material & M_ORGANIC || op->material & M_CLOTH || op->material & M_LIQUID) 247
248 if (mat & M_PAPER
249 || mat & M_LEATHER
250 || mat & M_WOOD
251 || mat & M_ORGANIC
252 || mat & M_CLOTH
253 || mat & M_LIQUID
254 || (mat & M_IRON && rndm (1, 5) == 1)
255 || (mat & M_GLASS && rndm (1, 2) == 1)
256 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1)
257 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1)
258 || (mat & M_ICE && temp > 32))
249 destroy = 1; 259 destroy = 1;
250 if (op->material & M_IRON && rndm (1, 5) == 1)
251 destroy = 1;
252 if (op->material & M_GLASS && rndm (1, 2) == 1)
253 destroy = 1;
254 if ((op->material & M_STONE || op->material & M_ADAMANT) && rndm (1, 10) == 1)
255 destroy = 1;
256 if ((op->material & M_SOFT_METAL || op->material & M_BONE) && rndm (1, 3) == 1)
257 destroy = 1;
258 if (op->material & M_ICE && MAP_TEMP (m) > 32)
259 destroy = 1;
260 } 260 }
261
261 /* adjust overall chance below */ 262 /* adjust overall chance below */
262 if (destroy && rndm (0, 1)) 263 if (destroy && rndm (0, 1))
263 { 264 op->destroy ();
264 remove_ob (op);
265 free_object (op);
266 }
267 } 265 }
268} 266}
269 267
270/* convert materialname to materialtype_t */ 268/* convert materialname to materialtype_t */
271 269
272materialtype_t * 270materialtype_t *
… …
300 return; 298 return;
301 299
302 if (change->materialname != NULL && strcmp (op->materialname, change->materialname)) 300 if (change->materialname != NULL && strcmp (op->materialname, change->materialname))
303 return; 301 return;
304 302
305 if (!IS_ARMOR (op)) 303 if (!op->is_armor ())
306 return; 304 return;
307 305
308 mt = name_to_material (op->materialname); 306 mt = name_to_material (op->materialname);
309 if (!mt) 307 if (!mt)
310 { 308 {
… …
356 { 354 {
357 if (op->material & mt->material && rndm (1, 100) <= mt->chance && 355 if (op->material & mt->material && rndm (1, 100) <= mt->chance &&
358 difficulty >= mt->difficulty && (op->magic >= mt->magic || mt->magic == 0)) 356 difficulty >= mt->difficulty && (op->magic >= mt->magic || mt->magic == 0))
359 { 357 {
360 lmt = mt; 358 lmt = mt;
361 if (!(IS_WEAPON (op) || IS_ARMOR (op))) 359 if (!(op->is_weapon () || op->is_armor ()))
362 break; 360 break;
363 } 361 }
364 } 362 }
365#endif 363#endif
366 } 364 }
… …
374#ifndef NEW_MATERIAL_CODE 372#ifndef NEW_MATERIAL_CODE
375 op->materialname = lmt->name; 373 op->materialname = lmt->name;
376 return; 374 return;
377#else 375#else
378 376
379 if (op->stats.dam && IS_WEAPON (op)) 377 if (op->stats.dam && op->is_weapon ())
380 { 378 {
381 op->stats.dam += lmt->damage; 379 op->stats.dam += lmt->damage;
382 if (op->stats.dam < 1) 380 if (op->stats.dam < 1)
383 op->stats.dam = 1; 381 op->stats.dam = 1;
384 } 382 }
385 if (op->stats.sp && op->type == BOW) 383 if (op->stats.sp && op->type == BOW)
386 op->stats.sp += lmt->sp; 384 op->stats.sp += lmt->sp;
387 if (op->stats.wc && IS_WEAPON (op)) 385 if (op->stats.wc && op->is_weapon ())
388 op->stats.wc += lmt->wc; 386 op->stats.wc += lmt->wc;
389 if (IS_ARMOR (op)) 387 if (op->is_armor ())
390 { 388 {
391 if (op->stats.ac) 389 if (op->stats.ac)
392 op->stats.ac += lmt->ac; 390 op->stats.ac += lmt->ac;
393 for (j = 0; j < NROFATTACKS; j++) 391 for (j = 0; j < NROFATTACKS; j++)
394 if (op->resist[j] != 0) 392 if (op->resist[j] != 0)
… …
400 op->resist[j] = -100; 398 op->resist[j] = -100;
401 } 399 }
402 } 400 }
403 op->materialname = add_string (lmt->name); 401 op->materialname = add_string (lmt->name);
404 /* dont make it unstackable if it doesn't need to be */ 402 /* dont make it unstackable if it doesn't need to be */
405 if (IS_WEAPON (op) || IS_ARMOR (op)) 403 if (op->is_weapon () || op->is_armor ())
406 { 404 {
407 op->weight = (op->weight * lmt->weight) / 100; 405 op->weight = (op->weight * lmt->weight) / 100;
408 op->value = (op->value * lmt->value) / 100; 406 op->value = (op->value * lmt->value) / 100;
409 } 407 }
410#endif 408#endif
… …
545 return; 543 return;
546} 544}
547 545
548///////////////////////////////////////////////////////////////////////////// 546/////////////////////////////////////////////////////////////////////////////
549 547
550#if 0
551refcounted *refcounted::rc_first;
552
553refcounted::refcounted ()
554{
555 refcnt = 0;
556 rc_next = rc_first;
557 rc_first = this;
558}
559
560refcounted::~refcounted ()
561{
562 assert (!rc_next);
563 assert (!refcnt);
564}
565#endif
566
567void *alloc (int s) throw (std::bad_alloc) 548void *salloc_ (int n) throw (std::bad_alloc)
568{ 549{
569 void *p = g_slice_alloc (s); 550 void *ptr = g_slice_alloc (n);
570 551
571 if (!p) 552 if (!ptr)
572 throw std::bad_alloc (); 553 throw std::bad_alloc ();
573 554
574 return p; 555 return ptr;
556}
557
558void *salloc_ (int n, void *src) throw (std::bad_alloc)
559{
560 void *ptr = salloc_ (n);
561
562 if (src)
563 memcpy (ptr, src, n);
564 else
565 memset (ptr, 0, n);
566
567 return ptr;
575} 568}
576 569
577void assign (char *dst, const char *src, int maxlen) 570void assign (char *dst, const char *src, int maxlen)
578{ 571{
579 if (!src) 572 if (!src)
… …
596 } 589 }
597 else 590 else
598 memcpy (dst, src, len + 1); 591 memcpy (dst, src, len + 1);
599} 592}
600 593
594tstamp now ()
595{
596 struct timeval tv;
601 597
598 gettimeofday (&tv, 0);
599 return tstamp (tv.tv_sec) + tstamp (tv.tv_usec) * tstamp (1e-6);
600}
601
602int
603similar_direction (int a, int b)
604{
605 if (!a || !b)
606 return 0;
607
608 int diff = (b - a) & 7;
609 return diff <= 1 || diff >= 7;
610}
611

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines