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.24 by root, Sat Dec 16 21:40:26 2006 UTC vs.
Revision 1.36 by pippijn, Sat Jan 6 14:42:29 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 CrossFire, A Multiplayer game for X-windows
3 3
4 Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 Copyright (C) 2002 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 Copyright (C) 1992 Frank Tore Johansen
6 7
7 This program is free software; you can redistribute it and/or modify 8 This program is free software; you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 it under the terms of the GNU General Public License as published by
… …
195 return (min); 196 return (min);
196 197
197 return (RANDOM () % diff + min); 198 return (RANDOM () % diff + min);
198} 199}
199 200
200/* decay and destroy persihable items in a map */ 201/* decay and destroy perishable items in a map */
201
202void 202void
203decay_objects (maptile *m) 203maptile::decay_objects ()
204{ 204{
205 int x, y, destroy; 205 if (!spaces)
206 object *op, *otmp;
207
208 if (m->unique)
209 return; 206 return;
210 207
211 for (x = 0; x < MAP_WIDTH (m); x++) 208 for (mapspace *ms = spaces + size (); ms-- > spaces; )
212 for (y = 0; y < MAP_HEIGHT (m); y++) 209 for (object *above, *op = ms->bot; op; op = above)
213 for (op = get_map_ob (m, x, y); op; op = otmp)
214 { 210 {
211 above = op->above;
212
215 destroy = 0; 213 bool destroy = 0;
216 otmp = op->above; 214
215 // do not decay anything above unique floor tiles (yet :)
217 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 216 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
218 break; 217 break;
218
219 if (QUERY_FLAG (op, FLAG_IS_FLOOR) || 219 if (QUERY_FLAG (op, FLAG_IS_FLOOR)
220 QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) || 220 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
221 QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL) || 221 || QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL)
222 QUERY_FLAG (op, FLAG_UNIQUE) || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR) || QUERY_FLAG (op, FLAG_UNPAID) || IS_LIVE (op)) 222 || QUERY_FLAG (op, FLAG_UNIQUE)
223 continue; 223 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
224 /* otherwise, we decay and destroy */ 224 || QUERY_FLAG (op, FLAG_UNPAID)
225 if (IS_WEAPON (op)) 225 || op->is_alive ())
226 ; // do not decay
227 else if (op->is_weapon ())
226 { 228 {
227 op->stats.dam--; 229 op->stats.dam--;
228 if (op->stats.dam < 0) 230 if (op->stats.dam < 0)
229 destroy = 1; 231 destroy = 1;
230 } 232 }
231 else if (IS_ARMOR (op)) 233 else if (op->is_armor ())
232 { 234 {
233 op->stats.ac--; 235 op->stats.ac--;
234 if (op->stats.ac < 0) 236 if (op->stats.ac < 0)
235 destroy = 1; 237 destroy = 1;
236 } 238 }
237 else if (op->type == FOOD) 239 else if (op->type == FOOD)
238 { 240 {
239 op->stats.food -= rndm (5, 20); 241 op->stats.food -= rndm (5, 20);
240 if (op->stats.food < 0) 242 if (op->stats.food < 0)
241 destroy = 1; 243 destroy = 1;
242 } 244 }
243 else 245 else
244 { 246 {
245 if (op->material & M_PAPER || op->material & M_LEATHER || 247 int mat = op->material;
246 op->material & M_WOOD || op->material & M_ORGANIC || op->material & M_CLOTH || op->material & M_LIQUID) 248
249 if (mat & M_PAPER
250 || mat & M_LEATHER
251 || mat & M_WOOD
252 || mat & M_ORGANIC
253 || mat & M_CLOTH
254 || mat & M_LIQUID
255 || (mat & M_IRON && rndm (1, 5) == 1)
256 || (mat & M_GLASS && rndm (1, 2) == 1)
257 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1)
258 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1)
259 || (mat & M_ICE && temp > 32))
247 destroy = 1; 260 destroy = 1;
248 if (op->material & M_IRON && rndm (1, 5) == 1)
249 destroy = 1;
250 if (op->material & M_GLASS && rndm (1, 2) == 1)
251 destroy = 1;
252 if ((op->material & M_STONE || op->material & M_ADAMANT) && rndm (1, 10) == 1)
253 destroy = 1;
254 if ((op->material & M_SOFT_METAL || op->material & M_BONE) && rndm (1, 3) == 1)
255 destroy = 1;
256 if (op->material & M_ICE && MAP_TEMP (m) > 32)
257 destroy = 1;
258 } 261 }
262
259 /* adjust overall chance below */ 263 /* adjust overall chance below */
260 if (destroy && rndm (0, 1)) 264 if (destroy && rndm (0, 1))
261 op->destroy (); 265 op->destroy ();
262 } 266 }
263} 267}
264 268
265/* convert materialname to materialtype_t */ 269/* convert materialname to materialtype_t */
266 270
267materialtype_t * 271materialtype_t *
… …
295 return; 299 return;
296 300
297 if (change->materialname != NULL && strcmp (op->materialname, change->materialname)) 301 if (change->materialname != NULL && strcmp (op->materialname, change->materialname))
298 return; 302 return;
299 303
300 if (!IS_ARMOR (op)) 304 if (!op->is_armor ())
301 return; 305 return;
302 306
303 mt = name_to_material (op->materialname); 307 mt = name_to_material (op->materialname);
304 if (!mt) 308 if (!mt)
305 { 309 {
… …
351 { 355 {
352 if (op->material & mt->material && rndm (1, 100) <= mt->chance && 356 if (op->material & mt->material && rndm (1, 100) <= mt->chance &&
353 difficulty >= mt->difficulty && (op->magic >= mt->magic || mt->magic == 0)) 357 difficulty >= mt->difficulty && (op->magic >= mt->magic || mt->magic == 0))
354 { 358 {
355 lmt = mt; 359 lmt = mt;
356 if (!(IS_WEAPON (op) || IS_ARMOR (op))) 360 if (!(op->is_weapon () || op->is_armor ()))
357 break; 361 break;
358 } 362 }
359 } 363 }
360#endif 364#endif
361 } 365 }
… …
369#ifndef NEW_MATERIAL_CODE 373#ifndef NEW_MATERIAL_CODE
370 op->materialname = lmt->name; 374 op->materialname = lmt->name;
371 return; 375 return;
372#else 376#else
373 377
374 if (op->stats.dam && IS_WEAPON (op)) 378 if (op->stats.dam && op->is_weapon ())
375 { 379 {
376 op->stats.dam += lmt->damage; 380 op->stats.dam += lmt->damage;
377 if (op->stats.dam < 1) 381 if (op->stats.dam < 1)
378 op->stats.dam = 1; 382 op->stats.dam = 1;
379 } 383 }
380 if (op->stats.sp && op->type == BOW) 384 if (op->stats.sp && op->type == BOW)
381 op->stats.sp += lmt->sp; 385 op->stats.sp += lmt->sp;
382 if (op->stats.wc && IS_WEAPON (op)) 386 if (op->stats.wc && op->is_weapon ())
383 op->stats.wc += lmt->wc; 387 op->stats.wc += lmt->wc;
384 if (IS_ARMOR (op)) 388 if (op->is_armor ())
385 { 389 {
386 if (op->stats.ac) 390 if (op->stats.ac)
387 op->stats.ac += lmt->ac; 391 op->stats.ac += lmt->ac;
388 for (j = 0; j < NROFATTACKS; j++) 392 for (j = 0; j < NROFATTACKS; j++)
389 if (op->resist[j] != 0) 393 if (op->resist[j] != 0)
… …
395 op->resist[j] = -100; 399 op->resist[j] = -100;
396 } 400 }
397 } 401 }
398 op->materialname = add_string (lmt->name); 402 op->materialname = add_string (lmt->name);
399 /* dont make it unstackable if it doesn't need to be */ 403 /* dont make it unstackable if it doesn't need to be */
400 if (IS_WEAPON (op) || IS_ARMOR (op)) 404 if (op->is_weapon () || op->is_armor ())
401 { 405 {
402 op->weight = (op->weight * lmt->weight) / 100; 406 op->weight = (op->weight * lmt->weight) / 100;
403 op->value = (op->value * lmt->value) / 100; 407 op->value = (op->value * lmt->value) / 100;
404 } 408 }
405#endif 409#endif
… …
540 return; 544 return;
541} 545}
542 546
543///////////////////////////////////////////////////////////////////////////// 547/////////////////////////////////////////////////////////////////////////////
544 548
545#if 0
546refcounted *refcounted::rc_first;
547
548refcounted::refcounted ()
549{
550 refcnt = 0;
551 rc_next = rc_first;
552 rc_first = this;
553}
554
555refcounted::~refcounted ()
556{
557 assert (!rc_next);
558 assert (!refcnt);
559}
560#endif
561
562void *salloc (int size) throw (std::bad_alloc) 549void *salloc_ (int n) throw (std::bad_alloc)
563{ 550{
564 void *ptr = g_slice_alloc (size); 551 void *ptr = g_slice_alloc (n);
565 552
566 if (!ptr) 553 if (!ptr)
567 throw std::bad_alloc (); 554 throw std::bad_alloc ();
568 555
569 return ptr; 556 return ptr;
570} 557}
571 558
572void *salloc (int size, void *src) throw (std::bad_alloc) 559void *salloc_ (int n, void *src) throw (std::bad_alloc)
573{ 560{
574 void *ptr = salloc (size); 561 void *ptr = salloc_ (n);
575 562
576 if (src) 563 if (src)
577 memcpy (ptr, src, size); 564 memcpy (ptr, src, n);
578 else 565 else
579 memset (ptr, 0, size); 566 memset (ptr, 0, n);
580 567
581 return ptr; 568 return ptr;
582} 569}
583 570
584void assign (char *dst, const char *src, int maxlen) 571void assign (char *dst, const char *src, int maxlen)
… …
611 598
612 gettimeofday (&tv, 0); 599 gettimeofday (&tv, 0);
613 return tstamp (tv.tv_sec) + tstamp (tv.tv_usec) * tstamp (1e-6); 600 return tstamp (tv.tv_sec) + tstamp (tv.tv_usec) * tstamp (1e-6);
614} 601}
615 602
603int
604similar_direction (int a, int b)
605{
606 if (!a || !b)
607 return 0;
608
609 int diff = (b - a) & 7;
610 return diff <= 1 || diff >= 7;
611}
612

Diff Legend

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