1 | /* |
1 | /* |
2 | * This file is part of Deliantra, the Roguelike Realtime MMORPG. |
2 | * This file is part of Deliantra, the Roguelike Realtime MMORPG. |
3 | * |
3 | * |
|
|
4 | * Copyright (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team |
4 | * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
5 | * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
5 | * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team |
6 | * Copyright (©) 2001 Mark Wedel & Crossfire Development Team |
6 | * Copyright (©) 1992,2007 Frank Tore Johansen |
7 | * Copyright (©) 1992 Frank Tore Johansen |
7 | * |
8 | * |
8 | * Deliantra is free software: you can redistribute it and/or modify it under |
9 | * Deliantra is free software: you can redistribute it and/or modify it under |
9 | * the terms of the Affero GNU General Public License as published by the |
10 | * the terms of the Affero GNU General Public License as published by the |
10 | * Free Software Foundation, either version 3 of the License, or (at your |
11 | * Free Software Foundation, either version 3 of the License, or (at your |
11 | * option) any later version. |
12 | * option) any later version. |
12 | * |
13 | * |
13 | * This program is distributed in the hope that it will be useful, |
14 | * This program is distributed in the hope that it will be useful, |
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
15 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
16 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
16 | * GNU General Public License for more details. |
17 | * GNU General Public License for more details. |
17 | * |
18 | * |
18 | * You should have received a copy of the Affero GNU General Public License |
19 | * You should have received a copy of the Affero GNU General Public License |
19 | * and the GNU General Public License along with this program. If not, see |
20 | * and the GNU General Public License along with this program. If not, see |
20 | * <http://www.gnu.org/licenses/>. |
21 | * <http://www.gnu.org/licenses/>. |
21 | * |
22 | * |
22 | * The authors can be reached via e-mail to <support@deliantra.net> |
23 | * The authors can be reached via e-mail to <support@deliantra.net> |
23 | */ |
24 | */ |
24 | |
25 | |
25 | #include <global.h> |
26 | #include <global.h> |
26 | #include <stdio.h> |
27 | #include <stdio.h> |
27 | #include <sys/types.h> |
28 | #include <sys/types.h> |
28 | #include <sys/uio.h> |
29 | #include <sys/uio.h> |
29 | #include <object.h> |
30 | #include <object.h> |
30 | #include <sproto.h> |
31 | #include <sproto.h> |
31 | #include <loader.h> |
|
|
32 | |
32 | |
33 | #include <bitset> |
33 | #include <bitset> |
34 | |
34 | |
35 | UUID UUID::cur; |
35 | UUID UUID::cur; |
36 | static uint64_t seq_next_save; |
36 | static uint64_t seq_next_save; |
… | |
… | |
38 | uint32_t mapspace::smellcount = 10000; |
38 | uint32_t mapspace::smellcount = 10000; |
39 | |
39 | |
40 | objectvec objects; |
40 | objectvec objects; |
41 | activevec actives; |
41 | activevec actives; |
42 | |
42 | |
|
|
43 | freelist_item *object::freelist; |
|
|
44 | uint32_t object::object_count; |
|
|
45 | uint32_t object::free_count; |
|
|
46 | uint32_t object::create_count; |
|
|
47 | uint32_t object::destroy_count; |
|
|
48 | |
43 | //+GPL |
49 | //+GPL |
44 | |
50 | |
45 | short freearr_x[SIZEOFFREE] = { |
51 | int freearr_x[SIZEOFFREE] = { |
46 | 0, |
52 | 0, |
47 | 0, 1, 1, 1, 0, -1, -1, -1, |
53 | 0, 1, 1, 1, 0, -1, -1, -1, |
48 | 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, |
54 | 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, |
49 | 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1 |
55 | 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1 |
50 | }; |
56 | }; |
51 | short freearr_y[SIZEOFFREE] = { |
57 | int freearr_y[SIZEOFFREE] = { |
52 | 0, |
58 | 0, |
53 | -1, -1, 0, 1, 1, 1, 0, -1, |
59 | -1, -1, 0, 1, 1, 1, 0, -1, |
54 | -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, |
60 | -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, |
55 | -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3 |
61 | -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3 |
56 | }; |
62 | }; |
… | |
… | |
66 | 9, 10, 13, 14, 17, 18, 21, 22, |
72 | 9, 10, 13, 14, 17, 18, 21, 22, |
67 | 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48, |
73 | 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48, |
68 | 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49 |
74 | 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49 |
69 | }; |
75 | }; |
70 | |
76 | |
|
|
77 | const char *wall_suffix[16] = { |
|
|
78 | "0", |
|
|
79 | "1_3", |
|
|
80 | "1_4", |
|
|
81 | "2_1_2", |
|
|
82 | "1_2", |
|
|
83 | "2_2_4", |
|
|
84 | "2_2_1", |
|
|
85 | "3_1", |
|
|
86 | "1_1", |
|
|
87 | "2_2_3", |
|
|
88 | "2_2_2", |
|
|
89 | "3_3", |
|
|
90 | "2_1_1", |
|
|
91 | "3_4", |
|
|
92 | "3_2", |
|
|
93 | "4" |
|
|
94 | }; |
|
|
95 | |
71 | static void |
96 | static void |
72 | write_uuid (uval64 skip, bool sync) |
97 | write_uuid (uval64 skip, bool sync) |
73 | { |
98 | { |
74 | CALL_BEGIN (2); |
99 | CALL_BEGIN (2); |
75 | CALL_ARG_SV (newSVval64 (skip)); |
100 | CALL_ARG_SV (newSVval64 (skip)); |
… | |
… | |
77 | CALL_CALL ("cf::write_uuid", G_DISCARD); |
102 | CALL_CALL ("cf::write_uuid", G_DISCARD); |
78 | CALL_END; |
103 | CALL_END; |
79 | } |
104 | } |
80 | |
105 | |
81 | static void |
106 | static void |
82 | read_uuid (void) |
107 | read_uuid () |
83 | { |
108 | { |
84 | char filename[MAX_BUF]; |
109 | char filename[MAX_BUF]; |
85 | |
110 | |
86 | sprintf (filename, "%s/uuid", settings.localdir); |
111 | sprintf (filename, "%s/uuid", settings.localdir); |
87 | |
112 | |
… | |
… | |
101 | |
126 | |
102 | LOG (llevError, "FATAL: cannot open %s for reading!\n", filename); |
127 | LOG (llevError, "FATAL: cannot open %s for reading!\n", filename); |
103 | _exit (1); |
128 | _exit (1); |
104 | } |
129 | } |
105 | |
130 | |
106 | UUID::BUF buf; |
131 | char buf [UUID::MAX_LEN]; |
107 | buf[0] = 0; |
132 | buf[0] = 0; |
108 | fgets (buf, sizeof (buf), fp); |
133 | fgets (buf, sizeof (buf), fp); |
109 | |
134 | |
110 | if (!UUID::cur.parse (buf)) |
135 | if (!UUID::cur.parse (buf)) |
111 | { |
136 | { |
… | |
… | |
138 | |
163 | |
139 | void |
164 | void |
140 | UUID::init () |
165 | UUID::init () |
141 | { |
166 | { |
142 | read_uuid (); |
167 | read_uuid (); |
|
|
168 | } |
|
|
169 | |
|
|
170 | bool |
|
|
171 | UUID::parse (const char *s) |
|
|
172 | { |
|
|
173 | if (*s++ != '<' || *s++ != '1' || *s++ != '.') |
|
|
174 | return false; |
|
|
175 | |
|
|
176 | seq = 0; |
|
|
177 | |
|
|
178 | while (*s != '>') |
|
|
179 | { |
|
|
180 | if (*s < '0') |
|
|
181 | return false; |
|
|
182 | |
|
|
183 | // this gives nice branchless code with gcc |
|
|
184 | assert ('0' < 'a' && '0' == 48 && 'a' == 97); |
|
|
185 | int digit = (*s + (*s & 0x40 ? 9 : 0)) & 15; |
|
|
186 | |
|
|
187 | seq = (seq << 4) | digit; |
|
|
188 | |
|
|
189 | ++s; |
|
|
190 | } |
|
|
191 | |
|
|
192 | return true; |
|
|
193 | } |
|
|
194 | |
|
|
195 | char * |
|
|
196 | UUID::append (char *buf) const |
|
|
197 | { |
|
|
198 | *buf++ = '<'; |
|
|
199 | *buf++ = '1'; |
|
|
200 | *buf++ = '.'; |
|
|
201 | |
|
|
202 | uint64_t seq = this->seq; |
|
|
203 | const int bits = 64; |
|
|
204 | char nz = 0; |
|
|
205 | static const char tohex [] = "0123456789abcdef"; |
|
|
206 | |
|
|
207 | // assert (len >= 3 + bits / 4 + 1 + 1); |
|
|
208 | for (int i = bits / 4; --i; ) |
|
|
209 | { |
|
|
210 | uint8_t digit = seq >> (bits - 4); |
|
|
211 | |
|
|
212 | *buf = tohex [digit]; |
|
|
213 | nz |= digit; |
|
|
214 | buf += nz ? 1 : 0; |
|
|
215 | seq <<= 4; |
|
|
216 | } |
|
|
217 | |
|
|
218 | // last digit is special - always emit |
|
|
219 | uint8_t digit = seq >> (bits - 4); |
|
|
220 | *buf++ = tohex [digit]; |
|
|
221 | |
|
|
222 | *buf++ = '>'; |
|
|
223 | |
|
|
224 | return buf; |
|
|
225 | } |
|
|
226 | |
|
|
227 | char * |
|
|
228 | UUID::c_str () const |
|
|
229 | { |
|
|
230 | static char buf [MAX_LEN]; |
|
|
231 | *append (buf) = 0; |
|
|
232 | return buf; |
143 | } |
233 | } |
144 | |
234 | |
145 | /* Returns TRUE if every key_values in wants has a partner with the same value in has. */ |
235 | /* Returns TRUE if every key_values in wants has a partner with the same value in has. */ |
146 | static bool |
236 | static bool |
147 | compare_ob_value_lists_one (const object *wants, const object *has) |
237 | compare_ob_value_lists_one (const object *wants, const object *has) |
148 | { |
238 | { |
149 | /* n-squared behaviour (see kv_get), but I'm hoping both |
239 | /* n-squared behaviour (see kv.get), but I'm hoping both |
150 | * objects with lists are rare, and lists stay short. If not, use a |
240 | * objects with lists are rare, and lists stay short. If not, use a |
151 | * different structure or at least keep the lists sorted... |
241 | * different structure or at least keep the lists sorted... |
152 | */ |
242 | */ |
153 | |
243 | |
154 | /* For each field in wants, */ |
244 | /* For each field in wants, */ |
155 | for (key_value *kv = wants->key_values; kv; kv = kv->next) |
245 | for (key_value *kv = wants->kv.first; kv; kv = kv->next) |
156 | if (has->kv_get (kv->key) != kv->value) |
246 | if (has->kv.get (kv->key) != kv->value) |
157 | return false; |
247 | return false; |
158 | |
248 | |
159 | /* If we get here, every field in wants has a matching field in has. */ |
249 | /* If we get here, every field in wants has a matching field in has. */ |
160 | return true; |
250 | return true; |
161 | } |
251 | } |
… | |
… | |
183 | * Improvements made with merge: Better checking on potion, and also |
273 | * Improvements made with merge: Better checking on potion, and also |
184 | * check weight |
274 | * check weight |
185 | */ |
275 | */ |
186 | bool object::can_merge_slow (object *ob1, object *ob2) |
276 | bool object::can_merge_slow (object *ob1, object *ob2) |
187 | { |
277 | { |
188 | /* A couple quicksanity checks */ |
278 | /* A couple quick sanity checks */ |
189 | if (ob1 == ob2 |
279 | if (ob1 == ob2 |
190 | || ob1->type != ob2->type |
280 | || ob1->type != ob2->type |
191 | || ob1->speed != ob2->speed |
|
|
192 | || ob1->value != ob2->value |
281 | || ob1->value != ob2->value |
193 | || ob1->name != ob2->name) |
282 | || ob1->name != ob2->name |
|
|
283 | || ob1->custom_name != ob2->custom_name |
|
|
284 | || fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED) |
194 | return 0; |
285 | return 0; |
195 | |
286 | |
196 | /* Do not merge objects if nrof would overflow, assume nrof |
287 | /* Do not merge objects if nrof would overflow, assume nrof |
197 | * is always 0 .. 2**31-1 */ |
288 | * is always 0 .. 2**31-1 */ |
198 | if (ob1->nrof > 0x7fffffff - ob2->nrof) |
289 | if (ob1->nrof > 0x7fffffff - ob2->nrof) |
… | |
… | |
202 | * This is to the comparison of the flags below will be OK. We |
293 | * This is to the comparison of the flags below will be OK. We |
203 | * just can't ignore the been applied or identified flags, as they |
294 | * just can't ignore the been applied or identified flags, as they |
204 | * are not equal - just if it has been identified, the been_applied |
295 | * are not equal - just if it has been identified, the been_applied |
205 | * flags lose any meaning. |
296 | * flags lose any meaning. |
206 | */ |
297 | */ |
207 | if (QUERY_FLAG (ob1, FLAG_IDENTIFIED)) |
298 | if (ob1->flag [FLAG_IDENTIFIED]) |
208 | SET_FLAG (ob1, FLAG_BEEN_APPLIED); |
299 | ob1->set_flag (FLAG_BEEN_APPLIED); |
209 | |
300 | |
210 | if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) |
301 | if (ob2->flag [FLAG_IDENTIFIED]) |
211 | SET_FLAG (ob2, FLAG_BEEN_APPLIED); |
302 | ob2->set_flag (FLAG_BEEN_APPLIED); |
212 | |
303 | |
213 | if (ob1->arch->archname != ob2->arch->archname |
304 | if (ob1->arch->archname != ob2->arch->archname |
214 | || ob1->name != ob2->name |
305 | || ob1->name != ob2->name |
215 | || ob1->title != ob2->title |
306 | || ob1->title != ob2->title |
216 | || ob1->msg != ob2->msg |
307 | || ob1->msg != ob2->msg |
… | |
… | |
219 | || ob1->magic != ob2->magic |
310 | || ob1->magic != ob2->magic |
220 | || ob1->slaying != ob2->slaying |
311 | || ob1->slaying != ob2->slaying |
221 | || ob1->skill != ob2->skill |
312 | || ob1->skill != ob2->skill |
222 | || ob1->value != ob2->value |
313 | || ob1->value != ob2->value |
223 | || ob1->animation_id != ob2->animation_id |
314 | || ob1->animation_id != ob2->animation_id |
224 | || (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other |
315 | || (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependend on each other |
225 | || ob1->client_type != ob2->client_type |
316 | || ob1->client_type != ob2->client_type |
226 | || ob1->materialname != ob2->materialname |
317 | || ob1->material != ob2->material |
227 | || ob1->lore != ob2->lore |
318 | || ob1->lore != ob2->lore |
228 | || ob1->subtype != ob2->subtype |
319 | || ob1->subtype != ob2->subtype |
229 | || ob1->move_type != ob2->move_type |
320 | || ob1->move_type != ob2->move_type |
230 | || ob1->move_block != ob2->move_block |
321 | || ob1->move_block != ob2->move_block |
231 | || ob1->move_allow != ob2->move_allow |
322 | || ob1->move_allow != ob2->move_allow |
232 | || ob1->move_on != ob2->move_on |
323 | || ob1->move_on != ob2->move_on |
233 | || ob1->move_off != ob2->move_off |
324 | || ob1->move_off != ob2->move_off |
234 | || ob1->move_slow != ob2->move_slow |
325 | || ob1->move_slow != ob2->move_slow |
235 | || ob1->move_slow_penalty != ob2->move_slow_penalty |
326 | || fabs (ob1->move_slow_penalty - ob2->move_slow_penalty) >= (1.f / 1024.f) |
236 | || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) |
327 | || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) |
237 | || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats))) |
328 | || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats))) |
238 | return 0; |
329 | return 0; |
239 | |
330 | |
240 | if ((ob1->flag ^ ob2->flag) |
331 | if ((ob1->flag ^ ob2->flag) |
… | |
… | |
261 | /* inventory ok - still need to check rest of this object to see |
352 | /* inventory ok - still need to check rest of this object to see |
262 | * if it is valid. |
353 | * if it is valid. |
263 | */ |
354 | */ |
264 | } |
355 | } |
265 | |
356 | |
266 | /* Don't merge objects that are applied. With the new 'body' code, |
357 | /* Don't merge objects that are applied. With the new 'body' code, |
267 | * it is possible for most any character to have more than one of |
358 | * it is possible for most any character to have more than one of |
268 | * some items equipped, and we don't want those to merge. |
359 | * some items equipped, and we don't want those to merge. |
269 | */ |
360 | */ |
270 | if (QUERY_FLAG (ob1, FLAG_APPLIED) || QUERY_FLAG (ob2, FLAG_APPLIED)) |
361 | if (ob1->flag [FLAG_APPLIED] || ob2->flag [FLAG_APPLIED]) |
271 | return 0; |
362 | return 0; |
272 | |
363 | |
273 | /* Note sure why the following is the case - either the object has to |
364 | /* Not sure why the following is the case - either the object has to |
274 | * be animated or have a very low speed. Is this an attempted monster |
365 | * be animated or have a very low speed. Is this an attempted monster |
275 | * check? |
366 | * check? |
276 | */ |
367 | */ |
277 | if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ()) |
368 | if (!ob1->flag [FLAG_ANIMATE] && ob1->has_active_speed ()) |
278 | return 0; |
369 | return 0; |
279 | |
370 | |
280 | switch (ob1->type) |
371 | switch (ob1->type) |
281 | { |
372 | { |
282 | case SCROLL: |
373 | case SCROLL: |
283 | if (ob1->level != ob2->level) |
374 | if (ob1->level != ob2->level) |
284 | return 0; |
375 | return 0; |
285 | break; |
376 | break; |
286 | } |
377 | } |
287 | |
378 | |
288 | if (ob1->key_values || ob2->key_values) |
379 | if (!ob1->kv.empty () || !ob2->kv.empty ()) |
289 | { |
380 | { |
290 | /* At least one of these has key_values. */ |
381 | /* At least one of these has key_values. */ |
291 | if ((!ob1->key_values) != (!ob2->key_values)) |
382 | if (ob1->kv.empty () != ob2->kv.empty ()) |
292 | return 0; /* One has fields, but the other one doesn't. */ |
383 | return 0; /* One has fields, but the other one doesn't. */ |
293 | |
384 | |
294 | if (!compare_ob_value_lists (ob1, ob2)) |
385 | if (!compare_ob_value_lists (ob1, ob2)) |
295 | return 0; |
386 | return 0; |
296 | } |
387 | } |
… | |
… | |
356 | |
447 | |
357 | return 0; |
448 | return 0; |
358 | } |
449 | } |
359 | |
450 | |
360 | // adjust weight per container type ("of holding") |
451 | // adjust weight per container type ("of holding") |
361 | static sint32 |
452 | static weight_t |
362 | weight_adjust_for (object *op, sint32 weight) |
453 | weight_adjust_for (object *op, weight_t weight) |
363 | { |
454 | { |
364 | return op->type == CONTAINER |
455 | if (op->type == CONTAINER) |
365 | ? lerp (weight, 0, 100, 0, 100 - op->stats.Str) |
456 | weight -= weight * op->stats.Str / 100; |
366 | : weight; |
|
|
367 | } |
|
|
368 | |
457 | |
|
|
458 | return weight; |
|
|
459 | } |
|
|
460 | |
369 | /* |
461 | /* |
370 | * adjust_weight(object, weight) adds the specified weight to an object, |
462 | * subtracts, then adds, the specified weight to an object, |
371 | * and also updates how much the environment(s) is/are carrying. |
463 | * and also updates how much the environment(s) is/are carrying. |
372 | */ |
464 | */ |
373 | static void |
465 | static void |
374 | adjust_weight (object *op, sint32 weight) |
466 | adjust_weight (object *op, weight_t sub, weight_t add) |
375 | { |
467 | { |
376 | while (op) |
468 | while (op) |
377 | { |
469 | { |
378 | // adjust by actual difference to account for rounding errors |
470 | weight_t carrying = (weight_t)op->carrying |
379 | // i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct |
471 | - weight_adjust_for (op, sub) |
380 | weight = weight_adjust_for (op, op->carrying) |
472 | + weight_adjust_for (op, add); |
381 | - weight_adjust_for (op, op->carrying - weight); |
|
|
382 | |
473 | |
383 | if (!weight) |
474 | sub = op->carrying; |
384 | return; |
|
|
385 | |
|
|
386 | op->carrying += weight; |
475 | op->carrying = carrying; |
|
|
476 | add = op->carrying; |
387 | |
477 | |
388 | if (object *pl = op->visible_to ()) |
478 | if (object *pl = op->visible_to ()) |
389 | if (pl != op) // player is handled lazily |
479 | if (pl != op) // player is handled lazily |
390 | esrv_update_item (UPD_WEIGHT, pl, op); |
480 | esrv_update_item (UPD_WEIGHT, pl, op); |
391 | |
481 | |
… | |
… | |
399 | * containers are carrying, and sums it up. |
489 | * containers are carrying, and sums it up. |
400 | */ |
490 | */ |
401 | void |
491 | void |
402 | object::update_weight () |
492 | object::update_weight () |
403 | { |
493 | { |
404 | sint32 sum = 0; |
494 | weight_t sum = 0; |
405 | |
495 | |
406 | for (object *op = inv; op; op = op->below) |
496 | for (object *op = inv; op; op = op->below) |
407 | { |
497 | { |
408 | if (op->inv) |
|
|
409 | op->update_weight (); |
498 | op->update_weight (); |
410 | |
499 | |
411 | sum += op->total_weight (); |
500 | sum += weight_adjust_for (this, op->total_weight ()); |
412 | } |
501 | } |
413 | |
|
|
414 | sum = weight_adjust_for (this, sum); |
|
|
415 | |
502 | |
416 | if (sum != carrying) |
503 | if (sum != carrying) |
417 | { |
504 | { |
|
|
505 | if (carrying != sum && carrying)//D |
|
|
506 | LOG (llevDebug, "updating carrying got %ld, expected %ld (%s)\n", |
|
|
507 | (long long)sum, (long long)carrying, debug_desc ()); |
|
|
508 | |
418 | carrying = sum; |
509 | carrying = sum; |
419 | |
510 | |
420 | if (object *pl = visible_to ()) |
511 | if (object *pl = visible_to ()) |
421 | if (pl != this) // player is handled lazily |
512 | if (pl != this) // player is handled lazily |
422 | esrv_update_item (UPD_WEIGHT, pl, this); |
513 | esrv_update_item (UPD_WEIGHT, pl, this); |
… | |
… | |
450 | object * |
541 | object * |
451 | find_object (tag_t i) |
542 | find_object (tag_t i) |
452 | { |
543 | { |
453 | for_all_objects (op) |
544 | for_all_objects (op) |
454 | if (op->count == i) |
545 | if (op->count == i) |
|
|
546 | return op; |
|
|
547 | |
|
|
548 | return 0; |
|
|
549 | } |
|
|
550 | |
|
|
551 | /* |
|
|
552 | * Returns the object which has the uuid equal to the argument. |
|
|
553 | * MOAR VERRRY slow. |
|
|
554 | */ |
|
|
555 | |
|
|
556 | object * |
|
|
557 | find_object_uuid (UUID i) |
|
|
558 | { |
|
|
559 | for_all_objects (op) |
|
|
560 | if (op->uuid == i) |
455 | return op; |
561 | return op; |
456 | |
562 | |
457 | return 0; |
563 | return 0; |
458 | } |
564 | } |
459 | |
565 | |
… | |
… | |
493 | LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ()); |
599 | LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ()); |
494 | return; |
600 | return; |
495 | } |
601 | } |
496 | |
602 | |
497 | this->owner = owner; |
603 | this->owner = owner; |
498 | } |
|
|
499 | |
|
|
500 | int |
|
|
501 | object::slottype () const |
|
|
502 | { |
|
|
503 | if (type == SKILL) |
|
|
504 | { |
|
|
505 | if (IS_COMBAT_SKILL (subtype)) return slot_combat; |
|
|
506 | if (IS_RANGED_SKILL (subtype)) return slot_ranged; |
|
|
507 | } |
|
|
508 | else |
|
|
509 | { |
|
|
510 | if (slot [body_combat].info) return slot_combat; |
|
|
511 | if (slot [body_range ].info) return slot_ranged; |
|
|
512 | } |
|
|
513 | |
|
|
514 | return slot_none; |
|
|
515 | } |
|
|
516 | |
|
|
517 | bool |
|
|
518 | object::change_weapon (object *ob) |
|
|
519 | { |
|
|
520 | if (current_weapon == ob) |
|
|
521 | return true; |
|
|
522 | |
|
|
523 | if (chosen_skill) |
|
|
524 | chosen_skill->flag [FLAG_APPLIED] = false; |
|
|
525 | |
|
|
526 | current_weapon = ob; |
|
|
527 | chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill); |
|
|
528 | |
|
|
529 | if (chosen_skill) |
|
|
530 | chosen_skill->flag [FLAG_APPLIED] = true; |
|
|
531 | |
|
|
532 | update_stats (); |
|
|
533 | |
|
|
534 | if (ob) |
|
|
535 | { |
|
|
536 | // now check wether any body locations became invalid, in which case |
|
|
537 | // we cannot apply the weapon at the moment. |
|
|
538 | for (int i = 0; i < NUM_BODY_LOCATIONS; ++i) |
|
|
539 | if (slot[i].used < 0) |
|
|
540 | { |
|
|
541 | current_weapon = chosen_skill = 0; |
|
|
542 | update_stats (); |
|
|
543 | |
|
|
544 | new_draw_info_format (NDI_UNIQUE, 0, this, |
|
|
545 | "You try to balance all your items at once, " |
|
|
546 | "but the %s is just too much for your body. " |
|
|
547 | "[You need to unapply some items first - use the 'body' command to see " |
|
|
548 | "how many items you cna wera on a specific body part.]", &ob->name); |
|
|
549 | return false; |
|
|
550 | } |
|
|
551 | |
|
|
552 | //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name); |
|
|
553 | } |
|
|
554 | else |
|
|
555 | ;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons."); |
|
|
556 | |
|
|
557 | if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL) |
|
|
558 | { |
|
|
559 | LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s", |
|
|
560 | &name, ob->debug_desc ()); |
|
|
561 | return false; |
|
|
562 | } |
|
|
563 | |
|
|
564 | return true; |
|
|
565 | } |
|
|
566 | |
|
|
567 | /* Zero the key_values on op, decrementing the shared-string |
|
|
568 | * refcounts and freeing the links. |
|
|
569 | */ |
|
|
570 | static void |
|
|
571 | free_key_values (object *op) |
|
|
572 | { |
|
|
573 | for (key_value *i = op->key_values; i; ) |
|
|
574 | { |
|
|
575 | key_value *next = i->next; |
|
|
576 | delete i; |
|
|
577 | |
|
|
578 | i = next; |
|
|
579 | } |
|
|
580 | |
|
|
581 | op->key_values = 0; |
|
|
582 | } |
604 | } |
583 | |
605 | |
584 | /* |
606 | /* |
585 | * copy_to first frees everything allocated by the dst object, |
607 | * copy_to first frees everything allocated by the dst object, |
586 | * and then copies the contents of itself into the second |
608 | * and then copies the contents of itself into the second |
… | |
… | |
592 | void |
614 | void |
593 | object::copy_to (object *dst) |
615 | object::copy_to (object *dst) |
594 | { |
616 | { |
595 | dst->remove (); |
617 | dst->remove (); |
596 | *(object_copy *)dst = *this; |
618 | *(object_copy *)dst = *this; |
|
|
619 | |
|
|
620 | // maybe move to object_copy? |
|
|
621 | dst->kv = kv; |
|
|
622 | |
597 | dst->flag [FLAG_REMOVED] = true; |
623 | dst->flag [FLAG_REMOVED] = true; |
598 | |
|
|
599 | /* Copy over key_values, if any. */ |
|
|
600 | if (key_values) |
|
|
601 | { |
|
|
602 | key_value *tail = 0; |
|
|
603 | dst->key_values = 0; |
|
|
604 | |
|
|
605 | for (key_value *i = key_values; i; i = i->next) |
|
|
606 | { |
|
|
607 | key_value *new_link = new key_value; |
|
|
608 | |
|
|
609 | new_link->next = 0; |
|
|
610 | new_link->key = i->key; |
|
|
611 | new_link->value = i->value; |
|
|
612 | |
|
|
613 | /* Try and be clever here, too. */ |
|
|
614 | if (!dst->key_values) |
|
|
615 | { |
|
|
616 | dst->key_values = new_link; |
|
|
617 | tail = new_link; |
|
|
618 | } |
|
|
619 | else |
|
|
620 | { |
|
|
621 | tail->next = new_link; |
|
|
622 | tail = new_link; |
|
|
623 | } |
|
|
624 | } |
|
|
625 | } |
|
|
626 | |
|
|
627 | if (speed < 0) |
|
|
628 | dst->speed_left -= rndm (); |
|
|
629 | |
|
|
630 | dst->activate (); |
624 | dst->activate (); |
631 | } |
625 | } |
632 | |
626 | |
633 | void |
627 | void |
634 | object::instantiate () |
628 | object::instantiate () |
635 | { |
629 | { |
636 | if (!uuid.seq) // HACK |
630 | if (!uuid.seq) // HACK |
637 | uuid = UUID::gen (); |
631 | uuid = UUID::gen (); |
638 | |
632 | |
|
|
633 | // TODO: unclean state changes, should not be done in copy_to AND instantiate |
|
|
634 | if (flag [FLAG_RANDOM_SPEED] && speed) |
|
|
635 | speed_left = - speed - rndm (); // TODO animation |
|
|
636 | else |
639 | speed_left = -0.1f; |
637 | speed_left = -1.; |
|
|
638 | |
640 | /* copy the body_info to the body_used - this is only really |
639 | /* copy the body_info to the body_used - this is only really |
641 | * need for monsters, but doesn't hurt to do it for everything. |
640 | * need for monsters, but doesn't hurt to do it for everything. |
642 | * by doing so, when a monster is created, it has good starting |
641 | * by doing so, when a monster is created, it has good starting |
643 | * values for the body_used info, so when items are created |
642 | * values for the body_used info, so when items are created |
644 | * for it, they can be properly equipped. |
643 | * for it, they can be properly equipped. |
645 | */ |
644 | */ |
646 | for (int i = NUM_BODY_LOCATIONS; i--; ) |
645 | for (int i = 0; i < NUM_BODY_LOCATIONS; ++i) |
647 | slot[i].used = slot[i].info; |
646 | slot[i].used = slot[i].info; |
648 | |
647 | |
649 | attachable::instantiate (); |
648 | attachable::instantiate (); |
650 | } |
649 | } |
651 | |
650 | |
652 | object * |
651 | object * |
653 | object::clone () |
652 | object::clone () |
654 | { |
653 | { |
655 | object *neu = create (); |
654 | object *neu = create (); |
656 | copy_to (neu); |
655 | copy_to (neu); |
|
|
656 | |
|
|
657 | // TODO: unclean state changes, should not be done in clone AND instantiate |
|
|
658 | if (neu->flag [FLAG_RANDOM_SPEED] && neu->speed) |
|
|
659 | neu->speed_left = - neu->speed - rndm (); // TODO animation |
|
|
660 | |
657 | neu->map = map; // not copied by copy_to |
661 | neu->map = map; // not copied by copy_to |
658 | return neu; |
662 | return neu; |
659 | } |
663 | } |
660 | |
664 | |
661 | /* |
665 | /* |
… | |
… | |
664 | * be called to update the face variable, _and_ how it looks on the map. |
668 | * be called to update the face variable, _and_ how it looks on the map. |
665 | */ |
669 | */ |
666 | void |
670 | void |
667 | update_turn_face (object *op) |
671 | update_turn_face (object *op) |
668 | { |
672 | { |
669 | if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch) |
673 | if (!op->flag [FLAG_IS_TURNABLE] || !op->arch) |
670 | return; |
674 | return; |
671 | |
675 | |
672 | SET_ANIMATION (op, op->direction); |
676 | SET_ANIMATION (op, op->direction); |
673 | update_object (op, UP_OBJ_FACE); |
677 | update_object (op, UP_OBJ_FACE); |
674 | } |
678 | } |
… | |
… | |
679 | * This function needs to be called whenever the speed of an object changes. |
683 | * This function needs to be called whenever the speed of an object changes. |
680 | */ |
684 | */ |
681 | void |
685 | void |
682 | object::set_speed (float speed) |
686 | object::set_speed (float speed) |
683 | { |
687 | { |
684 | if (flag [FLAG_FREED] && speed) |
|
|
685 | { |
|
|
686 | LOG (llevError, "Object %s is freed but has speed.\n", &name); |
|
|
687 | speed = 0; |
|
|
688 | } |
|
|
689 | |
|
|
690 | this->speed = speed; |
688 | this->speed = speed; |
691 | |
689 | |
692 | if (has_active_speed ()) |
690 | if (has_active_speed ()) |
693 | activate (); |
691 | activate (); |
694 | else |
692 | else |
… | |
… | |
741 | } |
739 | } |
742 | |
740 | |
743 | mapspace &m = op->ms (); |
741 | mapspace &m = op->ms (); |
744 | |
742 | |
745 | if (!(m.flags_ & P_UPTODATE)) |
743 | if (!(m.flags_ & P_UPTODATE)) |
746 | /* nop */; |
744 | m.update_up (); // nothing to do except copy up |
747 | else if (action == UP_OBJ_INSERT) |
745 | else if (action == UP_OBJ_INSERT) |
748 | { |
746 | { |
|
|
747 | #if 0 |
749 | // this is likely overkill, TODO: revisit (schmorp) |
748 | // this is likely overkill, TODO: revisit (schmorp) |
750 | if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) |
749 | if ((op->flag [FLAG_BLOCKSVIEW] && !(m.flags_ & P_BLOCKSVIEW)) |
751 | || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) |
750 | || (op->flag [FLAG_NO_MAGIC] && !(m.flags_ & P_NO_MAGIC)) |
752 | || (op->is_player () && !(m.flags_ & P_PLAYER)) |
751 | || (op->is_player () && !(m.flags_ & P_PLAYER)) |
753 | || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) |
752 | || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) |
754 | || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) |
753 | || (op->flag [FLAG_ALIVE] && !(m.flags_ & P_IS_ALIVE)) |
755 | || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) |
754 | || (op->flag [FLAG_DAMNED] && !(m.flags_ & P_NO_CLERIC)) |
756 | || (m.move_on | op->move_on ) != m.move_on |
755 | || (m.move_on | op->move_on ) != m.move_on |
757 | || (m.move_off | op->move_off ) != m.move_off |
756 | || (m.move_off | op->move_off ) != m.move_off |
758 | || (m.move_slow | op->move_slow) != m.move_slow |
757 | || (m.move_slow | op->move_slow) != m.move_slow |
759 | /* This isn't perfect, but I don't expect a lot of objects to |
758 | /* This isn't perfect, but I don't expect a lot of objects to |
760 | * have move_allow right now. |
759 | * have move_allow right now. |
761 | */ |
760 | */ |
762 | || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block |
761 | || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block |
763 | || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) |
|
|
764 | m.invalidate (); |
762 | m.invalidate (); |
|
|
763 | #else |
|
|
764 | // the above is not strong enough a test to skip updating. los maybe? TODO (schmorp) |
|
|
765 | m.invalidate (); |
|
|
766 | #endif |
765 | } |
767 | } |
766 | /* if the object is being removed, we can't make intelligent |
768 | /* if the object is being removed, we can't make intelligent |
767 | * decisions, because remove_ob can't really pass the object |
769 | * decisions, because remove_ob can't really pass the object |
768 | * that is being removed. |
770 | * that is being removed. |
769 | */ |
771 | */ |
770 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
772 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
771 | m.invalidate (); |
773 | m.invalidate (); |
772 | else if (action == UP_OBJ_FACE) |
774 | else if (action == UP_OBJ_FACE) |
773 | /* Nothing to do for that case */ ; |
775 | m.update_up (); // nothing to do for that case, except copy up |
774 | else |
776 | else |
775 | LOG (llevError, "update_object called with invalid action: %d\n", action); |
777 | LOG (llevError, "update_object called with invalid action: %d\n", action); |
776 | |
778 | |
777 | if (op->more) |
779 | if (op->more) |
778 | update_object (op->more, action); |
780 | update_object (op->more, action); |
779 | } |
781 | } |
780 | |
782 | |
781 | object::object () |
783 | object::object () |
782 | { |
784 | { |
783 | SET_FLAG (this, FLAG_REMOVED); |
785 | this->set_flag (FLAG_REMOVED); |
784 | |
786 | |
785 | //expmul = 1.0; declared const for the time being |
787 | //expmul = 1.0; declared const for the time being |
786 | face = blank_face; |
788 | face = blank_face; |
|
|
789 | material = MATERIAL_NULL; |
787 | } |
790 | } |
788 | |
791 | |
789 | object::~object () |
792 | object::~object () |
790 | { |
793 | { |
791 | unlink (); |
794 | unlink (); |
792 | |
795 | |
793 | free_key_values (this); |
796 | kv.clear (); |
794 | } |
797 | } |
795 | |
|
|
796 | static int object_count; |
|
|
797 | |
798 | |
798 | void object::link () |
799 | void object::link () |
799 | { |
800 | { |
800 | assert (!index);//D |
801 | assert (!index);//D |
801 | uuid = UUID::gen (); |
802 | uuid = UUID::gen (); |
802 | count = ++object_count; |
|
|
803 | |
803 | |
804 | refcnt_inc (); |
804 | refcnt_inc (); |
805 | objects.insert (this); |
805 | objects.insert (this); |
|
|
806 | |
|
|
807 | ++create_count; |
|
|
808 | |
806 | } |
809 | } |
807 | |
810 | |
808 | void object::unlink () |
811 | void object::unlink () |
809 | { |
812 | { |
810 | if (!index) |
813 | if (!index) |
811 | return; |
814 | return; |
|
|
815 | |
|
|
816 | ++destroy_count; |
812 | |
817 | |
813 | objects.erase (this); |
818 | objects.erase (this); |
814 | refcnt_dec (); |
819 | refcnt_dec (); |
815 | } |
820 | } |
816 | |
821 | |
… | |
… | |
839 | op->activate_recursive (); |
844 | op->activate_recursive (); |
840 | } |
845 | } |
841 | |
846 | |
842 | /* This function removes object 'op' from the list of active |
847 | /* This function removes object 'op' from the list of active |
843 | * objects. |
848 | * objects. |
844 | * This should only be used for style maps or other such |
849 | * This should only be used for style maps or other such |
845 | * reference maps where you don't want an object that isn't |
850 | * reference maps where you don't want an object that isn't |
846 | * in play chewing up cpu time getting processed. |
851 | * in play chewing up cpu time getting processed. |
847 | * The reverse of this is to call update_ob_speed, which |
852 | * The reverse of this is to call update_ob_speed, which |
848 | * will do the right thing based on the speed of the object. |
853 | * will do the right thing based on the speed of the object. |
849 | */ |
854 | */ |
… | |
… | |
895 | * if some form of movement is allowed, let objects |
900 | * if some form of movement is allowed, let objects |
896 | * drop on that space. |
901 | * drop on that space. |
897 | */ |
902 | */ |
898 | if (!drop_to_ground |
903 | if (!drop_to_ground |
899 | || !map |
904 | || !map |
900 | || map->in_memory != MAP_ACTIVE |
905 | || !map->linkable () |
901 | || map->no_drop |
906 | || map->no_drop |
902 | || ms ().move_block == MOVE_ALL) |
907 | || ms ().move_block == MOVE_ALL) |
903 | { |
908 | { |
904 | while (inv) |
909 | while (inv) |
905 | inv->destroy (); |
910 | inv->destroy (); |
… | |
… | |
921 | map->insert (op, x, y); |
926 | map->insert (op, x, y); |
922 | } |
927 | } |
923 | } |
928 | } |
924 | } |
929 | } |
925 | |
930 | |
|
|
931 | /* |
|
|
932 | * Remove and free all objects in the inventory of the given object. |
|
|
933 | * Unlike destroy_inv, this assumes the *this is destroyed as well |
|
|
934 | * well, so we can (and have to!) take shortcuts. |
|
|
935 | */ |
|
|
936 | void |
|
|
937 | object::destroy_inv_fast () |
|
|
938 | { |
|
|
939 | while (object *op = inv) |
|
|
940 | { |
|
|
941 | // remove from object the fast way |
|
|
942 | op->flag [FLAG_REMOVED] = true; |
|
|
943 | op->env = 0; |
|
|
944 | if ((inv = inv->below)) |
|
|
945 | inv->above = 0; |
|
|
946 | |
|
|
947 | // then destroy |
|
|
948 | op->destroy (); |
|
|
949 | } |
|
|
950 | } |
|
|
951 | |
|
|
952 | void |
|
|
953 | object::freelist_free (int count) |
|
|
954 | { |
|
|
955 | while (count-- && freelist) |
|
|
956 | { |
|
|
957 | freelist_item *next = freelist->next; |
|
|
958 | // count is being "destroyed" |
|
|
959 | |
|
|
960 | sfree ((char *)freelist, sizeof (object)); |
|
|
961 | |
|
|
962 | freelist = next; |
|
|
963 | --free_count; |
|
|
964 | } |
|
|
965 | } |
|
|
966 | |
|
|
967 | object * |
926 | object *object::create () |
968 | object::create () |
927 | { |
969 | { |
928 | object *op = new object; |
970 | object *op; |
|
|
971 | |
|
|
972 | if (freelist) |
|
|
973 | { |
|
|
974 | freelist_item li = *freelist; |
|
|
975 | memset (freelist, 0, sizeof (object)); |
|
|
976 | |
|
|
977 | op = new (freelist) object; |
|
|
978 | op->count = li.count; |
|
|
979 | |
|
|
980 | freelist = li.next; |
|
|
981 | --free_count; |
|
|
982 | } |
|
|
983 | else |
|
|
984 | { |
|
|
985 | void *ni = salloc0<char> (sizeof (object)); |
|
|
986 | |
|
|
987 | op = new(ni) object; |
|
|
988 | |
|
|
989 | op->count = ++object_count; |
|
|
990 | } |
|
|
991 | |
929 | op->link (); |
992 | op->link (); |
|
|
993 | |
930 | return op; |
994 | return op; |
931 | } |
995 | } |
932 | |
996 | |
933 | static struct freed_map : maptile |
997 | void |
|
|
998 | object::do_delete () |
934 | { |
999 | { |
935 | freed_map () |
1000 | uint32_t count = this->count; |
936 | { |
|
|
937 | path = "<freed objects map>"; |
|
|
938 | name = "/internal/freed_objects_map"; |
|
|
939 | width = 3; |
|
|
940 | height = 3; |
|
|
941 | no_drop = 1; |
|
|
942 | no_reset = 1; |
|
|
943 | |
1001 | |
944 | alloc (); |
1002 | this->~object (); |
945 | in_memory = MAP_ACTIVE; |
|
|
946 | } |
|
|
947 | |
1003 | |
948 | ~freed_map () |
1004 | freelist_item *li = (freelist_item *)this; |
949 | { |
1005 | li->next = freelist; |
950 | destroy (); |
1006 | li->count = count; |
951 | } |
1007 | |
952 | } freed_map; // freed objects are moved here to avoid crashes |
1008 | freelist = li; |
|
|
1009 | ++free_count; |
|
|
1010 | } |
953 | |
1011 | |
954 | void |
1012 | void |
955 | object::do_destroy () |
1013 | object::do_destroy () |
956 | { |
1014 | { |
957 | if (flag [FLAG_IS_LINKED]) |
1015 | if (flag [FLAG_IS_LINKED]) |
… | |
… | |
1000 | LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); |
1058 | LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); |
1001 | head->destroy (); |
1059 | head->destroy (); |
1002 | return; |
1060 | return; |
1003 | } |
1061 | } |
1004 | |
1062 | |
1005 | destroy_inv (false); |
1063 | destroy_inv_fast (); |
1006 | |
1064 | |
1007 | if (is_head ()) |
1065 | if (is_head ()) |
1008 | if (sound_destroy) |
1066 | if (sound_destroy) |
1009 | play_sound (sound_destroy); |
1067 | play_sound (sound_destroy); |
1010 | else if (flag [FLAG_MONSTER]) |
1068 | else if (flag [FLAG_MONSTER]) |
… | |
… | |
1031 | flag [FLAG_REMOVED] = true; |
1089 | flag [FLAG_REMOVED] = true; |
1032 | |
1090 | |
1033 | if (more) |
1091 | if (more) |
1034 | more->remove (); |
1092 | more->remove (); |
1035 | |
1093 | |
1036 | /* |
1094 | /* |
1037 | * In this case, the object to be removed is in someones |
1095 | * In this case, the object to be removed is in someones |
1038 | * inventory. |
1096 | * inventory. |
1039 | */ |
1097 | */ |
1040 | if (env) |
1098 | if (env) |
1041 | { |
1099 | { |
1042 | flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed |
1100 | flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed |
1043 | if (object *pl = visible_to ()) |
1101 | if (object *pl = visible_to ()) |
1044 | esrv_del_item (pl->contr, count); |
1102 | esrv_del_item (pl->contr, count); |
1045 | flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed |
1103 | flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed |
1046 | |
1104 | |
1047 | adjust_weight (env, -total_weight ()); |
1105 | adjust_weight (env, total_weight (), 0); |
1048 | |
1106 | |
1049 | object *pl = in_player (); |
1107 | object *pl = in_player (); |
1050 | |
1108 | |
1051 | /* we set up values so that it could be inserted into |
1109 | /* we set up values so that it could be inserted into |
1052 | * the map, but we don't actually do that - it is up |
1110 | * the map, but we don't actually do that - it is up |
… | |
… | |
1062 | |
1120 | |
1063 | above = 0; |
1121 | above = 0; |
1064 | below = 0; |
1122 | below = 0; |
1065 | env = 0; |
1123 | env = 0; |
1066 | |
1124 | |
1067 | /* NO_FIX_PLAYER is set when a great many changes are being |
1125 | if (pl && pl->is_player ()) |
1068 | * made to players inventory. If set, avoiding the call |
|
|
1069 | * to save cpu time. |
|
|
1070 | */ |
1126 | { |
1071 | if (pl) |
1127 | if (expect_false (pl->contr->combat_ob == this)) |
1072 | if (pl->is_player () && (glow_radius || !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER))) |
|
|
1073 | { |
1128 | { |
1074 | pl->update_stats (); |
1129 | pl->apply (pl->contr->combat_ob, AP_UNAPPLY | AP_IGNORE_CURSE); |
|
|
1130 | pl->contr->combat_ob = 0; |
|
|
1131 | if (pl->contr->ranged_ob) pl->apply (pl->contr->ranged_ob); |
|
|
1132 | } |
1075 | |
1133 | |
|
|
1134 | if (expect_false (pl->contr->ranged_ob == this)) |
|
|
1135 | { |
|
|
1136 | pl->apply (pl->contr->ranged_ob, AP_UNAPPLY | AP_IGNORE_CURSE); |
|
|
1137 | pl->contr->ranged_ob = 0; |
|
|
1138 | if (pl->contr->combat_ob) pl->apply (pl->contr->combat_ob); |
|
|
1139 | } |
|
|
1140 | |
|
|
1141 | pl->contr->queue_stats_update (); |
|
|
1142 | |
1076 | if (glow_radius && pl->is_on_map ()) |
1143 | if (expect_false (glow_radius) && pl->is_on_map ()) |
1077 | update_all_los (pl->map, pl->x, pl->y); |
1144 | update_all_los (pl->map, pl->x, pl->y); |
1078 | } |
1145 | } |
1079 | } |
1146 | } |
1080 | else if (map) |
1147 | else if (map) |
1081 | { |
1148 | { |
1082 | map->dirty = true; |
1149 | map->dirty = true; |
1083 | mapspace &ms = this->ms (); |
1150 | mapspace &ms = this->ms (); |
… | |
… | |
1101 | else if (pl->container_ () == this) |
1168 | else if (pl->container_ () == this) |
1102 | { |
1169 | { |
1103 | // removing a container should close it |
1170 | // removing a container should close it |
1104 | close_container (); |
1171 | close_container (); |
1105 | } |
1172 | } |
1106 | |
1173 | else |
1107 | esrv_del_item (pl->contr, count); |
1174 | esrv_del_item (pl->contr, count); |
1108 | } |
1175 | } |
1109 | |
1176 | |
1110 | /* link the object above us */ |
1177 | /* link the object above us */ |
1111 | // re-link, make sure compiler can easily use cmove |
1178 | // re-link, make sure compiler can easily use cmove |
1112 | *(above ? &above->below : &ms.top) = below; |
1179 | *(above ? &above->below : &ms.top) = below; |
… | |
… | |
1114 | |
1181 | |
1115 | above = 0; |
1182 | above = 0; |
1116 | below = 0; |
1183 | below = 0; |
1117 | |
1184 | |
1118 | ms.invalidate (); |
1185 | ms.invalidate (); |
1119 | |
|
|
1120 | if (map->in_memory == MAP_SAVING) |
|
|
1121 | return; |
|
|
1122 | |
1186 | |
1123 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1187 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1124 | |
1188 | |
1125 | if (object *pl = ms.player ()) |
1189 | if (object *pl = ms.player ()) |
1126 | { |
1190 | { |
… | |
… | |
1203 | |
1267 | |
1204 | object *prev = this; |
1268 | object *prev = this; |
1205 | |
1269 | |
1206 | for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more) |
1270 | for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more) |
1207 | { |
1271 | { |
1208 | object *op = arch_to_object (at); |
1272 | object *op = at->instance (); |
1209 | |
1273 | |
1210 | op->name = name; |
1274 | op->name = name; |
1211 | op->name_pl = name_pl; |
1275 | op->name_pl = name_pl; |
1212 | op->title = title; |
1276 | op->title = title; |
1213 | |
1277 | |
… | |
… | |
1251 | * Passing 0 for flag gives proper default values, so flag really only needs |
1315 | * Passing 0 for flag gives proper default values, so flag really only needs |
1252 | * to be set if special handling is needed. |
1316 | * to be set if special handling is needed. |
1253 | * |
1317 | * |
1254 | * Return value: |
1318 | * Return value: |
1255 | * new object if 'op' was merged with other object |
1319 | * new object if 'op' was merged with other object |
1256 | * NULL if 'op' was destroyed |
1320 | * NULL if there was an error (destroyed, blocked etc.) |
1257 | * just 'op' otherwise |
1321 | * just 'op' otherwise |
1258 | */ |
1322 | */ |
1259 | object * |
1323 | object * |
1260 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1324 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1261 | { |
1325 | { |
1262 | op->remove (); |
1326 | op->remove (); |
1263 | |
1327 | |
1264 | if (m == &freed_map)//D TODO: remove soon |
1328 | if (m == &freed_map)//D TODO: remove soon |
1265 | {//D |
1329 | {//D |
1266 | LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D |
1330 | LOG (llevError | logBacktrace, "tries to insert object on freed objects map: %s", op->debug_desc ());//D |
1267 | }//D |
1331 | }//D |
1268 | |
1332 | |
1269 | /* Ideally, the caller figures this out. However, it complicates a lot |
1333 | /* Ideally, the caller figures this out. However, it complicates a lot |
1270 | * of areas of callers (eg, anything that uses find_free_spot would now |
1334 | * of areas of callers (eg, anything that uses find_free_spot would now |
1271 | * need extra work |
1335 | * need extra work |
… | |
… | |
1298 | // from here :/ |
1362 | // from here :/ |
1299 | op->nrof += tmp->nrof; |
1363 | op->nrof += tmp->nrof; |
1300 | tmp->destroy (); |
1364 | tmp->destroy (); |
1301 | } |
1365 | } |
1302 | |
1366 | |
1303 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1367 | op->clr_flag (FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1304 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1368 | op->clr_flag (FLAG_INV_LOCKED); |
1305 | |
1369 | |
1306 | if (!QUERY_FLAG (op, FLAG_ALIVE)) |
1370 | if (!op->flag [FLAG_ALIVE]) |
1307 | CLEAR_FLAG (op, FLAG_NO_STEAL); |
1371 | op->clr_flag (FLAG_NO_STEAL); |
1308 | |
1372 | |
1309 | if (flag & INS_BELOW_ORIGINATOR) |
1373 | if (flag & INS_BELOW_ORIGINATOR) |
1310 | { |
1374 | { |
1311 | if (originator->map != op->map || originator->x != op->x || originator->y != op->y) |
1375 | if (originator->map != op->map || originator->x != op->x || originator->y != op->y) |
1312 | { |
1376 | { |
… | |
… | |
1340 | * We've already dealt with merging if appropriate. |
1404 | * We've already dealt with merging if appropriate. |
1341 | * Generally, we want to put the new object on top. But if |
1405 | * Generally, we want to put the new object on top. But if |
1342 | * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last |
1406 | * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last |
1343 | * floor, we want to insert above that and no further. |
1407 | * floor, we want to insert above that and no further. |
1344 | * Also, if there are spell objects on this space, we stop processing |
1408 | * Also, if there are spell objects on this space, we stop processing |
1345 | * once we get to them. This reduces the need to traverse over all of |
1409 | * once we get to them. This reduces the need to traverse over all of |
1346 | * them when adding another one - this saves quite a bit of cpu time |
1410 | * them when adding another one - this saves quite a bit of cpu time |
1347 | * when lots of spells are cast in one area. Currently, it is presumed |
1411 | * when lots of spells are cast in one area. Currently, it is presumed |
1348 | * that flying non pickable objects are spell objects. |
1412 | * that flying non pickable objects are spell objects. |
1349 | */ |
1413 | */ |
1350 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1414 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1351 | { |
1415 | { |
1352 | if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR)) |
1416 | if (tmp->flag [FLAG_IS_FLOOR] || tmp->flag [FLAG_OVERLAY_FLOOR]) |
1353 | floor = tmp; |
1417 | floor = tmp; |
1354 | |
1418 | |
1355 | if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR)) |
1419 | if (tmp->flag [FLAG_NO_PICK] && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !tmp->flag [FLAG_IS_FLOOR]) |
1356 | { |
1420 | { |
1357 | /* We insert above top, so we want this object below this */ |
1421 | /* We insert above top, so we want this object below this */ |
1358 | top = tmp->below; |
1422 | top = tmp->below; |
1359 | break; |
1423 | break; |
1360 | } |
1424 | } |
… | |
… | |
1378 | && (op->face && !faces [op->face].visibility)) |
1442 | && (op->face && !faces [op->face].visibility)) |
1379 | { |
1443 | { |
1380 | object *last; |
1444 | object *last; |
1381 | |
1445 | |
1382 | for (last = top; last != floor; last = last->below) |
1446 | for (last = top; last != floor; last = last->below) |
1383 | if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) |
1447 | if (last->flag [FLAG_BLOCKSVIEW] && (last->type != EXIT)) |
1384 | break; |
1448 | break; |
1385 | |
1449 | |
1386 | /* Check to see if we found the object that blocks view, |
1450 | /* Check to see if we found the object that blocks view, |
1387 | * and make sure we have a below pointer for it so that |
1451 | * and make sure we have a below pointer for it so that |
1388 | * we can get inserted below this one, which requires we |
1452 | * we can get inserted below this one, which requires we |
… | |
… | |
1461 | */ |
1525 | */ |
1462 | |
1526 | |
1463 | /* if this is not the head or flag has been passed, don't check walk on status */ |
1527 | /* if this is not the head or flag has been passed, don't check walk on status */ |
1464 | if (!(flag & INS_NO_WALK_ON) && op->is_head ()) |
1528 | if (!(flag & INS_NO_WALK_ON) && op->is_head ()) |
1465 | { |
1529 | { |
1466 | if (check_move_on (op, originator)) |
1530 | if (check_move_on (op, originator, flag)) |
1467 | return 0; |
1531 | return 0; |
1468 | |
1532 | |
1469 | /* If we are a multi part object, lets work our way through the check |
1533 | /* If we are a multi part object, let's work our way through the check |
1470 | * walk on's. |
1534 | * walk on's. |
1471 | */ |
1535 | */ |
1472 | for (object *tmp = op->more; tmp; tmp = tmp->more) |
1536 | for (object *tmp = op->more; tmp; tmp = tmp->more) |
1473 | if (check_move_on (tmp, originator)) |
1537 | if (check_move_on (tmp, originator, flag)) |
1474 | return 0; |
1538 | return 0; |
1475 | } |
1539 | } |
1476 | |
1540 | |
1477 | return op; |
1541 | return op; |
1478 | } |
1542 | } |
1479 | |
1543 | |
1480 | /* this function inserts an object in the map, but if it |
1544 | /* this function inserts an object in the map, but if it |
1481 | * finds an object of its own type, it'll remove that one first. |
1545 | * finds an object of its own type, it'll remove that one first. |
1482 | * op is the object to insert it under: supplies x and the map. |
1546 | * op is the object to insert it under: supplies x and the map. |
1483 | */ |
1547 | */ |
1484 | void |
1548 | void |
1485 | replace_insert_ob_in_map (shstr_tmp archname, object *op) |
1549 | replace_insert_ob_in_map (shstr_tmp archname, object *op) |
1486 | { |
1550 | { |
… | |
… | |
1488 | |
1552 | |
1489 | for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) |
1553 | for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) |
1490 | if (tmp->arch->archname == archname) /* same archetype */ |
1554 | if (tmp->arch->archname == archname) /* same archetype */ |
1491 | tmp->destroy (); |
1555 | tmp->destroy (); |
1492 | |
1556 | |
1493 | object *tmp = arch_to_object (archetype::find (archname)); |
1557 | object *tmp = archetype::find (archname)->instance (); |
1494 | |
1558 | |
1495 | tmp->x = op->x; |
1559 | tmp->x = op->x; |
1496 | tmp->y = op->y; |
1560 | tmp->y = op->y; |
1497 | |
1561 | |
1498 | insert_ob_in_map (tmp, op->map, op, 0); |
1562 | insert_ob_in_map (tmp, op->map, op, 0); |
… | |
… | |
1503 | { |
1567 | { |
1504 | if (where->env) |
1568 | if (where->env) |
1505 | return where->env->insert (this); |
1569 | return where->env->insert (this); |
1506 | else |
1570 | else |
1507 | return where->map->insert (this, where->x, where->y, originator, flags); |
1571 | return where->map->insert (this, where->x, where->y, originator, flags); |
|
|
1572 | } |
|
|
1573 | |
|
|
1574 | // check whether we can put this into the map, respect max_volume, max_items |
|
|
1575 | bool |
|
|
1576 | object::can_drop_at (maptile *m, int x, int y, object *originator) |
|
|
1577 | { |
|
|
1578 | mapspace &ms = m->at (x, y); |
|
|
1579 | |
|
|
1580 | int items = ms.items (); |
|
|
1581 | |
|
|
1582 | if (!items // testing !items ensures we can drop at least one item |
|
|
1583 | || (items < m->max_items |
|
|
1584 | && ms.volume () < m->max_volume)) |
|
|
1585 | return true; |
|
|
1586 | |
|
|
1587 | if (originator) |
|
|
1588 | originator->failmsgf ( |
|
|
1589 | "No matter how hard you try, you just cannot put the %s here! H<Try to remove some items from the floor first.>", |
|
|
1590 | query_name () |
|
|
1591 | ); |
|
|
1592 | |
|
|
1593 | return false; |
1508 | } |
1594 | } |
1509 | |
1595 | |
1510 | /* |
1596 | /* |
1511 | * decrease(object, number) decreases a specified number from |
1597 | * decrease(object, number) decreases a specified number from |
1512 | * the amount of an object. If the amount reaches 0, the object |
1598 | * the amount of an object. If the amount reaches 0, the object |
… | |
… | |
1522 | |
1608 | |
1523 | nr = min (nr, nrof); |
1609 | nr = min (nr, nrof); |
1524 | |
1610 | |
1525 | if (nrof > nr) |
1611 | if (nrof > nr) |
1526 | { |
1612 | { |
|
|
1613 | weight_t oweight = total_weight (); |
|
|
1614 | |
1527 | nrof -= nr; |
1615 | nrof -= nr; |
1528 | adjust_weight (env, -weight * max (1, nr)); // carrying == 0 |
|
|
1529 | |
1616 | |
1530 | if (object *pl = visible_to ()) |
1617 | if (object *pl = visible_to ()) |
1531 | esrv_update_item (UPD_NROF, pl, this); |
1618 | esrv_update_item (UPD_NROF, pl, this); |
|
|
1619 | |
|
|
1620 | adjust_weight (env, oweight, total_weight ()); |
1532 | |
1621 | |
1533 | return true; |
1622 | return true; |
1534 | } |
1623 | } |
1535 | else |
1624 | else |
1536 | { |
1625 | { |
… | |
… | |
1590 | /* |
1679 | /* |
1591 | * env->insert (op) |
1680 | * env->insert (op) |
1592 | * This function inserts the object op in the linked list |
1681 | * This function inserts the object op in the linked list |
1593 | * inside the object environment. |
1682 | * inside the object environment. |
1594 | * |
1683 | * |
1595 | * The function returns now pointer to inserted item, and return value can |
1684 | * The function returns now pointer to inserted item, and return value can |
1596 | * be != op, if items are merged. -Tero |
1685 | * be != op, if items are merged. -Tero |
1597 | */ |
1686 | */ |
1598 | object * |
1687 | object * |
1599 | object::insert (object *op) |
1688 | object::insert (object *op) |
1600 | { |
1689 | { |
… | |
… | |
1611 | if (op->nrof) |
1700 | if (op->nrof) |
1612 | for (object *tmp = inv; tmp; tmp = tmp->below) |
1701 | for (object *tmp = inv; tmp; tmp = tmp->below) |
1613 | if (object::can_merge (tmp, op)) |
1702 | if (object::can_merge (tmp, op)) |
1614 | { |
1703 | { |
1615 | /* return the original object and remove inserted object |
1704 | /* return the original object and remove inserted object |
1616 | (client needs the original object) */ |
1705 | (client prefers the original object) */ |
|
|
1706 | |
|
|
1707 | // carrying must be 0 for mergable objects |
|
|
1708 | weight_t oweight = weight_t (tmp->weight) * tmp->nrof; |
|
|
1709 | |
1617 | tmp->nrof += op->nrof; |
1710 | tmp->nrof += op->nrof; |
1618 | |
1711 | |
1619 | if (object *pl = tmp->visible_to ()) |
1712 | if (object *pl = tmp->visible_to ()) |
1620 | esrv_update_item (UPD_NROF, pl, tmp); |
1713 | esrv_update_item (UPD_NROF, pl, tmp); |
1621 | |
1714 | |
1622 | adjust_weight (this, op->total_weight ()); |
1715 | adjust_weight (this, oweight, weight_t (tmp->weight) * tmp->nrof); |
1623 | |
1716 | |
1624 | op->destroy (); |
1717 | op->destroy (); |
1625 | op = tmp; |
1718 | op = tmp; |
1626 | goto inserted; |
1719 | goto inserted; |
1627 | } |
1720 | } |
… | |
… | |
1643 | op->flag [FLAG_REMOVED] = 0; |
1736 | op->flag [FLAG_REMOVED] = 0; |
1644 | |
1737 | |
1645 | if (object *pl = op->visible_to ()) |
1738 | if (object *pl = op->visible_to ()) |
1646 | esrv_send_item (pl, op); |
1739 | esrv_send_item (pl, op); |
1647 | |
1740 | |
1648 | adjust_weight (this, op->total_weight ()); |
1741 | adjust_weight (this, 0, op->total_weight ()); |
1649 | |
1742 | |
1650 | inserted: |
1743 | inserted: |
1651 | /* reset the light list and los of the players on the map */ |
1744 | /* reset the light list and los of the players on the map */ |
1652 | if (op->glow_radius && is_on_map ()) |
1745 | if (op->glow_radius && is_on_map ()) |
1653 | { |
1746 | { |
1654 | update_stats (); |
1747 | update_stats (); |
1655 | update_all_los (map, x, y); |
1748 | update_all_los (map, x, y); |
1656 | } |
1749 | } |
1657 | else if (is_player () && !flag [FLAG_NO_FIX_PLAYER]) |
1750 | else if (is_player ()) |
1658 | // if this is a player's inventory, update stats |
1751 | // if this is a player's inventory, update stats |
1659 | update_stats (); |
1752 | contr->queue_stats_update (); |
1660 | |
1753 | |
1661 | INVOKE_OBJECT (INSERT, this); |
1754 | INVOKE_OBJECT (INSERT, this); |
1662 | |
1755 | |
1663 | return op; |
1756 | return op; |
1664 | } |
1757 | } |
… | |
… | |
1682 | * MSW 2001-07-08: Check all objects on space, not just those below |
1775 | * MSW 2001-07-08: Check all objects on space, not just those below |
1683 | * object being inserted. insert_ob_in_map may not put new objects |
1776 | * object being inserted. insert_ob_in_map may not put new objects |
1684 | * on top. |
1777 | * on top. |
1685 | */ |
1778 | */ |
1686 | int |
1779 | int |
1687 | check_move_on (object *op, object *originator) |
1780 | check_move_on (object *op, object *originator, int flags) |
1688 | { |
1781 | { |
1689 | if (QUERY_FLAG (op, FLAG_NO_APPLY)) |
1782 | if (op->flag [FLAG_NO_APPLY]) |
1690 | return 0; |
1783 | return 0; |
1691 | |
1784 | |
1692 | object *tmp; |
1785 | object *tmp; |
1693 | maptile *m = op->map; |
1786 | maptile *m = op->map; |
1694 | int x = op->x, y = op->y; |
1787 | int x = op->x, y = op->y; |
… | |
… | |
1716 | */ |
1809 | */ |
1717 | if ((op->move_type & ~move_on & ~move_block) != 0 && (op->move_type & ~move_slow & ~move_block) != 0) |
1810 | if ((op->move_type & ~move_on & ~move_block) != 0 && (op->move_type & ~move_slow & ~move_block) != 0) |
1718 | return 0; |
1811 | return 0; |
1719 | |
1812 | |
1720 | /* The objects have to be checked from top to bottom. |
1813 | /* The objects have to be checked from top to bottom. |
1721 | * Hence, we first go to the top: |
1814 | * Hence, we first go to the top: |
1722 | */ |
1815 | */ |
1723 | for (object *next, *tmp = ms.top; tmp; tmp = next) |
1816 | for (object *next, *tmp = ms.top; tmp; tmp = next) |
1724 | { |
1817 | { |
1725 | next = tmp->below; |
1818 | next = tmp->below; |
1726 | |
1819 | |
… | |
… | |
1731 | * Second check makes sure that the movement types not being slowed |
1824 | * Second check makes sure that the movement types not being slowed |
1732 | * (~slow_move) is not blocked on this space - just because the |
1825 | * (~slow_move) is not blocked on this space - just because the |
1733 | * space doesn't slow down swimming (for example), if you can't actually |
1826 | * space doesn't slow down swimming (for example), if you can't actually |
1734 | * swim on that space, can't use it to avoid the penalty. |
1827 | * swim on that space, can't use it to avoid the penalty. |
1735 | */ |
1828 | */ |
1736 | if (!QUERY_FLAG (op, FLAG_WIZPASS)) |
1829 | if (!op->flag [FLAG_WIZPASS]) |
1737 | { |
1830 | { |
1738 | if ((!op->move_type && tmp->move_slow & MOVE_WALK) || |
1831 | if ((!op->move_type && tmp->move_slow & MOVE_WALK) || |
1739 | ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) |
1832 | ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) |
1740 | { |
1833 | { |
1741 | float diff = tmp->move_slow_penalty * fabs (op->speed); |
1834 | float diff = tmp->move_slow_penalty * fabs (op->speed); |
… | |
… | |
1751 | |
1844 | |
1752 | /* Basically same logic as above, except now for actual apply. */ |
1845 | /* Basically same logic as above, except now for actual apply. */ |
1753 | if ((!op->move_type && tmp->move_on & MOVE_WALK) || |
1846 | if ((!op->move_type && tmp->move_on & MOVE_WALK) || |
1754 | ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0)) |
1847 | ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0)) |
1755 | { |
1848 | { |
|
|
1849 | if ((flags & INS_NO_AUTO_EXIT) |
|
|
1850 | && (tmp->type == EXIT || tmp->type == TELEPORTER |
|
|
1851 | || tmp->type == HOLE || tmp->type == TRAPDOOR)) //TODO: temporary, fix exits instead |
|
|
1852 | continue; |
|
|
1853 | |
1756 | move_apply (tmp, op, originator); |
1854 | move_apply (tmp, op, originator); |
1757 | |
1855 | |
1758 | if (op->destroyed ()) |
1856 | if (op->destroyed ()) |
1759 | return 1; |
1857 | return 1; |
1760 | |
1858 | |
… | |
… | |
1872 | void |
1970 | void |
1873 | flag_inv (object *op, int flag) |
1971 | flag_inv (object *op, int flag) |
1874 | { |
1972 | { |
1875 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
1973 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
1876 | { |
1974 | { |
1877 | SET_FLAG (tmp, flag); |
1975 | tmp->set_flag (flag); |
1878 | flag_inv (tmp, flag); |
1976 | flag_inv (tmp, flag); |
1879 | } |
1977 | } |
1880 | } |
1978 | } |
1881 | |
1979 | |
1882 | /* |
1980 | /* |
… | |
… | |
1885 | void |
1983 | void |
1886 | unflag_inv (object *op, int flag) |
1984 | unflag_inv (object *op, int flag) |
1887 | { |
1985 | { |
1888 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
1986 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
1889 | { |
1987 | { |
1890 | CLEAR_FLAG (tmp, flag); |
1988 | tmp->clr_flag (flag); |
1891 | unflag_inv (tmp, flag); |
1989 | unflag_inv (tmp, flag); |
1892 | } |
1990 | } |
1893 | } |
1991 | } |
1894 | |
1992 | |
1895 | /* |
1993 | /* |
… | |
… | |
1905 | * inform the caller. However, insert_ob_in_map will update as |
2003 | * inform the caller. However, insert_ob_in_map will update as |
1906 | * necessary, so the caller shouldn't need to do any special work. |
2004 | * necessary, so the caller shouldn't need to do any special work. |
1907 | * Note - updated to take an object instead of archetype - this is necessary |
2005 | * Note - updated to take an object instead of archetype - this is necessary |
1908 | * because arch_blocked (now ob_blocked) needs to know the movement type |
2006 | * because arch_blocked (now ob_blocked) needs to know the movement type |
1909 | * to know if the space in question will block the object. We can't use |
2007 | * to know if the space in question will block the object. We can't use |
1910 | * the archetype because that isn't correct if the monster has been |
2008 | * the archetype because that isn't correct if the monster has been |
1911 | * customized, changed states, etc. |
2009 | * customized, changed states, etc. |
1912 | */ |
2010 | */ |
1913 | int |
2011 | int |
1914 | find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) |
2012 | find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) |
1915 | { |
2013 | { |
1916 | int altern[SIZEOFFREE]; |
2014 | int altern[SIZEOFFREE]; |
1917 | int index = 0, flag; |
2015 | int index = 0; |
1918 | |
2016 | |
1919 | for (int i = start; i < stop; i++) |
2017 | for (int i = start; i < stop; i++) |
1920 | { |
2018 | { |
1921 | mapxy pos (m, x, y); pos.move (i); |
2019 | mapxy pos (m, x, y); pos.move (i); |
1922 | |
2020 | |
… | |
… | |
1938 | continue; |
2036 | continue; |
1939 | } |
2037 | } |
1940 | |
2038 | |
1941 | /* Basically, if we find a wall on a space, we cut down the search size. |
2039 | /* Basically, if we find a wall on a space, we cut down the search size. |
1942 | * In this way, we won't return spaces that are on another side of a wall. |
2040 | * In this way, we won't return spaces that are on another side of a wall. |
1943 | * This mostly work, but it cuts down the search size in all directions - |
2041 | * This mostly work, but it cuts down the search size in all directions - |
1944 | * if the space being examined only has a wall to the north and empty |
2042 | * if the space being examined only has a wall to the north and empty |
1945 | * spaces in all the other directions, this will reduce the search space |
2043 | * spaces in all the other directions, this will reduce the search space |
1946 | * to only the spaces immediately surrounding the target area, and |
2044 | * to only the spaces immediately surrounding the target area, and |
1947 | * won't look 2 spaces south of the target space. |
2045 | * won't look 2 spaces south of the target space. |
1948 | */ |
2046 | */ |
… | |
… | |
1978 | */ |
2076 | */ |
1979 | int |
2077 | int |
1980 | find_first_free_spot (const object *ob, maptile *m, int x, int y) |
2078 | find_first_free_spot (const object *ob, maptile *m, int x, int y) |
1981 | { |
2079 | { |
1982 | for (int i = 0; i < SIZEOFFREE; i++) |
2080 | for (int i = 0; i < SIZEOFFREE; i++) |
1983 | if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i])) |
2081 | if (!ob->blocked (m, x + DIRX (i), y + DIRY (i))) |
1984 | return i; |
2082 | return i; |
1985 | |
2083 | |
1986 | return -1; |
2084 | return -1; |
1987 | } |
2085 | } |
1988 | |
2086 | |
… | |
… | |
1999 | |
2097 | |
2000 | while (--end) |
2098 | while (--end) |
2001 | swap (arr [end], arr [rndm (end + 1)]); |
2099 | swap (arr [end], arr [rndm (end + 1)]); |
2002 | } |
2100 | } |
2003 | |
2101 | |
2004 | /* new function to make monster searching more efficient, and effective! |
2102 | /* new function to make monster searching more efficient, and effective! |
2005 | * This basically returns a randomized array (in the passed pointer) of |
2103 | * This basically returns a randomized array (in the passed pointer) of |
2006 | * the spaces to find monsters. In this way, it won't always look for |
2104 | * the spaces to find monsters. In this way, it won't always look for |
2007 | * monsters to the north first. However, the size of the array passed |
2105 | * monsters to the north first. However, the size of the array passed |
2008 | * covers all the spaces, so within that size, all the spaces within |
2106 | * covers all the spaces, so within that size, all the spaces within |
2009 | * the 3x3 area will be searched, just not in a predictable order. |
2107 | * the 3x3 area will be searched, just not in a predictable order. |
… | |
… | |
2034 | * there is capable of. |
2132 | * there is capable of. |
2035 | */ |
2133 | */ |
2036 | int |
2134 | int |
2037 | find_dir (maptile *m, int x, int y, object *exclude) |
2135 | find_dir (maptile *m, int x, int y, object *exclude) |
2038 | { |
2136 | { |
2039 | int max = SIZEOFFREE, mflags; |
2137 | int max = SIZEOFFREE; |
2040 | MoveType move_type; |
2138 | MoveType move_type; |
2041 | |
2139 | |
2042 | if (exclude && exclude->head_ () != exclude) |
2140 | if (exclude && exclude->head_ () != exclude) |
2043 | { |
2141 | { |
2044 | exclude = exclude->head; |
2142 | exclude = exclude->head; |
… | |
… | |
2085 | { |
2183 | { |
2086 | return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); |
2184 | return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); |
2087 | } |
2185 | } |
2088 | |
2186 | |
2089 | /* |
2187 | /* |
2090 | * find_dir_2(delta-x,delta-y) will return a direction in which |
2188 | * find_dir_2(delta-x,delta-y) will return a direction value |
2091 | * an object which has subtracted the x and y coordinates of another |
2189 | * for running into direct [dx, dy]. |
2092 | * object, needs to travel toward it. |
2190 | * (the opposite of crossfire's find_dir_2!) |
2093 | */ |
2191 | */ |
2094 | int |
2192 | int |
2095 | find_dir_2 (int x, int y) |
2193 | find_dir_2 (int x, int y) |
2096 | { |
2194 | { |
|
|
2195 | #if 1 // new algorithm |
|
|
2196 | // this works by putting x, y into 16 sectors, which |
|
|
2197 | // are not equal sized, but are a better approximation |
|
|
2198 | // then the old algorithm, and then using a mapping |
|
|
2199 | // table to map it into a direction value. |
|
|
2200 | // basically, it maps these comparisons to each bit |
|
|
2201 | // bit #3: x < 0 |
|
|
2202 | // bit #2: y < 0 |
|
|
2203 | // bit #1: x > y |
|
|
2204 | // bit #0: x > 2y |
|
|
2205 | |
|
|
2206 | static const uint8 dir[16] = { |
|
|
2207 | 4, 5, 4, 3, |
|
|
2208 | 2, 1, 2, 3, |
|
|
2209 | 6, 5, 6, 7, |
|
|
2210 | 8, 1, 8, 7, |
|
|
2211 | }; |
|
|
2212 | int sector = 0; |
|
|
2213 | |
|
|
2214 | // this is a bit ugly, but more likely to result in branchless code |
|
|
2215 | sector |= x < 0 ? 8 : 0; |
|
|
2216 | x = x < 0 ? -x : x; // abs |
|
|
2217 | |
|
|
2218 | sector |= y < 0 ? 4 : 0; |
|
|
2219 | y = y < 0 ? -y : y; // abs |
|
|
2220 | |
|
|
2221 | if (x > y) |
|
|
2222 | { |
|
|
2223 | sector |= 2; |
|
|
2224 | |
|
|
2225 | if (x > y * 2) |
|
|
2226 | sector |= 1; |
|
|
2227 | } |
|
|
2228 | else |
|
|
2229 | { |
|
|
2230 | if (y > x * 2) |
|
|
2231 | sector |= 1; |
|
|
2232 | else if (!y) |
|
|
2233 | return 0; // x == 0 here |
|
|
2234 | } |
|
|
2235 | |
|
|
2236 | return dir [sector]; |
|
|
2237 | #else // old algorithm |
2097 | int q; |
2238 | int q; |
2098 | |
2239 | |
2099 | if (y) |
2240 | if (y) |
2100 | q = x * 100 / y; |
2241 | q = 128 * x / y; |
2101 | else if (x) |
2242 | else if (x) |
2102 | q = -300 * x; |
2243 | q = -512 * x; // to make it > 309 |
2103 | else |
2244 | else |
2104 | return 0; |
2245 | return 0; |
2105 | |
2246 | |
2106 | if (y > 0) |
2247 | if (y > 0) |
2107 | { |
2248 | { |
2108 | if (q < -242) |
2249 | if (q < -309) return 7; |
|
|
2250 | if (q < -52) return 6; |
|
|
2251 | if (q < 52) return 5; |
|
|
2252 | if (q < 309) return 4; |
|
|
2253 | |
2109 | return 3; |
2254 | return 3; |
2110 | if (q < -41) |
2255 | } |
2111 | return 2; |
2256 | else |
2112 | if (q < 41) |
2257 | { |
2113 | return 1; |
2258 | if (q < -309) return 3; |
2114 | if (q < 242) |
2259 | if (q < -52) return 2; |
2115 | return 8; |
2260 | if (q < 52) return 1; |
|
|
2261 | if (q < 309) return 8; |
|
|
2262 | |
2116 | return 7; |
2263 | return 7; |
2117 | } |
2264 | } |
2118 | |
2265 | #endif |
2119 | if (q < -242) |
|
|
2120 | return 7; |
|
|
2121 | if (q < -41) |
|
|
2122 | return 6; |
|
|
2123 | if (q < 41) |
|
|
2124 | return 5; |
|
|
2125 | if (q < 242) |
|
|
2126 | return 4; |
|
|
2127 | |
|
|
2128 | return 3; |
|
|
2129 | } |
2266 | } |
2130 | |
2267 | |
2131 | /* |
2268 | /* |
2132 | * dirdiff(dir1, dir2) returns how many 45-degrees differences there is |
2269 | * dirdiff(dir1, dir2) returns how many 45-degrees differences there is |
2133 | * between two directions (which are expected to be absolute (see absdir()) |
2270 | * between two directions (which are expected to be absolute (see absdir()) |
2134 | */ |
2271 | */ |
2135 | int |
2272 | int |
2136 | dirdiff (int dir1, int dir2) |
2273 | dirdiff (int dir1, int dir2) |
2137 | { |
2274 | { |
2138 | int d; |
|
|
2139 | |
|
|
2140 | d = abs (dir1 - dir2); |
2275 | int d = abs (dir1 - dir2); |
2141 | if (d > 4) |
|
|
2142 | d = 8 - d; |
|
|
2143 | |
2276 | |
2144 | return d; |
2277 | return d > 4 ? 8 - d : d; |
2145 | } |
2278 | } |
2146 | |
2279 | |
2147 | /* peterm: |
2280 | /* peterm: |
2148 | * do LOS stuff for ball lightning. Go after the closest VISIBLE monster. |
2281 | * do LOS stuff for ball lightning. Go after the closest VISIBLE monster. |
2149 | * Basically, this is a table of directions, and what directions |
2282 | * Basically, this is a table of directions, and what directions |
… | |
… | |
2218 | int mflags; |
2351 | int mflags; |
2219 | |
2352 | |
2220 | if (dir < 0) |
2353 | if (dir < 0) |
2221 | return 0; /* exit condition: invalid direction */ |
2354 | return 0; /* exit condition: invalid direction */ |
2222 | |
2355 | |
2223 | dx = x + freearr_x[dir]; |
2356 | dx = x + DIRX (dir); |
2224 | dy = y + freearr_y[dir]; |
2357 | dy = y + DIRY (dir); |
2225 | |
2358 | |
2226 | mflags = get_map_flags (m, &m, dx, dy, &dx, &dy); |
2359 | mflags = get_map_flags (m, &m, dx, dy, &dx, &dy); |
2227 | |
2360 | |
2228 | /* This functional arguably was incorrect before - it was |
2361 | /* This functional arguably was incorrect before - it was |
2229 | * checking for P_WALL - that was basically seeing if |
2362 | * checking for P_WALL - that was basically seeing if |
… | |
… | |
2255 | * Add a check so we can't pick up invisible objects (0.93.8) |
2388 | * Add a check so we can't pick up invisible objects (0.93.8) |
2256 | */ |
2389 | */ |
2257 | int |
2390 | int |
2258 | can_pick (const object *who, const object *item) |
2391 | can_pick (const object *who, const object *item) |
2259 | { |
2392 | { |
2260 | return /*QUERY_FLAG(who,FLAG_WIZ)|| */ |
2393 | return /*who->flag [FLAG_WIZ]|| */ |
2261 | (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && |
2394 | (item->weight > 0 && !item->flag [FLAG_NO_PICK] && |
2262 | !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3)); |
2395 | !item->flag [FLAG_ALIVE] && !item->invisible && (who->is_player () || item->weight < who->weight / 3)); |
2263 | } |
2396 | } |
|
|
2397 | |
|
|
2398 | //-GPL |
2264 | |
2399 | |
2265 | /* |
2400 | /* |
2266 | * create clone from object to another |
2401 | * create clone from object to another |
2267 | */ |
2402 | */ |
2268 | object * |
2403 | object * |
… | |
… | |
2299 | return tmp; |
2434 | return tmp; |
2300 | |
2435 | |
2301 | return 0; |
2436 | return 0; |
2302 | } |
2437 | } |
2303 | |
2438 | |
|
|
2439 | /* Zero the key_values on op, decrementing the shared-string |
|
|
2440 | * refcounts and freeing the links. |
|
|
2441 | */ |
|
|
2442 | void |
|
|
2443 | key_values::clear () |
|
|
2444 | { |
|
|
2445 | for (key_value *kvp = first; kvp; ) |
|
|
2446 | { |
|
|
2447 | key_value *next = kvp->next; |
|
|
2448 | delete kvp; |
|
|
2449 | kvp = next; |
|
|
2450 | } |
|
|
2451 | |
|
|
2452 | first = 0; |
|
|
2453 | } |
|
|
2454 | |
2304 | shstr_tmp |
2455 | shstr_tmp |
2305 | object::kv_get (shstr_tmp key) const |
2456 | key_values::get (shstr_tmp key) const |
2306 | { |
2457 | { |
2307 | for (key_value *kv = key_values; kv; kv = kv->next) |
2458 | for (key_value *kv = first; kv; kv = kv->next) |
2308 | if (kv->key == key) |
2459 | if (kv->key == key) |
2309 | return kv->value; |
2460 | return kv->value; |
2310 | |
2461 | |
2311 | return shstr (); |
2462 | return shstr (); |
2312 | } |
2463 | } |
2313 | |
2464 | |
2314 | void |
2465 | void |
|
|
2466 | key_values::add (shstr_tmp key, shstr_tmp value) |
|
|
2467 | { |
|
|
2468 | key_value *kv = new key_value; |
|
|
2469 | |
|
|
2470 | kv->next = first; |
|
|
2471 | kv->key = key; |
|
|
2472 | kv->value = value; |
|
|
2473 | |
|
|
2474 | first = kv; |
|
|
2475 | } |
|
|
2476 | |
|
|
2477 | void |
2315 | object::kv_set (shstr_tmp key, shstr_tmp value) |
2478 | key_values::set (shstr_tmp key, shstr_tmp value) |
2316 | { |
2479 | { |
2317 | for (key_value *kv = key_values; kv; kv = kv->next) |
2480 | for (key_value *kv = first; kv; kv = kv->next) |
2318 | if (kv->key == key) |
2481 | if (kv->key == key) |
2319 | { |
2482 | { |
2320 | kv->value = value; |
2483 | kv->value = value; |
2321 | return; |
2484 | return; |
2322 | } |
2485 | } |
2323 | |
2486 | |
2324 | key_value *kv = new key_value; |
2487 | add (key, value); |
2325 | |
|
|
2326 | kv->next = key_values; |
|
|
2327 | kv->key = key; |
|
|
2328 | kv->value = value; |
|
|
2329 | |
|
|
2330 | key_values = kv; |
|
|
2331 | } |
2488 | } |
2332 | |
2489 | |
2333 | void |
2490 | void |
2334 | object::kv_del (shstr_tmp key) |
2491 | key_values::del (shstr_tmp key) |
2335 | { |
2492 | { |
2336 | for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next) |
2493 | for (key_value **kvp = &first; *kvp; kvp = &(*kvp)->next) |
2337 | if ((*kvp)->key == key) |
2494 | if ((*kvp)->key == key) |
2338 | { |
2495 | { |
2339 | key_value *kv = *kvp; |
2496 | key_value *kv = *kvp; |
2340 | *kvp = (*kvp)->next; |
2497 | *kvp = (*kvp)->next; |
2341 | delete kv; |
2498 | delete kv; |
2342 | return; |
2499 | return; |
2343 | } |
2500 | } |
|
|
2501 | } |
|
|
2502 | |
|
|
2503 | void |
|
|
2504 | key_values::reverse () |
|
|
2505 | { |
|
|
2506 | key_value *prev = 0; |
|
|
2507 | key_value *head = first; |
|
|
2508 | |
|
|
2509 | while (head) |
|
|
2510 | { |
|
|
2511 | key_value *node = head; |
|
|
2512 | head = head->next; |
|
|
2513 | node->next = prev; |
|
|
2514 | prev = node; |
|
|
2515 | } |
|
|
2516 | |
|
|
2517 | first = prev; |
|
|
2518 | } |
|
|
2519 | |
|
|
2520 | key_values & |
|
|
2521 | key_values::operator =(const key_values &kv) |
|
|
2522 | { |
|
|
2523 | clear (); |
|
|
2524 | |
|
|
2525 | for (key_value *kvp = kv.first; kvp; kvp = kvp->next) |
|
|
2526 | add (kvp->key, kvp->value); |
|
|
2527 | |
|
|
2528 | reverse (); |
2344 | } |
2529 | } |
2345 | |
2530 | |
2346 | object::depth_iterator::depth_iterator (object *container) |
2531 | object::depth_iterator::depth_iterator (object *container) |
2347 | : iterator_base (container) |
2532 | : iterator_base (container) |
2348 | { |
2533 | { |
… | |
… | |
2432 | { |
2617 | { |
2433 | return map ? map->region (x, y) |
2618 | return map ? map->region (x, y) |
2434 | : region::default_region (); |
2619 | : region::default_region (); |
2435 | } |
2620 | } |
2436 | |
2621 | |
2437 | const materialtype_t * |
2622 | //+GPL |
2438 | object::dominant_material () const |
|
|
2439 | { |
|
|
2440 | if (materialtype_t *mt = name_to_material (materialname)) |
|
|
2441 | return mt; |
|
|
2442 | |
|
|
2443 | return name_to_material (shstr_unknown); |
|
|
2444 | } |
|
|
2445 | |
2623 | |
2446 | void |
2624 | void |
2447 | object::open_container (object *new_container) |
2625 | object::open_container (object *new_container) |
2448 | { |
2626 | { |
2449 | if (container == new_container) |
2627 | if (container == new_container) |
… | |
… | |
2484 | // TODO: this does not seem to serve any purpose anymore? |
2662 | // TODO: this does not seem to serve any purpose anymore? |
2485 | #if 0 |
2663 | #if 0 |
2486 | // insert the "Close Container" object. |
2664 | // insert the "Close Container" object. |
2487 | if (archetype *closer = new_container->other_arch) |
2665 | if (archetype *closer = new_container->other_arch) |
2488 | { |
2666 | { |
2489 | object *closer = arch_to_object (new_container->other_arch); |
2667 | object *closer = new_container->other_arch->instance (); |
2490 | closer->flag [FLAG_NO_MAP_SAVE] = 1; |
2668 | closer->flag [FLAG_NO_MAP_SAVE] = 1; |
2491 | new_container->insert (closer); |
2669 | new_container->insert (closer); |
2492 | } |
2670 | } |
2493 | #endif |
2671 | #endif |
2494 | |
2672 | |
… | |
… | |
2507 | } |
2685 | } |
2508 | // else if (!old_container->env && contr && contr->ns) |
2686 | // else if (!old_container->env && contr && contr->ns) |
2509 | // contr->ns->floorbox_reset (); |
2687 | // contr->ns->floorbox_reset (); |
2510 | } |
2688 | } |
2511 | |
2689 | |
|
|
2690 | //-GPL |
|
|
2691 | |
|
|
2692 | // prefetch some flat area around the player |
|
|
2693 | static void |
|
|
2694 | prefetch_surrounding_area (object *op, maptile *map, int range) |
|
|
2695 | { |
|
|
2696 | for (maprect *rect = map->split_to_tiles (mapwalk_buf, |
|
|
2697 | op->x - range , op->y - range , |
|
|
2698 | op->x + range + 1, op->y + range + 1); |
|
|
2699 | rect->m; |
|
|
2700 | ++rect) |
|
|
2701 | { |
|
|
2702 | rect->m->touch (); |
|
|
2703 | rect->m->activate (); |
|
|
2704 | } |
|
|
2705 | } |
|
|
2706 | |
|
|
2707 | // prefetch a generous area around the player, also up and down |
|
|
2708 | void |
|
|
2709 | object::prefetch_surrounding_maps () |
|
|
2710 | { |
|
|
2711 | prefetch_surrounding_area (this, map, 40); |
|
|
2712 | |
|
|
2713 | if (maptile *m = map->tile_available (TILE_DOWN)) |
|
|
2714 | prefetch_surrounding_area (this, m, 20); |
|
|
2715 | |
|
|
2716 | if (maptile *m = map->tile_available (TILE_UP)) |
|
|
2717 | prefetch_surrounding_area (this, m, 20); |
|
|
2718 | } |
|
|
2719 | |
|
|
2720 | //+GPL |
|
|
2721 | |
2512 | object * |
2722 | object * |
2513 | object::force_find (shstr_tmp name) |
2723 | object::force_find (shstr_tmp name) |
2514 | { |
2724 | { |
2515 | /* cycle through his inventory to look for the MARK we want to |
2725 | /* cycle through his inventory to look for the MARK we want to |
2516 | * place |
2726 | * place |
2517 | */ |
2727 | */ |
2518 | for (object *tmp = inv; tmp; tmp = tmp->below) |
2728 | for (object *tmp = inv; tmp; tmp = tmp->below) |
2519 | if (tmp->type == FORCE && tmp->slaying == name) |
2729 | if (tmp->type == FORCE && tmp->slaying == name) |
2520 | return splay (tmp); |
2730 | return splay (tmp); |
2521 | |
2731 | |
2522 | return 0; |
2732 | return 0; |
2523 | } |
2733 | } |
2524 | |
2734 | |
2525 | //-GPL |
|
|
2526 | |
|
|
2527 | void |
2735 | void |
2528 | object::force_set_timer (int duration) |
2736 | object::force_set_timer (int duration) |
2529 | { |
2737 | { |
2530 | this->duration = 1; |
2738 | this->duration = 1; |
2531 | this->speed_left = -1.f; |
2739 | this->speed_left = -1.f; |
… | |
… | |
2537 | object::force_add (shstr_tmp name, int duration) |
2745 | object::force_add (shstr_tmp name, int duration) |
2538 | { |
2746 | { |
2539 | if (object *force = force_find (name)) |
2747 | if (object *force = force_find (name)) |
2540 | force->destroy (); |
2748 | force->destroy (); |
2541 | |
2749 | |
2542 | object *force = get_archetype (FORCE_NAME); |
2750 | object *force = archetype::get (FORCE_NAME); |
2543 | |
2751 | |
2544 | force->slaying = name; |
2752 | force->slaying = name; |
2545 | force->force_set_timer (duration); |
2753 | force->force_set_timer (duration); |
2546 | force->flag [FLAG_APPLIED] = true; |
2754 | force->flag [FLAG_APPLIED] = true; |
2547 | |
2755 | |
… | |
… | |
2600 | |
2808 | |
2601 | insert (force); |
2809 | insert (force); |
2602 | } |
2810 | } |
2603 | } |
2811 | } |
2604 | |
2812 | |
|
|
2813 | void object::change_move_type (MoveType mt) |
|
|
2814 | { |
|
|
2815 | if (move_type == mt) |
|
|
2816 | return; |
|
|
2817 | |
|
|
2818 | if (is_on_map ()) |
|
|
2819 | { |
|
|
2820 | // we are on the map, so handle move_on/off effects |
|
|
2821 | remove (); |
|
|
2822 | move_type = mt; |
|
|
2823 | map->insert (this, x, y, this); |
|
|
2824 | } |
|
|
2825 | else |
|
|
2826 | move_type = mt; |
|
|
2827 | } |
|
|
2828 | |
|
|
2829 | /* object should be a player. |
|
|
2830 | * we return the object the player has marked with the 'mark' command |
|
|
2831 | * below. If no match is found (or object has changed), we return |
|
|
2832 | * NULL. We leave it up to the calling function to print messages if |
|
|
2833 | * nothing is found. |
|
|
2834 | */ |
|
|
2835 | object * |
|
|
2836 | object::mark () const |
|
|
2837 | { |
|
|
2838 | if (contr && contr->mark && contr->mark->env == this) |
|
|
2839 | return contr->mark; |
|
|
2840 | else |
|
|
2841 | return 0; |
|
|
2842 | } |
|
|
2843 | |
|
|
2844 | // put marked object first in the inventory |
|
|
2845 | // this is used by identify-like spells so players can influence |
|
|
2846 | // the order a bit. |
|
|
2847 | void |
|
|
2848 | object::splay_marked () |
|
|
2849 | { |
|
|
2850 | if (object *marked = mark ()) |
|
|
2851 | splay (marked); |
|
|
2852 | } |
|
|
2853 | |