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.20 by root, Mon Dec 11 21:32:16 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
… …
27 28
28#include <global.h> 29#include <global.h>
29#include <funcpoint.h> 30#include <funcpoint.h>
30#include <material.h> 31#include <material.h>
31 32
33#include <sys/time.h>
34#include <time.h>
32#include <glib.h> 35#include <glib.h>
33 36
34/* 37/*
35 * The random functions here take luck into account when rolling random 38 * 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 39 * dice or numbers. This function has less of an impact the larger the
… …
193 return (min); 196 return (min);
194 197
195 return (RANDOM () % diff + min); 198 return (RANDOM () % diff + min);
196} 199}
197 200
198/* decay and destroy persihable items in a map */ 201/* decay and destroy perishable items in a map */
199
200void 202void
201decay_objects (maptile *m) 203maptile::decay_objects ()
202{ 204{
203 int x, y, destroy; 205 if (!spaces)
204 object *op, *otmp;
205
206 if (m->unique)
207 return; 206 return;
208 207
209 for (x = 0; x < MAP_WIDTH (m); x++) 208 for (mapspace *ms = spaces + size (); ms-- > spaces; )
210 for (y = 0; y < MAP_HEIGHT (m); y++) 209 for (object *above, *op = ms->bot; op; op = above)
211 for (op = get_map_ob (m, x, y); op; op = otmp)
212 { 210 {
211 above = op->above;
212
213 destroy = 0; 213 bool destroy = 0;
214 otmp = op->above; 214
215 // do not decay anything above unique floor tiles (yet :)
215 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))
216 break; 217 break;
218
217 if (QUERY_FLAG (op, FLAG_IS_FLOOR) || 219 if (QUERY_FLAG (op, FLAG_IS_FLOOR)
218 QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) || 220 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
219 QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL) || 221 || QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL)
220 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)
221 continue; 223 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
222 /* otherwise, we decay and destroy */ 224 || QUERY_FLAG (op, FLAG_UNPAID)
223 if (IS_WEAPON (op)) 225 || op->is_alive ())
226 ; // do not decay
227 else if (op->is_weapon ())
224 { 228 {
225 op->stats.dam--; 229 op->stats.dam--;
226 if (op->stats.dam < 0) 230 if (op->stats.dam < 0)
227 destroy = 1; 231 destroy = 1;
228 } 232 }
229 else if (IS_ARMOR (op)) 233 else if (op->is_armor ())
230 { 234 {
231 op->stats.ac--; 235 op->stats.ac--;
232 if (op->stats.ac < 0) 236 if (op->stats.ac < 0)
233 destroy = 1; 237 destroy = 1;
234 } 238 }
235 else if (op->type == FOOD) 239 else if (op->type == FOOD)
236 { 240 {
237 op->stats.food -= rndm (5, 20); 241 op->stats.food -= rndm (5, 20);
238 if (op->stats.food < 0) 242 if (op->stats.food < 0)
239 destroy = 1; 243 destroy = 1;
240 } 244 }
241 else 245 else
242 { 246 {
243 if (op->material & M_PAPER || op->material & M_LEATHER || 247 int mat = op->material;
244 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))
245 destroy = 1; 260 destroy = 1;
246 if (op->material & M_IRON && rndm (1, 5) == 1)
247 destroy = 1;
248 if (op->material & M_GLASS && rndm (1, 2) == 1)
249 destroy = 1;
250 if ((op->material & M_STONE || op->material & M_ADAMANT) && rndm (1, 10) == 1)
251 destroy = 1;
252 if ((op->material & M_SOFT_METAL || op->material & M_BONE) && rndm (1, 3) == 1)
253 destroy = 1;
254 if (op->material & M_ICE && MAP_TEMP (m) > 32)
255 destroy = 1;
256 } 261 }
262
257 /* adjust overall chance below */ 263 /* adjust overall chance below */
258 if (destroy && rndm (0, 1)) 264 if (destroy && rndm (0, 1))
259 { 265 op->destroy ();
260 remove_ob (op);
261 free_object (op);
262 }
263 } 266 }
264} 267}
265 268
266/* convert materialname to materialtype_t */ 269/* convert materialname to materialtype_t */
267 270
268materialtype_t * 271materialtype_t *
… …
296 return; 299 return;
297 300
298 if (change->materialname != NULL && strcmp (op->materialname, change->materialname)) 301 if (change->materialname != NULL && strcmp (op->materialname, change->materialname))
299 return; 302 return;
300 303
301 if (!IS_ARMOR (op)) 304 if (!op->is_armor ())
302 return; 305 return;
303 306
304 mt = name_to_material (op->materialname); 307 mt = name_to_material (op->materialname);
305 if (!mt) 308 if (!mt)
306 { 309 {
… …
352 { 355 {
353 if (op->material & mt->material && rndm (1, 100) <= mt->chance && 356 if (op->material & mt->material && rndm (1, 100) <= mt->chance &&
354 difficulty >= mt->difficulty && (op->magic >= mt->magic || mt->magic == 0)) 357 difficulty >= mt->difficulty && (op->magic >= mt->magic || mt->magic == 0))
355 { 358 {
356 lmt = mt; 359 lmt = mt;
357 if (!(IS_WEAPON (op) || IS_ARMOR (op))) 360 if (!(op->is_weapon () || op->is_armor ()))
358 break; 361 break;
359 } 362 }
360 } 363 }
361#endif 364#endif
362 } 365 }
… …
370#ifndef NEW_MATERIAL_CODE 373#ifndef NEW_MATERIAL_CODE
371 op->materialname = lmt->name; 374 op->materialname = lmt->name;
372 return; 375 return;
373#else 376#else
374 377
375 if (op->stats.dam && IS_WEAPON (op)) 378 if (op->stats.dam && op->is_weapon ())
376 { 379 {
377 op->stats.dam += lmt->damage; 380 op->stats.dam += lmt->damage;
378 if (op->stats.dam < 1) 381 if (op->stats.dam < 1)
379 op->stats.dam = 1; 382 op->stats.dam = 1;
380 } 383 }
381 if (op->stats.sp && op->type == BOW) 384 if (op->stats.sp && op->type == BOW)
382 op->stats.sp += lmt->sp; 385 op->stats.sp += lmt->sp;
383 if (op->stats.wc && IS_WEAPON (op)) 386 if (op->stats.wc && op->is_weapon ())
384 op->stats.wc += lmt->wc; 387 op->stats.wc += lmt->wc;
385 if (IS_ARMOR (op)) 388 if (op->is_armor ())
386 { 389 {
387 if (op->stats.ac) 390 if (op->stats.ac)
388 op->stats.ac += lmt->ac; 391 op->stats.ac += lmt->ac;
389 for (j = 0; j < NROFATTACKS; j++) 392 for (j = 0; j < NROFATTACKS; j++)
390 if (op->resist[j] != 0) 393 if (op->resist[j] != 0)
… …
396 op->resist[j] = -100; 399 op->resist[j] = -100;
397 } 400 }
398 } 401 }
399 op->materialname = add_string (lmt->name); 402 op->materialname = add_string (lmt->name);
400 /* dont make it unstackable if it doesn't need to be */ 403 /* dont make it unstackable if it doesn't need to be */
401 if (IS_WEAPON (op) || IS_ARMOR (op)) 404 if (op->is_weapon () || op->is_armor ())
402 { 405 {
403 op->weight = (op->weight * lmt->weight) / 100; 406 op->weight = (op->weight * lmt->weight) / 100;
404 op->value = (op->value * lmt->value) / 100; 407 op->value = (op->value * lmt->value) / 100;
405 } 408 }
406#endif 409#endif
… …
541 return; 544 return;
542} 545}
543 546
544///////////////////////////////////////////////////////////////////////////// 547/////////////////////////////////////////////////////////////////////////////
545 548
546#if 0
547refcounted *refcounted::rc_first;
548
549refcounted::refcounted ()
550{
551 refcnt = 0;
552 rc_next = rc_first;
553 rc_first = this;
554}
555
556refcounted::~refcounted ()
557{
558 assert (!rc_next);
559 assert (!refcnt);
560}
561#endif
562
563void *alloc (int s) throw (std::bad_alloc) 549void *salloc_ (int n) throw (std::bad_alloc)
564{ 550{
565 void *p = g_slice_alloc (s); 551 void *ptr = g_slice_alloc (n);
566 552
567 if (!p) 553 if (!ptr)
568 throw std::bad_alloc (); 554 throw std::bad_alloc ();
569 555
570 return p; 556 return ptr;
557}
558
559void *salloc_ (int n, void *src) throw (std::bad_alloc)
560{
561 void *ptr = salloc_ (n);
562
563 if (src)
564 memcpy (ptr, src, n);
565 else
566 memset (ptr, 0, n);
567
568 return ptr;
571} 569}
572 570
573void assign (char *dst, const char *src, int maxlen) 571void assign (char *dst, const char *src, int maxlen)
574{ 572{
575 if (!src) 573 if (!src)
… …
592 } 590 }
593 else 591 else
594 memcpy (dst, src, len + 1); 592 memcpy (dst, src, len + 1);
595} 593}
596 594
595tstamp now ()
596{
597 struct timeval tv;
597 598
599 gettimeofday (&tv, 0);
600 return tstamp (tv.tv_sec) + tstamp (tv.tv_usec) * tstamp (1e-6);
601}
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