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

Diff Legend

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