ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/include/util.h
(Generate patch)

Comparing deliantra/server/include/util.h (file contents):
Revision 1.102 by root, Thu Apr 29 12:24:04 2010 UTC vs.
Revision 1.129 by root, Sat Dec 1 20:22:13 2018 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 5 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * 6 *
6 * Deliantra is free software: you can redistribute it and/or modify it under 7 * Deliantra is free software: you can redistribute it and/or modify it under
7 * the terms of the Affero GNU General Public License as published by the 8 * the terms of the Affero GNU General Public License as published by the
8 * Free Software Foundation, either version 3 of the License, or (at your 9 * Free Software Foundation, either version 3 of the License, or (at your
9 * option) any later version. 10 * option) any later version.
10 * 11 *
11 * This program is distributed in the hope that it will be useful, 12 * This program is distributed in the hope that it will be useful,
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 * GNU General Public License for more details. 15 * GNU General Public License for more details.
15 * 16 *
16 * You should have received a copy of the Affero GNU General Public License 17 * You should have received a copy of the Affero GNU General Public License
17 * and the GNU General Public License along with this program. If not, see 18 * and the GNU General Public License along with this program. If not, see
18 * <http://www.gnu.org/licenses/>. 19 * <http://www.gnu.org/licenses/>.
19 * 20 *
20 * The authors can be reached via e-mail to <support@deliantra.net> 21 * The authors can be reached via e-mail to <support@deliantra.net>
21 */ 22 */
22 23
23#ifndef UTIL_H__ 24#ifndef UTIL_H__
24#define UTIL_H__ 25#define UTIL_H__
… …
35#include <cmath> 36#include <cmath>
36#include <new> 37#include <new>
37#include <vector> 38#include <vector>
38 39
39#include <glib.h> 40#include <glib.h>
41
42#include <flat_hash_map.hpp>
40 43
41#include <shstr.h> 44#include <shstr.h>
42#include <traits.h> 45#include <traits.h>
43 46
44#if DEBUG_SALLOC 47#if DEBUG_SALLOC
… …
52# define g_slice_alloc0(s) calloc (1, (s)) 55# define g_slice_alloc0(s) calloc (1, (s))
53# define g_slice_alloc(s) malloc ((s)) 56# define g_slice_alloc(s) malloc ((s))
54# define g_slice_free1(s,p) free ((p)) 57# define g_slice_free1(s,p) free ((p))
55#endif 58#endif
56 59
57// use C0X decltype for auto declarations until ISO C++ sanctifies them (if ever)
58#define auto(var,expr) decltype(expr) var = (expr)
59
60// could use the sizeof (arr) /( sizeof (arr [0]) here, but C++ is
61// much more obfuscated... :)
62
63template<typename T, int N>
64inline int array_length (const T (&arr)[N])
65{
66 return N;
67}
68
69// very ugly macro that basically declares and initialises a variable 60// very ugly macro that basically declares and initialises a variable
70// that is in scope for the next statement only 61// that is in scope for the next statement only
71// works only for stuff that can be assigned 0 and converts to false 62// works only for stuff that can be assigned 0 and converts to false
72// (note: works great for pointers) 63// (note: works great for pointers)
73// most ugly macro I ever wrote 64// most ugly macro I ever wrote
… …
79 70
80// in range excluding end 71// in range excluding end
81#define IN_RANGE_EXC(val,beg,end) \ 72#define IN_RANGE_EXC(val,beg,end) \
82 ((unsigned int)(val) - (unsigned int)(beg) < (unsigned int)(end) - (unsigned int)(beg)) 73 ((unsigned int)(val) - (unsigned int)(beg) < (unsigned int)(end) - (unsigned int)(beg))
83 74
84void cleanup (const char *cause, bool make_core = false); 75ecb_cold void cleanup (const char *cause, bool make_core = false);
85void fork_abort (const char *msg); 76ecb_cold void fork_abort (const char *msg);
86 77
87// rationale for using (U) not (T) is to reduce signed/unsigned issues, 78// rationale for using (U) not (T) is to reduce signed/unsigned issues,
88// as a is often a constant while b is the variable. it is still a bug, though. 79// as a is often a constant while b is the variable. it is still a bug, though.
89template<typename T, typename U> static inline T min (T a, U b) { return (U)a < b ? (U)a : b; } 80template<typename T, typename U> static inline T min (T a, U b) { return a < (T)b ? a : (T)b; }
90template<typename T, typename U> static inline T max (T a, U b) { return (U)a > b ? (U)a : b; } 81template<typename T, typename U> static inline T max (T a, U b) { return a > (T)b ? a : (T)b; }
91template<typename T, typename U, typename V> static inline T clamp (T v, U a, V b) { return v < (T)a ? (T)a : v >(T)b ? (T)b : v; } 82template<typename T, typename U, typename V> static inline T clamp (T v, U a, V b) { return v < (T)a ? (T)a : v >(T)b ? (T)b : v; }
92 83
93template<typename T, typename U> static inline void min_it (T &v, U m) { v = min (v, (T)m); } 84template<typename T, typename U> static inline void min_it (T &v, U m) { v = min (v, (T)m); }
94template<typename T, typename U> static inline void max_it (T &v, U m) { v = max (v, (T)m); } 85template<typename T, typename U> static inline void max_it (T &v, U m) { v = max (v, (T)m); }
95template<typename T, typename U, typename V> static inline void clamp_it (T &v, U a, V b) { v = clamp (v, (T)a, (T)b); } 86template<typename T, typename U, typename V> static inline void clamp_it (T &v, U a, V b) { v = clamp (v, (T)a, (T)b); }
… …
102// sign returns -1 or +1 93// sign returns -1 or +1
103template<typename T> 94template<typename T>
104static inline T sign (T v) { return v < 0 ? -1 : +1; } 95static inline T sign (T v) { return v < 0 ? -1 : +1; }
105// relies on 2c representation 96// relies on 2c representation
106template<> 97template<>
107inline sint8 sign (sint8 v) { return 1 - (sint8 (uint8 (v) >> 7) * 2); } 98inline sint8 sign (sint8 v) { return 1 - (sint8 (uint8 (v) >> 7) * 2); }
99template<>
100inline sint16 sign (sint16 v) { return 1 - (sint16 (uint16 (v) >> 15) * 2); }
101template<>
102inline sint32 sign (sint32 v) { return 1 - (sint32 (uint32 (v) >> 31) * 2); }
108 103
109// sign0 returns -1, 0 or +1 104// sign0 returns -1, 0 or +1
110template<typename T> 105template<typename T>
111static inline T sign0 (T v) { return v ? sign (v) : 0; } 106static inline T sign0 (T v) { return v ? sign (v) : 0; }
112 107
108//clashes with C++0x
113template<typename T, typename U> 109template<typename T, typename U>
114static inline T copysign (T a, U b) { return a > 0 ? b : -b; } 110static inline T copysign (T a, U b) { return a > 0 ? b : -b; }
115 111
116// div* only work correctly for div > 0 112// div* only work correctly for div > 0
117// div, with correct rounding (< 0.5 downwards, >=0.5 upwards) 113// div, with correct rounding (< 0.5 downwards, >=0.5 upwards)
118template<typename T> static inline T div (T val, T div) 114template<typename T> static inline T div (T val, T div)
119{ 115{
120 return expect_false (val < 0) ? - ((-val + (div - 1) / 2) / div) : (val + div / 2) / div; 116 return expect_false (val < 0) ? - ((-val + (div - 1) / 2) / div) : (val + div / 2) / div;
121} 117}
118
119template<> inline float div (float val, float div) { return val / div; }
120template<> inline double div (double val, double div) { return val / div; }
121
122// div, round-up 122// div, round-up
123template<typename T> static inline T div_ru (T val, T div) 123template<typename T> static inline T div_ru (T val, T div)
124{ 124{
125 return expect_false (val < 0) ? - ((-val ) / div) : (val + div - 1) / div; 125 return expect_false (val < 0) ? - ((-val ) / div) : (val + div - 1) / div;
126} 126}
… …
226#if 0 226#if 0
227// and has a max. error of 6 in the range -100..+100. 227// and has a max. error of 6 in the range -100..+100.
228#else 228#else
229// and has a max. error of 9 in the range -100..+100. 229// and has a max. error of 9 in the range -100..+100.
230#endif 230#endif
231inline int 231inline int
232idistance (int dx, int dy) 232idistance (int dx, int dy)
233{ 233{
234 unsigned int dx_ = abs (dx); 234 unsigned int dx_ = abs (dx);
235 unsigned int dy_ = abs (dy); 235 unsigned int dy_ = abs (dy);
236 236
237#if 0 237#if 0
238 return dx_ > dy_ 238 return dx_ > dy_
… …
241#else 241#else
242 return dx_ + dy_ - min (dx_, dy_) * 5 / 8; 242 return dx_ + dy_ - min (dx_, dy_) * 5 / 8;
243#endif 243#endif
244} 244}
245 245
246// can be substantially faster than floor, if your value range allows for it
247template<typename T>
248inline T
249fastfloor (T x)
250{
251 return std::floor (x);
252}
253
254inline float
255fastfloor (float x)
256{
257 return sint32(x) - (x < 0);
258}
259
260inline double
261fastfloor (double x)
262{
263 return sint64(x) - (x < 0);
264}
265
246/* 266/*
247 * absdir(int): Returns a number between 1 and 8, which represent 267 * absdir(int): Returns a number between 1 and 8, which represent
248 * the "absolute" direction of a number (it actually takes care of 268 * the "absolute" direction of a number (it actually takes care of
249 * "overflow" in previous calculations of a direction). 269 * "overflow" in previous calculations of a direction).
250 */ 270 */
… …
252absdir (int d) 272absdir (int d)
253{ 273{
254 return ((d - 1) & 7) + 1; 274 return ((d - 1) & 7) + 1;
255} 275}
256 276
257// avoid ctz name because netbsd or freebsd spams it's namespace with it
258#if GCC_VERSION(3,4)
259static inline int least_significant_bit (uint32_t x)
260{
261 return __builtin_ctz (x);
262}
263#else
264int least_significant_bit (uint32_t x);
265#endif
266
267#define for_all_bits_sparse_32(mask, idxvar) \ 277#define for_all_bits_sparse_32(mask, idxvar) \
268 for (uint32_t idxvar, mask_ = mask; \ 278 for (uint32_t idxvar, mask_ = mask; \
269 mask_ && ((idxvar = least_significant_bit (mask_)), mask_ &= ~(1 << idxvar), 1);) 279 mask_ && ((idxvar = ecb_ctz32 (mask_)), mask_ &= ~(1 << idxvar), 1);)
270 280
271extern ssize_t slice_alloc; // statistics 281extern ssize_t slice_alloc; // statistics
272 282
273void *salloc_ (int n) throw (std::bad_alloc); 283void *salloc_ (int n);
274void *salloc_ (int n, void *src) throw (std::bad_alloc); 284void *salloc_ (int n, void *src);
275 285
276// strictly the same as g_slice_alloc, but never returns 0 286// strictly the same as g_slice_alloc, but never returns 0
277template<typename T> 287template<typename T>
278inline T *salloc (int n = 1) throw (std::bad_alloc) { return (T *)salloc_ (n * sizeof (T)); } 288inline T *salloc (int n = 1) { return (T *)salloc_ (n * sizeof (T)); }
279 289
280// also copies src into the new area, like "memdup" 290// also copies src into the new area, like "memdup"
281// if src is 0, clears the memory 291// if src is 0, clears the memory
282template<typename T> 292template<typename T>
283inline T *salloc (int n, T *src) throw (std::bad_alloc) { return (T *)salloc_ (n * sizeof (T), (void *)src); } 293inline T *salloc (int n, T *src) { return (T *)salloc_ (n * sizeof (T), (void *)src); }
284 294
285// clears the memory 295// clears the memory
286template<typename T> 296template<typename T>
287inline T *salloc0(int n = 1) throw (std::bad_alloc) { return (T *)salloc_ (n * sizeof (T), 0); } 297inline T *salloc0(int n = 1) { return (T *)salloc_ (n * sizeof (T), 0); }
288 298
289// for symmetry 299// for symmetry
290template<typename T> 300template<typename T>
291inline void sfree (T *ptr, int n = 1) throw () 301inline void sfree (T *ptr, int n = 1) noexcept
292{ 302{
293 if (expect_true (ptr)) 303 if (expect_true (ptr))
294 { 304 {
295 slice_alloc -= n * sizeof (T); 305 slice_alloc -= n * sizeof (T);
296 if (DEBUG_POISON) memset (ptr, DEBUG_POISON, n * sizeof (T)); 306 if (DEBUG_POISON) memset (ptr, DEBUG_POISON, n * sizeof (T));
297 g_slice_free1 (n * sizeof (T), (void *)ptr); 307 g_slice_free1 (n * sizeof (T), (void *)ptr);
298 assert (slice_alloc >= 0);//D
299 } 308 }
300} 309}
301 310
302// nulls the pointer 311// nulls the pointer
303template<typename T> 312template<typename T>
304inline void sfree0 (T *&ptr, int n = 1) throw () 313inline void sfree0 (T *&ptr, int n = 1) noexcept
305{ 314{
306 sfree<T> (ptr, n); 315 sfree<T> (ptr, n);
307 ptr = 0; 316 ptr = 0;
308} 317}
309 318
… …
377 typedef const Tp *const_pointer; 386 typedef const Tp *const_pointer;
378 typedef Tp &reference; 387 typedef Tp &reference;
379 typedef const Tp &const_reference; 388 typedef const Tp &const_reference;
380 typedef Tp value_type; 389 typedef Tp value_type;
381 390
382 template <class U> 391 template <class U>
383 struct rebind 392 struct rebind
384 { 393 {
385 typedef slice_allocator<U> other; 394 typedef slice_allocator<U> other;
386 }; 395 };
387 396
388 slice_allocator () throw () { } 397 slice_allocator () noexcept { }
389 slice_allocator (const slice_allocator &) throw () { } 398 slice_allocator (const slice_allocator &) noexcept { }
390 template<typename Tp2> 399 template<typename Tp2>
391 slice_allocator (const slice_allocator<Tp2> &) throw () { } 400 slice_allocator (const slice_allocator<Tp2> &) noexcept { }
392 401
393 ~slice_allocator () { } 402 ~slice_allocator () { }
394 403
395 pointer address (reference x) const { return &x; } 404 pointer address (reference x) const { return &x; }
396 const_pointer address (const_reference x) const { return &x; } 405 const_pointer address (const_reference x) const { return &x; }
… …
403 void deallocate (pointer p, size_type n) 412 void deallocate (pointer p, size_type n)
404 { 413 {
405 sfree<Tp> (p, n); 414 sfree<Tp> (p, n);
406 } 415 }
407 416
408 size_type max_size () const throw () 417 size_type max_size () const noexcept
409 { 418 {
410 return size_t (-1) / sizeof (Tp); 419 return size_t (-1) / sizeof (Tp);
411 } 420 }
412 421
413 void construct (pointer p, const Tp &val) 422 void construct (pointer p, const Tp &val)
… …
419 { 428 {
420 p->~Tp (); 429 p->~Tp ();
421 } 430 }
422}; 431};
423 432
424// P. L'Ecuyer, “Maximally Equidistributed Combined Tausworthe Generators”, Mathematics of Computation, 65, 213 (1996), 203–213. 433// basically a memory area, but refcounted
425// http://www.iro.umontreal.ca/~lecuyer/myftp/papers/tausme.ps 434struct refcnt_buf
426// http://www.iro.umontreal.ca/~lecuyer/myftp/papers/tausme2.ps
427struct tausworthe_random_generator
428{ 435{
429 uint32_t state [4]; 436 char *data;
430 437
431 void operator =(const tausworthe_random_generator &src) 438 refcnt_buf (size_t size = 0);
432 { 439 refcnt_buf (void *data, size_t size);
433 state [0] = src.state [0];
434 state [1] = src.state [1];
435 state [2] = src.state [2];
436 state [3] = src.state [3];
437 }
438 440
439 void seed (uint32_t seed); 441 refcnt_buf (const refcnt_buf &src)
440 uint32_t next ();
441};
442
443// Xorshift RNGs, George Marsaglia
444// http://www.jstatsoft.org/v08/i14/paper
445// this one is about 40% faster than the tausworthe one above (i.e. not much),
446// despite the inlining, and has the issue of only creating 2**32-1 numbers.
447// see also http://www.iro.umontreal.ca/~lecuyer/myftp/papers/xorshift.pdf
448struct xorshift_random_generator
449{
450 uint32_t x, y;
451
452 void operator =(const xorshift_random_generator &src)
453 { 442 {
454 x = src.x; 443 data = src.data;
455 y = src.y; 444 inc ();
456 } 445 }
457 446
458 void seed (uint32_t seed) 447 ~refcnt_buf ();
459 {
460 x = seed;
461 y = seed * 69069U;
462 }
463 448
464 uint32_t next () 449 refcnt_buf &operator =(const refcnt_buf &src);
450
451 operator char *()
465 { 452 {
466 uint32_t t = x ^ (x << 10);
467 x = y;
468 y = y ^ (y >> 13) ^ t ^ (t >> 10);
469 return y; 453 return data;
470 } 454 }
471};
472 455
473template<class generator> 456 size_t size () const
474struct random_number_generator : generator
475{
476 // uniform distribution, 0 .. max (0, num - 1)
477 uint32_t operator ()(uint32_t num)
478 { 457 {
479 return !is_constant (num) ? get_range (num) // non-constant 458 return _size ();
480 : num & (num - 1) ? (this->next () * (uint64_t)num) >> 32U // constant, non-power-of-two
481 : this->next () & (num - 1); // constant, power-of-two
482 }
483
484 // return a number within the closed interval [min .. max]
485 int operator () (int r_min, int r_max)
486 {
487 return is_constant (r_min) && is_constant (r_max) && r_min <= r_max
488 ? r_min + operator ()(r_max - r_min + 1)
489 : get_range (r_min, r_max);
490 }
491
492 // return a number within the closed interval [0..1]
493 double operator ()()
494 {
495 return this->next () / (double)0xFFFFFFFFU;
496 } 459 }
497 460
498protected: 461protected:
499 uint32_t get_range (uint32_t r_max); 462 enum {
500 int get_range (int r_min, int r_max); 463 overhead = sizeof (uint32_t) * 2
501}; 464 };
502 465
503typedef random_number_generator<tausworthe_random_generator> rand_gen; 466 uint32_t &_size () const
467 {
468 return ((unsigned int *)data)[-2];
469 }
504 470
505extern rand_gen rndm, rmg_rndm; 471 uint32_t &_refcnt () const
472 {
473 return ((unsigned int *)data)[-1];
474 }
475
476 void _alloc (uint32_t size)
477 {
478 data = ((char *)salloc<char> (size + overhead)) + overhead;
479 _size () = size;
480 _refcnt () = 1;
481 }
482
483 void _dealloc ();
484
485 void inc ()
486 {
487 ++_refcnt ();
488 }
489
490 void dec ()
491 {
492 if (!--_refcnt ())
493 _dealloc ();
494 }
495};
506 496
507INTERFACE_CLASS (attachable) 497INTERFACE_CLASS (attachable)
508struct refcnt_base 498struct refcnt_base
509{ 499{
510 typedef int refcnt_t; 500 typedef int refcnt_t;
… …
525 // p if not null 515 // p if not null
526 refcnt_base::refcnt_t *refcnt_ref () { return p ? &p->refcnt : &refcnt_dummy; } 516 refcnt_base::refcnt_t *refcnt_ref () { return p ? &p->refcnt : &refcnt_dummy; }
527 517
528 void refcnt_dec () 518 void refcnt_dec ()
529 { 519 {
530 if (!is_constant (p)) 520 if (!ecb_is_constant (p))
531 --*refcnt_ref (); 521 --*refcnt_ref ();
532 else if (p) 522 else if (p)
533 --p->refcnt; 523 --p->refcnt;
534 } 524 }
535 525
536 void refcnt_inc () 526 void refcnt_inc ()
537 { 527 {
538 if (!is_constant (p)) 528 if (!ecb_is_constant (p))
539 ++*refcnt_ref (); 529 ++*refcnt_ref ();
540 else if (p) 530 else if (p)
541 ++p->refcnt; 531 ++p->refcnt;
542 } 532 }
543 533
… …
584 // use FNV-1a hash (http://isthe.com/chongo/tech/comp/fnv/) 574 // use FNV-1a hash (http://isthe.com/chongo/tech/comp/fnv/)
585 // it is about twice as fast as the one-at-a-time one, 575 // it is about twice as fast as the one-at-a-time one,
586 // with good distribution. 576 // with good distribution.
587 // FNV-1a is faster on many cpus because the multiplication 577 // FNV-1a is faster on many cpus because the multiplication
588 // runs concurrently with the looping logic. 578 // runs concurrently with the looping logic.
579 // we modify the hash a bit to improve its distribution
589 uint32_t hash = STRHSH_NULL; 580 uint32_t hash = STRHSH_NULL;
590 581
591 while (*s) 582 while (*s)
592 hash = (hash ^ *s++) * 16777619U; 583 hash = (hash ^ *s++) * 16777619U;
593 584
594 return hash; 585 return hash ^ (hash >> 16);
595} 586}
596 587
597static inline uint32_t 588static inline uint32_t
598memhsh (const char *s, size_t len) 589memhsh (const char *s, size_t len)
599{ 590{
600 uint32_t hash = STRHSH_NULL; 591 uint32_t hash = STRHSH_NULL;
601 592
602 while (len--) 593 while (len--)
603 hash = (hash ^ *s++) * 16777619U; 594 hash = (hash ^ *s++) * 16777619U;
604 595
605 return hash; 596 return hash;
606} 597}
… …
614 605
615 std::size_t operator ()(const shstr &s) const 606 std::size_t operator ()(const shstr &s) const
616 { 607 {
617 return strhsh (s); 608 return strhsh (s);
618 } 609 }
610
611 typedef ska::power_of_two_hash_policy hash_policy;
619}; 612};
620 613
621struct str_equal 614struct str_equal
622{ 615{
623 bool operator ()(const char *a, const char *b) const 616 bool operator ()(const char *a, const char *b) const
… …
649 } 642 }
650}; 643};
651 644
652// This container blends advantages of linked lists 645// This container blends advantages of linked lists
653// (efficiency) with vectors (random access) by 646// (efficiency) with vectors (random access) by
654// by using an unordered vector and storing the vector 647// using an unordered vector and storing the vector
655// index inside the object. 648// index inside the object.
656// 649//
657// + memory-efficient on most 64 bit archs 650// + memory-efficient on most 64 bit archs
658// + O(1) insert/remove 651// + O(1) insert/remove
659// + free unique (but varying) id for inserted objects 652// + free unique (but varying) id for inserted objects
… …
696 insert (&obj); 689 insert (&obj);
697 } 690 }
698 691
699 void erase (T *obj) 692 void erase (T *obj)
700 { 693 {
701 unsigned int pos = obj->*indexmember; 694 object_vector_index pos = obj->*indexmember;
702 obj->*indexmember = 0; 695 obj->*indexmember = 0;
703 696
704 if (pos < this->size ()) 697 if (pos < this->size ())
705 { 698 {
706 (*this)[pos - 1] = (*this)[this->size () - 1]; 699 (*this)[pos - 1] = (*this)[this->size () - 1];
… …
714 { 707 {
715 erase (&obj); 708 erase (&obj);
716 } 709 }
717}; 710};
718 711
712/////////////////////////////////////////////////////////////////////////////
713
714// something like a vector or stack, but without
715// out of bounds checking
716template<typename T>
717struct fixed_stack
718{
719 T *data;
720 int size;
721 int max;
722
723 fixed_stack ()
724 : size (0), data (0)
725 {
726 }
727
728 fixed_stack (int max)
729 : size (0), max (max)
730 {
731 data = salloc<T> (max);
732 }
733
734 void reset (int new_max)
735 {
736 sfree (data, max);
737 size = 0;
738 max = new_max;
739 data = salloc<T> (max);
740 }
741
742 void free ()
743 {
744 sfree (data, max);
745 data = 0;
746 }
747
748 ~fixed_stack ()
749 {
750 sfree (data, max);
751 }
752
753 T &operator[](int idx)
754 {
755 return data [idx];
756 }
757
758 void push (T v)
759 {
760 data [size++] = v;
761 }
762
763 T &pop ()
764 {
765 return data [--size];
766 }
767
768 T remove (int idx)
769 {
770 T v = data [idx];
771
772 data [idx] = data [--size];
773
774 return v;
775 }
776};
777
778/////////////////////////////////////////////////////////////////////////////
779
719// basically does what strncpy should do, but appends "..." to strings exceeding length 780// basically does what strncpy should do, but appends "..." to strings exceeding length
720// returns the number of bytes actually used (including \0) 781// returns the number of bytes actually used (including \0)
721int assign (char *dst, const char *src, int maxsize); 782int assign (char *dst, const char *src, int maxsize);
722 783
723// type-safe version of assign 784// type-safe version of assign
… …
734 795
735int similar_direction (int a, int b); 796int similar_direction (int a, int b);
736 797
737// like v?sprintf, but returns a "static" buffer 798// like v?sprintf, but returns a "static" buffer
738char *vformat (const char *format, va_list ap); 799char *vformat (const char *format, va_list ap);
739char *format (const char *format, ...) attribute ((format (printf, 1, 2))); 800char *format (const char *format, ...) ecb_attribute ((format (printf, 1, 2)));
740 801
741// safety-check player input which will become object->msg 802// safety-check player input which will become object->msg
742bool msg_is_safe (const char *msg); 803bool msg_is_safe (const char *msg);
743 804
744///////////////////////////////////////////////////////////////////////////// 805/////////////////////////////////////////////////////////////////////////////

Diff Legend

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