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.7 by root, Fri Sep 8 17:34:02 2006 UTC vs.
Revision 1.43 by root, Fri Jan 19 22:24:10 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines