1 | |
|
|
2 | /* |
1 | /* |
3 | * static char *rcsid_utils_c = |
|
|
4 | * "$Id: utils.C,v 1.10 2006/09/11 01:16:20 root Exp $"; |
|
|
5 | */ |
|
|
6 | |
|
|
7 | /* |
|
|
8 | CrossFire, A Multiplayer game for X-windows |
2 | * CrossFire, A Multiplayer game for X-windows |
9 | |
3 | * |
|
|
4 | * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team |
10 | Copyright (C) 2002 Mark Wedel & Crossfire Development Team |
5 | * Copyright (C) 2002 Mark Wedel & Crossfire Development Team |
11 | Copyright (C) 1992 Frank Tore Johansen |
6 | * Copyright (C) 1992 Frank Tore Johansen |
12 | |
7 | * |
13 | 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 |
14 | 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 |
15 | the Free Software Foundation; either version 2 of the License, or |
10 | * the Free Software Foundation; either version 2 of the License, or |
16 | (at your option) any later version. |
11 | * (at your option) any later version. |
17 | |
12 | * |
18 | 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, |
19 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
20 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
21 | GNU General Public License for more details. |
16 | * GNU General Public License for more details. |
22 | |
17 | * |
23 | 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 |
24 | along with this program; if not, write to the Free Software |
19 | * along with this program; if not, write to the Free Software |
25 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
20 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
26 | |
21 | * |
27 | 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> |
28 | */ |
23 | */ |
29 | |
24 | |
30 | /* |
25 | /* |
31 | * General convenience functions for crossfire. |
26 | * General convenience functions for crossfire. |
32 | */ |
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> |
33 | |
35 | |
34 | #include <global.h> |
36 | #include <global.h> |
35 | #include <funcpoint.h> |
37 | #include <funcpoint.h> |
36 | #include <material.h> |
38 | #include <material.h> |
37 | |
39 | |
38 | #include <glib.h> |
40 | #include <glib.h> |
|
|
41 | |
|
|
42 | rand_gen rndm; |
|
|
43 | |
|
|
44 | void |
|
|
45 | tausworthe_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 | |
|
|
56 | uint32_t |
|
|
57 | tausworthe_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 | |
|
|
67 | uint32_t |
|
|
68 | tausworthe_random_generator::get_range (uint32_t r_max) |
|
|
69 | { |
|
|
70 | return next () % r_max; |
|
|
71 | } |
|
|
72 | |
|
|
73 | // return a number within (min .. max) |
|
|
74 | int |
|
|
75 | tausworthe_random_generator::get_range (int r_min, int r_max) |
|
|
76 | { |
|
|
77 | return r_min + (*this) (max (r_max - r_min + 1, 1)); |
|
|
78 | } |
39 | |
79 | |
40 | /* |
80 | /* |
41 | * The random functions here take luck into account when rolling random |
81 | * The random functions here take luck into account when rolling random |
42 | * 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 |
43 | * difference becomes in the random numbers. IE, the effect is lessened |
83 | * difference becomes in the random numbers. IE, the effect is lessened |
… | |
… | |
50 | * 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, |
51 | * 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. |
52 | * Generally, op should be the player/caster/hitter requesting the roll, |
92 | * Generally, op should be the player/caster/hitter requesting the roll, |
53 | * not the recipient (ie, the poor slob getting hit). [garbled 20010916] |
93 | * not the recipient (ie, the poor slob getting hit). [garbled 20010916] |
54 | */ |
94 | */ |
55 | |
|
|
56 | int |
95 | int |
57 | random_roll (int min, int max, const object *op, int goodbad) |
96 | random_roll (int r_min, int r_max, const object *op, int goodbad) |
58 | { |
97 | { |
|
|
98 | int base = r_max - r_min > 1 ? 20 : 50; /* d2 and d3 are corner cases */ |
|
|
99 | |
|
|
100 | if (r_max < 1 || r_max < r_min) |
|
|
101 | { |
|
|
102 | LOG (llevError, "Calling random_roll with min=%d max=%d\n", r_min, r_max); |
|
|
103 | return r_min; |
|
|
104 | } |
|
|
105 | |
|
|
106 | if (op->type == PLAYER) |
|
|
107 | { |
|
|
108 | int luck = op->stats.luck; |
|
|
109 | |
|
|
110 | if (rndm (base) < min (10, abs (luck))) |
|
|
111 | { |
|
|
112 | //TODO: take luck into account |
|
|
113 | } |
|
|
114 | } |
|
|
115 | |
|
|
116 | return rndm (r_min, r_max); |
|
|
117 | } |
|
|
118 | |
|
|
119 | /* |
|
|
120 | * This is a 64 bit version of random_roll above. This is needed |
|
|
121 | * for exp loss calculations for players changing religions. |
|
|
122 | */ |
|
|
123 | sint64 |
|
|
124 | random_roll64 (sint64 min, sint64 max, const object *op, int goodbad) |
|
|
125 | { |
59 | int omin, diff, luck, base, ran; |
126 | sint64 omin, diff, luck, ran; |
|
|
127 | int base; |
60 | |
128 | |
61 | omin = min; |
129 | omin = min; |
62 | diff = max - min + 1; |
130 | diff = max - min + 1; |
63 | ((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 */ |
64 | |
132 | |
65 | if (max < 1 || diff < 1) |
133 | if (max < 1 || diff < 1) |
66 | { |
134 | { |
67 | LOG (llevError, "Calling random_roll with min=%d max=%d\n", min, max); |
135 | LOG (llevError, "Calling random_roll with min=%" PRId64 " max=%" PRId64 "\n", min, max); |
68 | return (min); /* avoids a float exception */ |
136 | return (min); /* avoids a float exception */ |
69 | } |
137 | } |
70 | |
138 | |
71 | ran = RANDOM (); |
139 | /* |
|
|
140 | * Make a call to get two 32 bit unsigned random numbers, and just to |
|
|
141 | * a little bitshifting. |
|
|
142 | */ |
|
|
143 | ran = (sint64) rndm.next () ^ ((sint64) rndm.next () << 31); |
72 | |
144 | |
73 | if (op->type != PLAYER) |
145 | if (op->type != PLAYER) |
74 | return ((ran % diff) + min); |
146 | return ((ran % diff) + min); |
75 | |
147 | |
76 | luck = op->stats.luck; |
148 | luck = op->stats.luck; |
77 | if (RANDOM () % base < MIN (10, abs (luck))) |
149 | if (rndm (base) < MIN (10, abs (luck))) |
78 | { |
150 | { |
79 | /* we have a winner */ |
151 | /* we have a winner */ |
80 | ((luck > 0) ? (luck = 1) : (luck = -1)); |
152 | ((luck > 0) ? (luck = 1) : (luck = -1)); |
81 | diff -= luck; |
153 | diff -= luck; |
82 | if (diff < 1) |
154 | if (diff < 1) |
83 | return (omin); /*check again */ |
155 | return (omin); /*check again */ |
84 | ((goodbad) ? (min += luck) : (diff)); |
156 | ((goodbad) ? (min += luck) : (diff)); |
85 | |
157 | |
86 | return (MAX (omin, MIN (max, (ran % diff) + min))); |
158 | return (MAX (omin, MIN (max, (ran % diff) + min))); |
87 | } |
159 | } |
88 | return ((ran % diff) + min); |
|
|
89 | } |
|
|
90 | |
160 | |
91 | /* |
|
|
92 | * This is a 64 bit version of random_roll above. This is needed |
|
|
93 | * for exp loss calculations for players changing religions. |
|
|
94 | */ |
|
|
95 | |
|
|
96 | sint64 |
|
|
97 | random_roll64 (sint64 min, sint64 max, const object *op, int goodbad) |
|
|
98 | { |
|
|
99 | sint64 omin, diff, luck, ran; |
|
|
100 | int base; |
|
|
101 | |
|
|
102 | omin = min; |
|
|
103 | diff = max - min + 1; |
|
|
104 | ((diff > 2) ? (base = 20) : (base = 50)); /* d2 and d3 are corner cases */ |
|
|
105 | |
|
|
106 | if (max < 1 || diff < 1) |
|
|
107 | { |
|
|
108 | #ifndef WIN32 |
|
|
109 | LOG (llevError, "Calling random_roll with min=%lld max=%lld\n", min, max); |
|
|
110 | #else |
|
|
111 | LOG (llevError, "Calling random_roll with min=%I64d max=%I64d\n", min, max); |
|
|
112 | #endif |
|
|
113 | return (min); /* avoids a float exception */ |
|
|
114 | } |
|
|
115 | |
|
|
116 | /* Don't know of a portable call to get 64 bit random values. |
|
|
117 | * So make a call to get two 32 bit random numbers, and just to |
|
|
118 | * a little byteshifting. Do make sure the first one is only |
|
|
119 | * 32 bit, so we don't get skewed results |
|
|
120 | */ |
|
|
121 | ran = (RANDOM () & 0xffffffff) | ((sint64) RANDOM () << 32); |
|
|
122 | |
|
|
123 | if (op->type != PLAYER) |
|
|
124 | return ((ran % diff) + min); |
|
|
125 | |
|
|
126 | luck = op->stats.luck; |
|
|
127 | if (RANDOM () % base < MIN (10, abs (luck))) |
|
|
128 | { |
|
|
129 | /* we have a winner */ |
|
|
130 | ((luck > 0) ? (luck = 1) : (luck = -1)); |
|
|
131 | diff -= luck; |
|
|
132 | if (diff < 1) |
|
|
133 | return (omin); /*check again */ |
|
|
134 | ((goodbad) ? (min += luck) : (diff)); |
|
|
135 | |
|
|
136 | return (MAX (omin, MIN (max, (ran % diff) + min))); |
|
|
137 | } |
|
|
138 | return ((ran % diff) + min); |
161 | return ((ran % diff) + min); |
139 | } |
162 | } |
140 | |
163 | |
141 | /* |
164 | /* |
142 | * 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, |
… | |
… | |
147 | */ |
170 | */ |
148 | |
171 | |
149 | int |
172 | int |
150 | die_roll (int num, int size, const object *op, int goodbad) |
173 | die_roll (int num, int size, const object *op, int goodbad) |
151 | { |
174 | { |
152 | int min, diff, luck, total, i, gotlucky, base, ran; |
175 | int min, diff, luck, total, i, gotlucky, base; |
153 | |
176 | |
154 | diff = size; |
177 | diff = size; |
155 | min = 1; |
178 | min = 1; |
156 | luck = total = gotlucky = 0; |
179 | luck = total = gotlucky = 0; |
157 | ((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 */ |
… | |
… | |
164 | if (op->type == PLAYER) |
187 | if (op->type == PLAYER) |
165 | luck = op->stats.luck; |
188 | luck = op->stats.luck; |
166 | |
189 | |
167 | for (i = 0; i < num; i++) |
190 | for (i = 0; i < num; i++) |
168 | { |
191 | { |
169 | if (RANDOM () % base < MIN (10, abs (luck)) && !gotlucky) |
192 | if (rndm (base) < MIN (10, abs (luck)) && !gotlucky) |
170 | { |
193 | { |
171 | /* we have a winner */ |
194 | /* we have a winner */ |
172 | gotlucky++; |
195 | gotlucky++; |
173 | ((luck > 0) ? (luck = 1) : (luck = -1)); |
196 | ((luck > 0) ? (luck = 1) : (luck = -1)); |
174 | diff -= luck; |
197 | diff -= luck; |
175 | if (diff < 1) |
198 | if (diff < 1) |
176 | return (num); /*check again */ |
199 | return (num); /*check again */ |
177 | ((goodbad) ? (min += luck) : (diff)); |
200 | ((goodbad) ? (min += luck) : (diff)); |
178 | ran = RANDOM (); |
|
|
179 | total += MAX (1, MIN (size, (ran % diff) + min)); |
201 | total += MAX (1, MIN (size, rndm (diff) + min)); |
180 | } |
202 | } |
181 | else |
203 | else |
182 | { |
|
|
183 | total += RANDOM () % size + 1; |
204 | total += rndm (size) + 1; |
184 | } |
|
|
185 | } |
205 | } |
|
|
206 | |
186 | return (total); |
207 | return total; |
187 | } |
208 | } |
188 | |
209 | |
189 | /* |
|
|
190 | * Another convenience function. Returns a number between min and max. |
|
|
191 | * It is suggested one use these functions rather than RANDOM()%, as it |
|
|
192 | * would appear that a number of off-by-one-errors exist due to improper |
|
|
193 | * use of %. This should also prevent SIGFPE. |
|
|
194 | */ |
|
|
195 | |
|
|
196 | int |
|
|
197 | rndm (int min, int max) |
|
|
198 | { |
|
|
199 | int diff; |
|
|
200 | |
|
|
201 | diff = max - min + 1; |
|
|
202 | if (max < 1 || diff < 1) |
|
|
203 | return (min); |
|
|
204 | |
|
|
205 | return (RANDOM () % diff + min); |
|
|
206 | } |
|
|
207 | |
|
|
208 | /* decay and destroy persihable items in a map */ |
210 | /* decay and destroy perishable items in a map */ |
209 | |
|
|
210 | void |
211 | void |
211 | decay_objects (mapstruct *m) |
212 | maptile::decay_objects () |
212 | { |
213 | { |
213 | int x, y, destroy; |
214 | if (!spaces) |
214 | object *op, *otmp; |
|
|
215 | |
|
|
216 | if (m->unique) |
|
|
217 | return; |
215 | return; |
218 | |
216 | |
219 | for (x = 0; x < MAP_WIDTH (m); x++) |
217 | for (mapspace *ms = spaces + size (); ms-- > spaces; ) |
220 | for (y = 0; y < MAP_HEIGHT (m); y++) |
218 | for (object *above, *op = ms->bot; op; op = above) |
221 | for (op = get_map_ob (m, x, y); op; op = otmp) |
|
|
222 | { |
219 | { |
|
|
220 | above = op->above; |
|
|
221 | |
223 | destroy = 0; |
222 | bool destroy = 0; |
224 | otmp = op->above; |
223 | |
|
|
224 | // do not decay anything above unique floor tiles (yet :) |
225 | 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)) |
226 | break; |
226 | break; |
|
|
227 | |
227 | if (QUERY_FLAG (op, FLAG_IS_FLOOR) || |
228 | if (QUERY_FLAG (op, FLAG_IS_FLOOR) |
228 | QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) || |
229 | || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) |
229 | QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL) || |
230 | || QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL) |
230 | QUERY_FLAG (op, FLAG_UNIQUE) || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR) || QUERY_FLAG (op, FLAG_UNPAID) || IS_LIVE (op)) |
231 | || QUERY_FLAG (op, FLAG_UNIQUE) |
231 | continue; |
232 | || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR) |
232 | /* otherwise, we decay and destroy */ |
233 | || QUERY_FLAG (op, FLAG_UNPAID) |
233 | if (IS_WEAPON (op)) |
234 | || op->is_alive ()) |
|
|
235 | ; // do not decay |
|
|
236 | else if (op->is_weapon ()) |
234 | { |
237 | { |
235 | op->stats.dam--; |
238 | op->stats.dam--; |
236 | if (op->stats.dam < 0) |
239 | if (op->stats.dam < 0) |
237 | destroy = 1; |
240 | destroy = 1; |
238 | } |
241 | } |
239 | else if (IS_ARMOR (op)) |
242 | else if (op->is_armor ()) |
240 | { |
243 | { |
241 | op->stats.ac--; |
244 | op->stats.ac--; |
242 | if (op->stats.ac < 0) |
245 | if (op->stats.ac < 0) |
243 | destroy = 1; |
246 | destroy = 1; |
244 | } |
247 | } |
245 | else if (op->type == FOOD) |
248 | else if (op->type == FOOD) |
246 | { |
249 | { |
247 | op->stats.food -= rndm (5, 20); |
250 | op->stats.food -= rndm (5, 20); |
248 | if (op->stats.food < 0) |
251 | if (op->stats.food < 0) |
249 | destroy = 1; |
252 | destroy = 1; |
250 | } |
253 | } |
251 | else |
254 | else |
252 | { |
255 | { |
253 | if (op->material & M_PAPER || op->material & M_LEATHER || |
256 | int mat = op->material; |
254 | op->material & M_WOOD || op->material & M_ORGANIC || op->material & M_CLOTH || op->material & M_LIQUID) |
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)) |
255 | destroy = 1; |
269 | destroy = 1; |
256 | if (op->material & M_IRON && rndm (1, 5) == 1) |
|
|
257 | destroy = 1; |
|
|
258 | if (op->material & M_GLASS && rndm (1, 2) == 1) |
|
|
259 | destroy = 1; |
|
|
260 | if ((op->material & M_STONE || op->material & M_ADAMANT) && rndm (1, 10) == 1) |
|
|
261 | destroy = 1; |
|
|
262 | if ((op->material & M_SOFT_METAL || op->material & M_BONE) && rndm (1, 3) == 1) |
|
|
263 | destroy = 1; |
|
|
264 | if (op->material & M_ICE && MAP_TEMP (m) > 32) |
|
|
265 | destroy = 1; |
|
|
266 | } |
270 | } |
|
|
271 | |
267 | /* adjust overall chance below */ |
272 | /* adjust overall chance below */ |
268 | if (destroy && rndm (0, 1)) |
273 | if (destroy && rndm (0, 1)) |
269 | { |
274 | op->destroy (); |
270 | remove_ob (op); |
|
|
271 | free_object (op); |
|
|
272 | } |
|
|
273 | } |
275 | } |
274 | } |
276 | } |
275 | |
277 | |
276 | /* convert materialname to materialtype_t */ |
278 | /* convert materialname to materialtype_t */ |
277 | |
279 | |
278 | materialtype_t * |
280 | materialtype_t * |
… | |
… | |
306 | return; |
308 | return; |
307 | |
309 | |
308 | if (change->materialname != NULL && strcmp (op->materialname, change->materialname)) |
310 | if (change->materialname != NULL && strcmp (op->materialname, change->materialname)) |
309 | return; |
311 | return; |
310 | |
312 | |
311 | if (!IS_ARMOR (op)) |
313 | if (!op->is_armor ()) |
312 | return; |
314 | return; |
313 | |
315 | |
314 | mt = name_to_material (op->materialname); |
316 | mt = name_to_material (op->materialname); |
315 | if (!mt) |
317 | if (!mt) |
316 | { |
318 | { |
… | |
… | |
362 | { |
364 | { |
363 | if (op->material & mt->material && rndm (1, 100) <= mt->chance && |
365 | if (op->material & mt->material && rndm (1, 100) <= mt->chance && |
364 | difficulty >= mt->difficulty && (op->magic >= mt->magic || mt->magic == 0)) |
366 | difficulty >= mt->difficulty && (op->magic >= mt->magic || mt->magic == 0)) |
365 | { |
367 | { |
366 | lmt = mt; |
368 | lmt = mt; |
367 | if (!(IS_WEAPON (op) || IS_ARMOR (op))) |
369 | if (!(op->is_weapon () || op->is_armor ())) |
368 | break; |
370 | break; |
369 | } |
371 | } |
370 | } |
372 | } |
371 | #endif |
373 | #endif |
372 | } |
374 | } |
… | |
… | |
380 | #ifndef NEW_MATERIAL_CODE |
382 | #ifndef NEW_MATERIAL_CODE |
381 | op->materialname = lmt->name; |
383 | op->materialname = lmt->name; |
382 | return; |
384 | return; |
383 | #else |
385 | #else |
384 | |
386 | |
385 | if (op->stats.dam && IS_WEAPON (op)) |
387 | if (op->stats.dam && op->is_weapon ()) |
386 | { |
388 | { |
387 | op->stats.dam += lmt->damage; |
389 | op->stats.dam += lmt->damage; |
388 | if (op->stats.dam < 1) |
390 | if (op->stats.dam < 1) |
389 | op->stats.dam = 1; |
391 | op->stats.dam = 1; |
390 | } |
392 | } |
|
|
393 | |
391 | if (op->stats.sp && op->type == BOW) |
394 | if (op->stats.sp && op->type == BOW) |
392 | op->stats.sp += lmt->sp; |
395 | op->stats.sp += lmt->sp; |
393 | if (op->stats.wc && IS_WEAPON (op)) |
396 | if (op->stats.wc && op->is_weapon ()) |
394 | op->stats.wc += lmt->wc; |
397 | op->stats.wc += lmt->wc; |
395 | if (IS_ARMOR (op)) |
398 | if (op->is_armor ()) |
396 | { |
399 | { |
397 | if (op->stats.ac) |
400 | if (op->stats.ac) |
398 | op->stats.ac += lmt->ac; |
401 | op->stats.ac += lmt->ac; |
399 | for (j = 0; j < NROFATTACKS; j++) |
402 | for (j = 0; j < NROFATTACKS; j++) |
400 | if (op->resist[j] != 0) |
403 | if (op->resist[j] != 0) |
… | |
… | |
404 | op->resist[j] = 100; |
407 | op->resist[j] = 100; |
405 | if (op->resist[j] < -100) |
408 | if (op->resist[j] < -100) |
406 | op->resist[j] = -100; |
409 | op->resist[j] = -100; |
407 | } |
410 | } |
408 | } |
411 | } |
409 | op->materialname = add_string (lmt->name); |
412 | op->materialname = lmt->name; |
410 | /* dont make it unstackable if it doesn't need to be */ |
413 | /* dont make it unstackable if it doesn't need to be */ |
411 | if (IS_WEAPON (op) || IS_ARMOR (op)) |
414 | if (op->is_weapon () || op->is_armor ()) |
412 | { |
415 | { |
413 | op->weight = (op->weight * lmt->weight) / 100; |
416 | op->weight = (op->weight * lmt->weight) / 100; |
414 | op->value = (op->value * lmt->value) / 100; |
417 | op->value = (op->value * lmt->value) / 100; |
415 | } |
418 | } |
416 | #endif |
419 | #endif |
… | |
… | |
531 | |
534 | |
532 | strncpy (tmp, input, MAX_BUF - 5); |
535 | strncpy (tmp, input, MAX_BUF - 5); |
533 | /*trim all trailing commas, spaces etc. */ |
536 | /*trim all trailing commas, spaces etc. */ |
534 | for (i = strlen (tmp); !isalnum (tmp[i]) && i >= 0; i--) |
537 | for (i = strlen (tmp); !isalnum (tmp[i]) && i >= 0; i--) |
535 | tmp[i] = '\0'; |
538 | tmp[i] = '\0'; |
|
|
539 | |
536 | strcat (tmp, "."); |
540 | strcat (tmp, "."); |
537 | |
541 | |
538 | p = strrchr (tmp, ','); |
542 | p = strrchr (tmp, ','); |
539 | if (p) |
543 | if (p) |
540 | { |
544 | { |
… | |
… | |
544 | strcat (input, " and"); |
548 | strcat (input, " and"); |
545 | strcat (input, p); |
549 | strcat (input, p); |
546 | } |
550 | } |
547 | else |
551 | else |
548 | strcpy (input, tmp); |
552 | strcpy (input, tmp); |
|
|
553 | |
549 | return; |
554 | return; |
550 | } |
555 | } |
551 | |
556 | |
|
|
557 | ///////////////////////////////////////////////////////////////////////////// |
|
|
558 | |
552 | void * |
559 | void |
553 | zero_initialised::operator new (size_t s, void *p) |
560 | fork_abort (const char *msg) |
554 | { |
561 | { |
555 | memset (p, 0, s); |
562 | if (!fork ()) |
|
|
563 | { |
|
|
564 | signal (SIGABRT, SIG_DFL); |
|
|
565 | abort (); |
|
|
566 | } |
|
|
567 | |
|
|
568 | LOG (llevError, "fork abort: %s\n", msg); |
|
|
569 | } |
|
|
570 | |
|
|
571 | void *salloc_ (int n) throw (std::bad_alloc) |
|
|
572 | { |
|
|
573 | #ifdef PREFER_MALLOC |
|
|
574 | void *ptr = malloc (n); |
|
|
575 | #else |
|
|
576 | void *ptr = g_slice_alloc (n); |
|
|
577 | #endif |
|
|
578 | |
|
|
579 | if (!ptr) |
|
|
580 | throw std::bad_alloc (); |
|
|
581 | |
556 | return p; |
582 | return ptr; |
557 | } |
583 | } |
558 | |
584 | |
559 | void * |
585 | void *salloc_ (int n, void *src) throw (std::bad_alloc) |
560 | zero_initialised::operator new (size_t s) |
|
|
561 | { |
586 | { |
562 | //return calloc (1, s); |
587 | void *ptr = salloc_ (n); |
563 | return g_slice_alloc0 (s); |
|
|
564 | } |
|
|
565 | |
588 | |
566 | void * |
589 | if (src) |
567 | zero_initialised::operator new[] (size_t s) |
590 | memcpy (ptr, src, n); |
568 | { |
591 | else |
569 | //return calloc (1, s); |
592 | memset (ptr, 0, n); |
570 | return g_slice_alloc0 (s); |
|
|
571 | } |
|
|
572 | |
593 | |
573 | void |
594 | return ptr; |
574 | zero_initialised::operator delete (void *p, size_t s) |
|
|
575 | { |
|
|
576 | //free (p); return; |
|
|
577 | g_slice_free1 (s, p); |
|
|
578 | } |
595 | } |
579 | |
596 | |
580 | void |
597 | void assign (char *dst, const char *src, int maxlen) |
581 | zero_initialised::operator delete[] (void *p, size_t s) |
|
|
582 | { |
598 | { |
583 | //free (p); return; |
599 | if (!src) |
584 | g_slice_free1 (s, p); |
600 | src = ""; |
|
|
601 | |
|
|
602 | int len = strlen (src); |
|
|
603 | |
|
|
604 | if (len >= maxlen - 1) |
|
|
605 | { |
|
|
606 | if (maxlen <= 4) |
|
|
607 | { |
|
|
608 | memset (dst, '.', maxlen - 1); |
|
|
609 | dst [maxlen - 1] = 0; |
|
|
610 | } |
|
|
611 | else |
|
|
612 | { |
|
|
613 | memcpy (dst, src, maxlen - 4); |
|
|
614 | memcpy (dst + maxlen - 4, "...", 4); |
|
|
615 | } |
|
|
616 | } |
|
|
617 | else |
|
|
618 | memcpy (dst, src, len + 1); |
585 | } |
619 | } |
|
|
620 | |
|
|
621 | tstamp now () |
|
|
622 | { |
|
|
623 | struct timeval tv; |
|
|
624 | |
|
|
625 | gettimeofday (&tv, 0); |
|
|
626 | return tstamp (tv.tv_sec) + tstamp (tv.tv_usec) * tstamp (1e-6); |
|
|
627 | } |
|
|
628 | |
|
|
629 | int |
|
|
630 | similar_direction (int a, int b) |
|
|
631 | { |
|
|
632 | if (!a || !b) |
|
|
633 | return 0; |
|
|
634 | |
|
|
635 | int diff = (b - a) & 7; |
|
|
636 | return diff <= 1 || diff >= 7; |
|
|
637 | } |
|
|
638 | |