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.61 by root, Tue Jul 10 05:51:37 2007 UTC vs.
Revision 1.68 by root, Thu Nov 8 19:43:24 2007 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;
… …
417 * 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
418 * 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.
419 * This function will also strip all trailing non alphanumeric characters. 420 * This function will also strip all trailing non alphanumeric characters.
420 * It does not insert an oxford comma. 421 * It does not insert an oxford comma.
421 */ 422 */
422
423void 423void
424make_list_like (char *input) 424make_list_like (char *input)
425{ 425{
426 char *p, tmp[MAX_BUF]; 426 char *p, tmp[MAX_BUF];
427 int i; 427 int i;
… …
472void *salloc_ (int n) throw (std::bad_alloc) 472void *salloc_ (int n) throw (std::bad_alloc)
473{ 473{
474#ifdef PREFER_MALLOC 474#ifdef PREFER_MALLOC
475 void *ptr = malloc (n); 475 void *ptr = malloc (n);
476#else 476#else
477 slice_alloc += n;
477 void *ptr = g_slice_alloc (n); 478 void *ptr = g_slice_alloc (n);
478#endif 479#endif
479 480
480 if (!ptr) 481 if (!ptr)
481 throw std::bad_alloc (); 482 throw std::bad_alloc ();
… …
517 } 518 }
518 else 519 else
519 memcpy (dst, src, len + 1); 520 memcpy (dst, src, len + 1);
520} 521}
521 522
522const std::string 523const char *
523format (const char *format, ...) 524format (const char *format, ...)
524{ 525{
525 int len; 526 static dynbuf_text buf;
526 527
527 { 528 buf.clear ();
528 char buf[128];
529 529
530 va_list ap; 530 va_list ap;
531 va_start (ap, format); 531 va_start (ap, format);
532 len = vsnprintf (buf, sizeof (buf), format, ap); 532 buf.vprintf (format, ap);
533 va_end (ap); 533 va_end (ap);
534 534
535 assert (len >= 0); // shield againstz broken vsnprintf's
536
537 // was our static buffer short enough?
538 if (len < sizeof (buf))
539 return std::string (buf, len);
540 }
541
542 {
543 // longer, try harder
544 char *buf = salloc<char> (len + 1);
545
546 va_list ap;
547 va_start (ap, format);
548 vsnprintf (buf, len + 1, format, ap);
549 va_end (ap);
550
551 const std::string s (buf, len);
552 sfree<char> (buf, len + 1);
553
554 return buf; 535 return buf;
555 }
556} 536}
557 537
558tstamp now () 538tstamp now ()
559{ 539{
560 struct timeval tv; 540 struct timeval tv;
… …
628 0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL, 608 0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL,
629 0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL, 609 0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL,
630 0x2d02ef8dL 610 0x2d02ef8dL
631}; 611};
632 612
633

Diff Legend

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