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.47 by root, Wed Feb 7 02:04:46 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;
43
44void
45tausworthe_random_generator::seed (uint32_t seed)
46{
47 state [0] = max ( 2U, seed * 69069U);
48 state [1] = max ( 8U, state [0] * 69069U);
49 state [2] = max ( 16U, state [1] * 69069U);
50 state [3] = max (128U, state [2] * 69069U);
51
52 for (int i = 11; --i; )
53 operator ()();
54}
55
56uint32_t
57tausworthe_random_generator::next ()
58{
59 state [0] = ((state [0] & 0xFFFFFFFEU) << 18U) ^ (((state [0] << 6U) ^ state [0]) >> 13U);
60 state [1] = ((state [1] & 0xFFFFFFF8U) << 2U) ^ (((state [1] << 2U) ^ state [1]) >> 27U);
61 state [2] = ((state [2] & 0xFFFFFFF0U) << 7U) ^ (((state [2] << 13U) ^ state [2]) >> 21U);
62 state [3] = ((state [3] & 0xFFFFFF80U) << 13U) ^ (((state [3] << 3U) ^ state [3]) >> 12U);
63
64 return state [0] ^ state [1] ^ state [2] ^ state [3];
65}
66
67uint32_t
68tausworthe_random_generator::get_range (uint32_t r_max)
69{
70 return next () % r_max;
71}
72
73// return a number within (min .. max)
74int
75tausworthe_random_generator::get_range (int r_min, int r_max)
76{
77 return r_min + (*this) (max (r_max - r_min + 1, 1));
78}
36 79
37/* 80/*
38 * The random functions here take luck into account when rolling random 81 * 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 82 * 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 83 * 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, 90 * 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. 91 * 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, 92 * Generally, op should be the player/caster/hitter requesting the roll,
50 * not the recipient (ie, the poor slob getting hit). [garbled 20010916] 93 * not the recipient (ie, the poor slob getting hit). [garbled 20010916]
51 */ 94 */
52 95int
53int random_roll(int min, int max, const object *op, int goodbad) { 96random_roll (int r_min, int r_max, const object *op, int goodbad)
54 int omin, diff, luck, base, ran; 97{
98 int base = r_max - r_min > 1 ? 20 : 50; /* d2 and d3 are corner cases */
55 99
56 omin = min; 100 if (r_max < 1 || r_max < r_min)
57 diff = max - min + 1; 101 {
58 ((diff > 2) ? (base = 20) : (base = 50)); /* d2 and d3 are corner cases */
59
60 if (max < 1 || diff < 1) {
61 LOG(llevError, "Calling random_roll with min=%d max=%d\n", min, max); 102 LOG (llevError, "Calling random_roll with min=%d max=%d\n", r_min, r_max);
62 return(min); /* avoids a float exception */ 103 return r_min;
63 } 104 }
64 105
65 ran = RANDOM();
66
67 if (op->type != PLAYER) 106 if (op->type == PLAYER)
68 return((ran%diff)+min); 107 {
69
70 luck = op->stats.luck; 108 int luck = op->stats.luck;
71 if (RANDOM()%base < MIN(10, abs(luck))) {
72 /* we have a winner */
73 ((luck > 0) ? (luck = 1) : (luck = -1));
74 diff -= luck;
75 if (diff < 1)
76 return(omin); /*check again*/
77 ((goodbad) ? (min += luck) : (diff));
78 109
79 return(MAX(omin, MIN(max, (ran%diff)+min))); 110 if (rndm (base) < min (10, abs (luck)))
111 {
112 //TODO: take luck into account
113 }
80 } 114 }
81 return((ran%diff)+min); 115
116 return rndm (r_min, r_max);
82} 117}
83 118
84/* 119/*
85 * This is a 64 bit version of random_roll above. This is needed 120 * This is a 64 bit version of random_roll above. This is needed
86 * for exp loss calculations for players changing religions. 121 * for exp loss calculations for players changing religions.
87 */ 122 */
88 123sint64
89sint64 random_roll64(sint64 min, sint64 max, const object *op, int goodbad) { 124random_roll64 (sint64 min, sint64 max, const object *op, int goodbad)
125{
90 sint64 omin, diff, luck, ran; 126 sint64 omin, diff, luck, ran;
91 int base; 127 int base;
92 128
93 omin = min; 129 omin = min;
94 diff = max - min + 1; 130 diff = max - min + 1;
95 ((diff > 2) ? (base = 20) : (base = 50)); /* d2 and d3 are corner cases */ 131 ((diff > 2) ? (base = 20) : (base = 50)); /* d2 and d3 are corner cases */
96 132
97 if (max < 1 || diff < 1) { 133 if (max < 1 || diff < 1)
98#ifndef WIN32 134 {
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); 135 LOG (llevError, "Calling random_roll with min=%" PRId64 " max=%" PRId64 "\n", min, max);
102#endif
103 return(min); /* avoids a float exception */ 136 return (min); /* avoids a float exception */
104 } 137 }
105 138
106 /* Don't know of a portable call to get 64 bit random values. 139 /*
107 * So make a call to get two 32 bit random numbers, and just to 140 * Make a call to get two 32 bit unsigned random numbers, and just to
108 * a little byteshifting. Do make sure the first one is only 141 * a little bitshifting.
109 * 32 bit, so we don't get skewed results
110 */ 142 */
111 ran = (RANDOM() & 0xffffffff) | ((sint64)RANDOM() << 32); 143 ran = (sint64) rndm.next () ^ ((sint64) rndm.next () << 31);
112 144
113 if (op->type != PLAYER) 145 if (op->type != PLAYER)
114 return((ran%diff)+min); 146 return ((ran % diff) + min);
115 147
116 luck = op->stats.luck; 148 luck = op->stats.luck;
117 if (RANDOM()%base < MIN(10, abs(luck))) { 149 if (rndm (base) < MIN (10, abs (luck)))
150 {
118 /* we have a winner */ 151 /* we have a winner */
119 ((luck > 0) ? (luck = 1) : (luck = -1)); 152 ((luck > 0) ? (luck = 1) : (luck = -1));
120 diff -= luck; 153 diff -= luck;
121 if (diff < 1) 154 if (diff < 1)
122 return(omin); /*check again*/ 155 return (omin); /*check again */
123 ((goodbad) ? (min += luck) : (diff)); 156 ((goodbad) ? (min += luck) : (diff));
124 157
125 return(MAX(omin, MIN(max, (ran%diff)+min))); 158 return (MAX (omin, MIN (max, (ran % diff) + min)));
126 } 159 }
160
127 return((ran%diff)+min); 161 return ((ran % diff) + min);
128} 162}
129 163
130/* 164/*
131 * Roll a number of dice (2d3, 4d6). Uses op to determine luck, 165 * 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. 166 * 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, 167 * Generally, op should be the player/caster/hitter requesting the roll,
134 * not the recipient (ie, the poor slob getting hit). 168 * not the recipient (ie, the poor slob getting hit).
135 * The args are num D size (ie 4d6) [garbled 20010916] 169 * The args are num D size (ie 4d6) [garbled 20010916]
136 */ 170 */
137 171
172int
138int die_roll(int num, int size, const object *op, int goodbad) { 173die_roll (int num, int size, const object *op, int goodbad)
174{
139 int min, diff, luck, total, i, gotlucky, base, ran; 175 int min, diff, luck, total, i, gotlucky, base;
140 176
141 diff = size; 177 diff = size;
142 min = 1; 178 min = 1;
143 luck = total = gotlucky = 0; 179 luck = total = gotlucky = 0;
144 ((diff > 2) ? (base = 20) : (base = 50)); /* d2 and d3 are corner cases */ 180 ((diff > 2) ? (base = 20) : (base = 50)); /* d2 and d3 are corner cases */
145 if (size < 2 || diff < 1) { 181 if (size < 2 || diff < 1)
182 {
146 LOG(llevError, "Calling die_roll with num=%d size=%d\n", num, size); 183 LOG (llevError, "Calling die_roll with num=%d size=%d\n", num, size);
147 return(num); /* avoids a float exception */ 184 return (num); /* avoids a float exception */
148 } 185 }
149 186
150 if (op->type == PLAYER) 187 if (op->type == PLAYER)
151 luck = op->stats.luck; 188 luck = op->stats.luck;
152 189
153 for (i = 0; i < num; i++) { 190 for (i = 0; i < num; i++)
191 {
154 if (RANDOM()%base < MIN(10, abs(luck)) && !gotlucky) { 192 if (rndm (base) < MIN (10, abs (luck)) && !gotlucky)
193 {
155 /* we have a winner */ 194 /* we have a winner */
156 gotlucky++; 195 gotlucky++;
157 ((luck > 0) ? (luck = 1) : (luck = -1)); 196 ((luck > 0) ? (luck = 1) : (luck = -1));
158 diff -= luck; 197 diff -= luck;
159 if (diff < 1) 198 if (diff < 1)
160 return(num); /*check again*/ 199 return (num); /*check again */
161 ((goodbad) ? (min += luck) : (diff)); 200 ((goodbad) ? (min += luck) : (diff));
162 ran = RANDOM();
163 total += MAX(1, MIN(size, (ran%diff)+min)); 201 total += MAX (1, MIN (size, rndm (diff) + min));
202 }
164 } else { 203 else
165 total += RANDOM()%size+1; 204 total += rndm (size) + 1;
166 }
167 } 205 }
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->materials;
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
254materialtype_t *name_to_material(const char *name) 280materialtype_t *
281name_to_material (const shstr &name)
255{ 282{
256 materialtype_t *mt, *nmt; 283 for (materialtype_t *mt = materialt; mt && mt->next; mt = mt->next)
257 284 if (name == mt->name)
258 mt = NULL;
259 for (nmt = materialt; nmt != NULL && nmt->next != NULL; nmt=nmt->next) {
260 if (strcmp(name, nmt->name) == 0) {
261 mt = nmt;
262 break;
263 }
264 }
265 return mt; 285 return mt;
286
287 return materialt;
266} 288}
267 289
268/* when doing transmutation of objects, we have to recheck the resistances, 290/* when doing transmutation of objects, we have to recheck the resistances,
269 * as some that did not apply previously, may apply now. 291 * as some that did not apply previously, may apply now.
270 */ 292 */
271 293
294void
272void transmute_materialname(object *op, const object *change) 295transmute_materialname (object *op, const object *change)
273{ 296{
274 materialtype_t *mt; 297 materialtype_t *mt;
275 int j; 298 int j;
276 299
277 if (op->materialname == NULL) 300 if (op->materialname == NULL)
278 return; 301 return;
279 302
280 if (change->materialname != NULL && 303 if (change->materialname != NULL && strcmp (op->materialname, change->materialname))
281 strcmp(op->materialname, change->materialname))
282 return; 304 return;
283 305
284 if (!IS_ARMOR(op)) 306 if (!op->is_armor ())
285 return; 307 return;
286 308
287 mt = name_to_material(op->materialname); 309 mt = name_to_material (op->materialname);
288 if (!mt) { 310 if (!mt)
311 {
289 LOG(llevError, "archetype '%s>%s' uses nonexistent material '%s'\n", &op->arch->name, &op->name, &op->materialname); 312 LOG (llevError, "archetype '%s>%s' uses nonexistent material '%s'\n", &op->arch->name, &op->name, &op->materialname);
290 return; 313 return;
291 } 314 }
292 315
293 for (j=0; j < NROFATTACKS; j++) 316 for (j = 0; j < NROFATTACKS; j++)
294 if (op->resist[j] == 0 && change->resist[j] != 0) { 317 if (op->resist[j] == 0 && change->resist[j] != 0)
318 {
295 op->resist[j] += mt->mod[j]; 319 op->resist[j] += mt->mod[j];
296 if (op->resist[j] > 100) 320 if (op->resist[j] > 100)
297 op->resist[j] = 100; 321 op->resist[j] = 100;
298 if (op->resist[j] < -100) 322 if (op->resist[j] < -100)
299 op->resist[j] = -100; 323 op->resist[j] = -100;
300 } 324 }
301} 325}
302 326
303/* set the materialname and type for an item */ 327/* set the materialname and type for an item */
328void
304void set_materialname(object *op, int difficulty, materialtype_t *nmt) 329set_materialname (object *op, int difficulty, materialtype_t *nmt)
305{ 330{
306 materialtype_t *mt, *lmt; 331 materialtype_t *mt, *lmt;
332
333#ifdef NEW_MATERIAL_CODE
307 int j; 334 int j;
335#endif
308 336
309 if (op->materialname != NULL) 337 if (op->materialname != NULL)
310 return; 338 return;
311 339
312 340
313 341
314 if (nmt == NULL) { 342 if (nmt == NULL)
343 {
315 lmt = NULL; 344 lmt = NULL;
316#ifndef NEW_MATERIAL_CODE 345#ifndef NEW_MATERIAL_CODE
317 for (mt = materialt; mt != NULL && mt->next != NULL; mt=mt->next) { 346 for (mt = materialt; mt && mt->next; mt = mt->next)
347 {
318 if (op->material & mt->material) { 348 if (op->materials & mt->material)
349 {
319 lmt = mt; 350 lmt = mt;
351 break;
352 }
353 }
354
355#else
356 for (mt = materialt; mt && mt->next; mt = mt->next)
357 {
358 if (op->materials & mt->material && rndm (1, 100) <= mt->chance &&
359 difficulty >= mt->difficulty && (op->magic >= mt->magic || mt->magic == 0))
360 {
361 lmt = mt;
362 if (!(op->is_weapon () || op->is_armor ()))
320 break; 363 break;
321 } 364 }
322 } 365 }
366#endif
367 }
368 else
369 {
370 lmt = nmt;
371 }
323 372
373 if (lmt != NULL)
374 {
375#ifndef NEW_MATERIAL_CODE
376 op->materialname = lmt->name;
377 return;
324#else 378#else
325 for (mt = materialt; mt != NULL && mt->next != NULL; mt=mt->next) { 379
326 if (op->material & mt->material && rndm(1, 100) <= mt->chance && 380 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 } 381 {
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; 382 op->stats.dam += lmt->damage;
347 if (op->stats.dam < 1) 383 if (op->stats.dam < 1)
348 op->stats.dam = 1; 384 op->stats.dam = 1;
349 } 385 }
386
350 if (op->stats.sp && op->type == BOW) 387 if (op->stats.sp && op->type == BOW)
351 op->stats.sp += lmt->sp; 388 op->stats.sp += lmt->sp;
352 if (op->stats.wc && IS_WEAPON(op)) 389 if (op->stats.wc && op->is_weapon ())
353 op->stats.wc += lmt->wc; 390 op->stats.wc += lmt->wc;
354 if (IS_ARMOR(op)) { 391 if (op->is_armor ())
392 {
355 if (op->stats.ac) 393 if (op->stats.ac)
356 op->stats.ac += lmt->ac; 394 op->stats.ac += lmt->ac;
357 for (j=0; j < NROFATTACKS; j++) 395 for (j = 0; j < NROFATTACKS; j++)
358 if (op->resist[j] != 0) { 396 if (op->resist[j] != 0)
397 {
359 op->resist[j] += lmt->mod[j]; 398 op->resist[j] += lmt->mod[j];
360 if (op->resist[j] > 100) 399 if (op->resist[j] > 100)
361 op->resist[j] = 100; 400 op->resist[j] = 100;
362 if (op->resist[j] < -100) 401 if (op->resist[j] < -100)
363 op->resist[j] = -100; 402 op->resist[j] = -100;
364 } 403 }
365 } 404 }
366 op->materialname = add_string(lmt->name); 405 op->materialname = lmt->name;
367 /* dont make it unstackable if it doesn't need to be */ 406 /* dont make it unstackable if it doesn't need to be */
368 if (IS_WEAPON(op) || IS_ARMOR(op)) { 407 if (op->is_weapon () || op->is_armor ())
408 {
369 op->weight = (op->weight * lmt->weight)/100; 409 op->weight = (op->weight * lmt->weight) / 100;
370 op->value = (op->value * lmt->value)/100; 410 op->value = (op->value * lmt->value) / 100;
371 } 411 }
372#endif 412#endif
373 } 413 }
374} 414}
375 415
376/* 416/*
377 * Strip out the media tags from a String. 417 * Strip out the media tags from a String.
378 * Warning the input string will contain the result string 418 * Warning the input string will contain the result string
379 */ 419 */
420void
380void strip_media_tag(char *message){ 421strip_media_tag (char *message)
422{
381 int in_tag=0; 423 int in_tag = 0;
382 char* dest; 424 char *dest;
383 char* src; 425 char *src;
426
384 src=dest=message; 427 src = dest = message;
385 while (*src!='\0'){ 428 while (*src != '\0')
429 {
386 if (*src=='['){ 430 if (*src == '[')
431 {
387 in_tag=1; 432 in_tag = 1;
433 }
388 } else if (in_tag && (*src==']')) 434 else if (in_tag && (*src == ']'))
389 in_tag=0; 435 in_tag = 0;
390 else if (!in_tag){ 436 else if (!in_tag)
437 {
391 *dest=*src; 438 *dest = *src;
392 dest++; 439 dest++;
393 } 440 }
394 src++; 441 src++;
395 } 442 }
396 *dest='\0'; 443 *dest = '\0';
397} 444}
398 445
446const char *
399const char* strrstr(const char* haystack, const char* needle){ 447strrstr (const char *haystack, const char *needle)
448{
400 const char* lastneedle; 449 const char *lastneedle;
450
401 lastneedle=NULL; 451 lastneedle = NULL;
402 while((haystack=strstr(haystack,needle))!=NULL){ 452 while ((haystack = strstr (haystack, needle)) != NULL)
453 {
403 lastneedle=haystack; 454 lastneedle = haystack;
404 haystack++; 455 haystack++;
405 } 456 }
406 return lastneedle; 457 return lastneedle;
407 458
408} 459}
460
409#define EOL_SIZE (sizeof("\n")-1) 461#define EOL_SIZE (sizeof("\n")-1)
462void
410void strip_endline(char* buf){ 463strip_endline (char *buf)
464{
411 if (strlen(buf)<sizeof("\n")){ 465 if (strlen (buf) < sizeof ("\n"))
466 {
412 return; 467 return;
413 } 468 }
414 if (!strcmp(buf+strlen(buf)-EOL_SIZE,"\n")) 469 if (!strcmp (buf + strlen (buf) - EOL_SIZE, "\n"))
415 buf[strlen(buf)-EOL_SIZE]='\0'; 470 buf[strlen (buf) - EOL_SIZE] = '\0';
416} 471}
417 472
418/** 473/**
419 * Replace in string src all occurrences of key by replacement. The resulting 474 * Replace in string src all occurrences of key by replacement. The resulting
420 * string is put into result; at most resultsize characters (including the 475 * string is put into result; at most resultsize characters (including the
421 * terminating null character) will be written to result. 476 * terminating null character) will be written to result.
422 */ 477 */
478void
423void replace(const char *src, const char *key, const char *replacement, char *result, size_t resultsize) 479replace (const char *src, const char *key, const char *replacement, char *result, size_t resultsize)
424{ 480{
425 size_t resultlen; 481 size_t resultlen;
426 size_t keylen; 482 size_t keylen;
427 483
428 /* special case to prevent infinite loop if key==replacement=="" */ 484 /* special case to prevent infinite loop if key==replacement=="" */
429 if(strcmp(key, replacement) == 0) 485 if (strcmp (key, replacement) == 0)
430 { 486 {
431 snprintf(result, resultsize, "%s", src); 487 snprintf (result, resultsize, "%s", src);
432 return; 488 return;
433 } 489 }
434 490
435 keylen = strlen(key); 491 keylen = strlen (key);
436 492
437 resultlen = 0; 493 resultlen = 0;
438 while(*src != '\0' && resultlen+1 < resultsize) 494 while (*src != '\0' && resultlen + 1 < resultsize)
439 { 495 {
440 if(strncmp(src, key, keylen) == 0) 496 if (strncmp (src, key, keylen) == 0)
441 { 497 {
442 snprintf(result+resultlen, resultsize-resultlen, "%s", replacement); 498 snprintf (result + resultlen, resultsize - resultlen, "%s", replacement);
443 resultlen += strlen(result+resultlen); 499 resultlen += strlen (result + resultlen);
444 src += keylen; 500 src += keylen;
445 } 501 }
446 else 502 else
447 {
448 result[resultlen++] = *src++;
449 }
450 } 503 {
504 result[resultlen++] = *src++;
505 }
506 }
451 result[resultlen] = '\0'; 507 result[resultlen] = '\0';
452} 508}
453 509
454/** 510/**
455 * Taking a string as an argument, mutate it into a string that looks like a list. 511 * 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 512 * 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. 513 * 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. 514 * This function will also strip all trailing non alphanumeric characters.
459 * It does not insert an oxford comma. 515 * It does not insert an oxford comma.
460 */ 516 */
461 517
518void
462void make_list_like(char *input) { 519make_list_like (char *input)
520{
463 char *p, tmp[MAX_BUF]; 521 char *p, tmp[MAX_BUF];
464 int i; 522 int i;
523
465 if (!input || strlen(input) > MAX_BUF-5) return; 524 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; 525 return;
484} 526 /* bad stuff would happen if we continued here, the -5 is to make space for ' and ' */
485 527
528 strncpy (tmp, input, MAX_BUF - 5);
529 /*trim all trailing commas, spaces etc. */
530 for (i = strlen (tmp); !isalnum (tmp[i]) && i >= 0; i--)
531 tmp[i] = '\0';
532
533 strcat (tmp, ".");
534
535 p = strrchr (tmp, ',');
536 if (p)
537 {
538 *p = '\0';
539 strcpy (input, tmp);
540 p++;
541 strcat (input, " and");
542 strcat (input, p);
543 }
544 else
545 strcpy (input, tmp);
546
547 return;
548}
549
550/////////////////////////////////////////////////////////////////////////////
551
486void * 552void
487zero_initialised::operator new (size_t s) 553fork_abort (const char *msg)
488{ 554{
555 if (!fork ())
556 {
557 signal (SIGABRT, SIG_DFL);
558 abort ();
559 }
560
561 LOG (llevError, "fork abort: %s\n", msg);
562}
563
564void *salloc_ (int n) throw (std::bad_alloc)
565{
566#ifdef PREFER_MALLOC
489 void *p = malloc (s); 567 void *ptr = malloc (n);
490 568#else
491 memset (p, 0, s); 569 void *ptr = g_slice_alloc (n);
570#endif
571
572 if (!ptr)
573 throw std::bad_alloc ();
574
492 return p; 575 return ptr;
493} 576}
494 577
495void 578void *salloc_ (int n, void *src) throw (std::bad_alloc)
496zero_initialised::operator delete (void *p, size_t s)
497{ 579{
498 free (p); 580 void *ptr = salloc_ (n);
499}
500 581
582 if (src)
583 memcpy (ptr, src, n);
584 else
585 memset (ptr, 0, n);
586
587 return ptr;
588}
589
590void assign (char *dst, const char *src, int maxlen)
591{
592 if (!src)
593 src = "";
594
595 int len = strlen (src);
596
597 if (len >= maxlen - 1)
598 {
599 if (maxlen <= 4)
600 {
601 memset (dst, '.', maxlen - 1);
602 dst [maxlen - 1] = 0;
603 }
604 else
605 {
606 memcpy (dst, src, maxlen - 4);
607 memcpy (dst + maxlen - 4, "...", 4);
608 }
609 }
610 else
611 memcpy (dst, src, len + 1);
612}
613
614tstamp now ()
615{
616 struct timeval tv;
617
618 gettimeofday (&tv, 0);
619 return tstamp (tv.tv_sec) + tstamp (tv.tv_usec) * tstamp (1e-6);
620}
621
622int
623similar_direction (int a, int b)
624{
625 if (!a || !b)
626 return 0;
627
628 int diff = (b - a) & 7;
629 return diff <= 1 || diff >= 7;
630}
631

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines