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.3 by root, Sun Sep 3 00:18:40 2006 UTC vs.
Revision 1.40 by root, Thu Jan 18 19:32:37 2007 UTC

1/* 1/*
2 * static char *rcsid_utils_c =
3 * "$Id: utils.C,v 1.3 2006/09/03 00:18:40 root Exp $";
4 */
5
6/*
7 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
8 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
9 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
10 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
11 7 *
12 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
13 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
14 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
15 (at your option) any later version. 11 * (at your option) any later version.
16 12 *
17 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,
18 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
19 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20 GNU General Public License for more details. 16 * GNU General Public License for more details.
21 17 *
22 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
23 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
24 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
25 21 *
26 The authors can be reached via e-mail at crossfire-devel@real-time.com 22 * The authors can be reached via e-mail at <crossfire@schmorp.de>
27*/ 23 */
28 24
29/* 25/*
30 * General convenience functions for crossfire. 26 * General convenience functions for crossfire.
31 */ 27 */
28
29#include <cstdlib>
30#include <sys/types.h>
31#include <unistd.h>
32#include <sys/time.h>
33#include <time.h>
34#include <signal.h>
32 35
33#include <global.h> 36#include <global.h>
34#include <funcpoint.h> 37#include <funcpoint.h>
35#include <material.h> 38#include <material.h>
39
40#include <glib.h>
41
42rand_gen rndm (time (0));
43
44tausworthe_random_generator::tausworthe_random_generator (uint32_t seed)
45{
46 state [0] = max ( 2, seed * 69069U);
47 state [1] = max ( 8, state [0] * 69069U);
48 state [2] = max ( 16, state [1] * 69069U);
49 state [3] = max (128, state [2] * 69069U);
50
51 for (int i = 11; --i; )
52 operator ()();
53}
54
55uint32_t
56tausworthe_random_generator::next ()
57{
58 state [0] = ((state [0] & 0xFFFFFFFEU) << 18U) ^ (((state [0] << 6U) ^ state [0]) >> 13U);
59 state [1] = ((state [1] & 0xFFFFFFF8U) << 2U) ^ (((state [1] << 2U) ^ state [1]) >> 27U);
60 state [2] = ((state [2] & 0xFFFFFFF0U) << 7U) ^ (((state [2] << 13U) ^ state [2]) >> 21U);
61 state [3] = ((state [3] & 0xFFFFFF80U) << 13U) ^ (((state [3] << 3U) ^ state [3]) >> 12U);
62
63 return state [0] ^ state [1] ^ state [2] ^ state [3];
64}
36 65
37/* 66/*
38 * The random functions here take luck into account when rolling random 67 * The random functions here take luck into account when rolling random
39 * dice or numbers. This function has less of an impact the larger the 68 * dice or numbers. This function has less of an impact the larger the
40 * difference becomes in the random numbers. IE, the effect is lessened 69 * difference becomes in the random numbers. IE, the effect is lessened
… …
47 * Roll a random number between min and max. Uses op to determine luck, 76 * Roll a random number between min and max. Uses op to determine luck,
48 * and if goodbad is non-zero, luck increases the roll, if zero, it decreases. 77 * and if goodbad is non-zero, luck increases the roll, if zero, it decreases.
49 * Generally, op should be the player/caster/hitter requesting the roll, 78 * Generally, op should be the player/caster/hitter requesting the roll,
50 * not the recipient (ie, the poor slob getting hit). [garbled 20010916] 79 * not the recipient (ie, the poor slob getting hit). [garbled 20010916]
51 */ 80 */
52 81int
53int random_roll(int min, int max, const object *op, int goodbad) { 82random_roll (int min, int max, const object *op, int goodbad)
83{
54 int omin, diff, luck, base, ran; 84 int omin, diff, luck, base, ran;
55 85
56 omin = min; 86 omin = min;
57 diff = max - min + 1; 87 diff = max - min + 1;
58 ((diff > 2) ? (base = 20) : (base = 50)); /* d2 and d3 are corner cases */ 88 ((diff > 2) ? (base = 20) : (base = 50)); /* d2 and d3 are corner cases */
59 89
60 if (max < 1 || diff < 1) { 90 if (max < 1 || diff < 1)
91 {
61 LOG(llevError, "Calling random_roll with min=%d max=%d\n", min, max); 92 LOG (llevError, "Calling random_roll with min=%d max=%d\n", min, max);
62 return(min); /* avoids a float exception */ 93 return (min); /* avoids a float exception */
63 } 94 }
64 95
65 ran = RANDOM(); 96 ran = RANDOM ();
66 97
67 if (op->type != PLAYER) 98 if (op->type != PLAYER)
68 return((ran%diff)+min); 99 return ((ran % diff) + min);
69 100
70 luck = op->stats.luck; 101 luck = op->stats.luck;
71 if (RANDOM()%base < MIN(10, abs(luck))) { 102 if (RANDOM () % base < MIN (10, abs (luck)))
103 {
72 /* we have a winner */ 104 /* we have a winner */
73 ((luck > 0) ? (luck = 1) : (luck = -1)); 105 ((luck > 0) ? (luck = 1) : (luck = -1));
74 diff -= luck; 106 diff -= luck;
75 if (diff < 1) 107 if (diff < 1)
76 return(omin); /*check again*/ 108 return (omin); /*check again */
77 ((goodbad) ? (min += luck) : (diff)); 109 ((goodbad) ? (min += luck) : (diff));
78 110
79 return(MAX(omin, MIN(max, (ran%diff)+min))); 111 return (MAX (omin, MIN (max, (ran % diff) + min)));
80 } 112 }
81 return((ran%diff)+min); 113 return ((ran % diff) + min);
82} 114}
83 115
84/* 116/*
85 * This is a 64 bit version of random_roll above. This is needed 117 * This is a 64 bit version of random_roll above. This is needed
86 * for exp loss calculations for players changing religions. 118 * for exp loss calculations for players changing religions.
87 */ 119 */
88 120
121sint64
89sint64 random_roll64(sint64 min, sint64 max, const object *op, int goodbad) { 122random_roll64 (sint64 min, sint64 max, const object *op, int goodbad)
123{
90 sint64 omin, diff, luck, ran; 124 sint64 omin, diff, luck, ran;
91 int base; 125 int base;
92 126
93 omin = min; 127 omin = min;
94 diff = max - min + 1; 128 diff = max - min + 1;
95 ((diff > 2) ? (base = 20) : (base = 50)); /* d2 and d3 are corner cases */ 129 ((diff > 2) ? (base = 20) : (base = 50)); /* d2 and d3 are corner cases */
96 130
97 if (max < 1 || diff < 1) { 131 if (max < 1 || diff < 1)
98#ifndef WIN32 132 {
99 LOG(llevError, "Calling random_roll with min=%lld max=%lld\n", min, max);
100#else
101 LOG(llevError, "Calling random_roll with min=%I64d max=%I64d\n", min, max); 133 LOG (llevError, "Calling random_roll with min=%" PRId64 " max=%" PRId64 "\n", min, max);
102#endif
103 return(min); /* avoids a float exception */ 134 return (min); /* avoids a float exception */
104 } 135 }
105 136
106 /* Don't know of a portable call to get 64 bit random values. 137 /* Don't know of a portable call to get 64 bit random values.
107 * So make a call to get two 32 bit random numbers, and just to 138 * So make a call to get two 32 bit random numbers, and just to
108 * a little byteshifting. Do make sure the first one is only 139 * a little byteshifting. Do make sure the first one is only
109 * 32 bit, so we don't get skewed results 140 * 32 bit, so we don't get skewed results
110 */ 141 */
111 ran = (RANDOM() & 0xffffffff) | ((sint64)RANDOM() << 32); 142 ran = (RANDOM () & 0xffffffff) | ((sint64) RANDOM () << 32);
112 143
113 if (op->type != PLAYER) 144 if (op->type != PLAYER)
114 return((ran%diff)+min); 145 return ((ran % diff) + min);
115 146
116 luck = op->stats.luck; 147 luck = op->stats.luck;
117 if (RANDOM()%base < MIN(10, abs(luck))) { 148 if (RANDOM () % base < MIN (10, abs (luck)))
149 {
118 /* we have a winner */ 150 /* we have a winner */
119 ((luck > 0) ? (luck = 1) : (luck = -1)); 151 ((luck > 0) ? (luck = 1) : (luck = -1));
120 diff -= luck; 152 diff -= luck;
121 if (diff < 1) 153 if (diff < 1)
122 return(omin); /*check again*/ 154 return (omin); /*check again */
123 ((goodbad) ? (min += luck) : (diff)); 155 ((goodbad) ? (min += luck) : (diff));
124 156
125 return(MAX(omin, MIN(max, (ran%diff)+min))); 157 return (MAX (omin, MIN (max, (ran % diff) + min)));
126 } 158 }
127 return((ran%diff)+min); 159 return ((ran % diff) + min);
128} 160}
129 161
130/* 162/*
131 * Roll a number of dice (2d3, 4d6). Uses op to determine luck, 163 * Roll a number of dice (2d3, 4d6). Uses op to determine luck,
132 * If goodbad is non-zero, luck increases the roll, if zero, it decreases. 164 * If goodbad is non-zero, luck increases the roll, if zero, it decreases.
133 * Generally, op should be the player/caster/hitter requesting the roll, 165 * Generally, op should be the player/caster/hitter requesting the roll,
134 * not the recipient (ie, the poor slob getting hit). 166 * not the recipient (ie, the poor slob getting hit).
135 * The args are num D size (ie 4d6) [garbled 20010916] 167 * The args are num D size (ie 4d6) [garbled 20010916]
136 */ 168 */
137 169
170int
138int die_roll(int num, int size, const object *op, int goodbad) { 171die_roll (int num, int size, const object *op, int goodbad)
172{
139 int min, diff, luck, total, i, gotlucky, base, ran; 173 int min, diff, luck, total, i, gotlucky, base, ran;
140 174
141 diff = size; 175 diff = size;
142 min = 1; 176 min = 1;
143 luck = total = gotlucky = 0; 177 luck = total = gotlucky = 0;
144 ((diff > 2) ? (base = 20) : (base = 50)); /* d2 and d3 are corner cases */ 178 ((diff > 2) ? (base = 20) : (base = 50)); /* d2 and d3 are corner cases */
145 if (size < 2 || diff < 1) { 179 if (size < 2 || diff < 1)
180 {
146 LOG(llevError, "Calling die_roll with num=%d size=%d\n", num, size); 181 LOG (llevError, "Calling die_roll with num=%d size=%d\n", num, size);
147 return(num); /* avoids a float exception */ 182 return (num); /* avoids a float exception */
148 } 183 }
149 184
150 if (op->type == PLAYER) 185 if (op->type == PLAYER)
151 luck = op->stats.luck; 186 luck = op->stats.luck;
152 187
153 for (i = 0; i < num; i++) { 188 for (i = 0; i < num; i++)
189 {
154 if (RANDOM()%base < MIN(10, abs(luck)) && !gotlucky) { 190 if (RANDOM () % base < MIN (10, abs (luck)) && !gotlucky)
191 {
155 /* we have a winner */ 192 /* we have a winner */
156 gotlucky++; 193 gotlucky++;
157 ((luck > 0) ? (luck = 1) : (luck = -1)); 194 ((luck > 0) ? (luck = 1) : (luck = -1));
158 diff -= luck; 195 diff -= luck;
159 if (diff < 1) 196 if (diff < 1)
160 return(num); /*check again*/ 197 return (num); /*check again */
161 ((goodbad) ? (min += luck) : (diff)); 198 ((goodbad) ? (min += luck) : (diff));
162 ran = RANDOM(); 199 ran = RANDOM ();
163 total += MAX(1, MIN(size, (ran%diff)+min)); 200 total += MAX (1, MIN (size, (ran % diff) + min));
201 }
164 } else { 202 else
203 {
165 total += RANDOM()%size+1; 204 total += RANDOM () % size + 1;
166 } 205 }
167 } 206 }
168 return(total); 207 return (total);
169} 208}
170 209
171/*
172 * Another convenience function. Returns a number between min and max.
173 * It is suggested one use these functions rather than RANDOM()%, as it
174 * would appear that a number of off-by-one-errors exist due to improper
175 * use of %. This should also prevent SIGFPE.
176 */
177
178int rndm(int min, int max)
179{
180 int diff;
181
182 diff = max - min + 1;
183 if (max < 1 || diff < 1)
184 return(min);
185
186 return(RANDOM()%diff+min);
187}
188
189/* decay and destroy persihable items in a map */ 210/* decay and destroy perishable items in a map */
190 211void
191void decay_objects(mapstruct *m) 212maptile::decay_objects ()
192{ 213{
193 int x, y, destroy; 214 if (!spaces)
194 object *op, *otmp;
195
196 if (m->unique)
197 return; 215 return;
198 216
199 for (x=0; x < MAP_WIDTH(m); x++) 217 for (mapspace *ms = spaces + size (); ms-- > spaces; )
200 for (y=0; y < MAP_HEIGHT(m); y++) 218 for (object *above, *op = ms->bot; op; op = above)
201 for (op = get_map_ob(m, x, y); op; op = otmp) { 219 {
220 above = op->above;
221
202 destroy = 0; 222 bool destroy = 0;
203 otmp = op->above; 223
224 // do not decay anything above unique floor tiles (yet :)
204 if (QUERY_FLAG(op,FLAG_IS_FLOOR) && QUERY_FLAG(op, FLAG_UNIQUE)) 225 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
205 break; 226 break;
227
206 if (QUERY_FLAG(op, FLAG_IS_FLOOR) || 228 if (QUERY_FLAG (op, FLAG_IS_FLOOR)
207 QUERY_FLAG(op, FLAG_OBJ_ORIGINAL) || 229 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
208 QUERY_FLAG(op, FLAG_OBJ_SAVE_ON_OVL) || 230 || QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL)
209 QUERY_FLAG(op, FLAG_UNIQUE) || 231 || QUERY_FLAG (op, FLAG_UNIQUE)
210 QUERY_FLAG(op, FLAG_OVERLAY_FLOOR) || 232 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
211 QUERY_FLAG(op, FLAG_UNPAID) || IS_LIVE(op)) 233 || QUERY_FLAG (op, FLAG_UNPAID)
212 continue; 234 || op->is_alive ())
213 /* otherwise, we decay and destroy */ 235 ; // do not decay
214 if (IS_WEAPON(op)) { 236 else if (op->is_weapon ())
237 {
215 op->stats.dam--; 238 op->stats.dam--;
216 if (op->stats.dam < 0) 239 if (op->stats.dam < 0)
217 destroy = 1; 240 destroy = 1;
218 } else if (IS_ARMOR(op)) {
219 op->stats.ac--;
220 if (op->stats.ac < 0)
221 destroy = 1;
222 } else if (op->type == FOOD) {
223 op->stats.food -= rndm(5,20);
224 if (op->stats.food < 0)
225 destroy = 1;
226 } else {
227 if (op->material & M_PAPER || op->material & M_LEATHER ||
228 op->material & M_WOOD || op->material & M_ORGANIC ||
229 op->material & M_CLOTH || op->material & M_LIQUID)
230 destroy = 1;
231 if (op->material & M_IRON && rndm(1,5) == 1)
232 destroy = 1;
233 if (op->material & M_GLASS && rndm(1,2) == 1)
234 destroy = 1;
235 if ((op->material & M_STONE || op->material & M_ADAMANT) &&
236 rndm(1,10) == 1)
237 destroy = 1;
238 if ((op->material & M_SOFT_METAL || op->material & M_BONE) &&
239 rndm(1,3) == 1)
240 destroy = 1;
241 if (op->material & M_ICE && MAP_TEMP(m) > 32)
242 destroy = 1;
243 }
244 /* adjust overall chance below */
245 if (destroy && rndm(0, 1)) {
246 remove_ob(op);
247 free_object(op);
248 }
249 } 241 }
242 else if (op->is_armor ())
243 {
244 op->stats.ac--;
245 if (op->stats.ac < 0)
246 destroy = 1;
247 }
248 else if (op->type == FOOD)
249 {
250 op->stats.food -= rndm (5, 20);
251 if (op->stats.food < 0)
252 destroy = 1;
253 }
254 else
255 {
256 int mat = op->material;
257
258 if (mat & M_PAPER
259 || mat & M_LEATHER
260 || mat & M_WOOD
261 || mat & M_ORGANIC
262 || mat & M_CLOTH
263 || mat & M_LIQUID
264 || (mat & M_IRON && rndm (1, 5) == 1)
265 || (mat & M_GLASS && rndm (1, 2) == 1)
266 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1)
267 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1)
268 || (mat & M_ICE && temp > 32))
269 destroy = 1;
270 }
271
272 /* adjust overall chance below */
273 if (destroy && rndm (0, 1))
274 op->destroy ();
275 }
250} 276}
251 277
252/* convert materialname to materialtype_t */ 278/* convert materialname to materialtype_t */
253 279
280materialtype_t *
254materialtype_t *name_to_material(const char *name) 281name_to_material (const char *name)
255{ 282{
256 materialtype_t *mt, *nmt; 283 materialtype_t *mt, *nmt;
257 284
258 mt = NULL; 285 mt = NULL;
259 for (nmt = materialt; nmt != NULL && nmt->next != NULL; nmt=nmt->next) { 286 for (nmt = materialt; nmt != NULL && nmt->next != NULL; nmt = nmt->next)
287 {
260 if (strcmp(name, nmt->name) == 0) { 288 if (strcmp (name, nmt->name) == 0)
289 {
261 mt = nmt; 290 mt = nmt;
262 break; 291 break;
263 } 292 }
264 } 293 }
265 return mt; 294 return mt;
266} 295}
267 296
268/* when doing transmutation of objects, we have to recheck the resistances, 297/* when doing transmutation of objects, we have to recheck the resistances,
269 * as some that did not apply previously, may apply now. 298 * as some that did not apply previously, may apply now.
270 */ 299 */
271 300
301void
272void transmute_materialname(object *op, const object *change) 302transmute_materialname (object *op, const object *change)
273{ 303{
274 materialtype_t *mt; 304 materialtype_t *mt;
275 int j; 305 int j;
276 306
277 if (op->materialname == NULL) 307 if (op->materialname == NULL)
278 return; 308 return;
279 309
280 if (change->materialname != NULL && 310 if (change->materialname != NULL && strcmp (op->materialname, change->materialname))
281 strcmp(op->materialname, change->materialname))
282 return; 311 return;
283 312
284 if (!IS_ARMOR(op)) 313 if (!op->is_armor ())
285 return; 314 return;
286 315
287 mt = name_to_material(op->materialname); 316 mt = name_to_material (op->materialname);
288 if (!mt) { 317 if (!mt)
318 {
289 LOG(llevError, "archetype '%s>%s' uses nonexistent material '%s'\n", &op->arch->name, &op->name, &op->materialname); 319 LOG (llevError, "archetype '%s>%s' uses nonexistent material '%s'\n", &op->arch->name, &op->name, &op->materialname);
290 return; 320 return;
291 } 321 }
292 322
293 for (j=0; j < NROFATTACKS; j++) 323 for (j = 0; j < NROFATTACKS; j++)
294 if (op->resist[j] == 0 && change->resist[j] != 0) { 324 if (op->resist[j] == 0 && change->resist[j] != 0)
325 {
295 op->resist[j] += mt->mod[j]; 326 op->resist[j] += mt->mod[j];
296 if (op->resist[j] > 100) 327 if (op->resist[j] > 100)
297 op->resist[j] = 100; 328 op->resist[j] = 100;
298 if (op->resist[j] < -100) 329 if (op->resist[j] < -100)
299 op->resist[j] = -100; 330 op->resist[j] = -100;
300 } 331 }
301} 332}
302 333
303/* set the materialname and type for an item */ 334/* set the materialname and type for an item */
335void
304void set_materialname(object *op, int difficulty, materialtype_t *nmt) 336set_materialname (object *op, int difficulty, materialtype_t *nmt)
305{ 337{
306 materialtype_t *mt, *lmt; 338 materialtype_t *mt, *lmt;
339
340#ifdef NEW_MATERIAL_CODE
307 int j; 341 int j;
342#endif
308 343
309 if (op->materialname != NULL) 344 if (op->materialname != NULL)
310 return; 345 return;
311 346
312 347
313 348
314 if (nmt == NULL) { 349 if (nmt == NULL)
350 {
315 lmt = NULL; 351 lmt = NULL;
316#ifndef NEW_MATERIAL_CODE 352#ifndef NEW_MATERIAL_CODE
317 for (mt = materialt; mt != NULL && mt->next != NULL; mt=mt->next) { 353 for (mt = materialt; mt != NULL && mt->next != NULL; mt = mt->next)
354 {
318 if (op->material & mt->material) { 355 if (op->material & mt->material)
356 {
319 lmt = mt; 357 lmt = mt;
358 break;
359 }
360 }
361
362#else
363 for (mt = materialt; mt != NULL && mt->next != NULL; mt = mt->next)
364 {
365 if (op->material & mt->material && rndm (1, 100) <= mt->chance &&
366 difficulty >= mt->difficulty && (op->magic >= mt->magic || mt->magic == 0))
367 {
368 lmt = mt;
369 if (!(op->is_weapon () || op->is_armor ()))
320 break; 370 break;
321 } 371 }
322 } 372 }
373#endif
374 }
375 else
376 {
377 lmt = nmt;
378 }
323 379
380 if (lmt != NULL)
381 {
382#ifndef NEW_MATERIAL_CODE
383 op->materialname = lmt->name;
384 return;
324#else 385#else
325 for (mt = materialt; mt != NULL && mt->next != NULL; mt=mt->next) { 386
326 if (op->material & mt->material && rndm(1, 100) <= mt->chance && 387 if (op->stats.dam && op->is_weapon ())
327 difficulty >= mt->difficulty &&
328 (op->magic >= mt->magic || mt->magic == 0)) {
329 lmt = mt;
330 if (!(IS_WEAPON(op) || IS_ARMOR(op)))
331 break;
332 }
333 } 388 {
334#endif
335 } else {
336 lmt = nmt;
337 }
338
339 if (lmt != NULL) {
340#ifndef NEW_MATERIAL_CODE
341 op->materialname = lmt->name;
342 return;
343#else
344
345 if (op->stats.dam && IS_WEAPON(op)) {
346 op->stats.dam += lmt->damage; 389 op->stats.dam += lmt->damage;
347 if (op->stats.dam < 1) 390 if (op->stats.dam < 1)
348 op->stats.dam = 1; 391 op->stats.dam = 1;
349 } 392 }
350 if (op->stats.sp && op->type == BOW) 393 if (op->stats.sp && op->type == BOW)
351 op->stats.sp += lmt->sp; 394 op->stats.sp += lmt->sp;
352 if (op->stats.wc && IS_WEAPON(op)) 395 if (op->stats.wc && op->is_weapon ())
353 op->stats.wc += lmt->wc; 396 op->stats.wc += lmt->wc;
354 if (IS_ARMOR(op)) { 397 if (op->is_armor ())
398 {
355 if (op->stats.ac) 399 if (op->stats.ac)
356 op->stats.ac += lmt->ac; 400 op->stats.ac += lmt->ac;
357 for (j=0; j < NROFATTACKS; j++) 401 for (j = 0; j < NROFATTACKS; j++)
358 if (op->resist[j] != 0) { 402 if (op->resist[j] != 0)
403 {
359 op->resist[j] += lmt->mod[j]; 404 op->resist[j] += lmt->mod[j];
360 if (op->resist[j] > 100) 405 if (op->resist[j] > 100)
361 op->resist[j] = 100; 406 op->resist[j] = 100;
362 if (op->resist[j] < -100) 407 if (op->resist[j] < -100)
363 op->resist[j] = -100; 408 op->resist[j] = -100;
364 } 409 }
365 } 410 }
366 op->materialname = add_string(lmt->name); 411 op->materialname = add_string (lmt->name);
367 /* dont make it unstackable if it doesn't need to be */ 412 /* dont make it unstackable if it doesn't need to be */
368 if (IS_WEAPON(op) || IS_ARMOR(op)) { 413 if (op->is_weapon () || op->is_armor ())
414 {
369 op->weight = (op->weight * lmt->weight)/100; 415 op->weight = (op->weight * lmt->weight) / 100;
370 op->value = (op->value * lmt->value)/100; 416 op->value = (op->value * lmt->value) / 100;
371 } 417 }
372#endif 418#endif
373 } 419 }
374} 420}
375 421
376/* 422/*
377 * Strip out the media tags from a String. 423 * Strip out the media tags from a String.
378 * Warning the input string will contain the result string 424 * Warning the input string will contain the result string
379 */ 425 */
426void
380void strip_media_tag(char *message){ 427strip_media_tag (char *message)
428{
381 int in_tag=0; 429 int in_tag = 0;
382 char* dest; 430 char *dest;
383 char* src; 431 char *src;
432
384 src=dest=message; 433 src = dest = message;
385 while (*src!='\0'){ 434 while (*src != '\0')
435 {
386 if (*src=='['){ 436 if (*src == '[')
437 {
387 in_tag=1; 438 in_tag = 1;
439 }
388 } else if (in_tag && (*src==']')) 440 else if (in_tag && (*src == ']'))
389 in_tag=0; 441 in_tag = 0;
390 else if (!in_tag){ 442 else if (!in_tag)
443 {
391 *dest=*src; 444 *dest = *src;
392 dest++; 445 dest++;
393 } 446 }
394 src++; 447 src++;
395 } 448 }
396 *dest='\0'; 449 *dest = '\0';
397} 450}
398 451
452const char *
399const char* strrstr(const char* haystack, const char* needle){ 453strrstr (const char *haystack, const char *needle)
454{
400 const char* lastneedle; 455 const char *lastneedle;
456
401 lastneedle=NULL; 457 lastneedle = NULL;
402 while((haystack=strstr(haystack,needle))!=NULL){ 458 while ((haystack = strstr (haystack, needle)) != NULL)
459 {
403 lastneedle=haystack; 460 lastneedle = haystack;
404 haystack++; 461 haystack++;
405 } 462 }
406 return lastneedle; 463 return lastneedle;
407 464
408} 465}
466
409#define EOL_SIZE (sizeof("\n")-1) 467#define EOL_SIZE (sizeof("\n")-1)
468void
410void strip_endline(char* buf){ 469strip_endline (char *buf)
470{
411 if (strlen(buf)<sizeof("\n")){ 471 if (strlen (buf) < sizeof ("\n"))
472 {
412 return; 473 return;
413 } 474 }
414 if (!strcmp(buf+strlen(buf)-EOL_SIZE,"\n")) 475 if (!strcmp (buf + strlen (buf) - EOL_SIZE, "\n"))
415 buf[strlen(buf)-EOL_SIZE]='\0'; 476 buf[strlen (buf) - EOL_SIZE] = '\0';
416} 477}
417 478
418/** 479/**
419 * Replace in string src all occurrences of key by replacement. The resulting 480 * Replace in string src all occurrences of key by replacement. The resulting
420 * string is put into result; at most resultsize characters (including the 481 * string is put into result; at most resultsize characters (including the
421 * terminating null character) will be written to result. 482 * terminating null character) will be written to result.
422 */ 483 */
484void
423void replace(const char *src, const char *key, const char *replacement, char *result, size_t resultsize) 485replace (const char *src, const char *key, const char *replacement, char *result, size_t resultsize)
424{ 486{
425 size_t resultlen; 487 size_t resultlen;
426 size_t keylen; 488 size_t keylen;
427 489
428 /* special case to prevent infinite loop if key==replacement=="" */ 490 /* special case to prevent infinite loop if key==replacement=="" */
429 if(strcmp(key, replacement) == 0) 491 if (strcmp (key, replacement) == 0)
430 { 492 {
431 snprintf(result, resultsize, "%s", src); 493 snprintf (result, resultsize, "%s", src);
432 return; 494 return;
433 } 495 }
434 496
435 keylen = strlen(key); 497 keylen = strlen (key);
436 498
437 resultlen = 0; 499 resultlen = 0;
438 while(*src != '\0' && resultlen+1 < resultsize) 500 while (*src != '\0' && resultlen + 1 < resultsize)
439 { 501 {
440 if(strncmp(src, key, keylen) == 0) 502 if (strncmp (src, key, keylen) == 0)
441 { 503 {
442 snprintf(result+resultlen, resultsize-resultlen, "%s", replacement); 504 snprintf (result + resultlen, resultsize - resultlen, "%s", replacement);
443 resultlen += strlen(result+resultlen); 505 resultlen += strlen (result + resultlen);
444 src += keylen; 506 src += keylen;
445 } 507 }
446 else 508 else
447 {
448 result[resultlen++] = *src++;
449 }
450 } 509 {
510 result[resultlen++] = *src++;
511 }
512 }
451 result[resultlen] = '\0'; 513 result[resultlen] = '\0';
452} 514}
453 515
454/** 516/**
455 * Taking a string as an argument, mutate it into a string that looks like a list. 517 * Taking a string as an argument, mutate it into a string that looks like a list.
456 * a 'list' for the purposes here, is a string of items, seperated by commas, except 518 * a 'list' for the purposes here, is a string of items, seperated by commas, except
457 * for the last entry, which has an 'and' before it, and a full stop (period) after it. 519 * for the last entry, which has an 'and' before it, and a full stop (period) after it.
458 * This function will also strip all trailing non alphanumeric characters. 520 * This function will also strip all trailing non alphanumeric characters.
459 * It does not insert an oxford comma. 521 * It does not insert an oxford comma.
460 */ 522 */
461 523
524void
462void make_list_like(char *input) { 525make_list_like (char *input)
526{
463 char *p, tmp[MAX_BUF]; 527 char *p, tmp[MAX_BUF];
464 int i; 528 int i;
529
465 if (!input || strlen(input) > MAX_BUF-5) return; 530 if (!input || strlen (input) > MAX_BUF - 5)
466 /* bad stuff would happen if we continued here, the -5 is to make space for ' and ' */
467
468 strncpy(tmp, input, MAX_BUF-5);
469 /*trim all trailing commas, spaces etc.*/
470 for (i=strlen(tmp); !isalnum(tmp[i]) && i >= 0; i--)
471 tmp[i]='\0';
472 strcat(tmp, ".");
473
474 p=strrchr(tmp, ',');
475 if (p) {
476 *p='\0';
477 strcpy(input, tmp);
478 p++;
479 strcat(input, " and");
480 strcat(input, p);
481 }
482 else strcpy(input, tmp);
483 return; 531 return;
484} 532 /* bad stuff would happen if we continued here, the -5 is to make space for ' and ' */
485 533
534 strncpy (tmp, input, MAX_BUF - 5);
535 /*trim all trailing commas, spaces etc. */
536 for (i = strlen (tmp); !isalnum (tmp[i]) && i >= 0; i--)
537 tmp[i] = '\0';
538
539 strcat (tmp, ".");
540
541 p = strrchr (tmp, ',');
542 if (p)
543 {
544 *p = '\0';
545 strcpy (input, tmp);
546 p++;
547 strcat (input, " and");
548 strcat (input, p);
549 }
550 else
551 strcpy (input, tmp);
552
553 return;
554}
555
556/////////////////////////////////////////////////////////////////////////////
557
486void * 558void
487zero_initialised::operator new (size_t s) 559fork_abort (const char *msg)
488{ 560{
561 if (!fork ())
562 {
563 signal (SIGABRT, SIG_DFL);
564 abort ();
565 }
566
567 LOG (llevError, "fork abort: %s\n", msg);
568}
569
570void *salloc_ (int n) throw (std::bad_alloc)
571{
489 void *p = malloc (s); 572 void *ptr = g_slice_alloc (n);
490 573
491 memset (p, 0, s); 574 if (!ptr)
575 throw std::bad_alloc ();
576
492 return p; 577 return ptr;
493} 578}
494 579
495void 580void *salloc_ (int n, void *src) throw (std::bad_alloc)
496zero_initialised::operator delete (void *p, size_t s)
497{ 581{
498 free (p); 582 void *ptr = salloc_ (n);
499}
500 583
584 if (src)
585 memcpy (ptr, src, n);
586 else
587 memset (ptr, 0, n);
588
589 return ptr;
590}
591
592void assign (char *dst, const char *src, int maxlen)
593{
594 if (!src)
595 src = "";
596
597 int len = strlen (src);
598
599 if (len >= maxlen - 1)
600 {
601 if (maxlen <= 4)
602 {
603 memset (dst, '.', maxlen - 1);
604 dst [maxlen - 1] = 0;
605 }
606 else
607 {
608 memcpy (dst, src, maxlen - 4);
609 memcpy (dst + maxlen - 4, "...", 4);
610 }
611 }
612 else
613 memcpy (dst, src, len + 1);
614}
615
616tstamp now ()
617{
618 struct timeval tv;
619
620 gettimeofday (&tv, 0);
621 return tstamp (tv.tv_sec) + tstamp (tv.tv_usec) * tstamp (1e-6);
622}
623
624int
625similar_direction (int a, int b)
626{
627 if (!a || !b)
628 return 0;
629
630 int diff = (b - a) & 7;
631 return diff <= 1 || diff >= 7;
632}
633

Diff Legend

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