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.60 by root, Sun Jul 1 05:00:18 2007 UTC vs.
Revision 1.72 by root, Tue Apr 1 19:50:36 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * 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
10 * the Free Software Foundation, either version 3 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
… …
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * 20 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 22 */
23 23
24/* 24/*
25 * General convenience functions for crossfire. 25 * General convenience functions for crossfire.
26 */ 26 */
… …
36#include <funcpoint.h> 36#include <funcpoint.h>
37#include <material.h> 37#include <material.h>
38 38
39#include <glib.h> 39#include <glib.h>
40 40
41refcnt_base::refcnt_t refcnt_dummy;
42size_t slice_alloc;
41rand_gen rndm; 43rand_gen rndm;
42 44
43void 45void
44tausworthe_random_generator::seed (uint32_t seed) 46tausworthe_random_generator::seed (uint32_t seed)
45{ 47{
… …
212{ 214{
213 for (materialtype_t *mt = materialt; mt && mt->next; mt = mt->next) 215 for (materialtype_t *mt = materialt; mt && mt->next; mt = mt->next)
214 if (name == mt->name) 216 if (name == mt->name)
215 return mt; 217 return mt;
216 218
217 return materialt; 219 return 0;
218} 220}
219 221
220/* when doing transmutation of objects, we have to recheck the resistances, 222/* when doing transmutation of objects, we have to recheck the resistances,
221 * as some that did not apply previously, may apply now. 223 * as some that did not apply previously, may apply now.
222 */ 224 */
223
224void 225void
225transmute_materialname (object *op, const object *change) 226transmute_materialname (object *op, const object *change)
226{ 227{
227 materialtype_t *mt; 228 materialtype_t *mt;
228 int j; 229 int j;
… …
258void 259void
259set_materialname (object *op, int difficulty, materialtype_t *nmt) 260set_materialname (object *op, int difficulty, materialtype_t *nmt)
260{ 261{
261 materialtype_t *mt, *lmt; 262 materialtype_t *mt, *lmt;
262 263
263#ifdef NEW_MATERIAL_CODE
264 int j;
265#endif
266
267 if (op->materialname != NULL) 264 if (op->materialname != NULL)
268 return; 265 return;
269 266
270
271
272 if (nmt == NULL) 267 if (nmt == NULL)
273 { 268 {
274 lmt = NULL; 269 lmt = NULL;
275#ifndef NEW_MATERIAL_CODE 270
276 for (mt = materialt; mt && mt->next; mt = mt->next) 271 for (mt = materialt; mt && mt->next; mt = mt->next)
277 { 272 if (op->materials & mt->material && rndm (1, 100) <= mt->chance &&
278 if (op->materials & mt->material) 273 difficulty >= mt->difficulty && (op->magic >= mt->magic || mt->magic == 0))
279 { 274 {
280 lmt = mt; 275 lmt = mt;
276 if (!(op->is_weapon () || op->is_armor ()))
281 break; 277 break;
282 } 278 }
283 }
284
285#else
286 for (mt = materialt; mt && mt->next; mt = mt->next)
287 {
288 if (op->materials & mt->material && rndm (1, 100) <= mt->chance &&
289 difficulty >= mt->difficulty && (op->magic >= mt->magic || mt->magic == 0))
290 {
291 lmt = mt;
292 if (!(op->is_weapon () || op->is_armor ()))
293 break;
294 }
295 }
296#endif
297 } 279 }
298 else 280 else
299 {
300 lmt = nmt; 281 lmt = nmt;
301 }
302 282
303 if (lmt != NULL) 283 if (lmt != NULL)
304 { 284 {
305#ifndef NEW_MATERIAL_CODE
306 op->materialname = lmt->name;
307 return;
308#else
309
310 if (op->stats.dam && op->is_weapon ()) 285 if (op->stats.dam && op->is_weapon ())
311 { 286 {
312 op->stats.dam += lmt->damage; 287 op->stats.dam += lmt->damage;
313 if (op->stats.dam < 1) 288 if (op->stats.dam < 1)
314 op->stats.dam = 1; 289 op->stats.dam = 1;
… …
320 op->stats.wc += lmt->wc; 295 op->stats.wc += lmt->wc;
321 if (op->is_armor ()) 296 if (op->is_armor ())
322 { 297 {
323 if (op->stats.ac) 298 if (op->stats.ac)
324 op->stats.ac += lmt->ac; 299 op->stats.ac += lmt->ac;
300
325 for (j = 0; j < NROFATTACKS; j++) 301 for (int j = 0; j < NROFATTACKS; j++)
326 if (op->resist[j] != 0) 302 if (op->resist[j] != 0)
327 { 303 {
328 op->resist[j] += lmt->mod[j]; 304 op->resist[j] += lmt->mod[j];
329 if (op->resist[j] > 100) 305 if (op->resist[j] > 100)
330 op->resist[j] = 100; 306 op->resist[j] = 100;
331 if (op->resist[j] < -100) 307 if (op->resist[j] < -100)
332 op->resist[j] = -100; 308 op->resist[j] = -100;
333 } 309 }
334 } 310 }
311
335 op->materialname = lmt->name; 312 op->materialname = lmt->name;
336 /* dont make it unstackable if it doesn't need to be */ 313 /* dont make it unstackable if it doesn't need to be */
337 if (op->is_weapon () || op->is_armor ()) 314 if (op->is_weapon () || op->is_armor ())
338 { 315 {
339 op->weight = (op->weight * lmt->weight) / 100; 316 op->weight = (op->weight * lmt->weight) / 100;
340 op->value = (op->value * lmt->value) / 100; 317 op->value = (op->value * lmt->value) / 100;
341 } 318 }
342#endif
343 } 319 }
344} 320}
345 321
346/* 322/*
347 * Strip out the media tags from a String. 323 * Strip out the media tags from a String.
… …
442 * a 'list' for the purposes here, is a string of items, seperated by commas, except 418 * a 'list' for the purposes here, is a string of items, seperated by commas, except
443 * for the last entry, which has an 'and' before it, and a full stop (period) after it. 419 * for the last entry, which has an 'and' before it, and a full stop (period) after it.
444 * This function will also strip all trailing non alphanumeric characters. 420 * This function will also strip all trailing non alphanumeric characters.
445 * It does not insert an oxford comma. 421 * It does not insert an oxford comma.
446 */ 422 */
447
448void 423void
449make_list_like (char *input) 424make_list_like (char *input)
450{ 425{
451 char *p, tmp[MAX_BUF]; 426 char *p, tmp[MAX_BUF];
452 int i; 427 int i;
… …
494 LOG (llevError, "fork abort: %s\n", msg); 469 LOG (llevError, "fork abort: %s\n", msg);
495} 470}
496 471
497void *salloc_ (int n) throw (std::bad_alloc) 472void *salloc_ (int n) throw (std::bad_alloc)
498{ 473{
499#ifdef PREFER_MALLOC 474#if PREFER_MALLOC
500 void *ptr = malloc (n); 475 void *ptr = malloc (n);
501#else 476#else
477 slice_alloc += n;
502 void *ptr = g_slice_alloc (n); 478 void *ptr = g_slice_alloc (n);
503#endif 479#endif
504 480
505 if (!ptr) 481 if (!ptr)
506 throw std::bad_alloc (); 482 throw std::bad_alloc ();
… …
518 memset (ptr, 0, n); 494 memset (ptr, 0, n);
519 495
520 return ptr; 496 return ptr;
521} 497}
522 498
499/******************************************************************************/
500
501#if DEBUG_SALLOC
502
503#define MAGIC 0xa1b2c35543deadLL
504
505void *g_slice_alloc (unsigned long size)
506{
507 unsigned long *p = (unsigned long *) (g_slice_alloc)(size + sizeof (unsigned long));
508 *p++ = size ^ MAGIC;
509 //fprintf (stderr, "g_slice_alloc %ld %p\n", size, p);//D
510 return (void *)p;
511}
512
513void *g_slice_alloc0 (unsigned long size)
514{
515 return memset (g_slice_alloc (size), 0, size);
516}
517
518void g_slice_free1 (unsigned long size, void *ptr)
519{
520 if (expect_true (ptr))
521 {
522 //fprintf (stderr, "g_slice_free %ld %p\n", size, ptr);//D
523 unsigned long *p = (unsigned long *)ptr;
524 unsigned long s = *--p ^ MAGIC;
525
526 if (size != (unsigned long)(*p ^ MAGIC))
527 LOG (logBacktrace | llevError, "slice free size (%lx) doesn't match alloc size (%lx)\n", size, s);
528
529 *p = MAGIC;
530
531 (g_slice_free1)(s + sizeof (unsigned long), p);
532 }
533}
534
535#endif
536
537/******************************************************************************/
538
523void assign (char *dst, const char *src, int maxlen) 539void assign (char *dst, const char *src, int maxlen)
524{ 540{
525 if (!src) 541 if (!src)
526 src = ""; 542 src = "";
527 543
… …
542 } 558 }
543 else 559 else
544 memcpy (dst, src, len + 1); 560 memcpy (dst, src, len + 1);
545} 561}
546 562
547const std::string 563const char *
548format (const char *format, ...) 564format (const char *format, ...)
549{ 565{
550 int len; 566 static dynbuf_text buf;
551 567
552 { 568 buf.clear ();
553 char buf[128];
554 569
555 va_list ap; 570 va_list ap;
556 va_start (ap, format); 571 va_start (ap, format);
557 len = vsnprintf (buf, sizeof (buf), format, ap); 572 buf.vprintf (format, ap);
558 va_end (ap); 573 va_end (ap);
559 574
560 assert (len >= 0); // shield againstz broken vsnprintf's
561
562 // was our static buffer short enough?
563 if (len < sizeof (buf))
564 return std::string (buf, len);
565 }
566
567 {
568 // longer, try harder
569 char *buf = salloc<char> (len + 1);
570
571 va_list ap;
572 va_start (ap, format);
573 vsnprintf (buf, len + 1, format, ap);
574 va_end (ap);
575
576 const std::string s (buf, len);
577 sfree<char> (buf, len + 1);
578
579 return buf; 575 return buf;
580 }
581} 576}
582 577
583tstamp now () 578tstamp now ()
584{ 579{
585 struct timeval tv; 580 struct timeval tv;
… …
653 0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL, 648 0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL,
654 0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL, 649 0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL,
655 0x2d02ef8dL 650 0x2d02ef8dL
656}; 651};
657 652
658

Diff Legend

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