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.59 by root, Thu Jun 7 19:12:22 2007 UTC vs.
Revision 1.70 by root, Fri Jan 25 18:09:23 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. 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 it 8 * Deliantra is free software: you can redistribute it and/or modify
9 * under the terms of the GNU General Public License as published by the Free 9 * it under the terms of the GNU General Public License as published by
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * the Free Software Foundation, either version 3 of the License, or
11 * 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, but 13 * This program is distributed in the hope that it will be useful,
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * 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 along 18 * You should have received a copy of the GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 20 *
22 * 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>
23 */ 22 */
24 23
25/* 24/*
26 * General convenience functions for crossfire. 25 * General convenience functions for crossfire.
27 */ 26 */
… …
37#include <funcpoint.h> 36#include <funcpoint.h>
38#include <material.h> 37#include <material.h>
39 38
40#include <glib.h> 39#include <glib.h>
41 40
41refcnt_base::refcnt_t refcnt_dummy;
42size_t slice_alloc;
42rand_gen rndm; 43rand_gen rndm;
43 44
44void 45void
45tausworthe_random_generator::seed (uint32_t seed) 46tausworthe_random_generator::seed (uint32_t seed)
46{ 47{
… …
213{ 214{
214 for (materialtype_t *mt = materialt; mt && mt->next; mt = mt->next) 215 for (materialtype_t *mt = materialt; mt && mt->next; mt = mt->next)
215 if (name == mt->name) 216 if (name == mt->name)
216 return mt; 217 return mt;
217 218
218 return materialt; 219 return 0;
219} 220}
220 221
221/* when doing transmutation of objects, we have to recheck the resistances, 222/* when doing transmutation of objects, we have to recheck the resistances,
222 * as some that did not apply previously, may apply now. 223 * as some that did not apply previously, may apply now.
223 */ 224 */
224
225void 225void
226transmute_materialname (object *op, const object *change) 226transmute_materialname (object *op, const object *change)
227{ 227{
228 materialtype_t *mt; 228 materialtype_t *mt;
229 int j; 229 int j;
… …
259void 259void
260set_materialname (object *op, int difficulty, materialtype_t *nmt) 260set_materialname (object *op, int difficulty, materialtype_t *nmt)
261{ 261{
262 materialtype_t *mt, *lmt; 262 materialtype_t *mt, *lmt;
263 263
264#ifdef NEW_MATERIAL_CODE
265 int j;
266#endif
267
268 if (op->materialname != NULL) 264 if (op->materialname != NULL)
269 return; 265 return;
270 266
271
272
273 if (nmt == NULL) 267 if (nmt == NULL)
274 { 268 {
275 lmt = NULL; 269 lmt = NULL;
276#ifndef NEW_MATERIAL_CODE 270
277 for (mt = materialt; mt && mt->next; mt = mt->next) 271 for (mt = materialt; mt && mt->next; mt = mt->next)
278 { 272 if (op->materials & mt->material && rndm (1, 100) <= mt->chance &&
279 if (op->materials & mt->material) 273 difficulty >= mt->difficulty && (op->magic >= mt->magic || mt->magic == 0))
280 { 274 {
281 lmt = mt; 275 lmt = mt;
276 if (!(op->is_weapon () || op->is_armor ()))
282 break; 277 break;
283 } 278 }
284 }
285
286#else
287 for (mt = materialt; mt && mt->next; mt = mt->next)
288 {
289 if (op->materials & mt->material && rndm (1, 100) <= mt->chance &&
290 difficulty >= mt->difficulty && (op->magic >= mt->magic || mt->magic == 0))
291 {
292 lmt = mt;
293 if (!(op->is_weapon () || op->is_armor ()))
294 break;
295 }
296 }
297#endif
298 } 279 }
299 else 280 else
300 {
301 lmt = nmt; 281 lmt = nmt;
302 }
303 282
304 if (lmt != NULL) 283 if (lmt != NULL)
305 { 284 {
306#ifndef NEW_MATERIAL_CODE
307 op->materialname = lmt->name;
308 return;
309#else
310
311 if (op->stats.dam && op->is_weapon ()) 285 if (op->stats.dam && op->is_weapon ())
312 { 286 {
313 op->stats.dam += lmt->damage; 287 op->stats.dam += lmt->damage;
314 if (op->stats.dam < 1) 288 if (op->stats.dam < 1)
315 op->stats.dam = 1; 289 op->stats.dam = 1;
… …
321 op->stats.wc += lmt->wc; 295 op->stats.wc += lmt->wc;
322 if (op->is_armor ()) 296 if (op->is_armor ())
323 { 297 {
324 if (op->stats.ac) 298 if (op->stats.ac)
325 op->stats.ac += lmt->ac; 299 op->stats.ac += lmt->ac;
300
326 for (j = 0; j < NROFATTACKS; j++) 301 for (int j = 0; j < NROFATTACKS; j++)
327 if (op->resist[j] != 0) 302 if (op->resist[j] != 0)
328 { 303 {
329 op->resist[j] += lmt->mod[j]; 304 op->resist[j] += lmt->mod[j];
330 if (op->resist[j] > 100) 305 if (op->resist[j] > 100)
331 op->resist[j] = 100; 306 op->resist[j] = 100;
332 if (op->resist[j] < -100) 307 if (op->resist[j] < -100)
333 op->resist[j] = -100; 308 op->resist[j] = -100;
334 } 309 }
335 } 310 }
311
336 op->materialname = lmt->name; 312 op->materialname = lmt->name;
337 /* dont make it unstackable if it doesn't need to be */ 313 /* dont make it unstackable if it doesn't need to be */
338 if (op->is_weapon () || op->is_armor ()) 314 if (op->is_weapon () || op->is_armor ())
339 { 315 {
340 op->weight = (op->weight * lmt->weight) / 100; 316 op->weight = (op->weight * lmt->weight) / 100;
341 op->value = (op->value * lmt->value) / 100; 317 op->value = (op->value * lmt->value) / 100;
342 } 318 }
343#endif
344 } 319 }
345} 320}
346 321
347/* 322/*
348 * Strip out the media tags from a String. 323 * Strip out the media tags from a String.
… …
443 * 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
444 * 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.
445 * This function will also strip all trailing non alphanumeric characters. 420 * This function will also strip all trailing non alphanumeric characters.
446 * It does not insert an oxford comma. 421 * It does not insert an oxford comma.
447 */ 422 */
448
449void 423void
450make_list_like (char *input) 424make_list_like (char *input)
451{ 425{
452 char *p, tmp[MAX_BUF]; 426 char *p, tmp[MAX_BUF];
453 int i; 427 int i;
… …
498void *salloc_ (int n) throw (std::bad_alloc) 472void *salloc_ (int n) throw (std::bad_alloc)
499{ 473{
500#ifdef PREFER_MALLOC 474#ifdef PREFER_MALLOC
501 void *ptr = malloc (n); 475 void *ptr = malloc (n);
502#else 476#else
477 slice_alloc += n;
503 void *ptr = g_slice_alloc (n); 478 void *ptr = g_slice_alloc (n);
504#endif 479#endif
505 480
506 if (!ptr) 481 if (!ptr)
507 throw std::bad_alloc (); 482 throw std::bad_alloc ();
… …
519 memset (ptr, 0, n); 494 memset (ptr, 0, n);
520 495
521 return ptr; 496 return ptr;
522} 497}
523 498
499/******************************************************************************/
500
501#ifdef 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 ((*p ^ MAGIC) != size)
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
524void assign (char *dst, const char *src, int maxlen) 539void assign (char *dst, const char *src, int maxlen)
525{ 540{
526 if (!src) 541 if (!src)
527 src = ""; 542 src = "";
528 543
… …
543 } 558 }
544 else 559 else
545 memcpy (dst, src, len + 1); 560 memcpy (dst, src, len + 1);
546} 561}
547 562
548const std::string 563const char *
549format (const char *format, ...) 564format (const char *format, ...)
550{ 565{
551 int len; 566 static dynbuf_text buf;
552 567
553 { 568 buf.clear ();
554 char buf[128];
555 569
556 va_list ap; 570 va_list ap;
557 va_start (ap, format); 571 va_start (ap, format);
558 len = vsnprintf (buf, sizeof (buf), format, ap); 572 buf.vprintf (format, ap);
559 va_end (ap); 573 va_end (ap);
560 574
561 assert (len >= 0); // shield againstz broken vsnprintf's
562
563 // was our static buffer short enough?
564 if (len < sizeof (buf))
565 return std::string (buf, len);
566 }
567
568 {
569 // longer, try harder
570 char *buf = salloc<char> (len + 1);
571
572 va_list ap;
573 va_start (ap, format);
574 vsnprintf (buf, len + 1, format, ap);
575 va_end (ap);
576
577 const std::string s (buf, len);
578 sfree<char> (buf, len + 1);
579
580 return buf; 575 return buf;
581 }
582} 576}
583 577
584tstamp now () 578tstamp now ()
585{ 579{
586 struct timeval tv; 580 struct timeval tv;
… …
654 0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL, 648 0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL,
655 0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL, 649 0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL,
656 0x2d02ef8dL 650 0x2d02ef8dL
657}; 651};
658 652
659

Diff Legend

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