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 (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
4 | * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
5 | * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team |
5 | * Copyright (©) 2001 Mark Wedel & Crossfire Development Team |
6 | * Copyright (©) 1992,2007 Frank Tore Johansen |
6 | * Copyright (©) 1992 Frank Tore Johansen |
7 | * |
7 | * |
8 | * Deliantra is free software: you can redistribute it and/or modify |
8 | * Deliantra is free software: you can redistribute it and/or modify it under |
9 | * it under the terms of the GNU General Public License as published by |
9 | * the terms of the Affero GNU General Public License as published by the |
10 | * the Free Software Foundation, either version 3 of the License, or |
10 | * Free Software Foundation, either version 3 of the License, or (at your |
11 | * (at your option) any later version. |
11 | * option) any later version. |
12 | * |
12 | * |
13 | * 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, |
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
16 | * GNU General Public License for more details. |
16 | * GNU General Public License for more details. |
17 | * |
17 | * |
18 | * You should have received a copy of the GNU General Public License |
18 | * You should have received a copy of the Affero GNU General Public License |
19 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
19 | * and the GNU General Public License along with this program. If not, see |
|
|
20 | * <http://www.gnu.org/licenses/>. |
20 | * |
21 | * |
21 | * The authors can be reached via e-mail to <support@deliantra.net> |
22 | * The authors can be reached via e-mail to <support@deliantra.net> |
22 | */ |
23 | */ |
23 | |
24 | |
24 | #include <global.h> |
25 | #include <global.h> |
25 | #include <stdio.h> |
26 | #include <stdio.h> |
26 | #include <sys/types.h> |
27 | #include <sys/types.h> |
27 | #include <sys/uio.h> |
28 | #include <sys/uio.h> |
28 | #include <object.h> |
29 | #include <object.h> |
29 | #include <sproto.h> |
30 | #include <sproto.h> |
30 | #include <loader.h> |
|
|
31 | |
31 | |
32 | #include <bitset> |
32 | #include <bitset> |
33 | |
33 | |
34 | UUID UUID::cur; |
34 | UUID UUID::cur; |
35 | static uint64_t seq_next_save; |
35 | static uint64_t seq_next_save; |
36 | static const uint64 UUID_GAP = 1<<19; |
36 | static const uint64 UUID_GAP = 1<<19; |
|
|
37 | uint32_t mapspace::smellcount = 10000; |
37 | |
38 | |
38 | objectvec objects; |
39 | objectvec objects; |
39 | activevec actives; |
40 | activevec actives; |
|
|
41 | |
|
|
42 | freelist_item *object::freelist; |
|
|
43 | uint32_t object::object_count; |
|
|
44 | uint32_t object::free_count; |
|
|
45 | uint32_t object::create_count; |
|
|
46 | uint32_t object::destroy_count; |
|
|
47 | |
|
|
48 | //+GPL |
40 | |
49 | |
41 | short freearr_x[SIZEOFFREE] = { |
50 | short freearr_x[SIZEOFFREE] = { |
42 | 0, |
51 | 0, |
43 | 0, 1, 1, 1, 0, -1, -1, -1, |
52 | 0, 1, 1, 1, 0, -1, -1, -1, |
44 | 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, |
53 | 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, |
… | |
… | |
48 | 0, |
57 | 0, |
49 | -1, -1, 0, 1, 1, 1, 0, -1, |
58 | -1, -1, 0, 1, 1, 1, 0, -1, |
50 | -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, |
59 | -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, |
51 | -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3 |
60 | -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3 |
52 | }; |
61 | }; |
53 | int maxfree[SIZEOFFREE] = { |
|
|
54 | 0, |
|
|
55 | 9, 10, 13, 14, 17, 18, 21, 22, |
|
|
56 | 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48, |
|
|
57 | 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49 |
|
|
58 | }; |
|
|
59 | int freedir[SIZEOFFREE] = { |
62 | int freedir[SIZEOFFREE] = { |
60 | 0, |
63 | 0, |
61 | 1, 2, 3, 4, 5, 6, 7, 8, |
64 | 1, 2, 3, 4, 5, 6, 7, 8, |
62 | 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8, |
65 | 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8, |
63 | 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8 |
66 | 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8 |
64 | }; |
67 | }; |
65 | |
68 | |
|
|
69 | static int maxfree[SIZEOFFREE] = { |
|
|
70 | 0, |
|
|
71 | 9, 10, 13, 14, 17, 18, 21, 22, |
|
|
72 | 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48, |
|
|
73 | 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 | }; |
|
|
75 | |
|
|
76 | const char *wall_suffix[16] = { |
|
|
77 | "0", |
|
|
78 | "1_3", |
|
|
79 | "1_4", |
|
|
80 | "2_1_2", |
|
|
81 | "1_2", |
|
|
82 | "2_2_4", |
|
|
83 | "2_2_1", |
|
|
84 | "3_1", |
|
|
85 | "1_1", |
|
|
86 | "2_2_3", |
|
|
87 | "2_2_2", |
|
|
88 | "3_3", |
|
|
89 | "2_1_1", |
|
|
90 | "3_4", |
|
|
91 | "3_2", |
|
|
92 | "4" |
|
|
93 | }; |
|
|
94 | |
66 | static void |
95 | static void |
67 | write_uuid (uval64 skip, bool sync) |
96 | write_uuid (uval64 skip, bool sync) |
68 | { |
97 | { |
69 | CALL_BEGIN (2); |
98 | CALL_BEGIN (2); |
70 | CALL_ARG_SV (newSVval64 (skip)); |
99 | CALL_ARG_SV (newSVval64 (skip)); |
… | |
… | |
72 | CALL_CALL ("cf::write_uuid", G_DISCARD); |
101 | CALL_CALL ("cf::write_uuid", G_DISCARD); |
73 | CALL_END; |
102 | CALL_END; |
74 | } |
103 | } |
75 | |
104 | |
76 | static void |
105 | static void |
77 | read_uuid (void) |
106 | read_uuid () |
78 | { |
107 | { |
79 | char filename[MAX_BUF]; |
108 | char filename[MAX_BUF]; |
80 | |
109 | |
81 | sprintf (filename, "%s/uuid", settings.localdir); |
110 | sprintf (filename, "%s/uuid", settings.localdir); |
82 | |
111 | |
… | |
… | |
96 | |
125 | |
97 | LOG (llevError, "FATAL: cannot open %s for reading!\n", filename); |
126 | LOG (llevError, "FATAL: cannot open %s for reading!\n", filename); |
98 | _exit (1); |
127 | _exit (1); |
99 | } |
128 | } |
100 | |
129 | |
101 | UUID::BUF buf; |
130 | char buf [UUID::MAX_LEN]; |
102 | buf[0] = 0; |
131 | buf[0] = 0; |
103 | fgets (buf, sizeof (buf), fp); |
132 | fgets (buf, sizeof (buf), fp); |
104 | |
133 | |
105 | if (!UUID::cur.parse (buf)) |
134 | if (!UUID::cur.parse (buf)) |
106 | { |
135 | { |
… | |
… | |
133 | |
162 | |
134 | void |
163 | void |
135 | UUID::init () |
164 | UUID::init () |
136 | { |
165 | { |
137 | read_uuid (); |
166 | read_uuid (); |
|
|
167 | } |
|
|
168 | |
|
|
169 | bool |
|
|
170 | UUID::parse (const char *s) |
|
|
171 | { |
|
|
172 | if (*s++ != '<' || *s++ != '1' || *s++ != '.') |
|
|
173 | return false; |
|
|
174 | |
|
|
175 | seq = 0; |
|
|
176 | |
|
|
177 | while (*s != '>') |
|
|
178 | { |
|
|
179 | if (*s < '0') |
|
|
180 | return false; |
|
|
181 | |
|
|
182 | // this gives nice branchless code with gcc |
|
|
183 | assert ('0' < 'a' && '0' == 48 && 'a' == 97); |
|
|
184 | int digit = (*s + (*s & 0x40 ? 9 : 0)) & 15; |
|
|
185 | |
|
|
186 | seq = (seq << 4) | digit; |
|
|
187 | |
|
|
188 | ++s; |
|
|
189 | } |
|
|
190 | |
|
|
191 | return true; |
|
|
192 | } |
|
|
193 | |
|
|
194 | char * |
|
|
195 | UUID::append (char *buf) const |
|
|
196 | { |
|
|
197 | *buf++ = '<'; |
|
|
198 | *buf++ = '1'; |
|
|
199 | *buf++ = '.'; |
|
|
200 | |
|
|
201 | uint64_t seq = this->seq; |
|
|
202 | const int bits = 64; |
|
|
203 | char nz = 0; |
|
|
204 | static const char tohex [] = "0123456789abcdef"; |
|
|
205 | |
|
|
206 | // assert (len >= 3 + bits / 4 + 1 + 1); |
|
|
207 | for (int i = bits / 4; --i; ) |
|
|
208 | { |
|
|
209 | uint8_t digit = seq >> (bits - 4); |
|
|
210 | |
|
|
211 | *buf = tohex [digit]; |
|
|
212 | nz |= digit; |
|
|
213 | buf += nz ? 1 : 0; |
|
|
214 | seq <<= 4; |
|
|
215 | } |
|
|
216 | |
|
|
217 | // last digit is special - always emit |
|
|
218 | uint8_t digit = seq >> (bits - 4); |
|
|
219 | *buf++ = tohex [digit]; |
|
|
220 | |
|
|
221 | *buf++ = '>'; |
|
|
222 | |
|
|
223 | return buf; |
|
|
224 | } |
|
|
225 | |
|
|
226 | char * |
|
|
227 | UUID::c_str () const |
|
|
228 | { |
|
|
229 | static char buf [MAX_LEN]; |
|
|
230 | *append (buf) = 0; |
|
|
231 | return buf; |
138 | } |
232 | } |
139 | |
233 | |
140 | /* Returns TRUE if every key_values in wants has a partner with the same value in has. */ |
234 | /* Returns TRUE if every key_values in wants has a partner with the same value in has. */ |
141 | static bool |
235 | static bool |
142 | compare_ob_value_lists_one (const object *wants, const object *has) |
236 | compare_ob_value_lists_one (const object *wants, const object *has) |
143 | { |
237 | { |
144 | /* n-squared behaviour (see kv_get), but I'm hoping both |
238 | /* n-squared behaviour (see kv.get), but I'm hoping both |
145 | * objects with lists are rare, and lists stay short. If not, use a |
239 | * objects with lists are rare, and lists stay short. If not, use a |
146 | * different structure or at least keep the lists sorted... |
240 | * different structure or at least keep the lists sorted... |
147 | */ |
241 | */ |
148 | |
242 | |
149 | /* For each field in wants, */ |
243 | /* For each field in wants, */ |
150 | for (key_value *kv = wants->key_values; kv; kv = kv->next) |
244 | for (key_value *kv = wants->kv.first; kv; kv = kv->next) |
151 | if (has->kv_get (kv->key) != kv->value) |
245 | if (has->kv.get (kv->key) != kv->value) |
152 | return false; |
246 | return false; |
153 | |
247 | |
154 | /* If we get here, every field in wants has a matching field in has. */ |
248 | /* If we get here, every field in wants has a matching field in has. */ |
155 | return true; |
249 | return true; |
156 | } |
250 | } |
… | |
… | |
178 | * Improvements made with merge: Better checking on potion, and also |
272 | * Improvements made with merge: Better checking on potion, and also |
179 | * check weight |
273 | * check weight |
180 | */ |
274 | */ |
181 | bool object::can_merge_slow (object *ob1, object *ob2) |
275 | bool object::can_merge_slow (object *ob1, object *ob2) |
182 | { |
276 | { |
183 | /* A couple quicksanity checks */ |
277 | /* A couple quick sanity checks */ |
184 | if (ob1 == ob2 |
278 | if (ob1 == ob2 |
185 | || ob1->type != ob2->type |
279 | || ob1->type != ob2->type |
186 | || ob1->speed != ob2->speed |
|
|
187 | || ob1->value != ob2->value |
280 | || ob1->value != ob2->value |
188 | || ob1->name != ob2->name) |
281 | || ob1->name != ob2->name |
|
|
282 | || ob1->custom_name != ob2->custom_name |
|
|
283 | || fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED) |
189 | return 0; |
284 | return 0; |
190 | |
285 | |
191 | /* Do not merge objects if nrof would overflow. First part checks |
286 | /* Do not merge objects if nrof would overflow, assume nrof |
192 | * for unsigned overflow (2c), second part checks whether the result |
287 | * is always 0 .. 2**31-1 */ |
193 | * would fit into a 32 bit signed int, which is often used to hold |
288 | if (ob1->nrof > 0x7fffffff - ob2->nrof) |
194 | * nrof values. |
|
|
195 | */ |
|
|
196 | if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31)) |
|
|
197 | return 0; |
289 | return 0; |
198 | |
290 | |
199 | /* If the objects have been identified, set the BEEN_APPLIED flag. |
291 | /* If the objects have been identified, set the BEEN_APPLIED flag. |
200 | * This is to the comparison of the flags below will be OK. We |
292 | * This is to the comparison of the flags below will be OK. We |
201 | * just can't ignore the been applied or identified flags, as they |
293 | * just can't ignore the been applied or identified flags, as they |
202 | * are not equal - just if it has been identified, the been_applied |
294 | * are not equal - just if it has been identified, the been_applied |
203 | * flags lose any meaning. |
295 | * flags lose any meaning. |
204 | */ |
296 | */ |
205 | if (QUERY_FLAG (ob1, FLAG_IDENTIFIED)) |
297 | if (ob1->flag [FLAG_IDENTIFIED]) |
206 | SET_FLAG (ob1, FLAG_BEEN_APPLIED); |
298 | ob1->set_flag (FLAG_BEEN_APPLIED); |
207 | |
299 | |
208 | if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) |
300 | if (ob2->flag [FLAG_IDENTIFIED]) |
209 | SET_FLAG (ob2, FLAG_BEEN_APPLIED); |
301 | ob2->set_flag (FLAG_BEEN_APPLIED); |
210 | |
302 | |
211 | if (ob1->arch->archname != ob2->arch->archname |
303 | if (ob1->arch->archname != ob2->arch->archname |
212 | || ob1->name != ob2->name |
304 | || ob1->name != ob2->name |
213 | || ob1->title != ob2->title |
305 | || ob1->title != ob2->title |
214 | || ob1->msg != ob2->msg |
306 | || ob1->msg != ob2->msg |
… | |
… | |
217 | || ob1->magic != ob2->magic |
309 | || ob1->magic != ob2->magic |
218 | || ob1->slaying != ob2->slaying |
310 | || ob1->slaying != ob2->slaying |
219 | || ob1->skill != ob2->skill |
311 | || ob1->skill != ob2->skill |
220 | || ob1->value != ob2->value |
312 | || ob1->value != ob2->value |
221 | || ob1->animation_id != ob2->animation_id |
313 | || ob1->animation_id != ob2->animation_id |
222 | || (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other |
314 | || (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependend on each other |
223 | || ob1->client_type != ob2->client_type |
315 | || ob1->client_type != ob2->client_type |
224 | || ob1->materialname != ob2->materialname |
316 | || ob1->material != ob2->material |
225 | || ob1->lore != ob2->lore |
317 | || ob1->lore != ob2->lore |
226 | || ob1->subtype != ob2->subtype |
318 | || ob1->subtype != ob2->subtype |
227 | || ob1->move_type != ob2->move_type |
319 | || ob1->move_type != ob2->move_type |
228 | || ob1->move_block != ob2->move_block |
320 | || ob1->move_block != ob2->move_block |
229 | || ob1->move_allow != ob2->move_allow |
321 | || ob1->move_allow != ob2->move_allow |
230 | || ob1->move_on != ob2->move_on |
322 | || ob1->move_on != ob2->move_on |
231 | || ob1->move_off != ob2->move_off |
323 | || ob1->move_off != ob2->move_off |
232 | || ob1->move_slow != ob2->move_slow |
324 | || ob1->move_slow != ob2->move_slow |
233 | || ob1->move_slow_penalty != ob2->move_slow_penalty |
325 | || fabs (ob1->move_slow_penalty - ob2->move_slow_penalty) >= (1.f / 1024.f) |
234 | || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) |
326 | || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) |
235 | || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats))) |
327 | || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats))) |
236 | return 0; |
328 | return 0; |
237 | |
329 | |
238 | if ((ob1->flag ^ ob2->flag) |
330 | if ((ob1->flag ^ ob2->flag) |
239 | .reset (FLAG_INV_LOCKED) |
331 | .reset (FLAG_INV_LOCKED) |
240 | .reset (FLAG_CLIENT_SENT) |
|
|
241 | .reset (FLAG_REMOVED) |
332 | .reset (FLAG_REMOVED) |
242 | .any ()) |
333 | .any ()) |
243 | return 0; |
334 | return 0; |
244 | |
335 | |
245 | /* This is really a spellbook check - we should in general |
336 | /* This is really a spellbook check - we should in general |
… | |
… | |
264 | |
355 | |
265 | /* Don't merge objects that are applied. With the new 'body' code, |
356 | /* Don't merge objects that are applied. With the new 'body' code, |
266 | * it is possible for most any character to have more than one of |
357 | * it is possible for most any character to have more than one of |
267 | * some items equipped, and we don't want those to merge. |
358 | * some items equipped, and we don't want those to merge. |
268 | */ |
359 | */ |
269 | if (QUERY_FLAG (ob1, FLAG_APPLIED) || QUERY_FLAG (ob2, FLAG_APPLIED)) |
360 | if (ob1->flag [FLAG_APPLIED] || ob2->flag [FLAG_APPLIED]) |
270 | return 0; |
361 | return 0; |
271 | |
362 | |
272 | /* Note sure why the following is the case - either the object has to |
363 | /* Note sure why the following is the case - either the object has to |
273 | * be animated or have a very low speed. Is this an attempted monster |
364 | * be animated or have a very low speed. Is this an attempted monster |
274 | * check? |
365 | * check? |
275 | */ |
366 | */ |
276 | if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ()) |
367 | if (!ob1->flag [FLAG_ANIMATE] && ob1->has_active_speed ()) |
277 | return 0; |
368 | return 0; |
278 | |
369 | |
279 | switch (ob1->type) |
370 | switch (ob1->type) |
280 | { |
371 | { |
281 | case SCROLL: |
372 | case SCROLL: |
282 | if (ob1->level != ob2->level) |
373 | if (ob1->level != ob2->level) |
283 | return 0; |
374 | return 0; |
284 | break; |
375 | break; |
285 | } |
376 | } |
286 | |
377 | |
287 | if (ob1->key_values || ob2->key_values) |
378 | if (!ob1->kv.empty () || !ob2->kv.empty ()) |
288 | { |
379 | { |
289 | /* At least one of these has key_values. */ |
380 | /* At least one of these has key_values. */ |
290 | if ((!ob1->key_values) != (!ob2->key_values)) |
381 | if (ob1->kv.empty () != ob2->kv.empty ()) |
291 | return 0; /* One has fields, but the other one doesn't. */ |
382 | return 0; /* One has fields, but the other one doesn't. */ |
292 | |
383 | |
293 | if (!compare_ob_value_lists (ob1, ob2)) |
384 | if (!compare_ob_value_lists (ob1, ob2)) |
294 | return 0; |
385 | return 0; |
295 | } |
386 | } |
… | |
… | |
327 | { |
418 | { |
328 | // see if we are in a container of sorts |
419 | // see if we are in a container of sorts |
329 | if (env) |
420 | if (env) |
330 | { |
421 | { |
331 | // the player inventory itself is always visible |
422 | // the player inventory itself is always visible |
332 | if (env->type == PLAYER) |
423 | if (env->is_player ()) |
333 | return env; |
424 | return env; |
334 | |
425 | |
335 | // else a player could have our env open |
426 | // else a player could have our env open |
336 | object *envest = env->outer_env (); |
427 | object *envest = env->outer_env_or_self (); |
337 | |
428 | |
338 | // the player itself is always on a map, so we will find him here |
429 | // the player itself is always on a map, so we will find him here |
339 | // even if our inv is in a player. |
430 | // even if our inv is in a player. |
340 | if (envest->is_on_map ()) |
431 | if (envest->is_on_map ()) |
341 | if (object *pl = envest->ms ().player ()) |
432 | if (object *pl = envest->ms ().player ()) |
342 | if (pl->container == env) |
433 | if (pl->container_ () == env) |
343 | return pl; |
434 | return pl; |
344 | } |
435 | } |
345 | else |
436 | else |
346 | { |
437 | { |
347 | // maybe there is a player standing on the same mapspace |
438 | // maybe there is a player standing on the same mapspace |
348 | // this will catch the case where "this" is a player |
439 | // this will catch the case where "this" is a player |
349 | if (object *pl = ms ().player ()) |
440 | if (object *pl = ms ().player ()) |
350 | if (!pl->container || this == pl->container) |
441 | if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look) |
|
|
442 | || pl->container_ () == this) |
351 | return pl; |
443 | return pl; |
352 | } |
444 | } |
353 | } |
445 | } |
354 | |
446 | |
355 | return 0; |
447 | return 0; |
356 | } |
448 | } |
357 | |
449 | |
358 | // adjust weight per container type ("of holding") |
450 | // adjust weight per container type ("of holding") |
359 | static sint32 |
451 | static weight_t |
360 | weight_adjust_for (object *op, sint32 weight) |
452 | weight_adjust_for (object *op, weight_t weight) |
361 | { |
453 | { |
362 | return op->type == CONTAINER |
454 | if (op->type == CONTAINER) |
363 | ? lerp (weight, 0, 100, 0, 100 - op->stats.Str) |
455 | weight -= weight * op->stats.Str / 100; |
364 | : weight; |
|
|
365 | } |
|
|
366 | |
456 | |
|
|
457 | return weight; |
|
|
458 | } |
|
|
459 | |
367 | /* |
460 | /* |
368 | * adjust_weight(object, weight) adds the specified weight to an object, |
461 | * subtracts, then adds, the specified weight to an object, |
369 | * and also updates how much the environment(s) is/are carrying. |
462 | * and also updates how much the environment(s) is/are carrying. |
370 | */ |
463 | */ |
371 | static void |
464 | static void |
372 | adjust_weight (object *op, sint32 weight) |
465 | adjust_weight (object *op, weight_t sub, weight_t add) |
373 | { |
466 | { |
374 | while (op) |
467 | while (op) |
375 | { |
468 | { |
376 | // adjust by actual difference to account for rounding errors |
469 | weight_t carrying = (weight_t)op->carrying |
377 | // i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct |
470 | - weight_adjust_for (op, sub) |
378 | weight = weight_adjust_for (op, op->carrying) |
471 | + weight_adjust_for (op, add); |
379 | - weight_adjust_for (op, op->carrying - weight); |
|
|
380 | |
472 | |
381 | if (!weight) |
473 | sub = op->carrying; |
382 | return; |
|
|
383 | |
|
|
384 | op->carrying += weight; |
474 | op->carrying = carrying; |
|
|
475 | add = op->carrying; |
385 | |
476 | |
386 | if (object *pl = op->visible_to ()) |
477 | if (object *pl = op->visible_to ()) |
387 | if (pl != op) // player is handled lazily |
478 | if (pl != op) // player is handled lazily |
388 | esrv_update_item (UPD_WEIGHT, pl, op); |
479 | esrv_update_item (UPD_WEIGHT, pl, op); |
389 | |
480 | |
… | |
… | |
397 | * containers are carrying, and sums it up. |
488 | * containers are carrying, and sums it up. |
398 | */ |
489 | */ |
399 | void |
490 | void |
400 | object::update_weight () |
491 | object::update_weight () |
401 | { |
492 | { |
402 | sint32 sum = 0; |
493 | weight_t sum = 0; |
403 | |
494 | |
404 | for (object *op = inv; op; op = op->below) |
495 | for (object *op = inv; op; op = op->below) |
405 | { |
496 | { |
406 | if (op->inv) |
|
|
407 | op->update_weight (); |
497 | op->update_weight (); |
408 | |
498 | |
409 | sum += op->total_weight (); |
499 | sum += weight_adjust_for (this, op->total_weight ()); |
410 | } |
500 | } |
411 | |
|
|
412 | sum = weight_adjust_for (this, sum); |
|
|
413 | |
501 | |
414 | if (sum != carrying) |
502 | if (sum != carrying) |
415 | { |
503 | { |
|
|
504 | if (carrying != sum && carrying)//D |
|
|
505 | LOG (llevDebug, "updating carrying got %ld, expected %ld (%s)\n", |
|
|
506 | (long long)sum, (long long)carrying, debug_desc ()); |
|
|
507 | |
416 | carrying = sum; |
508 | carrying = sum; |
417 | |
509 | |
418 | if (object *pl = visible_to ()) |
510 | if (object *pl = visible_to ()) |
419 | if (pl != this) // player is handled lazily |
511 | if (pl != this) // player is handled lazily |
420 | esrv_update_item (UPD_WEIGHT, pl, this); |
512 | esrv_update_item (UPD_WEIGHT, pl, this); |
… | |
… | |
433 | object_freezer freezer; |
525 | object_freezer freezer; |
434 | op->write (freezer); |
526 | op->write (freezer); |
435 | return freezer.as_string (); |
527 | return freezer.as_string (); |
436 | } |
528 | } |
437 | |
529 | |
438 | /* |
530 | char * |
439 | * get_nearest_part(multi-object, object 2) returns the part of the |
531 | object::as_string () |
440 | * multi-object 1 which is closest to the second object. |
|
|
441 | * If it's not a multi-object, it is returned. |
|
|
442 | */ |
|
|
443 | object * |
|
|
444 | get_nearest_part (object *op, const object *pl) |
|
|
445 | { |
532 | { |
446 | object *tmp, *closest; |
533 | return dump_object (this); |
447 | int last_dist, i; |
|
|
448 | |
|
|
449 | if (!op->more) |
|
|
450 | return op; |
|
|
451 | |
|
|
452 | for (last_dist = distance (op, pl), closest = op, tmp = op->more; |
|
|
453 | tmp; |
|
|
454 | tmp = tmp->more) |
|
|
455 | if ((i = distance (tmp, pl)) < last_dist) |
|
|
456 | closest = tmp, last_dist = i; |
|
|
457 | |
|
|
458 | return closest; |
|
|
459 | } |
534 | } |
460 | |
535 | |
461 | /* |
536 | /* |
462 | * Returns the object which has the count-variable equal to the argument. |
537 | * Returns the object which has the count-variable equal to the argument. |
463 | * VERRRY slow. |
538 | * VERRRY slow. |
… | |
… | |
465 | object * |
540 | object * |
466 | find_object (tag_t i) |
541 | find_object (tag_t i) |
467 | { |
542 | { |
468 | for_all_objects (op) |
543 | for_all_objects (op) |
469 | if (op->count == i) |
544 | if (op->count == i) |
|
|
545 | return op; |
|
|
546 | |
|
|
547 | return 0; |
|
|
548 | } |
|
|
549 | |
|
|
550 | /* |
|
|
551 | * Returns the object which has the uuid equal to the argument. |
|
|
552 | * MOAR VERRRY slow. |
|
|
553 | */ |
|
|
554 | |
|
|
555 | object * |
|
|
556 | find_object_uuid (UUID i) |
|
|
557 | { |
|
|
558 | for_all_objects (op) |
|
|
559 | if (op->uuid == i) |
470 | return op; |
560 | return op; |
471 | |
561 | |
472 | return 0; |
562 | return 0; |
473 | } |
563 | } |
474 | |
564 | |
… | |
… | |
508 | LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ()); |
598 | LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ()); |
509 | return; |
599 | return; |
510 | } |
600 | } |
511 | |
601 | |
512 | this->owner = owner; |
602 | this->owner = owner; |
513 | } |
|
|
514 | |
|
|
515 | int |
|
|
516 | object::slottype () const |
|
|
517 | { |
|
|
518 | if (type == SKILL) |
|
|
519 | { |
|
|
520 | if (IS_COMBAT_SKILL (subtype)) return slot_combat; |
|
|
521 | if (IS_RANGED_SKILL (subtype)) return slot_ranged; |
|
|
522 | } |
|
|
523 | else |
|
|
524 | { |
|
|
525 | if (slot [body_combat].info) return slot_combat; |
|
|
526 | if (slot [body_range ].info) return slot_ranged; |
|
|
527 | } |
|
|
528 | |
|
|
529 | return slot_none; |
|
|
530 | } |
|
|
531 | |
|
|
532 | bool |
|
|
533 | object::change_weapon (object *ob) |
|
|
534 | { |
|
|
535 | if (current_weapon == ob) |
|
|
536 | return true; |
|
|
537 | |
|
|
538 | if (chosen_skill) |
|
|
539 | chosen_skill->flag [FLAG_APPLIED] = false; |
|
|
540 | |
|
|
541 | current_weapon = ob; |
|
|
542 | chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill); |
|
|
543 | |
|
|
544 | if (chosen_skill) |
|
|
545 | chosen_skill->flag [FLAG_APPLIED] = true; |
|
|
546 | |
|
|
547 | update_stats (); |
|
|
548 | |
|
|
549 | if (ob) |
|
|
550 | { |
|
|
551 | // now check wether any body locations became invalid, in which case |
|
|
552 | // we cannot apply the weapon at the moment. |
|
|
553 | for (int i = 0; i < NUM_BODY_LOCATIONS; ++i) |
|
|
554 | if (slot[i].used < 0) |
|
|
555 | { |
|
|
556 | current_weapon = chosen_skill = 0; |
|
|
557 | update_stats (); |
|
|
558 | |
|
|
559 | new_draw_info_format (NDI_UNIQUE, 0, this, |
|
|
560 | "You try to balance all your items at once, " |
|
|
561 | "but the %s is just too much for your body. " |
|
|
562 | "[You need to unapply some items first.]", &ob->name); |
|
|
563 | return false; |
|
|
564 | } |
|
|
565 | |
|
|
566 | //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name); |
|
|
567 | } |
|
|
568 | else |
|
|
569 | ;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons."); |
|
|
570 | |
|
|
571 | if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL) |
|
|
572 | { |
|
|
573 | LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s", |
|
|
574 | &name, ob->debug_desc ()); |
|
|
575 | return false; |
|
|
576 | } |
|
|
577 | |
|
|
578 | return true; |
|
|
579 | } |
|
|
580 | |
|
|
581 | /* Zero the key_values on op, decrementing the shared-string |
|
|
582 | * refcounts and freeing the links. |
|
|
583 | */ |
|
|
584 | static void |
|
|
585 | free_key_values (object *op) |
|
|
586 | { |
|
|
587 | for (key_value *i = op->key_values; i; ) |
|
|
588 | { |
|
|
589 | key_value *next = i->next; |
|
|
590 | delete i; |
|
|
591 | |
|
|
592 | i = next; |
|
|
593 | } |
|
|
594 | |
|
|
595 | op->key_values = 0; |
|
|
596 | } |
603 | } |
597 | |
604 | |
598 | /* |
605 | /* |
599 | * copy_to first frees everything allocated by the dst object, |
606 | * copy_to first frees everything allocated by the dst object, |
600 | * and then copies the contents of itself into the second |
607 | * and then copies the contents of itself into the second |
… | |
… | |
606 | void |
613 | void |
607 | object::copy_to (object *dst) |
614 | object::copy_to (object *dst) |
608 | { |
615 | { |
609 | dst->remove (); |
616 | dst->remove (); |
610 | *(object_copy *)dst = *this; |
617 | *(object_copy *)dst = *this; |
|
|
618 | |
|
|
619 | // maybe move to object_copy? |
|
|
620 | dst->kv = kv; |
|
|
621 | |
611 | dst->flag [FLAG_REMOVED] = true; |
622 | dst->flag [FLAG_REMOVED] = true; |
612 | |
623 | dst->activate (); |
613 | /* Copy over key_values, if any. */ |
|
|
614 | if (key_values) |
|
|
615 | { |
|
|
616 | key_value *tail = 0; |
|
|
617 | dst->key_values = 0; |
|
|
618 | |
|
|
619 | for (key_value *i = key_values; i; i = i->next) |
|
|
620 | { |
|
|
621 | key_value *new_link = new key_value; |
|
|
622 | |
|
|
623 | new_link->next = 0; |
|
|
624 | new_link->key = i->key; |
|
|
625 | new_link->value = i->value; |
|
|
626 | |
|
|
627 | /* Try and be clever here, too. */ |
|
|
628 | if (!dst->key_values) |
|
|
629 | { |
|
|
630 | dst->key_values = new_link; |
|
|
631 | tail = new_link; |
|
|
632 | } |
|
|
633 | else |
|
|
634 | { |
|
|
635 | tail->next = new_link; |
|
|
636 | tail = new_link; |
|
|
637 | } |
|
|
638 | } |
|
|
639 | } |
|
|
640 | |
|
|
641 | if (speed < 0) |
|
|
642 | dst->speed_left -= rndm (); |
|
|
643 | |
|
|
644 | dst->set_speed (dst->speed); |
|
|
645 | } |
624 | } |
646 | |
625 | |
647 | void |
626 | void |
648 | object::instantiate () |
627 | object::instantiate () |
649 | { |
628 | { |
650 | if (!uuid.seq) // HACK |
629 | if (!uuid.seq) // HACK |
651 | uuid = UUID::gen (); |
630 | uuid = UUID::gen (); |
652 | |
631 | |
|
|
632 | // TODO: unclean state changes, should not be done in copy_to AND instantiate |
|
|
633 | if (flag [FLAG_RANDOM_SPEED] && speed) |
|
|
634 | speed_left = - speed - rndm (); // TODO animation |
|
|
635 | else |
653 | speed_left = -0.1f; |
636 | speed_left = -1.; |
|
|
637 | |
654 | /* copy the body_info to the body_used - this is only really |
638 | /* copy the body_info to the body_used - this is only really |
655 | * need for monsters, but doesn't hurt to do it for everything. |
639 | * need for monsters, but doesn't hurt to do it for everything. |
656 | * by doing so, when a monster is created, it has good starting |
640 | * by doing so, when a monster is created, it has good starting |
657 | * values for the body_used info, so when items are created |
641 | * values for the body_used info, so when items are created |
658 | * for it, they can be properly equipped. |
642 | * for it, they can be properly equipped. |
… | |
… | |
666 | object * |
650 | object * |
667 | object::clone () |
651 | object::clone () |
668 | { |
652 | { |
669 | object *neu = create (); |
653 | object *neu = create (); |
670 | copy_to (neu); |
654 | copy_to (neu); |
|
|
655 | |
|
|
656 | // TODO: unclean state changes, should not be done in clone AND instantiate |
|
|
657 | if (neu->flag [FLAG_RANDOM_SPEED] && neu->speed) |
|
|
658 | neu->speed_left = - neu->speed - rndm (); // TODO animation |
|
|
659 | |
671 | neu->map = map; // not copied by copy_to |
660 | neu->map = map; // not copied by copy_to |
672 | return neu; |
661 | return neu; |
673 | } |
662 | } |
674 | |
663 | |
675 | /* |
664 | /* |
… | |
… | |
678 | * be called to update the face variable, _and_ how it looks on the map. |
667 | * be called to update the face variable, _and_ how it looks on the map. |
679 | */ |
668 | */ |
680 | void |
669 | void |
681 | update_turn_face (object *op) |
670 | update_turn_face (object *op) |
682 | { |
671 | { |
683 | if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch) |
672 | if (!op->flag [FLAG_IS_TURNABLE] || !op->arch) |
684 | return; |
673 | return; |
685 | |
674 | |
686 | SET_ANIMATION (op, op->direction); |
675 | SET_ANIMATION (op, op->direction); |
687 | update_object (op, UP_OBJ_FACE); |
676 | update_object (op, UP_OBJ_FACE); |
688 | } |
677 | } |
… | |
… | |
693 | * This function needs to be called whenever the speed of an object changes. |
682 | * This function needs to be called whenever the speed of an object changes. |
694 | */ |
683 | */ |
695 | void |
684 | void |
696 | object::set_speed (float speed) |
685 | object::set_speed (float speed) |
697 | { |
686 | { |
698 | if (flag [FLAG_FREED] && speed) |
|
|
699 | { |
|
|
700 | LOG (llevError, "Object %s is freed but has speed.\n", &name); |
|
|
701 | speed = 0; |
|
|
702 | } |
|
|
703 | |
|
|
704 | this->speed = speed; |
687 | this->speed = speed; |
705 | |
688 | |
706 | if (has_active_speed ()) |
689 | if (has_active_speed ()) |
707 | activate (); |
690 | activate (); |
708 | else |
691 | else |
… | |
… | |
755 | } |
738 | } |
756 | |
739 | |
757 | mapspace &m = op->ms (); |
740 | mapspace &m = op->ms (); |
758 | |
741 | |
759 | if (!(m.flags_ & P_UPTODATE)) |
742 | if (!(m.flags_ & P_UPTODATE)) |
760 | /* nop */; |
743 | m.update_up (); // nothing to do except copy up |
761 | else if (action == UP_OBJ_INSERT) |
744 | else if (action == UP_OBJ_INSERT) |
762 | { |
745 | { |
|
|
746 | #if 0 |
763 | // this is likely overkill, TODO: revisit (schmorp) |
747 | // this is likely overkill, TODO: revisit (schmorp) |
764 | if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) |
748 | if ((op->flag [FLAG_BLOCKSVIEW] && !(m.flags_ & P_BLOCKSVIEW)) |
765 | || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) |
749 | || (op->flag [FLAG_NO_MAGIC] && !(m.flags_ & P_NO_MAGIC)) |
766 | || (op->type == PLAYER && !(m.flags_ & P_PLAYER)) |
750 | || (op->is_player () && !(m.flags_ & P_PLAYER)) |
767 | || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) |
751 | || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) |
768 | || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) |
752 | || (op->flag [FLAG_ALIVE] && !(m.flags_ & P_IS_ALIVE)) |
769 | || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) |
753 | || (op->flag [FLAG_DAMNED] && !(m.flags_ & P_NO_CLERIC)) |
770 | || (m.move_on | op->move_on ) != m.move_on |
754 | || (m.move_on | op->move_on ) != m.move_on |
771 | || (m.move_off | op->move_off ) != m.move_off |
755 | || (m.move_off | op->move_off ) != m.move_off |
772 | || (m.move_slow | op->move_slow) != m.move_slow |
756 | || (m.move_slow | op->move_slow) != m.move_slow |
773 | /* This isn't perfect, but I don't expect a lot of objects to |
757 | /* This isn't perfect, but I don't expect a lot of objects to |
774 | * to have move_allow right now. |
758 | * have move_allow right now. |
775 | */ |
759 | */ |
776 | || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block |
760 | || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block |
|
|
761 | m.invalidate (); |
|
|
762 | #else |
777 | || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) |
763 | // the above is not strong enough a test to skip updating. los maybe? TODO (schmorp) |
778 | m.flags_ = 0; |
764 | m.invalidate (); |
|
|
765 | #endif |
779 | } |
766 | } |
780 | /* if the object is being removed, we can't make intelligent |
767 | /* if the object is being removed, we can't make intelligent |
781 | * decisions, because remove_ob can't really pass the object |
768 | * decisions, because remove_ob can't really pass the object |
782 | * that is being removed. |
769 | * that is being removed. |
783 | */ |
770 | */ |
784 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
771 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
785 | m.flags_ = 0; |
772 | m.invalidate (); |
786 | else if (action == UP_OBJ_FACE) |
773 | else if (action == UP_OBJ_FACE) |
787 | /* Nothing to do for that case */ ; |
774 | m.update_up (); // nothing to do for that case, except copy up |
788 | else |
775 | else |
789 | LOG (llevError, "update_object called with invalid action: %d\n", action); |
776 | LOG (llevError, "update_object called with invalid action: %d\n", action); |
790 | |
777 | |
791 | if (op->more) |
778 | if (op->more) |
792 | update_object (op->more, action); |
779 | update_object (op->more, action); |
793 | } |
780 | } |
794 | |
781 | |
795 | object::object () |
782 | object::object () |
796 | { |
783 | { |
797 | SET_FLAG (this, FLAG_REMOVED); |
784 | this->set_flag (FLAG_REMOVED); |
798 | |
785 | |
799 | expmul = 1.0; |
786 | //expmul = 1.0; declared const for the time being |
800 | face = blank_face; |
787 | face = blank_face; |
|
|
788 | material = MATERIAL_NULL; |
801 | } |
789 | } |
802 | |
790 | |
803 | object::~object () |
791 | object::~object () |
804 | { |
792 | { |
805 | unlink (); |
793 | unlink (); |
806 | |
794 | |
807 | free_key_values (this); |
795 | kv.clear (); |
808 | } |
796 | } |
809 | |
|
|
810 | static int object_count; |
|
|
811 | |
797 | |
812 | void object::link () |
798 | void object::link () |
813 | { |
799 | { |
814 | assert (!index);//D |
800 | assert (!index);//D |
815 | uuid = UUID::gen (); |
801 | uuid = UUID::gen (); |
816 | count = ++object_count; |
|
|
817 | |
802 | |
818 | refcnt_inc (); |
803 | refcnt_inc (); |
819 | objects.insert (this); |
804 | objects.insert (this); |
|
|
805 | |
|
|
806 | ++create_count; |
|
|
807 | |
820 | } |
808 | } |
821 | |
809 | |
822 | void object::unlink () |
810 | void object::unlink () |
823 | { |
811 | { |
824 | if (!index) |
812 | if (!index) |
825 | return; |
813 | return; |
|
|
814 | |
|
|
815 | ++destroy_count; |
826 | |
816 | |
827 | objects.erase (this); |
817 | objects.erase (this); |
828 | refcnt_dec (); |
818 | refcnt_dec (); |
829 | } |
819 | } |
830 | |
820 | |
… | |
… | |
834 | /* If already on active list, don't do anything */ |
824 | /* If already on active list, don't do anything */ |
835 | if (active) |
825 | if (active) |
836 | return; |
826 | return; |
837 | |
827 | |
838 | if (has_active_speed ()) |
828 | if (has_active_speed ()) |
|
|
829 | { |
|
|
830 | if (flag [FLAG_FREED]) |
|
|
831 | LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D |
|
|
832 | |
839 | actives.insert (this); |
833 | actives.insert (this); |
|
|
834 | } |
840 | } |
835 | } |
841 | |
836 | |
842 | void |
837 | void |
843 | object::activate_recursive () |
838 | object::activate_recursive () |
844 | { |
839 | { |
… | |
… | |
904 | * if some form of movement is allowed, let objects |
899 | * if some form of movement is allowed, let objects |
905 | * drop on that space. |
900 | * drop on that space. |
906 | */ |
901 | */ |
907 | if (!drop_to_ground |
902 | if (!drop_to_ground |
908 | || !map |
903 | || !map |
909 | || map->in_memory != MAP_ACTIVE |
904 | || !map->linkable () |
910 | || map->no_drop |
905 | || map->no_drop |
911 | || ms ().move_block == MOVE_ALL) |
906 | || ms ().move_block == MOVE_ALL) |
912 | { |
907 | { |
913 | while (inv) |
908 | while (inv) |
914 | { |
|
|
915 | inv->destroy_inv (false); |
|
|
916 | inv->destroy (); |
909 | inv->destroy (); |
917 | } |
|
|
918 | } |
910 | } |
919 | else |
911 | else |
920 | { /* Put objects in inventory onto this space */ |
912 | { /* Put objects in inventory onto this space */ |
921 | while (inv) |
913 | while (inv) |
922 | { |
914 | { |
… | |
… | |
926 | || op->flag [FLAG_NO_DROP] |
918 | || op->flag [FLAG_NO_DROP] |
927 | || op->type == RUNE |
919 | || op->type == RUNE |
928 | || op->type == TRAP |
920 | || op->type == TRAP |
929 | || op->flag [FLAG_IS_A_TEMPLATE] |
921 | || op->flag [FLAG_IS_A_TEMPLATE] |
930 | || op->flag [FLAG_DESTROY_ON_DEATH]) |
922 | || op->flag [FLAG_DESTROY_ON_DEATH]) |
931 | op->destroy (true); |
923 | op->destroy (); |
932 | else |
924 | else |
933 | map->insert (op, x, y); |
925 | map->insert (op, x, y); |
934 | } |
926 | } |
935 | } |
927 | } |
936 | } |
928 | } |
937 | |
929 | |
|
|
930 | /* |
|
|
931 | * Remove and free all objects in the inventory of the given object. |
|
|
932 | * Unlike destroy_inv, this assumes the *this is destroyed as well |
|
|
933 | * well, so we can (and have to!) take shortcuts. |
|
|
934 | */ |
|
|
935 | void |
|
|
936 | object::destroy_inv_fast () |
|
|
937 | { |
|
|
938 | while (object *op = inv) |
|
|
939 | { |
|
|
940 | // remove from object the fast way |
|
|
941 | op->flag [FLAG_REMOVED] = true; |
|
|
942 | op->env = 0; |
|
|
943 | if ((inv = inv->below)) |
|
|
944 | inv->above = 0; |
|
|
945 | |
|
|
946 | // then destroy |
|
|
947 | op->destroy (); |
|
|
948 | } |
|
|
949 | } |
|
|
950 | |
|
|
951 | void |
|
|
952 | object::freelist_free (int count) |
|
|
953 | { |
|
|
954 | while (count-- && freelist) |
|
|
955 | { |
|
|
956 | freelist_item *next = freelist->next; |
|
|
957 | // count is being "destroyed" |
|
|
958 | |
|
|
959 | sfree ((char *)freelist, sizeof (object)); |
|
|
960 | |
|
|
961 | freelist = next; |
|
|
962 | --free_count; |
|
|
963 | } |
|
|
964 | } |
|
|
965 | |
|
|
966 | object * |
938 | object *object::create () |
967 | object::create () |
939 | { |
968 | { |
940 | object *op = new object; |
969 | object *op; |
|
|
970 | |
|
|
971 | if (freelist) |
|
|
972 | { |
|
|
973 | freelist_item li = *freelist; |
|
|
974 | memset (freelist, 0, sizeof (object)); |
|
|
975 | |
|
|
976 | op = new (freelist) object; |
|
|
977 | op->count = li.count; |
|
|
978 | |
|
|
979 | freelist = li.next; |
|
|
980 | --free_count; |
|
|
981 | } |
|
|
982 | else |
|
|
983 | { |
|
|
984 | void *ni = salloc0<char> (sizeof (object)); |
|
|
985 | |
|
|
986 | op = new(ni) object; |
|
|
987 | |
|
|
988 | op->count = ++object_count; |
|
|
989 | } |
|
|
990 | |
941 | op->link (); |
991 | op->link (); |
|
|
992 | |
942 | return op; |
993 | return op; |
943 | } |
994 | } |
944 | |
995 | |
945 | static struct freed_map : maptile |
996 | void |
|
|
997 | object::do_delete () |
946 | { |
998 | { |
947 | freed_map () |
999 | uint32_t count = this->count; |
948 | { |
|
|
949 | path = "<freed objects map>"; |
|
|
950 | name = "/internal/freed_objects_map"; |
|
|
951 | width = 3; |
|
|
952 | height = 3; |
|
|
953 | no_drop = 1; |
|
|
954 | no_reset = 1; |
|
|
955 | |
1000 | |
956 | alloc (); |
1001 | this->~object (); |
957 | in_memory = MAP_ACTIVE; |
|
|
958 | } |
|
|
959 | |
1002 | |
960 | ~freed_map () |
1003 | freelist_item *li = (freelist_item *)this; |
961 | { |
1004 | li->next = freelist; |
962 | destroy (); |
1005 | li->count = count; |
963 | } |
1006 | |
964 | } freed_map; // freed objects are moved here to avoid crashes |
1007 | freelist = li; |
|
|
1008 | ++free_count; |
|
|
1009 | } |
965 | |
1010 | |
966 | void |
1011 | void |
967 | object::do_destroy () |
1012 | object::do_destroy () |
968 | { |
1013 | { |
969 | if (flag [FLAG_IS_LINKED]) |
1014 | if (flag [FLAG_IS_LINKED]) |
970 | remove_button_link (this); |
1015 | remove_link (); |
971 | |
1016 | |
972 | if (flag [FLAG_FRIENDLY]) |
1017 | if (flag [FLAG_FRIENDLY]) |
973 | remove_friendly_object (this); |
1018 | remove_friendly_object (this); |
974 | |
1019 | |
975 | remove (); |
1020 | remove (); |
… | |
… | |
1000 | attacked_by = 0; |
1045 | attacked_by = 0; |
1001 | current_weapon = 0; |
1046 | current_weapon = 0; |
1002 | } |
1047 | } |
1003 | |
1048 | |
1004 | void |
1049 | void |
1005 | object::destroy (bool destroy_inventory) |
1050 | object::destroy () |
1006 | { |
1051 | { |
1007 | if (destroyed ()) |
1052 | if (destroyed ()) |
1008 | return; |
1053 | return; |
1009 | |
1054 | |
1010 | if (!is_head () && !head->destroyed ()) |
1055 | if (!is_head () && !head->destroyed ()) |
1011 | { |
1056 | { |
1012 | LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); |
1057 | LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); |
1013 | head->destroy (destroy_inventory); |
1058 | head->destroy (); |
1014 | return; |
1059 | return; |
1015 | } |
1060 | } |
1016 | |
1061 | |
1017 | destroy_inv (!destroy_inventory); |
1062 | destroy_inv_fast (); |
1018 | |
1063 | |
1019 | if (is_head ()) |
1064 | if (is_head ()) |
1020 | if (sound_destroy) |
1065 | if (sound_destroy) |
1021 | play_sound (sound_destroy); |
1066 | play_sound (sound_destroy); |
1022 | else if (flag [FLAG_MONSTER]) |
1067 | else if (flag [FLAG_MONSTER]) |
… | |
… | |
1033 | * the previous environment. |
1078 | * the previous environment. |
1034 | */ |
1079 | */ |
1035 | void |
1080 | void |
1036 | object::do_remove () |
1081 | object::do_remove () |
1037 | { |
1082 | { |
1038 | object *tmp, *last = 0; |
|
|
1039 | object *otmp; |
|
|
1040 | |
|
|
1041 | if (flag [FLAG_REMOVED]) |
1083 | if (flag [FLAG_REMOVED]) |
1042 | return; |
1084 | return; |
1043 | |
1085 | |
1044 | INVOKE_OBJECT (REMOVE, this); |
1086 | INVOKE_OBJECT (REMOVE, this); |
1045 | |
1087 | |
… | |
… | |
1057 | flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed |
1099 | flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed |
1058 | if (object *pl = visible_to ()) |
1100 | if (object *pl = visible_to ()) |
1059 | esrv_del_item (pl->contr, count); |
1101 | esrv_del_item (pl->contr, count); |
1060 | flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed |
1102 | flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed |
1061 | |
1103 | |
1062 | adjust_weight (env, -total_weight ()); |
1104 | adjust_weight (env, total_weight (), 0); |
|
|
1105 | |
|
|
1106 | object *pl = in_player (); |
1063 | |
1107 | |
1064 | /* we set up values so that it could be inserted into |
1108 | /* we set up values so that it could be inserted into |
1065 | * the map, but we don't actually do that - it is up |
1109 | * the map, but we don't actually do that - it is up |
1066 | * to the caller to decide what we want to do. |
1110 | * to the caller to decide what we want to do. |
1067 | */ |
1111 | */ |
… | |
… | |
1075 | |
1119 | |
1076 | above = 0; |
1120 | above = 0; |
1077 | below = 0; |
1121 | below = 0; |
1078 | env = 0; |
1122 | env = 0; |
1079 | |
1123 | |
1080 | /* NO_FIX_PLAYER is set when a great many changes are being |
1124 | if (pl && pl->is_player ()) |
1081 | * made to players inventory. If set, avoiding the call |
|
|
1082 | * to save cpu time. |
|
|
1083 | */ |
1125 | { |
1084 | if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1126 | if (expect_false (pl->contr->combat_ob == this)) |
1085 | otmp->update_stats (); |
1127 | { |
|
|
1128 | pl->apply (pl->contr->combat_ob, AP_UNAPPLY | AP_IGNORE_CURSE); |
|
|
1129 | pl->contr->combat_ob = 0; |
|
|
1130 | if (pl->contr->ranged_ob) pl->apply (pl->contr->ranged_ob); |
|
|
1131 | } |
|
|
1132 | |
|
|
1133 | if (expect_false (pl->contr->ranged_ob == this)) |
|
|
1134 | { |
|
|
1135 | pl->apply (pl->contr->ranged_ob, AP_UNAPPLY | AP_IGNORE_CURSE); |
|
|
1136 | pl->contr->ranged_ob = 0; |
|
|
1137 | if (pl->contr->combat_ob) pl->apply (pl->contr->combat_ob); |
|
|
1138 | } |
|
|
1139 | |
|
|
1140 | pl->contr->queue_stats_update (); |
|
|
1141 | |
|
|
1142 | if (expect_false (glow_radius) && pl->is_on_map ()) |
|
|
1143 | update_all_los (pl->map, pl->x, pl->y); |
|
|
1144 | } |
1086 | } |
1145 | } |
1087 | else if (map) |
1146 | else if (map) |
1088 | { |
1147 | { |
1089 | map->dirty = true; |
1148 | map->dirty = true; |
1090 | mapspace &ms = this->ms (); |
1149 | mapspace &ms = this->ms (); |
1091 | |
1150 | |
1092 | if (object *pl = ms.player ()) |
1151 | if (object *pl = ms.player ()) |
1093 | { |
1152 | { |
1094 | if (type == PLAYER) // this == pl(!) |
1153 | if (is_player ()) |
1095 | { |
1154 | { |
|
|
1155 | if (!flag [FLAG_WIZPASS]) |
|
|
1156 | ms.smell = ++mapspace::smellcount; // remember the smell of the player |
|
|
1157 | |
1096 | // leaving a spot always closes any open container on the ground |
1158 | // leaving a spot always closes any open container on the ground |
1097 | if (container && !container->env) |
1159 | if (container && !container->env) |
1098 | // this causes spurious floorbox updates, but it ensures |
1160 | // this causes spurious floorbox updates, but it ensures |
1099 | // that the CLOSE event is being sent. |
1161 | // that the CLOSE event is being sent. |
1100 | close_container (); |
1162 | close_container (); |
1101 | |
1163 | |
1102 | --map->players; |
1164 | --map->players; |
1103 | map->touch (); |
1165 | map->touch (); |
1104 | } |
1166 | } |
1105 | else if (pl->container == this) |
1167 | else if (pl->container_ () == this) |
1106 | { |
1168 | { |
1107 | // removing a container should close it |
1169 | // removing a container should close it |
1108 | close_container (); |
1170 | close_container (); |
1109 | } |
1171 | } |
1110 | |
1172 | else |
1111 | esrv_del_item (pl->contr, count); |
1173 | esrv_del_item (pl->contr, count); |
1112 | } |
1174 | } |
1113 | |
1175 | |
1114 | /* link the object above us */ |
1176 | /* link the object above us */ |
1115 | // re-link, make sure compiler can easily use cmove |
1177 | // re-link, make sure compiler can easily use cmove |
1116 | *(above ? &above->below : &ms.top) = below; |
1178 | *(above ? &above->below : &ms.top) = below; |
1117 | *(below ? &below->above : &ms.bot) = above; |
1179 | *(below ? &below->above : &ms.bot) = above; |
1118 | |
1180 | |
1119 | above = 0; |
1181 | above = 0; |
1120 | below = 0; |
1182 | below = 0; |
1121 | |
1183 | |
1122 | if (map->in_memory == MAP_SAVING) |
1184 | ms.invalidate (); |
1123 | return; |
|
|
1124 | |
1185 | |
1125 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1186 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1126 | |
1187 | |
1127 | if (object *pl = ms.player ()) |
1188 | if (object *pl = ms.player ()) |
1128 | { |
1189 | { |
1129 | if (pl->container == this) |
1190 | if (pl->container_ () == this) |
1130 | /* If a container that the player is currently using somehow gets |
1191 | /* If a container that the player is currently using somehow gets |
1131 | * removed (most likely destroyed), update the player view |
1192 | * removed (most likely destroyed), update the player view |
1132 | * appropriately. |
1193 | * appropriately. |
1133 | */ |
1194 | */ |
1134 | pl->close_container (); |
1195 | pl->close_container (); |
… | |
… | |
1138 | //TODO: update floorbox to preserve ordering |
1199 | //TODO: update floorbox to preserve ordering |
1139 | if (pl->contr->ns) |
1200 | if (pl->contr->ns) |
1140 | pl->contr->ns->floorbox_update (); |
1201 | pl->contr->ns->floorbox_update (); |
1141 | } |
1202 | } |
1142 | |
1203 | |
|
|
1204 | if (check_walk_off) |
1143 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
1205 | for (object *above, *tmp = ms.bot; tmp; tmp = above) |
1144 | { |
1206 | { |
|
|
1207 | above = tmp->above; |
|
|
1208 | |
1145 | /* No point updating the players look faces if he is the object |
1209 | /* No point updating the players look faces if he is the object |
1146 | * being removed. |
1210 | * being removed. |
1147 | */ |
1211 | */ |
1148 | |
1212 | |
1149 | /* See if object moving off should effect something */ |
1213 | /* See if object moving off should effect something */ |
1150 | if (check_walk_off |
|
|
1151 | && ((move_type & tmp->move_off) |
1214 | if ((move_type & tmp->move_off) |
1152 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1215 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0) |
1153 | { |
|
|
1154 | move_apply (tmp, this, 0); |
1216 | move_apply (tmp, this, 0); |
1155 | |
|
|
1156 | if (destroyed ()) |
|
|
1157 | LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); |
|
|
1158 | } |
1217 | } |
1159 | |
1218 | |
1160 | last = tmp; |
1219 | if (affects_los ()) |
1161 | } |
|
|
1162 | |
|
|
1163 | /* last == NULL if there are no objects on this space */ |
|
|
1164 | //TODO: this makes little sense, why only update the topmost object? |
|
|
1165 | if (!last) |
|
|
1166 | map->at (x, y).flags_ = 0; |
|
|
1167 | else |
|
|
1168 | update_object (last, UP_OBJ_REMOVE); |
|
|
1169 | |
|
|
1170 | if (flag [FLAG_BLOCKSVIEW] || glow_radius) |
|
|
1171 | update_all_los (map, x, y); |
1220 | update_all_los (map, x, y); |
1172 | } |
1221 | } |
1173 | } |
1222 | } |
1174 | |
1223 | |
1175 | /* |
1224 | /* |
… | |
… | |
1199 | esrv_update_item (UPD_NROF, pl, top); |
1248 | esrv_update_item (UPD_NROF, pl, top); |
1200 | |
1249 | |
1201 | op->weight = 0; // cancel the addition above |
1250 | op->weight = 0; // cancel the addition above |
1202 | op->carrying = 0; // must be 0 already |
1251 | op->carrying = 0; // must be 0 already |
1203 | |
1252 | |
1204 | op->destroy (1); |
1253 | op->destroy (); |
1205 | |
1254 | |
1206 | return top; |
1255 | return top; |
1207 | } |
1256 | } |
1208 | |
1257 | |
1209 | return 0; |
1258 | return 0; |
… | |
… | |
1217 | |
1266 | |
1218 | object *prev = this; |
1267 | object *prev = this; |
1219 | |
1268 | |
1220 | for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more) |
1269 | for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more) |
1221 | { |
1270 | { |
1222 | object *op = arch_to_object (at); |
1271 | object *op = at->instance (); |
1223 | |
1272 | |
1224 | op->name = name; |
1273 | op->name = name; |
1225 | op->name_pl = name_pl; |
1274 | op->name_pl = name_pl; |
1226 | op->title = title; |
1275 | op->title = title; |
1227 | |
1276 | |
… | |
… | |
1265 | * Passing 0 for flag gives proper default values, so flag really only needs |
1314 | * Passing 0 for flag gives proper default values, so flag really only needs |
1266 | * to be set if special handling is needed. |
1315 | * to be set if special handling is needed. |
1267 | * |
1316 | * |
1268 | * Return value: |
1317 | * Return value: |
1269 | * new object if 'op' was merged with other object |
1318 | * new object if 'op' was merged with other object |
1270 | * NULL if 'op' was destroyed |
1319 | * NULL if there was an error (destroyed, blocked etc.) |
1271 | * just 'op' otherwise |
1320 | * just 'op' otherwise |
1272 | */ |
1321 | */ |
1273 | object * |
1322 | object * |
1274 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1323 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1275 | { |
1324 | { |
1276 | if (op->is_on_map ()) |
|
|
1277 | { |
|
|
1278 | LOG (llevError, "insert_ob_in_map called for object already on map"); |
|
|
1279 | abort (); |
|
|
1280 | } |
|
|
1281 | |
|
|
1282 | if (op->env) |
|
|
1283 | { |
|
|
1284 | LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)"); |
|
|
1285 | op->remove (); |
1325 | op->remove (); |
1286 | } |
|
|
1287 | |
1326 | |
1288 | if (op->face && !face_info (op->face))//D TODO: remove soon |
1327 | if (m == &freed_map)//D TODO: remove soon |
1289 | {//D |
1328 | {//D |
1290 | LOG (llevError | logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D |
1329 | LOG (llevError | logBacktrace, "tries to insert object on freed objects map: %s", op->debug_desc ());//D |
1291 | op->face = 1;//D |
|
|
1292 | }//D |
1330 | }//D |
1293 | |
1331 | |
1294 | /* Ideally, the caller figures this out. However, it complicates a lot |
1332 | /* Ideally, the caller figures this out. However, it complicates a lot |
1295 | * of areas of callers (eg, anything that uses find_free_spot would now |
1333 | * of areas of callers (eg, anything that uses find_free_spot would now |
1296 | * need extra work |
1334 | * need extra work |
1297 | */ |
1335 | */ |
|
|
1336 | maptile *newmap = m; |
1298 | if (!xy_normalise (m, op->x, op->y)) |
1337 | if (!xy_normalise (newmap, op->x, op->y)) |
1299 | { |
1338 | { |
1300 | op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found |
1339 | op->head_ ()->destroy ();// remove head_ once all tail object destroyers found |
1301 | return 0; |
1340 | return 0; |
1302 | } |
1341 | } |
1303 | |
1342 | |
1304 | if (object *more = op->more) |
1343 | if (object *more = op->more) |
1305 | if (!insert_ob_in_map (more, m, originator, flag)) |
1344 | if (!insert_ob_in_map (more, m, originator, flag)) |
1306 | return 0; |
1345 | return 0; |
1307 | |
1346 | |
1308 | CLEAR_FLAG (op, FLAG_REMOVED); |
1347 | op->flag [FLAG_REMOVED] = false; |
1309 | |
1348 | op->env = 0; |
1310 | op->map = m; |
1349 | op->map = newmap; |
|
|
1350 | |
1311 | mapspace &ms = op->ms (); |
1351 | mapspace &ms = op->ms (); |
1312 | |
1352 | |
1313 | /* this has to be done after we translate the coordinates. |
1353 | /* this has to be done after we translate the coordinates. |
1314 | */ |
1354 | */ |
1315 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1355 | if (op->nrof && !(flag & INS_NO_MERGE)) |
… | |
… | |
1318 | { |
1358 | { |
1319 | // TODO: we actually want to update tmp, not op, |
1359 | // TODO: we actually want to update tmp, not op, |
1320 | // but some caller surely breaks when we return tmp |
1360 | // but some caller surely breaks when we return tmp |
1321 | // from here :/ |
1361 | // from here :/ |
1322 | op->nrof += tmp->nrof; |
1362 | op->nrof += tmp->nrof; |
1323 | tmp->destroy (1); |
1363 | tmp->destroy (); |
1324 | } |
1364 | } |
1325 | |
1365 | |
1326 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1366 | op->clr_flag (FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1327 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1367 | op->clr_flag (FLAG_INV_LOCKED); |
1328 | |
1368 | |
1329 | if (!QUERY_FLAG (op, FLAG_ALIVE)) |
1369 | if (!op->flag [FLAG_ALIVE]) |
1330 | CLEAR_FLAG (op, FLAG_NO_STEAL); |
1370 | op->clr_flag (FLAG_NO_STEAL); |
1331 | |
1371 | |
1332 | if (flag & INS_BELOW_ORIGINATOR) |
1372 | if (flag & INS_BELOW_ORIGINATOR) |
1333 | { |
1373 | { |
1334 | if (originator->map != op->map || originator->x != op->x || originator->y != op->y) |
1374 | if (originator->map != op->map || originator->x != op->x || originator->y != op->y) |
1335 | { |
1375 | { |
1336 | LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); |
1376 | LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); |
1337 | abort (); |
1377 | abort (); |
1338 | } |
1378 | } |
1339 | |
1379 | |
1340 | if (!originator->is_on_map ()) |
1380 | if (!originator->is_on_map ()) |
|
|
1381 | { |
1341 | LOG (llevDebug | logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map", |
1382 | LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map", |
1342 | op->debug_desc (), originator->debug_desc ()); |
1383 | op->debug_desc (), originator->debug_desc ()); |
|
|
1384 | abort (); |
|
|
1385 | } |
1343 | |
1386 | |
1344 | op->above = originator; |
1387 | op->above = originator; |
1345 | op->below = originator->below; |
1388 | op->below = originator->below; |
1346 | originator->below = op; |
1389 | originator->below = op; |
1347 | |
1390 | |
… | |
… | |
1367 | * when lots of spells are cast in one area. Currently, it is presumed |
1410 | * when lots of spells are cast in one area. Currently, it is presumed |
1368 | * that flying non pickable objects are spell objects. |
1411 | * that flying non pickable objects are spell objects. |
1369 | */ |
1412 | */ |
1370 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1413 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1371 | { |
1414 | { |
1372 | if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR)) |
1415 | if (tmp->flag [FLAG_IS_FLOOR] || tmp->flag [FLAG_OVERLAY_FLOOR]) |
1373 | floor = tmp; |
1416 | floor = tmp; |
1374 | |
1417 | |
1375 | if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR)) |
1418 | if (tmp->flag [FLAG_NO_PICK] && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !tmp->flag [FLAG_IS_FLOOR]) |
1376 | { |
1419 | { |
1377 | /* We insert above top, so we want this object below this */ |
1420 | /* We insert above top, so we want this object below this */ |
1378 | top = tmp->below; |
1421 | top = tmp->below; |
1379 | break; |
1422 | break; |
1380 | } |
1423 | } |
… | |
… | |
1398 | && (op->face && !faces [op->face].visibility)) |
1441 | && (op->face && !faces [op->face].visibility)) |
1399 | { |
1442 | { |
1400 | object *last; |
1443 | object *last; |
1401 | |
1444 | |
1402 | for (last = top; last != floor; last = last->below) |
1445 | for (last = top; last != floor; last = last->below) |
1403 | if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) |
1446 | if (last->flag [FLAG_BLOCKSVIEW] && (last->type != EXIT)) |
1404 | break; |
1447 | break; |
1405 | |
1448 | |
1406 | /* Check to see if we found the object that blocks view, |
1449 | /* Check to see if we found the object that blocks view, |
1407 | * and make sure we have a below pointer for it so that |
1450 | * and make sure we have a below pointer for it so that |
1408 | * we can get inserted below this one, which requires we |
1451 | * we can get inserted below this one, which requires we |
… | |
… | |
1433 | op->below = top; |
1476 | op->below = top; |
1434 | *(op->above ? &op->above->below : &ms.top) = op; |
1477 | *(op->above ? &op->above->below : &ms.top) = op; |
1435 | } |
1478 | } |
1436 | } |
1479 | } |
1437 | |
1480 | |
1438 | if (op->type == PLAYER) |
1481 | if (op->is_player ()) |
1439 | { |
1482 | { |
1440 | op->contr->do_los = 1; |
1483 | op->contr->do_los = 1; |
1441 | ++op->map->players; |
1484 | ++op->map->players; |
1442 | op->map->touch (); |
1485 | op->map->touch (); |
1443 | } |
1486 | } |
… | |
… | |
1458 | * be far away from this change and not affected in any way - |
1501 | * be far away from this change and not affected in any way - |
1459 | * this should get redone to only look for players within range, |
1502 | * this should get redone to only look for players within range, |
1460 | * or just updating the P_UPTODATE for spaces within this area |
1503 | * or just updating the P_UPTODATE for spaces within this area |
1461 | * of effect may be sufficient. |
1504 | * of effect may be sufficient. |
1462 | */ |
1505 | */ |
1463 | if (op->map->darkness && (op->glow_radius != 0)) |
1506 | if (op->affects_los ()) |
|
|
1507 | { |
|
|
1508 | op->ms ().invalidate (); |
1464 | update_all_los (op->map, op->x, op->y); |
1509 | update_all_los (op->map, op->x, op->y); |
|
|
1510 | } |
1465 | |
1511 | |
1466 | /* updates flags (blocked, alive, no magic, etc) for this map space */ |
1512 | /* updates flags (blocked, alive, no magic, etc) for this map space */ |
1467 | update_object (op, UP_OBJ_INSERT); |
1513 | update_object (op, UP_OBJ_INSERT); |
1468 | |
1514 | |
1469 | INVOKE_OBJECT (INSERT, op); |
1515 | INVOKE_OBJECT (INSERT, op); |
… | |
… | |
1476 | * blocked() and wall() work properly), and these flags are updated by |
1522 | * blocked() and wall() work properly), and these flags are updated by |
1477 | * update_object(). |
1523 | * update_object(). |
1478 | */ |
1524 | */ |
1479 | |
1525 | |
1480 | /* if this is not the head or flag has been passed, don't check walk on status */ |
1526 | /* if this is not the head or flag has been passed, don't check walk on status */ |
1481 | if (!(flag & INS_NO_WALK_ON) && op->head_ () == op) |
1527 | if (!(flag & INS_NO_WALK_ON) && op->is_head ()) |
1482 | { |
1528 | { |
1483 | if (check_move_on (op, originator)) |
1529 | if (check_move_on (op, originator, flag)) |
1484 | return 0; |
1530 | return 0; |
1485 | |
1531 | |
1486 | /* If we are a multi part object, lets work our way through the check |
1532 | /* If we are a multi part object, let's work our way through the check |
1487 | * walk on's. |
1533 | * walk on's. |
1488 | */ |
1534 | */ |
1489 | for (object *tmp = op->more; tmp; tmp = tmp->more) |
1535 | for (object *tmp = op->more; tmp; tmp = tmp->more) |
1490 | if (check_move_on (tmp, originator)) |
1536 | if (check_move_on (tmp, originator, flag)) |
1491 | return 0; |
1537 | return 0; |
1492 | } |
1538 | } |
1493 | |
1539 | |
1494 | return op; |
1540 | return op; |
1495 | } |
1541 | } |
… | |
… | |
1497 | /* this function inserts an object in the map, but if it |
1543 | /* this function inserts an object in the map, but if it |
1498 | * finds an object of its own type, it'll remove that one first. |
1544 | * finds an object of its own type, it'll remove that one first. |
1499 | * op is the object to insert it under: supplies x and the map. |
1545 | * op is the object to insert it under: supplies x and the map. |
1500 | */ |
1546 | */ |
1501 | void |
1547 | void |
1502 | replace_insert_ob_in_map (const char *arch_string, object *op) |
1548 | replace_insert_ob_in_map (shstr_tmp archname, object *op) |
1503 | { |
1549 | { |
1504 | /* first search for itself and remove any old instances */ |
1550 | /* first search for itself and remove any old instances */ |
1505 | |
1551 | |
1506 | for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) |
1552 | for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) |
1507 | if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ |
1553 | if (tmp->arch->archname == archname) /* same archetype */ |
1508 | tmp->destroy (1); |
1554 | tmp->destroy (); |
1509 | |
1555 | |
1510 | object *tmp = arch_to_object (archetype::find (arch_string)); |
1556 | object *tmp = archetype::find (archname)->instance (); |
1511 | |
1557 | |
1512 | tmp->x = op->x; |
1558 | tmp->x = op->x; |
1513 | tmp->y = op->y; |
1559 | tmp->y = op->y; |
1514 | |
1560 | |
1515 | insert_ob_in_map (tmp, op->map, op, 0); |
1561 | insert_ob_in_map (tmp, op->map, op, 0); |
… | |
… | |
1520 | { |
1566 | { |
1521 | if (where->env) |
1567 | if (where->env) |
1522 | return where->env->insert (this); |
1568 | return where->env->insert (this); |
1523 | else |
1569 | else |
1524 | return where->map->insert (this, where->x, where->y, originator, flags); |
1570 | return where->map->insert (this, where->x, where->y, originator, flags); |
|
|
1571 | } |
|
|
1572 | |
|
|
1573 | // check whether we can put this into the map, respect max_volume, max_items |
|
|
1574 | bool |
|
|
1575 | object::can_drop_at (maptile *m, int x, int y, object *originator) |
|
|
1576 | { |
|
|
1577 | mapspace &ms = m->at (x, y); |
|
|
1578 | |
|
|
1579 | int items = ms.items (); |
|
|
1580 | |
|
|
1581 | if (!items // testing !items ensures we can drop at least one item |
|
|
1582 | || (items < m->max_items |
|
|
1583 | && ms.volume () < m->max_volume)) |
|
|
1584 | return true; |
|
|
1585 | |
|
|
1586 | if (originator) |
|
|
1587 | originator->failmsgf ( |
|
|
1588 | "No matter how hard you try, you just cannot put the %s here! H<Try to remove some items from the floor first.>", |
|
|
1589 | query_name () |
|
|
1590 | ); |
|
|
1591 | |
|
|
1592 | return false; |
1525 | } |
1593 | } |
1526 | |
1594 | |
1527 | /* |
1595 | /* |
1528 | * decrease(object, number) decreases a specified number from |
1596 | * decrease(object, number) decreases a specified number from |
1529 | * the amount of an object. If the amount reaches 0, the object |
1597 | * the amount of an object. If the amount reaches 0, the object |
… | |
… | |
1537 | if (!nr) |
1605 | if (!nr) |
1538 | return true; |
1606 | return true; |
1539 | |
1607 | |
1540 | nr = min (nr, nrof); |
1608 | nr = min (nr, nrof); |
1541 | |
1609 | |
|
|
1610 | if (nrof > nr) |
|
|
1611 | { |
|
|
1612 | weight_t oweight = total_weight (); |
|
|
1613 | |
1542 | nrof -= nr; |
1614 | nrof -= nr; |
1543 | |
|
|
1544 | if (nrof) |
|
|
1545 | { |
|
|
1546 | adjust_weight (env, -weight * nr); // carrying == 0 |
|
|
1547 | |
1615 | |
1548 | if (object *pl = visible_to ()) |
1616 | if (object *pl = visible_to ()) |
1549 | esrv_update_item (UPD_NROF, pl, this); |
1617 | esrv_update_item (UPD_NROF, pl, this); |
1550 | |
1618 | |
|
|
1619 | adjust_weight (env, oweight, total_weight ()); |
|
|
1620 | |
1551 | return true; |
1621 | return true; |
1552 | } |
1622 | } |
1553 | else |
1623 | else |
1554 | { |
1624 | { |
1555 | destroy (1); |
1625 | destroy (); |
1556 | return false; |
1626 | return false; |
1557 | } |
1627 | } |
1558 | } |
1628 | } |
1559 | |
1629 | |
1560 | /* |
1630 | /* |
… | |
… | |
1629 | if (op->nrof) |
1699 | if (op->nrof) |
1630 | for (object *tmp = inv; tmp; tmp = tmp->below) |
1700 | for (object *tmp = inv; tmp; tmp = tmp->below) |
1631 | if (object::can_merge (tmp, op)) |
1701 | if (object::can_merge (tmp, op)) |
1632 | { |
1702 | { |
1633 | /* return the original object and remove inserted object |
1703 | /* return the original object and remove inserted object |
1634 | (client needs the original object) */ |
1704 | (client prefers the original object) */ |
|
|
1705 | |
|
|
1706 | // carrying must be 0 for mergable objects |
|
|
1707 | weight_t oweight = weight_t (tmp->weight) * tmp->nrof; |
|
|
1708 | |
1635 | tmp->nrof += op->nrof; |
1709 | tmp->nrof += op->nrof; |
1636 | |
1710 | |
1637 | if (object *pl = tmp->visible_to ()) |
1711 | if (object *pl = tmp->visible_to ()) |
1638 | esrv_update_item (UPD_NROF, pl, tmp); |
1712 | esrv_update_item (UPD_NROF, pl, tmp); |
1639 | |
1713 | |
1640 | adjust_weight (this, op->total_weight ()); |
1714 | adjust_weight (this, oweight, weight_t (tmp->weight) * tmp->nrof); |
1641 | |
1715 | |
1642 | op->destroy (1); |
1716 | op->destroy (); |
1643 | op = tmp; |
1717 | op = tmp; |
1644 | goto inserted; |
1718 | goto inserted; |
1645 | } |
1719 | } |
1646 | |
1720 | |
1647 | op->owner = 0; // it's his/hers now. period. |
1721 | op->owner = 0; // it's his/hers now. period. |
… | |
… | |
1661 | op->flag [FLAG_REMOVED] = 0; |
1735 | op->flag [FLAG_REMOVED] = 0; |
1662 | |
1736 | |
1663 | if (object *pl = op->visible_to ()) |
1737 | if (object *pl = op->visible_to ()) |
1664 | esrv_send_item (pl, op); |
1738 | esrv_send_item (pl, op); |
1665 | |
1739 | |
1666 | adjust_weight (this, op->total_weight ()); |
1740 | adjust_weight (this, 0, op->total_weight ()); |
1667 | |
1741 | |
1668 | inserted: |
1742 | inserted: |
1669 | /* reset the light list and los of the players on the map */ |
1743 | /* reset the light list and los of the players on the map */ |
1670 | if (op->glow_radius && map && map->darkness) |
1744 | if (op->glow_radius && is_on_map ()) |
|
|
1745 | { |
|
|
1746 | update_stats (); |
1671 | update_all_los (map, x, y); |
1747 | update_all_los (map, x, y); |
1672 | |
1748 | } |
|
|
1749 | else if (is_player ()) |
1673 | // if this is a player's inventory, update stats |
1750 | // if this is a player's inventory, update stats |
1674 | if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER]) |
1751 | contr->queue_stats_update (); |
1675 | update_stats (); |
|
|
1676 | |
1752 | |
1677 | INVOKE_OBJECT (INSERT, this); |
1753 | INVOKE_OBJECT (INSERT, this); |
1678 | |
1754 | |
1679 | return op; |
1755 | return op; |
1680 | } |
1756 | } |
… | |
… | |
1698 | * MSW 2001-07-08: Check all objects on space, not just those below |
1774 | * MSW 2001-07-08: Check all objects on space, not just those below |
1699 | * object being inserted. insert_ob_in_map may not put new objects |
1775 | * object being inserted. insert_ob_in_map may not put new objects |
1700 | * on top. |
1776 | * on top. |
1701 | */ |
1777 | */ |
1702 | int |
1778 | int |
1703 | check_move_on (object *op, object *originator) |
1779 | check_move_on (object *op, object *originator, int flags) |
1704 | { |
1780 | { |
|
|
1781 | if (op->flag [FLAG_NO_APPLY]) |
|
|
1782 | return 0; |
|
|
1783 | |
1705 | object *tmp; |
1784 | object *tmp; |
1706 | maptile *m = op->map; |
1785 | maptile *m = op->map; |
1707 | int x = op->x, y = op->y; |
1786 | int x = op->x, y = op->y; |
1708 | |
1787 | |
1709 | MoveType move_on, move_slow, move_block; |
1788 | mapspace &ms = m->at (x, y); |
1710 | |
1789 | |
1711 | if (QUERY_FLAG (op, FLAG_NO_APPLY)) |
1790 | ms.update (); |
1712 | return 0; |
|
|
1713 | |
1791 | |
1714 | move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); |
1792 | MoveType move_on = ms.move_on; |
1715 | move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); |
1793 | MoveType move_slow = ms.move_slow; |
1716 | move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); |
1794 | MoveType move_block = ms.move_block; |
1717 | |
1795 | |
1718 | /* if nothing on this space will slow op down or be applied, |
1796 | /* if nothing on this space will slow op down or be applied, |
1719 | * no need to do checking below. have to make sure move_type |
1797 | * no need to do checking below. have to make sure move_type |
1720 | * is set, as lots of objects don't have it set - we treat that |
1798 | * is set, as lots of objects don't have it set - we treat that |
1721 | * as walking. |
1799 | * as walking. |
… | |
… | |
1732 | return 0; |
1810 | return 0; |
1733 | |
1811 | |
1734 | /* The objects have to be checked from top to bottom. |
1812 | /* The objects have to be checked from top to bottom. |
1735 | * Hence, we first go to the top: |
1813 | * Hence, we first go to the top: |
1736 | */ |
1814 | */ |
1737 | |
1815 | for (object *next, *tmp = ms.top; tmp; tmp = next) |
1738 | for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above) |
|
|
1739 | { |
|
|
1740 | /* Trim the search when we find the first other spell effect |
|
|
1741 | * this helps performance so that if a space has 50 spell objects, |
|
|
1742 | * we don't need to check all of them. |
|
|
1743 | */ |
|
|
1744 | if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK)) |
|
|
1745 | break; |
|
|
1746 | } |
1816 | { |
|
|
1817 | next = tmp->below; |
1747 | |
1818 | |
1748 | for (; tmp; tmp = tmp->below) |
|
|
1749 | { |
|
|
1750 | if (tmp == op) |
1819 | if (tmp == op) |
1751 | continue; /* Can't apply yourself */ |
1820 | continue; /* Can't apply yourself */ |
1752 | |
1821 | |
1753 | /* Check to see if one of the movement types should be slowed down. |
1822 | /* Check to see if one of the movement types should be slowed down. |
1754 | * Second check makes sure that the movement types not being slowed |
1823 | * Second check makes sure that the movement types not being slowed |
1755 | * (~slow_move) is not blocked on this space - just because the |
1824 | * (~slow_move) is not blocked on this space - just because the |
1756 | * space doesn't slow down swimming (for example), if you can't actually |
1825 | * space doesn't slow down swimming (for example), if you can't actually |
1757 | * swim on that space, can't use it to avoid the penalty. |
1826 | * swim on that space, can't use it to avoid the penalty. |
1758 | */ |
1827 | */ |
1759 | if (!QUERY_FLAG (op, FLAG_WIZPASS)) |
1828 | if (!op->flag [FLAG_WIZPASS]) |
1760 | { |
1829 | { |
1761 | if ((!op->move_type && tmp->move_slow & MOVE_WALK) || |
1830 | if ((!op->move_type && tmp->move_slow & MOVE_WALK) || |
1762 | ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) |
1831 | ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) |
1763 | { |
1832 | { |
1764 | |
|
|
1765 | float |
|
|
1766 | diff = tmp->move_slow_penalty * fabs (op->speed); |
1833 | float diff = tmp->move_slow_penalty * fabs (op->speed); |
1767 | |
1834 | |
1768 | if (op->type == PLAYER) |
1835 | if (op->is_player ()) |
1769 | if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || |
1836 | if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) || |
1770 | (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) |
1837 | (tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN))) |
1771 | diff /= 4.0; |
1838 | diff /= 4.0; |
1772 | |
1839 | |
1773 | op->speed_left -= diff; |
1840 | op->speed_left -= diff; |
1774 | } |
1841 | } |
1775 | } |
1842 | } |
1776 | |
1843 | |
1777 | /* Basically same logic as above, except now for actual apply. */ |
1844 | /* Basically same logic as above, except now for actual apply. */ |
1778 | if ((!op->move_type && tmp->move_on & MOVE_WALK) || |
1845 | if ((!op->move_type && tmp->move_on & MOVE_WALK) || |
1779 | ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0)) |
1846 | ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0)) |
1780 | { |
1847 | { |
|
|
1848 | if ((flags & INS_NO_AUTO_EXIT) |
|
|
1849 | && (tmp->type == EXIT || tmp->type == TELEPORTER |
|
|
1850 | || tmp->type == HOLE || tmp->type == TRAPDOOR)) //TODO: temporary, fix exits instead |
|
|
1851 | continue; |
|
|
1852 | |
1781 | move_apply (tmp, op, originator); |
1853 | move_apply (tmp, op, originator); |
1782 | |
1854 | |
1783 | if (op->destroyed ()) |
1855 | if (op->destroyed ()) |
1784 | return 1; |
1856 | return 1; |
1785 | |
1857 | |
… | |
… | |
1897 | void |
1969 | void |
1898 | flag_inv (object *op, int flag) |
1970 | flag_inv (object *op, int flag) |
1899 | { |
1971 | { |
1900 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
1972 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
1901 | { |
1973 | { |
1902 | SET_FLAG (tmp, flag); |
1974 | tmp->set_flag (flag); |
1903 | flag_inv (tmp, flag); |
1975 | flag_inv (tmp, flag); |
1904 | } |
1976 | } |
1905 | } |
1977 | } |
1906 | |
1978 | |
1907 | /* |
1979 | /* |
… | |
… | |
1910 | void |
1982 | void |
1911 | unflag_inv (object *op, int flag) |
1983 | unflag_inv (object *op, int flag) |
1912 | { |
1984 | { |
1913 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
1985 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
1914 | { |
1986 | { |
1915 | CLEAR_FLAG (tmp, flag); |
1987 | tmp->clr_flag (flag); |
1916 | unflag_inv (tmp, flag); |
1988 | unflag_inv (tmp, flag); |
1917 | } |
1989 | } |
1918 | } |
1990 | } |
1919 | |
1991 | |
1920 | /* |
1992 | /* |
… | |
… | |
1937 | */ |
2009 | */ |
1938 | int |
2010 | int |
1939 | find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) |
2011 | find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) |
1940 | { |
2012 | { |
1941 | int altern[SIZEOFFREE]; |
2013 | int altern[SIZEOFFREE]; |
1942 | int index = 0, flag; |
2014 | int index = 0; |
1943 | |
2015 | |
1944 | for (int i = start; i < stop; i++) |
2016 | for (int i = start; i < stop; i++) |
1945 | { |
2017 | { |
1946 | mapxy pos (m, x, y); pos.move (i); |
2018 | mapxy pos (m, x, y); pos.move (i); |
1947 | |
2019 | |
… | |
… | |
1981 | * head of the object should correspond for the entire object. |
2053 | * head of the object should correspond for the entire object. |
1982 | */ |
2054 | */ |
1983 | if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) |
2055 | if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) |
1984 | continue; |
2056 | continue; |
1985 | |
2057 | |
1986 | if (ob->blocked (m, pos.x, pos.y)) |
2058 | if (ob->blocked (pos.m, pos.x, pos.y)) |
1987 | continue; |
2059 | continue; |
1988 | |
2060 | |
1989 | altern [index++] = i; |
2061 | altern [index++] = i; |
1990 | } |
2062 | } |
1991 | |
2063 | |
… | |
… | |
2059 | * there is capable of. |
2131 | * there is capable of. |
2060 | */ |
2132 | */ |
2061 | int |
2133 | int |
2062 | find_dir (maptile *m, int x, int y, object *exclude) |
2134 | find_dir (maptile *m, int x, int y, object *exclude) |
2063 | { |
2135 | { |
2064 | int i, max = SIZEOFFREE, mflags; |
2136 | int max = SIZEOFFREE; |
2065 | |
|
|
2066 | sint16 nx, ny; |
|
|
2067 | object *tmp; |
|
|
2068 | maptile *mp; |
|
|
2069 | |
|
|
2070 | MoveType blocked, move_type; |
2137 | MoveType move_type; |
2071 | |
2138 | |
2072 | if (exclude && exclude->head_ () != exclude) |
2139 | if (exclude && exclude->head_ () != exclude) |
2073 | { |
2140 | { |
2074 | exclude = exclude->head; |
2141 | exclude = exclude->head; |
2075 | move_type = exclude->move_type; |
2142 | move_type = exclude->move_type; |
… | |
… | |
2078 | { |
2145 | { |
2079 | /* If we don't have anything, presume it can use all movement types. */ |
2146 | /* If we don't have anything, presume it can use all movement types. */ |
2080 | move_type = MOVE_ALL; |
2147 | move_type = MOVE_ALL; |
2081 | } |
2148 | } |
2082 | |
2149 | |
2083 | for (i = 1; i < max; i++) |
2150 | for (int i = 1; i < max; i++) |
2084 | { |
2151 | { |
2085 | mp = m; |
2152 | mapxy pos (m, x, y); |
2086 | nx = x + freearr_x[i]; |
2153 | pos.move (i); |
2087 | ny = y + freearr_y[i]; |
|
|
2088 | |
2154 | |
2089 | mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); |
2155 | if (!pos.normalise ()) |
2090 | |
|
|
2091 | if (mflags & P_OUT_OF_MAP) |
|
|
2092 | max = maxfree[i]; |
2156 | max = maxfree[i]; |
2093 | else |
2157 | else |
2094 | { |
2158 | { |
2095 | mapspace &ms = mp->at (nx, ny); |
2159 | mapspace &ms = *pos; |
2096 | |
2160 | |
2097 | blocked = ms.move_block; |
|
|
2098 | |
|
|
2099 | if ((move_type & blocked) == move_type) |
2161 | if ((move_type & ms.move_block) == move_type) |
2100 | max = maxfree[i]; |
2162 | max = maxfree [i]; |
2101 | else if (mflags & P_IS_ALIVE) |
2163 | else if (ms.flags () & P_IS_ALIVE) |
2102 | { |
2164 | { |
2103 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
2165 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
2104 | if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) |
2166 | if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ()) |
2105 | && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude))) |
2167 | && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude))) |
2106 | break; |
|
|
2107 | |
|
|
2108 | if (tmp) |
|
|
2109 | return freedir[i]; |
2168 | return freedir [i]; |
2110 | } |
2169 | } |
2111 | } |
2170 | } |
2112 | } |
2171 | } |
2113 | |
2172 | |
2114 | return 0; |
2173 | return 0; |
… | |
… | |
2123 | { |
2182 | { |
2124 | return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); |
2183 | return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); |
2125 | } |
2184 | } |
2126 | |
2185 | |
2127 | /* |
2186 | /* |
2128 | * find_dir_2(delta-x,delta-y) will return a direction in which |
2187 | * find_dir_2(delta-x,delta-y) will return a direction value |
2129 | * an object which has subtracted the x and y coordinates of another |
2188 | * for running into direct [dx, dy]. |
2130 | * object, needs to travel toward it. |
2189 | * (the opposite of crossfire's find_dir_2!) |
2131 | */ |
2190 | */ |
2132 | int |
2191 | int |
2133 | find_dir_2 (int x, int y) |
2192 | find_dir_2 (int x, int y) |
2134 | { |
2193 | { |
|
|
2194 | #if 1 // new algorithm |
|
|
2195 | // this works by putting x, y into 16 sectors, which |
|
|
2196 | // are not equal sized, but are a better approximation |
|
|
2197 | // then the old algorithm, and then using a mapping |
|
|
2198 | // table to map it into a direction value. |
|
|
2199 | // basically, it maps these comparisons to each bit |
|
|
2200 | // bit #3: x < 0 |
|
|
2201 | // bit #2: y < 0 |
|
|
2202 | // bit #1: x > y |
|
|
2203 | // bit #0: x > 2y |
|
|
2204 | |
|
|
2205 | static const uint8 dir[16] = { |
|
|
2206 | 4, 5, 4, 3, |
|
|
2207 | 2, 1, 2, 3, |
|
|
2208 | 6, 5, 6, 7, |
|
|
2209 | 8, 1, 8, 7, |
|
|
2210 | }; |
|
|
2211 | int sector = 0; |
|
|
2212 | |
|
|
2213 | // this is a bit ugly, but more likely to result in branchless code |
|
|
2214 | sector |= x < 0 ? 8 : 0; |
|
|
2215 | x = x < 0 ? -x : x; // abs |
|
|
2216 | |
|
|
2217 | sector |= y < 0 ? 4 : 0; |
|
|
2218 | y = y < 0 ? -y : y; // abs |
|
|
2219 | |
|
|
2220 | if (x > y) |
|
|
2221 | { |
|
|
2222 | sector |= 2; |
|
|
2223 | |
|
|
2224 | if (x > y * 2) |
|
|
2225 | sector |= 1; |
|
|
2226 | } |
|
|
2227 | else |
|
|
2228 | { |
|
|
2229 | if (y > x * 2) |
|
|
2230 | sector |= 1; |
|
|
2231 | else if (!y) |
|
|
2232 | return 0; // x == 0 here |
|
|
2233 | } |
|
|
2234 | |
|
|
2235 | return dir [sector]; |
|
|
2236 | #else // old algorithm |
2135 | int q; |
2237 | int q; |
2136 | |
2238 | |
2137 | if (y) |
2239 | if (y) |
2138 | q = x * 100 / y; |
2240 | q = 128 * x / y; |
2139 | else if (x) |
2241 | else if (x) |
2140 | q = -300 * x; |
2242 | q = -512 * x; // to make it > 309 |
2141 | else |
2243 | else |
2142 | return 0; |
2244 | return 0; |
2143 | |
2245 | |
2144 | if (y > 0) |
2246 | if (y > 0) |
2145 | { |
2247 | { |
2146 | if (q < -242) |
2248 | if (q < -309) return 7; |
|
|
2249 | if (q < -52) return 6; |
|
|
2250 | if (q < 52) return 5; |
|
|
2251 | if (q < 309) return 4; |
|
|
2252 | |
2147 | return 3; |
2253 | return 3; |
2148 | if (q < -41) |
2254 | } |
2149 | return 2; |
2255 | else |
2150 | if (q < 41) |
2256 | { |
2151 | return 1; |
2257 | if (q < -309) return 3; |
2152 | if (q < 242) |
2258 | if (q < -52) return 2; |
2153 | return 8; |
2259 | if (q < 52) return 1; |
|
|
2260 | if (q < 309) return 8; |
|
|
2261 | |
2154 | return 7; |
2262 | return 7; |
2155 | } |
2263 | } |
2156 | |
2264 | #endif |
2157 | if (q < -242) |
|
|
2158 | return 7; |
|
|
2159 | if (q < -41) |
|
|
2160 | return 6; |
|
|
2161 | if (q < 41) |
|
|
2162 | return 5; |
|
|
2163 | if (q < 242) |
|
|
2164 | return 4; |
|
|
2165 | |
|
|
2166 | return 3; |
|
|
2167 | } |
2265 | } |
2168 | |
2266 | |
2169 | /* |
2267 | /* |
2170 | * dirdiff(dir1, dir2) returns how many 45-degrees differences there is |
2268 | * dirdiff(dir1, dir2) returns how many 45-degrees differences there is |
2171 | * between two directions (which are expected to be absolute (see absdir()) |
2269 | * between two directions (which are expected to be absolute (see absdir()) |
2172 | */ |
2270 | */ |
2173 | int |
2271 | int |
2174 | dirdiff (int dir1, int dir2) |
2272 | dirdiff (int dir1, int dir2) |
2175 | { |
2273 | { |
2176 | int d; |
|
|
2177 | |
|
|
2178 | d = abs (dir1 - dir2); |
2274 | int d = abs (dir1 - dir2); |
2179 | if (d > 4) |
|
|
2180 | d = 8 - d; |
|
|
2181 | |
2275 | |
2182 | return d; |
2276 | return d > 4 ? 8 - d : d; |
2183 | } |
2277 | } |
2184 | |
2278 | |
2185 | /* peterm: |
2279 | /* peterm: |
2186 | * do LOS stuff for ball lightning. Go after the closest VISIBLE monster. |
2280 | * do LOS stuff for ball lightning. Go after the closest VISIBLE monster. |
2187 | * Basically, this is a table of directions, and what directions |
2281 | * Basically, this is a table of directions, and what directions |
… | |
… | |
2189 | * This basically means that if direction is 15, then it could either go |
2283 | * This basically means that if direction is 15, then it could either go |
2190 | * direction 4, 14, or 16 to get back to where we are. |
2284 | * direction 4, 14, or 16 to get back to where we are. |
2191 | * Moved from spell_util.c to object.c with the other related direction |
2285 | * Moved from spell_util.c to object.c with the other related direction |
2192 | * functions. |
2286 | * functions. |
2193 | */ |
2287 | */ |
2194 | int reduction_dir[SIZEOFFREE][3] = { |
2288 | static const int reduction_dir[SIZEOFFREE][3] = { |
2195 | {0, 0, 0}, /* 0 */ |
2289 | {0, 0, 0}, /* 0 */ |
2196 | {0, 0, 0}, /* 1 */ |
2290 | {0, 0, 0}, /* 1 */ |
2197 | {0, 0, 0}, /* 2 */ |
2291 | {0, 0, 0}, /* 2 */ |
2198 | {0, 0, 0}, /* 3 */ |
2292 | {0, 0, 0}, /* 3 */ |
2199 | {0, 0, 0}, /* 4 */ |
2293 | {0, 0, 0}, /* 4 */ |
… | |
… | |
2293 | * Add a check so we can't pick up invisible objects (0.93.8) |
2387 | * Add a check so we can't pick up invisible objects (0.93.8) |
2294 | */ |
2388 | */ |
2295 | int |
2389 | int |
2296 | can_pick (const object *who, const object *item) |
2390 | can_pick (const object *who, const object *item) |
2297 | { |
2391 | { |
2298 | return /*QUERY_FLAG(who,FLAG_WIZ)|| */ |
2392 | return /*who->flag [FLAG_WIZ]|| */ |
2299 | (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && |
2393 | (item->weight > 0 && !item->flag [FLAG_NO_PICK] && |
2300 | !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); |
2394 | !item->flag [FLAG_ALIVE] && !item->invisible && (who->is_player () || item->weight < who->weight / 3)); |
2301 | } |
2395 | } |
|
|
2396 | |
|
|
2397 | //-GPL |
2302 | |
2398 | |
2303 | /* |
2399 | /* |
2304 | * create clone from object to another |
2400 | * create clone from object to another |
2305 | */ |
2401 | */ |
2306 | object * |
2402 | object * |
… | |
… | |
2337 | return tmp; |
2433 | return tmp; |
2338 | |
2434 | |
2339 | return 0; |
2435 | return 0; |
2340 | } |
2436 | } |
2341 | |
2437 | |
2342 | const shstr & |
2438 | /* Zero the key_values on op, decrementing the shared-string |
2343 | object::kv_get (const shstr &key) const |
2439 | * refcounts and freeing the links. |
|
|
2440 | */ |
|
|
2441 | void |
|
|
2442 | key_values::clear () |
2344 | { |
2443 | { |
|
|
2444 | for (key_value *kvp = first; kvp; ) |
|
|
2445 | { |
|
|
2446 | key_value *next = kvp->next; |
|
|
2447 | delete kvp; |
|
|
2448 | kvp = next; |
|
|
2449 | } |
|
|
2450 | |
|
|
2451 | first = 0; |
|
|
2452 | } |
|
|
2453 | |
|
|
2454 | shstr_tmp |
|
|
2455 | key_values::get (shstr_tmp key) const |
|
|
2456 | { |
2345 | for (key_value *kv = key_values; kv; kv = kv->next) |
2457 | for (key_value *kv = first; kv; kv = kv->next) |
2346 | if (kv->key == key) |
2458 | if (kv->key == key) |
2347 | return kv->value; |
2459 | return kv->value; |
2348 | |
2460 | |
2349 | return shstr_null; |
2461 | return shstr (); |
2350 | } |
2462 | } |
2351 | |
2463 | |
2352 | void |
2464 | void |
2353 | object::kv_set (const shstr &key, const shstr &value) |
2465 | key_values::add (shstr_tmp key, shstr_tmp value) |
2354 | { |
2466 | { |
|
|
2467 | key_value *kv = new key_value; |
|
|
2468 | |
|
|
2469 | kv->next = first; |
|
|
2470 | kv->key = key; |
|
|
2471 | kv->value = value; |
|
|
2472 | |
|
|
2473 | first = kv; |
|
|
2474 | } |
|
|
2475 | |
|
|
2476 | void |
|
|
2477 | key_values::set (shstr_tmp key, shstr_tmp value) |
|
|
2478 | { |
2355 | for (key_value *kv = key_values; kv; kv = kv->next) |
2479 | for (key_value *kv = first; kv; kv = kv->next) |
2356 | if (kv->key == key) |
2480 | if (kv->key == key) |
2357 | { |
2481 | { |
2358 | kv->value = value; |
2482 | kv->value = value; |
2359 | return; |
2483 | return; |
2360 | } |
2484 | } |
2361 | |
2485 | |
2362 | key_value *kv = new key_value; |
2486 | add (key, value); |
2363 | |
|
|
2364 | kv->next = key_values; |
|
|
2365 | kv->key = key; |
|
|
2366 | kv->value = value; |
|
|
2367 | |
|
|
2368 | key_values = kv; |
|
|
2369 | } |
2487 | } |
2370 | |
2488 | |
2371 | void |
2489 | void |
2372 | object::kv_del (const shstr &key) |
2490 | key_values::del (shstr_tmp key) |
2373 | { |
2491 | { |
2374 | for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next) |
2492 | for (key_value **kvp = &first; *kvp; kvp = &(*kvp)->next) |
2375 | if ((*kvp)->key == key) |
2493 | if ((*kvp)->key == key) |
2376 | { |
2494 | { |
2377 | key_value *kv = *kvp; |
2495 | key_value *kv = *kvp; |
2378 | *kvp = (*kvp)->next; |
2496 | *kvp = (*kvp)->next; |
2379 | delete kv; |
2497 | delete kv; |
2380 | return; |
2498 | return; |
2381 | } |
2499 | } |
|
|
2500 | } |
|
|
2501 | |
|
|
2502 | void |
|
|
2503 | key_values::reverse () |
|
|
2504 | { |
|
|
2505 | key_value *prev = 0; |
|
|
2506 | key_value *head = first; |
|
|
2507 | |
|
|
2508 | while (head) |
|
|
2509 | { |
|
|
2510 | key_value *node = head; |
|
|
2511 | head = head->next; |
|
|
2512 | node->next = prev; |
|
|
2513 | prev = node; |
|
|
2514 | } |
|
|
2515 | |
|
|
2516 | first = prev; |
|
|
2517 | } |
|
|
2518 | |
|
|
2519 | key_values & |
|
|
2520 | key_values::operator =(const key_values &kv) |
|
|
2521 | { |
|
|
2522 | clear (); |
|
|
2523 | |
|
|
2524 | for (key_value *kvp = kv.first; kvp; kvp = kvp->next) |
|
|
2525 | add (kvp->key, kvp->value); |
|
|
2526 | |
|
|
2527 | reverse (); |
2382 | } |
2528 | } |
2383 | |
2529 | |
2384 | object::depth_iterator::depth_iterator (object *container) |
2530 | object::depth_iterator::depth_iterator (object *container) |
2385 | : iterator_base (container) |
2531 | : iterator_base (container) |
2386 | { |
2532 | { |
… | |
… | |
2470 | { |
2616 | { |
2471 | return map ? map->region (x, y) |
2617 | return map ? map->region (x, y) |
2472 | : region::default_region (); |
2618 | : region::default_region (); |
2473 | } |
2619 | } |
2474 | |
2620 | |
2475 | const materialtype_t * |
2621 | //+GPL |
2476 | object::dominant_material () const |
|
|
2477 | { |
|
|
2478 | if (materialtype_t *mt = name_to_material (materialname)) |
|
|
2479 | return mt; |
|
|
2480 | |
|
|
2481 | return name_to_material (shstr_unknown); |
|
|
2482 | } |
|
|
2483 | |
2622 | |
2484 | void |
2623 | void |
2485 | object::open_container (object *new_container) |
2624 | object::open_container (object *new_container) |
2486 | { |
2625 | { |
2487 | if (container == new_container) |
2626 | if (container == new_container) |
… | |
… | |
2508 | container = 0; |
2647 | container = 0; |
2509 | |
2648 | |
2510 | // client needs item update to make it work, client bug requires this to be separate |
2649 | // client needs item update to make it work, client bug requires this to be separate |
2511 | esrv_update_item (UPD_FLAGS, this, old_container); |
2650 | esrv_update_item (UPD_FLAGS, this, old_container); |
2512 | |
2651 | |
2513 | new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); |
2652 | new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ()); |
2514 | play_sound (sound_find ("chest_close")); |
2653 | play_sound (sound_find ("chest_close")); |
2515 | } |
2654 | } |
2516 | |
2655 | |
2517 | if (new_container) |
2656 | if (new_container) |
2518 | { |
2657 | { |
… | |
… | |
2522 | // TODO: this does not seem to serve any purpose anymore? |
2661 | // TODO: this does not seem to serve any purpose anymore? |
2523 | #if 0 |
2662 | #if 0 |
2524 | // insert the "Close Container" object. |
2663 | // insert the "Close Container" object. |
2525 | if (archetype *closer = new_container->other_arch) |
2664 | if (archetype *closer = new_container->other_arch) |
2526 | { |
2665 | { |
2527 | object *closer = arch_to_object (new_container->other_arch); |
2666 | object *closer = new_container->other_arch->instance (); |
2528 | closer->flag [FLAG_NO_MAP_SAVE] = 1; |
2667 | closer->flag [FLAG_NO_MAP_SAVE] = 1; |
2529 | new_container->insert (closer); |
2668 | new_container->insert (closer); |
2530 | } |
2669 | } |
2531 | #endif |
2670 | #endif |
2532 | |
2671 | |
2533 | new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); |
2672 | new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ()); |
2534 | |
2673 | |
2535 | // make sure the container is available, client bug requires this to be separate |
2674 | // make sure the container is available, client bug requires this to be separate |
2536 | esrv_send_item (this, new_container); |
2675 | esrv_send_item (this, new_container); |
2537 | |
2676 | |
2538 | new_container->flag [FLAG_APPLIED] = true; |
2677 | new_container->flag [FLAG_APPLIED] = true; |
… | |
… | |
2545 | } |
2684 | } |
2546 | // else if (!old_container->env && contr && contr->ns) |
2685 | // else if (!old_container->env && contr && contr->ns) |
2547 | // contr->ns->floorbox_reset (); |
2686 | // contr->ns->floorbox_reset (); |
2548 | } |
2687 | } |
2549 | |
2688 | |
|
|
2689 | //-GPL |
|
|
2690 | |
|
|
2691 | // prefetch some flat area around the player |
|
|
2692 | static void |
|
|
2693 | prefetch_surrounding_area (object *op, maptile *map, int range) |
|
|
2694 | { |
|
|
2695 | for (maprect *rect = map->split_to_tiles (mapwalk_buf, |
|
|
2696 | op->x - range , op->y - range , |
|
|
2697 | op->x + range + 1, op->y + range + 1); |
|
|
2698 | rect->m; |
|
|
2699 | ++rect) |
|
|
2700 | { |
|
|
2701 | rect->m->touch (); |
|
|
2702 | rect->m->activate (); |
|
|
2703 | } |
|
|
2704 | } |
|
|
2705 | |
|
|
2706 | // prefetch a generous area around the player, also up and down |
|
|
2707 | void |
|
|
2708 | object::prefetch_surrounding_maps () |
|
|
2709 | { |
|
|
2710 | prefetch_surrounding_area (this, map, 40); |
|
|
2711 | |
|
|
2712 | if (maptile *m = map->tile_available (TILE_DOWN)) |
|
|
2713 | prefetch_surrounding_area (this, m, 20); |
|
|
2714 | |
|
|
2715 | if (maptile *m = map->tile_available (TILE_UP)) |
|
|
2716 | prefetch_surrounding_area (this, m, 20); |
|
|
2717 | } |
|
|
2718 | |
|
|
2719 | //+GPL |
|
|
2720 | |
2550 | object * |
2721 | object * |
2551 | object::force_find (const shstr name) |
2722 | object::force_find (shstr_tmp name) |
2552 | { |
2723 | { |
2553 | /* cycle through his inventory to look for the MARK we want to |
2724 | /* cycle through his inventory to look for the MARK we want to |
2554 | * place |
2725 | * place |
2555 | */ |
2726 | */ |
2556 | for (object *tmp = inv; tmp; tmp = tmp->below) |
2727 | for (object *tmp = inv; tmp; tmp = tmp->below) |
… | |
… | |
2559 | |
2730 | |
2560 | return 0; |
2731 | return 0; |
2561 | } |
2732 | } |
2562 | |
2733 | |
2563 | void |
2734 | void |
|
|
2735 | object::force_set_timer (int duration) |
|
|
2736 | { |
|
|
2737 | this->duration = 1; |
|
|
2738 | this->speed_left = -1.f; |
|
|
2739 | |
|
|
2740 | this->set_speed (duration ? 1.f / duration : 0.f); |
|
|
2741 | } |
|
|
2742 | |
|
|
2743 | object * |
2564 | object::force_add (const shstr name, int duration) |
2744 | object::force_add (shstr_tmp name, int duration) |
2565 | { |
2745 | { |
2566 | if (object *force = force_find (name)) |
2746 | if (object *force = force_find (name)) |
2567 | force->destroy (); |
2747 | force->destroy (); |
2568 | |
2748 | |
2569 | object *force = get_archetype (FORCE_NAME); |
2749 | object *force = archetype::get (FORCE_NAME); |
2570 | |
2750 | |
2571 | force->slaying = name; |
2751 | force->slaying = name; |
2572 | force->stats.food = 1; |
2752 | force->force_set_timer (duration); |
2573 | force->speed_left = -1.f; |
|
|
2574 | |
|
|
2575 | force->set_speed (duration ? 1.f / duration : 0.f); |
|
|
2576 | force->flag [FLAG_IS_USED_UP] = true; |
|
|
2577 | force->flag [FLAG_APPLIED] = true; |
2753 | force->flag [FLAG_APPLIED] = true; |
2578 | |
2754 | |
2579 | insert (force); |
2755 | return insert (force); |
2580 | } |
2756 | } |
2581 | |
2757 | |
2582 | void |
2758 | void |
2583 | object::play_sound (faceidx sound) |
2759 | object::play_sound (faceidx sound) const |
2584 | { |
2760 | { |
2585 | if (!sound) |
2761 | if (!sound) |
2586 | return; |
2762 | return; |
2587 | |
2763 | |
2588 | if (flag [FLAG_REMOVED]) |
2764 | if (is_on_map ()) |
|
|
2765 | map->play_sound (sound, x, y); |
|
|
2766 | else if (object *pl = in_player ()) |
|
|
2767 | pl->contr->play_sound (sound); |
|
|
2768 | } |
|
|
2769 | |
|
|
2770 | void |
|
|
2771 | object::say_msg (const char *msg) const |
|
|
2772 | { |
|
|
2773 | if (is_on_map ()) |
|
|
2774 | map->say_msg (msg, x, y); |
|
|
2775 | else if (object *pl = in_player ()) |
|
|
2776 | pl->contr->play_sound (sound); |
|
|
2777 | } |
|
|
2778 | |
|
|
2779 | void |
|
|
2780 | object::make_noise () |
|
|
2781 | { |
|
|
2782 | // we do not model noise in the map, so instead put |
|
|
2783 | // a temporary light into the noise source |
|
|
2784 | // could use the map instead, but that's less reliable for our |
|
|
2785 | // goal, which is to make invisibility a bit harder to exploit |
|
|
2786 | |
|
|
2787 | // currently only works sensibly for players |
|
|
2788 | if (!is_player ()) |
2589 | return; |
2789 | return; |
2590 | |
2790 | |
2591 | if (env) |
2791 | // find old force, or create new one |
2592 | { |
2792 | object *force = force_find (shstr_noise_force); |
2593 | if (object *pl = in_player ()) |
2793 | |
2594 | pl->contr->play_sound (sound); |
2794 | if (force) |
2595 | } |
2795 | force->speed_left = -1.f; // patch old speed up |
2596 | else |
2796 | else |
2597 | map->play_sound (sound, x, y); |
2797 | { |
2598 | } |
2798 | force = archetype::get (shstr_noise_force); |
2599 | |
2799 | |
|
|
2800 | force->slaying = shstr_noise_force; |
|
|
2801 | force->stats.food = 1; |
|
|
2802 | force->speed_left = -1.f; |
|
|
2803 | |
|
|
2804 | force->set_speed (1.f / 4.f); |
|
|
2805 | force->flag [FLAG_IS_USED_UP] = true; |
|
|
2806 | force->flag [FLAG_APPLIED] = true; |
|
|
2807 | |
|
|
2808 | insert (force); |
|
|
2809 | } |
|
|
2810 | } |
|
|
2811 | |
|
|
2812 | void object::change_move_type (MoveType mt) |
|
|
2813 | { |
|
|
2814 | if (move_type == mt) |
|
|
2815 | return; |
|
|
2816 | |
|
|
2817 | if (is_on_map ()) |
|
|
2818 | { |
|
|
2819 | // we are on the map, so handle move_on/off effects |
|
|
2820 | remove (); |
|
|
2821 | move_type = mt; |
|
|
2822 | map->insert (this, x, y, this); |
|
|
2823 | } |
|
|
2824 | else |
|
|
2825 | move_type = mt; |
|
|
2826 | } |
|
|
2827 | |
|
|
2828 | /* object should be a player. |
|
|
2829 | * we return the object the player has marked with the 'mark' command |
|
|
2830 | * below. If no match is found (or object has changed), we return |
|
|
2831 | * NULL. We leave it up to the calling function to print messages if |
|
|
2832 | * nothing is found. |
|
|
2833 | */ |
|
|
2834 | object * |
|
|
2835 | object::mark () const |
|
|
2836 | { |
|
|
2837 | if (contr && contr->mark && contr->mark->env == this) |
|
|
2838 | return contr->mark; |
|
|
2839 | else |
|
|
2840 | return 0; |
|
|
2841 | } |
|
|
2842 | |
|
|
2843 | // put marked object first in the inventory |
|
|
2844 | // this is used by identify-like spells so players can influence |
|
|
2845 | // the order a bit. |
|
|
2846 | void |
|
|
2847 | object::splay_marked () |
|
|
2848 | { |
|
|
2849 | if (object *marked = mark ()) |
|
|
2850 | splay (marked); |
|
|
2851 | } |
|
|
2852 | |