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 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
5 | * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team |
5 | * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team |
6 | * Copyright (©) 1992,2007 Frank Tore Johansen |
6 | * Copyright (©) 1992,2007 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 | //+GPL |
40 | |
43 | |
41 | short freearr_x[SIZEOFFREE] = { |
44 | short freearr_x[SIZEOFFREE] = { |
42 | 0, |
45 | 0, |
43 | 0, 1, 1, 1, 0, -1, -1, -1, |
46 | 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, |
47 | 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, |
… | |
… | |
48 | 0, |
51 | 0, |
49 | -1, -1, 0, 1, 1, 1, 0, -1, |
52 | -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, |
53 | -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 |
54 | -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 | }; |
55 | }; |
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] = { |
56 | int freedir[SIZEOFFREE] = { |
60 | 0, |
57 | 0, |
61 | 1, 2, 3, 4, 5, 6, 7, 8, |
58 | 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, |
59 | 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 |
60 | 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 | }; |
61 | }; |
65 | |
62 | |
|
|
63 | static int maxfree[SIZEOFFREE] = { |
|
|
64 | 0, |
|
|
65 | 9, 10, 13, 14, 17, 18, 21, 22, |
|
|
66 | 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48, |
|
|
67 | 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49 |
|
|
68 | }; |
|
|
69 | |
66 | static void |
70 | static void |
67 | write_uuid (uval64 skip, bool sync) |
71 | write_uuid (uval64 skip, bool sync) |
68 | { |
72 | { |
69 | CALL_BEGIN (2); |
73 | CALL_BEGIN (2); |
70 | CALL_ARG_SV (newSVval64 (skip)); |
74 | CALL_ARG_SV (newSVval64 (skip)); |
… | |
… | |
72 | CALL_CALL ("cf::write_uuid", G_DISCARD); |
76 | CALL_CALL ("cf::write_uuid", G_DISCARD); |
73 | CALL_END; |
77 | CALL_END; |
74 | } |
78 | } |
75 | |
79 | |
76 | static void |
80 | static void |
77 | read_uuid (void) |
81 | read_uuid () |
78 | { |
82 | { |
79 | char filename[MAX_BUF]; |
83 | char filename[MAX_BUF]; |
80 | |
84 | |
81 | sprintf (filename, "%s/uuid", settings.localdir); |
85 | sprintf (filename, "%s/uuid", settings.localdir); |
82 | |
86 | |
… | |
… | |
96 | |
100 | |
97 | LOG (llevError, "FATAL: cannot open %s for reading!\n", filename); |
101 | LOG (llevError, "FATAL: cannot open %s for reading!\n", filename); |
98 | _exit (1); |
102 | _exit (1); |
99 | } |
103 | } |
100 | |
104 | |
101 | UUID::BUF buf; |
105 | char buf [UUID::MAX_LEN]; |
102 | buf[0] = 0; |
106 | buf[0] = 0; |
103 | fgets (buf, sizeof (buf), fp); |
107 | fgets (buf, sizeof (buf), fp); |
104 | |
108 | |
105 | if (!UUID::cur.parse (buf)) |
109 | if (!UUID::cur.parse (buf)) |
106 | { |
110 | { |
… | |
… | |
133 | |
137 | |
134 | void |
138 | void |
135 | UUID::init () |
139 | UUID::init () |
136 | { |
140 | { |
137 | read_uuid (); |
141 | read_uuid (); |
|
|
142 | } |
|
|
143 | |
|
|
144 | bool |
|
|
145 | UUID::parse (const char *s) |
|
|
146 | { |
|
|
147 | if (*s++ != '<' || *s++ != '1' || *s++ != '.') |
|
|
148 | return false; |
|
|
149 | |
|
|
150 | seq = 0; |
|
|
151 | |
|
|
152 | while (*s != '>') |
|
|
153 | { |
|
|
154 | if (*s < '0') |
|
|
155 | return false; |
|
|
156 | |
|
|
157 | // this gives nice branchless code with gcc |
|
|
158 | assert ('0' < 'a' && '0' == 48 && 'a' == 97); |
|
|
159 | int digit = (*s + (*s & 0x40 ? 9 : 0)) & 15; |
|
|
160 | |
|
|
161 | seq = (seq << 4) | digit; |
|
|
162 | |
|
|
163 | ++s; |
|
|
164 | } |
|
|
165 | |
|
|
166 | return true; |
|
|
167 | } |
|
|
168 | |
|
|
169 | char * |
|
|
170 | UUID::append (char *buf) const |
|
|
171 | { |
|
|
172 | *buf++ = '<'; |
|
|
173 | *buf++ = '1'; |
|
|
174 | *buf++ = '.'; |
|
|
175 | |
|
|
176 | uint64_t seq = this->seq; |
|
|
177 | const int bits = 64; |
|
|
178 | char nz = 0; |
|
|
179 | static const char tohex [] = "0123456789abcdef"; |
|
|
180 | |
|
|
181 | // assert (len >= 3 + bits / 4 + 1 + 1); |
|
|
182 | for (int i = bits / 4; --i; ) |
|
|
183 | { |
|
|
184 | uint8_t digit = seq >> (bits - 4); |
|
|
185 | |
|
|
186 | *buf = tohex [digit]; |
|
|
187 | nz |= digit; |
|
|
188 | buf += nz ? 1 : 0; |
|
|
189 | seq <<= 4; |
|
|
190 | } |
|
|
191 | |
|
|
192 | // last digit is special - always emit |
|
|
193 | uint8_t digit = seq >> (bits - 4); |
|
|
194 | *buf++ = tohex [digit]; |
|
|
195 | |
|
|
196 | *buf++ = '>'; |
|
|
197 | |
|
|
198 | return buf; |
|
|
199 | } |
|
|
200 | |
|
|
201 | char * |
|
|
202 | UUID::c_str () const |
|
|
203 | { |
|
|
204 | static char buf [MAX_LEN]; |
|
|
205 | *append (buf) = 0; |
|
|
206 | return buf; |
138 | } |
207 | } |
139 | |
208 | |
140 | /* Returns TRUE if every key_values in wants has a partner with the same value in has. */ |
209 | /* Returns TRUE if every key_values in wants has a partner with the same value in has. */ |
141 | static bool |
210 | static bool |
142 | compare_ob_value_lists_one (const object *wants, const object *has) |
211 | compare_ob_value_lists_one (const object *wants, const object *has) |
… | |
… | |
178 | * Improvements made with merge: Better checking on potion, and also |
247 | * Improvements made with merge: Better checking on potion, and also |
179 | * check weight |
248 | * check weight |
180 | */ |
249 | */ |
181 | bool object::can_merge_slow (object *ob1, object *ob2) |
250 | bool object::can_merge_slow (object *ob1, object *ob2) |
182 | { |
251 | { |
183 | /* A couple quicksanity checks */ |
252 | /* A couple quick sanity checks */ |
184 | if (ob1 == ob2 |
253 | if (ob1 == ob2 |
185 | || ob1->type != ob2->type |
254 | || ob1->type != ob2->type |
186 | || ob1->speed != ob2->speed |
|
|
187 | || ob1->value != ob2->value |
255 | || ob1->value != ob2->value |
188 | || ob1->name != ob2->name) |
256 | || ob1->name != ob2->name |
|
|
257 | || fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED) |
189 | return 0; |
258 | return 0; |
190 | |
259 | |
191 | /* Do not merge objects if nrof would overflow. First part checks |
260 | /* Do not merge objects if nrof would overflow, assume nrof |
192 | * for unsigned overflow (2c), second part checks whether the result |
261 | * is always 0 .. 2**31-1 */ |
193 | * would fit into a 32 bit signed int, which is often used to hold |
262 | 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; |
263 | return 0; |
198 | |
264 | |
199 | /* If the objects have been identified, set the BEEN_APPLIED flag. |
265 | /* 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 |
266 | * 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 |
267 | * just can't ignore the been applied or identified flags, as they |
… | |
… | |
217 | || ob1->magic != ob2->magic |
283 | || ob1->magic != ob2->magic |
218 | || ob1->slaying != ob2->slaying |
284 | || ob1->slaying != ob2->slaying |
219 | || ob1->skill != ob2->skill |
285 | || ob1->skill != ob2->skill |
220 | || ob1->value != ob2->value |
286 | || ob1->value != ob2->value |
221 | || ob1->animation_id != ob2->animation_id |
287 | || ob1->animation_id != ob2->animation_id |
222 | || (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other |
288 | || (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependend on each other |
223 | || ob1->client_type != ob2->client_type |
289 | || ob1->client_type != ob2->client_type |
224 | || ob1->materialname != ob2->materialname |
290 | || ob1->material != ob2->material |
225 | || ob1->lore != ob2->lore |
291 | || ob1->lore != ob2->lore |
226 | || ob1->subtype != ob2->subtype |
292 | || ob1->subtype != ob2->subtype |
227 | || ob1->move_type != ob2->move_type |
293 | || ob1->move_type != ob2->move_type |
228 | || ob1->move_block != ob2->move_block |
294 | || ob1->move_block != ob2->move_block |
229 | || ob1->move_allow != ob2->move_allow |
295 | || ob1->move_allow != ob2->move_allow |
230 | || ob1->move_on != ob2->move_on |
296 | || ob1->move_on != ob2->move_on |
231 | || ob1->move_off != ob2->move_off |
297 | || ob1->move_off != ob2->move_off |
232 | || ob1->move_slow != ob2->move_slow |
298 | || ob1->move_slow != ob2->move_slow |
233 | || ob1->move_slow_penalty != ob2->move_slow_penalty |
299 | || fabs (ob1->move_slow_penalty - ob2->move_slow_penalty) >= (1.f / 1024.f) |
234 | || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) |
300 | || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) |
235 | || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats))) |
301 | || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats))) |
236 | return 0; |
302 | return 0; |
237 | |
303 | |
238 | if ((ob1->flag ^ ob2->flag) |
304 | if ((ob1->flag ^ ob2->flag) |
239 | .reset (FLAG_INV_LOCKED) |
305 | .reset (FLAG_INV_LOCKED) |
240 | .reset (FLAG_CLIENT_SENT) |
|
|
241 | .reset (FLAG_REMOVED) |
306 | .reset (FLAG_REMOVED) |
242 | .any ()) |
307 | .any ()) |
243 | return 0; |
308 | return 0; |
244 | |
309 | |
245 | /* This is really a spellbook check - we should in general |
310 | /* This is really a spellbook check - we should in general |
… | |
… | |
327 | { |
392 | { |
328 | // see if we are in a container of sorts |
393 | // see if we are in a container of sorts |
329 | if (env) |
394 | if (env) |
330 | { |
395 | { |
331 | // the player inventory itself is always visible |
396 | // the player inventory itself is always visible |
332 | if (env->type == PLAYER) |
397 | if (env->is_player ()) |
333 | return env; |
398 | return env; |
334 | |
399 | |
335 | // else a player could have our env open |
400 | // else a player could have our env open |
336 | object *envest = env->outer_env (); |
401 | object *envest = env->outer_env_or_self (); |
337 | |
402 | |
338 | // the player itself is always on a map, so we will find him here |
403 | // the player itself is always on a map, so we will find him here |
339 | // even if our inv is in a player. |
404 | // even if our inv is in a player. |
340 | if (envest->is_on_map ()) |
405 | if (envest->is_on_map ()) |
341 | if (object *pl = envest->ms ().player ()) |
406 | if (object *pl = envest->ms ().player ()) |
342 | if (pl->container == env) |
407 | if (pl->container_ () == env) |
343 | return pl; |
408 | return pl; |
344 | } |
409 | } |
345 | else |
410 | else |
346 | { |
411 | { |
347 | // maybe there is a player standing on the same mapspace |
412 | // maybe there is a player standing on the same mapspace |
348 | // this will catch the case where "this" is a player |
413 | // this will catch the case where "this" is a player |
349 | if (object *pl = ms ().player ()) |
414 | if (object *pl = ms ().player ()) |
350 | if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look) |
415 | if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look) |
351 | || this == pl->container) |
416 | || pl->container_ () == this) |
352 | return pl; |
417 | return pl; |
353 | } |
418 | } |
354 | } |
419 | } |
355 | |
420 | |
356 | return 0; |
421 | return 0; |
… | |
… | |
434 | object_freezer freezer; |
499 | object_freezer freezer; |
435 | op->write (freezer); |
500 | op->write (freezer); |
436 | return freezer.as_string (); |
501 | return freezer.as_string (); |
437 | } |
502 | } |
438 | |
503 | |
439 | /* |
504 | char * |
440 | * get_nearest_part(multi-object, object 2) returns the part of the |
505 | object::as_string () |
441 | * multi-object 1 which is closest to the second object. |
|
|
442 | * If it's not a multi-object, it is returned. |
|
|
443 | */ |
|
|
444 | object * |
|
|
445 | get_nearest_part (object *op, const object *pl) |
|
|
446 | { |
506 | { |
447 | object *tmp, *closest; |
507 | return dump_object (this); |
448 | int last_dist, i; |
|
|
449 | |
|
|
450 | if (!op->more) |
|
|
451 | return op; |
|
|
452 | |
|
|
453 | for (last_dist = distance (op, pl), closest = op, tmp = op->more; |
|
|
454 | tmp; |
|
|
455 | tmp = tmp->more) |
|
|
456 | if ((i = distance (tmp, pl)) < last_dist) |
|
|
457 | closest = tmp, last_dist = i; |
|
|
458 | |
|
|
459 | return closest; |
|
|
460 | } |
508 | } |
461 | |
509 | |
462 | /* |
510 | /* |
463 | * Returns the object which has the count-variable equal to the argument. |
511 | * Returns the object which has the count-variable equal to the argument. |
464 | * VERRRY slow. |
512 | * VERRRY slow. |
… | |
… | |
558 | update_stats (); |
606 | update_stats (); |
559 | |
607 | |
560 | new_draw_info_format (NDI_UNIQUE, 0, this, |
608 | new_draw_info_format (NDI_UNIQUE, 0, this, |
561 | "You try to balance all your items at once, " |
609 | "You try to balance all your items at once, " |
562 | "but the %s is just too much for your body. " |
610 | "but the %s is just too much for your body. " |
563 | "[You need to unapply some items first.]", &ob->name); |
611 | "[You need to unapply some items first - use the 'body' command to see " |
|
|
612 | "how many items you cna wera on a specific body part.]", &ob->name); |
564 | return false; |
613 | return false; |
565 | } |
614 | } |
566 | |
615 | |
567 | //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name); |
616 | //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name); |
568 | } |
617 | } |
… | |
… | |
637 | tail = new_link; |
686 | tail = new_link; |
638 | } |
687 | } |
639 | } |
688 | } |
640 | } |
689 | } |
641 | |
690 | |
642 | if (speed < 0) |
691 | dst->activate (); |
643 | dst->speed_left -= rndm (); |
|
|
644 | |
|
|
645 | dst->set_speed (dst->speed); |
|
|
646 | } |
692 | } |
647 | |
693 | |
648 | void |
694 | void |
649 | object::instantiate () |
695 | object::instantiate () |
650 | { |
696 | { |
651 | if (!uuid.seq) // HACK |
697 | if (!uuid.seq) // HACK |
652 | uuid = UUID::gen (); |
698 | uuid = UUID::gen (); |
653 | |
699 | |
|
|
700 | // TODO: unclean state changes, should nt be done in copy_to AND instantiate |
|
|
701 | if (flag [FLAG_RANDOM_SPEED] && speed) |
|
|
702 | speed_left = - speed - rndm (); // TODO animation |
|
|
703 | else |
654 | speed_left = -0.1f; |
704 | speed_left = -1.; |
|
|
705 | |
655 | /* copy the body_info to the body_used - this is only really |
706 | /* copy the body_info to the body_used - this is only really |
656 | * need for monsters, but doesn't hurt to do it for everything. |
707 | * need for monsters, but doesn't hurt to do it for everything. |
657 | * by doing so, when a monster is created, it has good starting |
708 | * by doing so, when a monster is created, it has good starting |
658 | * values for the body_used info, so when items are created |
709 | * values for the body_used info, so when items are created |
659 | * for it, they can be properly equipped. |
710 | * for it, they can be properly equipped. |
… | |
… | |
667 | object * |
718 | object * |
668 | object::clone () |
719 | object::clone () |
669 | { |
720 | { |
670 | object *neu = create (); |
721 | object *neu = create (); |
671 | copy_to (neu); |
722 | copy_to (neu); |
|
|
723 | |
|
|
724 | // TODO: unclean state changes, should not be done in clone AND instantiate |
|
|
725 | if (neu->flag [FLAG_RANDOM_SPEED] && neu->speed) |
|
|
726 | neu->speed_left = - neu->speed - rndm (); // TODO animation |
|
|
727 | |
672 | neu->map = map; // not copied by copy_to |
728 | neu->map = map; // not copied by copy_to |
673 | return neu; |
729 | return neu; |
674 | } |
730 | } |
675 | |
731 | |
676 | /* |
732 | /* |
… | |
… | |
694 | * This function needs to be called whenever the speed of an object changes. |
750 | * This function needs to be called whenever the speed of an object changes. |
695 | */ |
751 | */ |
696 | void |
752 | void |
697 | object::set_speed (float speed) |
753 | object::set_speed (float speed) |
698 | { |
754 | { |
699 | if (flag [FLAG_FREED] && speed) |
|
|
700 | { |
|
|
701 | LOG (llevError, "Object %s is freed but has speed.\n", &name); |
|
|
702 | speed = 0; |
|
|
703 | } |
|
|
704 | |
|
|
705 | this->speed = speed; |
755 | this->speed = speed; |
706 | |
756 | |
707 | if (has_active_speed ()) |
757 | if (has_active_speed ()) |
708 | activate (); |
758 | activate (); |
709 | else |
759 | else |
… | |
… | |
759 | |
809 | |
760 | if (!(m.flags_ & P_UPTODATE)) |
810 | if (!(m.flags_ & P_UPTODATE)) |
761 | /* nop */; |
811 | /* nop */; |
762 | else if (action == UP_OBJ_INSERT) |
812 | else if (action == UP_OBJ_INSERT) |
763 | { |
813 | { |
|
|
814 | #if 0 |
764 | // this is likely overkill, TODO: revisit (schmorp) |
815 | // this is likely overkill, TODO: revisit (schmorp) |
765 | if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) |
816 | if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) |
766 | || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) |
817 | || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) |
|
|
818 | || (op->is_player () && !(m.flags_ & P_PLAYER)) |
767 | || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) |
819 | || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) |
768 | || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) |
820 | || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) |
769 | || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) |
821 | || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) |
770 | || (m.move_on | op->move_on ) != m.move_on |
822 | || (m.move_on | op->move_on ) != m.move_on |
771 | || (m.move_off | op->move_off ) != m.move_off |
823 | || (m.move_off | op->move_off ) != m.move_off |
772 | || (m.move_slow | op->move_slow) != m.move_slow |
824 | || (m.move_slow | op->move_slow) != m.move_slow |
773 | /* This isn't perfect, but I don't expect a lot of objects to |
825 | /* This isn't perfect, but I don't expect a lot of objects to |
774 | * have move_allow right now. |
826 | * have move_allow right now. |
775 | */ |
827 | */ |
776 | || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block |
828 | || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block |
|
|
829 | m.invalidate (); |
|
|
830 | #else |
777 | || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) |
831 | // the above is not strong enough a test to skip updating. los maybe? TODO (schmorp) |
778 | m.flags_ = 0; |
832 | m.invalidate (); |
|
|
833 | #endif |
779 | } |
834 | } |
780 | /* if the object is being removed, we can't make intelligent |
835 | /* if the object is being removed, we can't make intelligent |
781 | * decisions, because remove_ob can't really pass the object |
836 | * decisions, because remove_ob can't really pass the object |
782 | * that is being removed. |
837 | * that is being removed. |
783 | */ |
838 | */ |
784 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
839 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
785 | m.flags_ = 0; |
840 | m.invalidate (); |
786 | else if (action == UP_OBJ_FACE) |
841 | else if (action == UP_OBJ_FACE) |
787 | /* Nothing to do for that case */ ; |
842 | /* Nothing to do for that case */ ; |
788 | else |
843 | else |
789 | LOG (llevError, "update_object called with invalid action: %d\n", action); |
844 | LOG (llevError, "update_object called with invalid action: %d\n", action); |
790 | |
845 | |
… | |
… | |
794 | |
849 | |
795 | object::object () |
850 | object::object () |
796 | { |
851 | { |
797 | SET_FLAG (this, FLAG_REMOVED); |
852 | SET_FLAG (this, FLAG_REMOVED); |
798 | |
853 | |
799 | expmul = 1.0; |
854 | //expmul = 1.0; declared const for the time being |
800 | face = blank_face; |
855 | face = blank_face; |
|
|
856 | material = MATERIAL_NULL; |
801 | } |
857 | } |
802 | |
858 | |
803 | object::~object () |
859 | object::~object () |
804 | { |
860 | { |
805 | unlink (); |
861 | unlink (); |
… | |
… | |
834 | /* If already on active list, don't do anything */ |
890 | /* If already on active list, don't do anything */ |
835 | if (active) |
891 | if (active) |
836 | return; |
892 | return; |
837 | |
893 | |
838 | if (has_active_speed ()) |
894 | if (has_active_speed ()) |
|
|
895 | { |
|
|
896 | if (flag [FLAG_FREED]) |
|
|
897 | LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D |
|
|
898 | |
839 | actives.insert (this); |
899 | actives.insert (this); |
|
|
900 | } |
840 | } |
901 | } |
841 | |
902 | |
842 | void |
903 | void |
843 | object::activate_recursive () |
904 | object::activate_recursive () |
844 | { |
905 | { |
… | |
… | |
909 | || map->in_memory != MAP_ACTIVE |
970 | || map->in_memory != MAP_ACTIVE |
910 | || map->no_drop |
971 | || map->no_drop |
911 | || ms ().move_block == MOVE_ALL) |
972 | || ms ().move_block == MOVE_ALL) |
912 | { |
973 | { |
913 | while (inv) |
974 | while (inv) |
914 | inv->destroy (true); |
975 | inv->destroy (); |
915 | } |
976 | } |
916 | else |
977 | else |
917 | { /* Put objects in inventory onto this space */ |
978 | { /* Put objects in inventory onto this space */ |
918 | while (inv) |
979 | while (inv) |
919 | { |
980 | { |
… | |
… | |
923 | || op->flag [FLAG_NO_DROP] |
984 | || op->flag [FLAG_NO_DROP] |
924 | || op->type == RUNE |
985 | || op->type == RUNE |
925 | || op->type == TRAP |
986 | || op->type == TRAP |
926 | || op->flag [FLAG_IS_A_TEMPLATE] |
987 | || op->flag [FLAG_IS_A_TEMPLATE] |
927 | || op->flag [FLAG_DESTROY_ON_DEATH]) |
988 | || op->flag [FLAG_DESTROY_ON_DEATH]) |
928 | op->destroy (true); |
989 | op->destroy (); |
929 | else |
990 | else |
930 | map->insert (op, x, y); |
991 | map->insert (op, x, y); |
931 | } |
992 | } |
932 | } |
993 | } |
933 | } |
994 | } |
… | |
… | |
962 | |
1023 | |
963 | void |
1024 | void |
964 | object::do_destroy () |
1025 | object::do_destroy () |
965 | { |
1026 | { |
966 | if (flag [FLAG_IS_LINKED]) |
1027 | if (flag [FLAG_IS_LINKED]) |
967 | remove_button_link (this); |
1028 | remove_link (); |
968 | |
1029 | |
969 | if (flag [FLAG_FRIENDLY]) |
1030 | if (flag [FLAG_FRIENDLY]) |
970 | remove_friendly_object (this); |
1031 | remove_friendly_object (this); |
971 | |
1032 | |
972 | remove (); |
1033 | remove (); |
… | |
… | |
997 | attacked_by = 0; |
1058 | attacked_by = 0; |
998 | current_weapon = 0; |
1059 | current_weapon = 0; |
999 | } |
1060 | } |
1000 | |
1061 | |
1001 | void |
1062 | void |
1002 | object::destroy (bool destroy_inventory) |
1063 | object::destroy () |
1003 | { |
1064 | { |
1004 | if (destroyed ()) |
1065 | if (destroyed ()) |
1005 | return; |
1066 | return; |
1006 | |
1067 | |
1007 | if (!is_head () && !head->destroyed ()) |
1068 | if (!is_head () && !head->destroyed ()) |
1008 | { |
1069 | { |
1009 | LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); |
1070 | LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); |
1010 | head->destroy (destroy_inventory); |
1071 | head->destroy (); |
1011 | return; |
1072 | return; |
1012 | } |
1073 | } |
1013 | |
1074 | |
1014 | destroy_inv (!destroy_inventory); |
1075 | destroy_inv (false); |
1015 | |
1076 | |
1016 | if (is_head ()) |
1077 | if (is_head ()) |
1017 | if (sound_destroy) |
1078 | if (sound_destroy) |
1018 | play_sound (sound_destroy); |
1079 | play_sound (sound_destroy); |
1019 | else if (flag [FLAG_MONSTER]) |
1080 | else if (flag [FLAG_MONSTER]) |
… | |
… | |
1030 | * the previous environment. |
1091 | * the previous environment. |
1031 | */ |
1092 | */ |
1032 | void |
1093 | void |
1033 | object::do_remove () |
1094 | object::do_remove () |
1034 | { |
1095 | { |
1035 | object *tmp, *last = 0; |
|
|
1036 | object *otmp; |
|
|
1037 | |
|
|
1038 | if (flag [FLAG_REMOVED]) |
1096 | if (flag [FLAG_REMOVED]) |
1039 | return; |
1097 | return; |
1040 | |
1098 | |
1041 | INVOKE_OBJECT (REMOVE, this); |
1099 | INVOKE_OBJECT (REMOVE, this); |
1042 | |
1100 | |
… | |
… | |
1055 | if (object *pl = visible_to ()) |
1113 | if (object *pl = visible_to ()) |
1056 | esrv_del_item (pl->contr, count); |
1114 | esrv_del_item (pl->contr, count); |
1057 | flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed |
1115 | flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed |
1058 | |
1116 | |
1059 | adjust_weight (env, -total_weight ()); |
1117 | adjust_weight (env, -total_weight ()); |
|
|
1118 | |
|
|
1119 | object *pl = in_player (); |
1060 | |
1120 | |
1061 | /* we set up values so that it could be inserted into |
1121 | /* we set up values so that it could be inserted into |
1062 | * the map, but we don't actually do that - it is up |
1122 | * the map, but we don't actually do that - it is up |
1063 | * to the caller to decide what we want to do. |
1123 | * to the caller to decide what we want to do. |
1064 | */ |
1124 | */ |
… | |
… | |
1072 | |
1132 | |
1073 | above = 0; |
1133 | above = 0; |
1074 | below = 0; |
1134 | below = 0; |
1075 | env = 0; |
1135 | env = 0; |
1076 | |
1136 | |
1077 | /* NO_FIX_PLAYER is set when a great many changes are being |
1137 | if (pl && pl->is_player ()) |
1078 | * made to players inventory. If set, avoiding the call |
|
|
1079 | * to save cpu time. |
|
|
1080 | */ |
1138 | { |
1081 | if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1139 | pl->contr->queue_stats_update (); |
1082 | otmp->update_stats (); |
1140 | |
|
|
1141 | if (glow_radius && pl->is_on_map ()) |
|
|
1142 | update_all_los (pl->map, pl->x, pl->y); |
|
|
1143 | } |
1083 | } |
1144 | } |
1084 | else if (map) |
1145 | else if (map) |
1085 | { |
1146 | { |
1086 | map->dirty = true; |
1147 | map->dirty = true; |
1087 | mapspace &ms = this->ms (); |
1148 | mapspace &ms = this->ms (); |
1088 | |
1149 | |
1089 | if (object *pl = ms.player ()) |
1150 | if (object *pl = ms.player ()) |
1090 | { |
1151 | { |
1091 | if (type == PLAYER) // this == pl(!) |
1152 | if (is_player ()) |
1092 | { |
1153 | { |
|
|
1154 | if (!flag [FLAG_WIZPASS]) |
|
|
1155 | ms.smell = ++mapspace::smellcount; // remember the smell of the player |
|
|
1156 | |
1093 | // leaving a spot always closes any open container on the ground |
1157 | // leaving a spot always closes any open container on the ground |
1094 | if (container && !container->env) |
1158 | if (container && !container->env) |
1095 | // this causes spurious floorbox updates, but it ensures |
1159 | // this causes spurious floorbox updates, but it ensures |
1096 | // that the CLOSE event is being sent. |
1160 | // that the CLOSE event is being sent. |
1097 | close_container (); |
1161 | close_container (); |
1098 | |
1162 | |
1099 | --map->players; |
1163 | --map->players; |
1100 | map->touch (); |
1164 | map->touch (); |
1101 | } |
1165 | } |
1102 | else if (pl->container == this) |
1166 | else if (pl->container_ () == this) |
1103 | { |
1167 | { |
1104 | // removing a container should close it |
1168 | // removing a container should close it |
1105 | close_container (); |
1169 | close_container (); |
1106 | } |
1170 | } |
1107 | |
1171 | |
… | |
… | |
1114 | *(below ? &below->above : &ms.bot) = above; |
1178 | *(below ? &below->above : &ms.bot) = above; |
1115 | |
1179 | |
1116 | above = 0; |
1180 | above = 0; |
1117 | below = 0; |
1181 | below = 0; |
1118 | |
1182 | |
|
|
1183 | ms.invalidate (); |
|
|
1184 | |
1119 | if (map->in_memory == MAP_SAVING) |
1185 | if (map->in_memory == MAP_SAVING) |
1120 | return; |
1186 | return; |
1121 | |
1187 | |
1122 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1188 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1123 | |
1189 | |
1124 | if (object *pl = ms.player ()) |
1190 | if (object *pl = ms.player ()) |
1125 | { |
1191 | { |
1126 | if (pl->container == this) |
1192 | if (pl->container_ () == this) |
1127 | /* If a container that the player is currently using somehow gets |
1193 | /* If a container that the player is currently using somehow gets |
1128 | * removed (most likely destroyed), update the player view |
1194 | * removed (most likely destroyed), update the player view |
1129 | * appropriately. |
1195 | * appropriately. |
1130 | */ |
1196 | */ |
1131 | pl->close_container (); |
1197 | pl->close_container (); |
… | |
… | |
1135 | //TODO: update floorbox to preserve ordering |
1201 | //TODO: update floorbox to preserve ordering |
1136 | if (pl->contr->ns) |
1202 | if (pl->contr->ns) |
1137 | pl->contr->ns->floorbox_update (); |
1203 | pl->contr->ns->floorbox_update (); |
1138 | } |
1204 | } |
1139 | |
1205 | |
|
|
1206 | if (check_walk_off) |
1140 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
1207 | for (object *above, *tmp = ms.bot; tmp; tmp = above) |
1141 | { |
1208 | { |
|
|
1209 | above = tmp->above; |
|
|
1210 | |
1142 | /* No point updating the players look faces if he is the object |
1211 | /* No point updating the players look faces if he is the object |
1143 | * being removed. |
1212 | * being removed. |
1144 | */ |
1213 | */ |
1145 | |
1214 | |
1146 | /* See if object moving off should effect something */ |
1215 | /* See if object moving off should effect something */ |
1147 | if (check_walk_off |
|
|
1148 | && ((move_type & tmp->move_off) |
1216 | if ((move_type & tmp->move_off) |
1149 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1217 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0) |
1150 | { |
|
|
1151 | move_apply (tmp, this, 0); |
1218 | move_apply (tmp, this, 0); |
1152 | |
|
|
1153 | if (destroyed ()) |
|
|
1154 | LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); |
|
|
1155 | } |
1219 | } |
1156 | |
1220 | |
1157 | last = tmp; |
1221 | if (affects_los ()) |
1158 | } |
|
|
1159 | |
|
|
1160 | /* last == NULL if there are no objects on this space */ |
|
|
1161 | //TODO: this makes little sense, why only update the topmost object? |
|
|
1162 | if (!last) |
|
|
1163 | map->at (x, y).flags_ = 0; |
|
|
1164 | else |
|
|
1165 | update_object (last, UP_OBJ_REMOVE); |
|
|
1166 | |
|
|
1167 | if (flag [FLAG_BLOCKSVIEW] || glow_radius) |
|
|
1168 | update_all_los (map, x, y); |
1222 | update_all_los (map, x, y); |
1169 | } |
1223 | } |
1170 | } |
1224 | } |
1171 | |
1225 | |
1172 | /* |
1226 | /* |
… | |
… | |
1196 | esrv_update_item (UPD_NROF, pl, top); |
1250 | esrv_update_item (UPD_NROF, pl, top); |
1197 | |
1251 | |
1198 | op->weight = 0; // cancel the addition above |
1252 | op->weight = 0; // cancel the addition above |
1199 | op->carrying = 0; // must be 0 already |
1253 | op->carrying = 0; // must be 0 already |
1200 | |
1254 | |
1201 | op->destroy (1); |
1255 | op->destroy (); |
1202 | |
1256 | |
1203 | return top; |
1257 | return top; |
1204 | } |
1258 | } |
1205 | |
1259 | |
1206 | return 0; |
1260 | return 0; |
… | |
… | |
1214 | |
1268 | |
1215 | object *prev = this; |
1269 | object *prev = this; |
1216 | |
1270 | |
1217 | for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more) |
1271 | for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more) |
1218 | { |
1272 | { |
1219 | object *op = arch_to_object (at); |
1273 | object *op = at->instance (); |
1220 | |
1274 | |
1221 | op->name = name; |
1275 | op->name = name; |
1222 | op->name_pl = name_pl; |
1276 | op->name_pl = name_pl; |
1223 | op->title = title; |
1277 | op->title = title; |
1224 | |
1278 | |
… | |
… | |
1268 | * just 'op' otherwise |
1322 | * just 'op' otherwise |
1269 | */ |
1323 | */ |
1270 | object * |
1324 | object * |
1271 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1325 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1272 | { |
1326 | { |
1273 | if (op->is_on_map ()) |
|
|
1274 | { |
|
|
1275 | LOG (llevError, "insert_ob_in_map called for object already on map"); |
|
|
1276 | abort (); |
|
|
1277 | } |
|
|
1278 | |
|
|
1279 | if (op->env) |
|
|
1280 | { |
|
|
1281 | LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)"); |
|
|
1282 | op->remove (); |
1327 | op->remove (); |
1283 | } |
|
|
1284 | |
1328 | |
1285 | if (op->face && !face_info (op->face))//D TODO: remove soon |
1329 | if (m == &freed_map)//D TODO: remove soon |
1286 | {//D |
1330 | {//D |
1287 | LOG (llevError | logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D |
1331 | LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D |
1288 | op->face = 1;//D |
|
|
1289 | }//D |
1332 | }//D |
1290 | |
1333 | |
1291 | /* Ideally, the caller figures this out. However, it complicates a lot |
1334 | /* Ideally, the caller figures this out. However, it complicates a lot |
1292 | * of areas of callers (eg, anything that uses find_free_spot would now |
1335 | * of areas of callers (eg, anything that uses find_free_spot would now |
1293 | * need extra work |
1336 | * need extra work |
1294 | */ |
1337 | */ |
|
|
1338 | maptile *newmap = m; |
1295 | if (!xy_normalise (m, op->x, op->y)) |
1339 | if (!xy_normalise (newmap, op->x, op->y)) |
1296 | { |
1340 | { |
1297 | op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found |
1341 | op->head_ ()->destroy ();// remove head_ once all tail object destroyers found |
1298 | return 0; |
1342 | return 0; |
1299 | } |
1343 | } |
1300 | |
1344 | |
1301 | if (object *more = op->more) |
1345 | if (object *more = op->more) |
1302 | if (!insert_ob_in_map (more, m, originator, flag)) |
1346 | if (!insert_ob_in_map (more, m, originator, flag)) |
1303 | return 0; |
1347 | return 0; |
1304 | |
1348 | |
1305 | CLEAR_FLAG (op, FLAG_REMOVED); |
1349 | op->flag [FLAG_REMOVED] = false; |
1306 | |
1350 | op->env = 0; |
1307 | op->map = m; |
1351 | op->map = newmap; |
|
|
1352 | |
1308 | mapspace &ms = op->ms (); |
1353 | mapspace &ms = op->ms (); |
1309 | |
1354 | |
1310 | /* this has to be done after we translate the coordinates. |
1355 | /* this has to be done after we translate the coordinates. |
1311 | */ |
1356 | */ |
1312 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1357 | if (op->nrof && !(flag & INS_NO_MERGE)) |
… | |
… | |
1315 | { |
1360 | { |
1316 | // TODO: we actually want to update tmp, not op, |
1361 | // TODO: we actually want to update tmp, not op, |
1317 | // but some caller surely breaks when we return tmp |
1362 | // but some caller surely breaks when we return tmp |
1318 | // from here :/ |
1363 | // from here :/ |
1319 | op->nrof += tmp->nrof; |
1364 | op->nrof += tmp->nrof; |
1320 | tmp->destroy (1); |
1365 | tmp->destroy (); |
1321 | } |
1366 | } |
1322 | |
1367 | |
1323 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1368 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1324 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1369 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1325 | |
1370 | |
… | |
… | |
1333 | LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); |
1378 | LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); |
1334 | abort (); |
1379 | abort (); |
1335 | } |
1380 | } |
1336 | |
1381 | |
1337 | if (!originator->is_on_map ()) |
1382 | if (!originator->is_on_map ()) |
|
|
1383 | { |
1338 | LOG (llevDebug | logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map", |
1384 | LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map", |
1339 | op->debug_desc (), originator->debug_desc ()); |
1385 | op->debug_desc (), originator->debug_desc ()); |
|
|
1386 | abort (); |
|
|
1387 | } |
1340 | |
1388 | |
1341 | op->above = originator; |
1389 | op->above = originator; |
1342 | op->below = originator->below; |
1390 | op->below = originator->below; |
1343 | originator->below = op; |
1391 | originator->below = op; |
1344 | |
1392 | |
… | |
… | |
1430 | op->below = top; |
1478 | op->below = top; |
1431 | *(op->above ? &op->above->below : &ms.top) = op; |
1479 | *(op->above ? &op->above->below : &ms.top) = op; |
1432 | } |
1480 | } |
1433 | } |
1481 | } |
1434 | |
1482 | |
1435 | if (op->type == PLAYER) |
1483 | if (op->is_player ()) |
1436 | { |
1484 | { |
1437 | op->contr->do_los = 1; |
1485 | op->contr->do_los = 1; |
1438 | ++op->map->players; |
1486 | ++op->map->players; |
1439 | op->map->touch (); |
1487 | op->map->touch (); |
1440 | } |
1488 | } |
… | |
… | |
1455 | * be far away from this change and not affected in any way - |
1503 | * be far away from this change and not affected in any way - |
1456 | * this should get redone to only look for players within range, |
1504 | * this should get redone to only look for players within range, |
1457 | * or just updating the P_UPTODATE for spaces within this area |
1505 | * or just updating the P_UPTODATE for spaces within this area |
1458 | * of effect may be sufficient. |
1506 | * of effect may be sufficient. |
1459 | */ |
1507 | */ |
1460 | if (op->map->darkness && (op->glow_radius != 0)) |
1508 | if (op->affects_los ()) |
|
|
1509 | { |
|
|
1510 | op->ms ().invalidate (); |
1461 | update_all_los (op->map, op->x, op->y); |
1511 | update_all_los (op->map, op->x, op->y); |
|
|
1512 | } |
1462 | |
1513 | |
1463 | /* updates flags (blocked, alive, no magic, etc) for this map space */ |
1514 | /* updates flags (blocked, alive, no magic, etc) for this map space */ |
1464 | update_object (op, UP_OBJ_INSERT); |
1515 | update_object (op, UP_OBJ_INSERT); |
1465 | |
1516 | |
1466 | INVOKE_OBJECT (INSERT, op); |
1517 | INVOKE_OBJECT (INSERT, op); |
… | |
… | |
1473 | * blocked() and wall() work properly), and these flags are updated by |
1524 | * blocked() and wall() work properly), and these flags are updated by |
1474 | * update_object(). |
1525 | * update_object(). |
1475 | */ |
1526 | */ |
1476 | |
1527 | |
1477 | /* if this is not the head or flag has been passed, don't check walk on status */ |
1528 | /* if this is not the head or flag has been passed, don't check walk on status */ |
1478 | if (!(flag & INS_NO_WALK_ON) && op->head_ () == op) |
1529 | if (!(flag & INS_NO_WALK_ON) && op->is_head ()) |
1479 | { |
1530 | { |
1480 | if (check_move_on (op, originator)) |
1531 | if (check_move_on (op, originator)) |
1481 | return 0; |
1532 | return 0; |
1482 | |
1533 | |
1483 | /* If we are a multi part object, lets work our way through the check |
1534 | /* If we are a multi part object, lets work our way through the check |
… | |
… | |
1494 | /* this function inserts an object in the map, but if it |
1545 | /* this function inserts an object in the map, but if it |
1495 | * finds an object of its own type, it'll remove that one first. |
1546 | * finds an object of its own type, it'll remove that one first. |
1496 | * op is the object to insert it under: supplies x and the map. |
1547 | * op is the object to insert it under: supplies x and the map. |
1497 | */ |
1548 | */ |
1498 | void |
1549 | void |
1499 | replace_insert_ob_in_map (const char *arch_string, object *op) |
1550 | replace_insert_ob_in_map (shstr_tmp archname, object *op) |
1500 | { |
1551 | { |
1501 | /* first search for itself and remove any old instances */ |
1552 | /* first search for itself and remove any old instances */ |
1502 | |
1553 | |
1503 | for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) |
1554 | for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) |
1504 | if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ |
1555 | if (tmp->arch->archname == archname) /* same archetype */ |
1505 | tmp->destroy (1); |
1556 | tmp->destroy (); |
1506 | |
1557 | |
1507 | object *tmp = arch_to_object (archetype::find (arch_string)); |
1558 | object *tmp = archetype::find (archname)->instance (); |
1508 | |
1559 | |
1509 | tmp->x = op->x; |
1560 | tmp->x = op->x; |
1510 | tmp->y = op->y; |
1561 | tmp->y = op->y; |
1511 | |
1562 | |
1512 | insert_ob_in_map (tmp, op->map, op, 0); |
1563 | insert_ob_in_map (tmp, op->map, op, 0); |
… | |
… | |
1517 | { |
1568 | { |
1518 | if (where->env) |
1569 | if (where->env) |
1519 | return where->env->insert (this); |
1570 | return where->env->insert (this); |
1520 | else |
1571 | else |
1521 | return where->map->insert (this, where->x, where->y, originator, flags); |
1572 | return where->map->insert (this, where->x, where->y, originator, flags); |
|
|
1573 | } |
|
|
1574 | |
|
|
1575 | // check whether we can put this into the map, respect max_volume, max_items |
|
|
1576 | bool |
|
|
1577 | object::can_drop_at (maptile *m, int x, int y, object *originator) |
|
|
1578 | { |
|
|
1579 | mapspace &ms = m->at (x, y); |
|
|
1580 | |
|
|
1581 | int items = ms.items (); |
|
|
1582 | |
|
|
1583 | if (!items // testing !items ensures we can drop at least one item |
|
|
1584 | || (items < m->max_items |
|
|
1585 | && ms.volume () < m->max_volume)) |
|
|
1586 | return true; |
|
|
1587 | |
|
|
1588 | if (originator && originator->is_player ()) |
|
|
1589 | originator->contr->failmsg (format ( |
|
|
1590 | "No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>", |
|
|
1591 | query_name () |
|
|
1592 | )); |
|
|
1593 | |
|
|
1594 | return false; |
1522 | } |
1595 | } |
1523 | |
1596 | |
1524 | /* |
1597 | /* |
1525 | * decrease(object, number) decreases a specified number from |
1598 | * decrease(object, number) decreases a specified number from |
1526 | * the amount of an object. If the amount reaches 0, the object |
1599 | * the amount of an object. If the amount reaches 0, the object |
… | |
… | |
1633 | if (object *pl = tmp->visible_to ()) |
1706 | if (object *pl = tmp->visible_to ()) |
1634 | esrv_update_item (UPD_NROF, pl, tmp); |
1707 | esrv_update_item (UPD_NROF, pl, tmp); |
1635 | |
1708 | |
1636 | adjust_weight (this, op->total_weight ()); |
1709 | adjust_weight (this, op->total_weight ()); |
1637 | |
1710 | |
1638 | op->destroy (1); |
1711 | op->destroy (); |
1639 | op = tmp; |
1712 | op = tmp; |
1640 | goto inserted; |
1713 | goto inserted; |
1641 | } |
1714 | } |
1642 | |
1715 | |
1643 | op->owner = 0; // it's his/hers now. period. |
1716 | op->owner = 0; // it's his/hers now. period. |
… | |
… | |
1661 | |
1734 | |
1662 | adjust_weight (this, op->total_weight ()); |
1735 | adjust_weight (this, op->total_weight ()); |
1663 | |
1736 | |
1664 | inserted: |
1737 | inserted: |
1665 | /* reset the light list and los of the players on the map */ |
1738 | /* reset the light list and los of the players on the map */ |
1666 | if (op->glow_radius && map && map->darkness) |
1739 | if (op->glow_radius && is_on_map ()) |
|
|
1740 | { |
|
|
1741 | update_stats (); |
1667 | update_all_los (map, x, y); |
1742 | update_all_los (map, x, y); |
1668 | |
1743 | } |
|
|
1744 | else if (is_player ()) |
1669 | // if this is a player's inventory, update stats |
1745 | // if this is a player's inventory, update stats |
1670 | if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER]) |
1746 | contr->queue_stats_update (); |
1671 | update_stats (); |
|
|
1672 | |
1747 | |
1673 | INVOKE_OBJECT (INSERT, this); |
1748 | INVOKE_OBJECT (INSERT, this); |
1674 | |
1749 | |
1675 | return op; |
1750 | return op; |
1676 | } |
1751 | } |
… | |
… | |
1696 | * on top. |
1771 | * on top. |
1697 | */ |
1772 | */ |
1698 | int |
1773 | int |
1699 | check_move_on (object *op, object *originator) |
1774 | check_move_on (object *op, object *originator) |
1700 | { |
1775 | { |
|
|
1776 | if (QUERY_FLAG (op, FLAG_NO_APPLY)) |
|
|
1777 | return 0; |
|
|
1778 | |
1701 | object *tmp; |
1779 | object *tmp; |
1702 | maptile *m = op->map; |
1780 | maptile *m = op->map; |
1703 | int x = op->x, y = op->y; |
1781 | int x = op->x, y = op->y; |
1704 | |
1782 | |
1705 | MoveType move_on, move_slow, move_block; |
1783 | mapspace &ms = m->at (x, y); |
1706 | |
1784 | |
1707 | if (QUERY_FLAG (op, FLAG_NO_APPLY)) |
1785 | ms.update (); |
1708 | return 0; |
|
|
1709 | |
1786 | |
1710 | move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); |
1787 | MoveType move_on = ms.move_on; |
1711 | move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); |
1788 | MoveType move_slow = ms.move_slow; |
1712 | move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); |
1789 | MoveType move_block = ms.move_block; |
1713 | |
1790 | |
1714 | /* if nothing on this space will slow op down or be applied, |
1791 | /* if nothing on this space will slow op down or be applied, |
1715 | * no need to do checking below. have to make sure move_type |
1792 | * no need to do checking below. have to make sure move_type |
1716 | * is set, as lots of objects don't have it set - we treat that |
1793 | * is set, as lots of objects don't have it set - we treat that |
1717 | * as walking. |
1794 | * as walking. |
… | |
… | |
1728 | return 0; |
1805 | return 0; |
1729 | |
1806 | |
1730 | /* The objects have to be checked from top to bottom. |
1807 | /* The objects have to be checked from top to bottom. |
1731 | * Hence, we first go to the top: |
1808 | * Hence, we first go to the top: |
1732 | */ |
1809 | */ |
1733 | |
1810 | for (object *next, *tmp = ms.top; tmp; tmp = next) |
1734 | for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above) |
|
|
1735 | { |
|
|
1736 | /* Trim the search when we find the first other spell effect |
|
|
1737 | * this helps performance so that if a space has 50 spell objects, |
|
|
1738 | * we don't need to check all of them. |
|
|
1739 | */ |
|
|
1740 | if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK)) |
|
|
1741 | break; |
|
|
1742 | } |
1811 | { |
|
|
1812 | next = tmp->below; |
1743 | |
1813 | |
1744 | for (; tmp; tmp = tmp->below) |
|
|
1745 | { |
|
|
1746 | if (tmp == op) |
1814 | if (tmp == op) |
1747 | continue; /* Can't apply yourself */ |
1815 | continue; /* Can't apply yourself */ |
1748 | |
1816 | |
1749 | /* Check to see if one of the movement types should be slowed down. |
1817 | /* Check to see if one of the movement types should be slowed down. |
1750 | * Second check makes sure that the movement types not being slowed |
1818 | * Second check makes sure that the movement types not being slowed |
… | |
… | |
1755 | if (!QUERY_FLAG (op, FLAG_WIZPASS)) |
1823 | if (!QUERY_FLAG (op, FLAG_WIZPASS)) |
1756 | { |
1824 | { |
1757 | if ((!op->move_type && tmp->move_slow & MOVE_WALK) || |
1825 | if ((!op->move_type && tmp->move_slow & MOVE_WALK) || |
1758 | ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) |
1826 | ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) |
1759 | { |
1827 | { |
1760 | |
|
|
1761 | float |
|
|
1762 | diff = tmp->move_slow_penalty * fabs (op->speed); |
1828 | float diff = tmp->move_slow_penalty * fabs (op->speed); |
1763 | |
1829 | |
1764 | if (op->type == PLAYER) |
1830 | if (op->is_player ()) |
1765 | if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || |
1831 | if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) || |
1766 | (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) |
1832 | (tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN))) |
1767 | diff /= 4.0; |
1833 | diff /= 4.0; |
1768 | |
1834 | |
1769 | op->speed_left -= diff; |
1835 | op->speed_left -= diff; |
1770 | } |
1836 | } |
1771 | } |
1837 | } |
… | |
… | |
1977 | * head of the object should correspond for the entire object. |
2043 | * head of the object should correspond for the entire object. |
1978 | */ |
2044 | */ |
1979 | if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) |
2045 | if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) |
1980 | continue; |
2046 | continue; |
1981 | |
2047 | |
1982 | if (ob->blocked (m, pos.x, pos.y)) |
2048 | if (ob->blocked (pos.m, pos.x, pos.y)) |
1983 | continue; |
2049 | continue; |
1984 | |
2050 | |
1985 | altern [index++] = i; |
2051 | altern [index++] = i; |
1986 | } |
2052 | } |
1987 | |
2053 | |
… | |
… | |
2055 | * there is capable of. |
2121 | * there is capable of. |
2056 | */ |
2122 | */ |
2057 | int |
2123 | int |
2058 | find_dir (maptile *m, int x, int y, object *exclude) |
2124 | find_dir (maptile *m, int x, int y, object *exclude) |
2059 | { |
2125 | { |
2060 | int i, max = SIZEOFFREE, mflags; |
2126 | int max = SIZEOFFREE, mflags; |
2061 | |
|
|
2062 | sint16 nx, ny; |
|
|
2063 | object *tmp; |
|
|
2064 | maptile *mp; |
|
|
2065 | |
|
|
2066 | MoveType blocked, move_type; |
2127 | MoveType move_type; |
2067 | |
2128 | |
2068 | if (exclude && exclude->head_ () != exclude) |
2129 | if (exclude && exclude->head_ () != exclude) |
2069 | { |
2130 | { |
2070 | exclude = exclude->head; |
2131 | exclude = exclude->head; |
2071 | move_type = exclude->move_type; |
2132 | move_type = exclude->move_type; |
… | |
… | |
2074 | { |
2135 | { |
2075 | /* If we don't have anything, presume it can use all movement types. */ |
2136 | /* If we don't have anything, presume it can use all movement types. */ |
2076 | move_type = MOVE_ALL; |
2137 | move_type = MOVE_ALL; |
2077 | } |
2138 | } |
2078 | |
2139 | |
2079 | for (i = 1; i < max; i++) |
2140 | for (int i = 1; i < max; i++) |
2080 | { |
2141 | { |
2081 | mp = m; |
2142 | mapxy pos (m, x, y); |
2082 | nx = x + freearr_x[i]; |
2143 | pos.move (i); |
2083 | ny = y + freearr_y[i]; |
|
|
2084 | |
2144 | |
2085 | mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); |
2145 | if (!pos.normalise ()) |
2086 | |
|
|
2087 | if (mflags & P_OUT_OF_MAP) |
|
|
2088 | max = maxfree[i]; |
2146 | max = maxfree[i]; |
2089 | else |
2147 | else |
2090 | { |
2148 | { |
2091 | mapspace &ms = mp->at (nx, ny); |
2149 | mapspace &ms = *pos; |
2092 | |
2150 | |
2093 | blocked = ms.move_block; |
|
|
2094 | |
|
|
2095 | if ((move_type & blocked) == move_type) |
2151 | if ((move_type & ms.move_block) == move_type) |
2096 | max = maxfree[i]; |
2152 | max = maxfree [i]; |
2097 | else if (mflags & P_IS_ALIVE) |
2153 | else if (ms.flags () & P_IS_ALIVE) |
2098 | { |
2154 | { |
2099 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
2155 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
2100 | if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) |
2156 | if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ()) |
2101 | && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude))) |
2157 | && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude))) |
2102 | break; |
|
|
2103 | |
|
|
2104 | if (tmp) |
|
|
2105 | return freedir[i]; |
2158 | return freedir [i]; |
2106 | } |
2159 | } |
2107 | } |
2160 | } |
2108 | } |
2161 | } |
2109 | |
2162 | |
2110 | return 0; |
2163 | return 0; |
… | |
… | |
2185 | * This basically means that if direction is 15, then it could either go |
2238 | * This basically means that if direction is 15, then it could either go |
2186 | * direction 4, 14, or 16 to get back to where we are. |
2239 | * direction 4, 14, or 16 to get back to where we are. |
2187 | * Moved from spell_util.c to object.c with the other related direction |
2240 | * Moved from spell_util.c to object.c with the other related direction |
2188 | * functions. |
2241 | * functions. |
2189 | */ |
2242 | */ |
2190 | int reduction_dir[SIZEOFFREE][3] = { |
2243 | static const int reduction_dir[SIZEOFFREE][3] = { |
2191 | {0, 0, 0}, /* 0 */ |
2244 | {0, 0, 0}, /* 0 */ |
2192 | {0, 0, 0}, /* 1 */ |
2245 | {0, 0, 0}, /* 1 */ |
2193 | {0, 0, 0}, /* 2 */ |
2246 | {0, 0, 0}, /* 2 */ |
2194 | {0, 0, 0}, /* 3 */ |
2247 | {0, 0, 0}, /* 3 */ |
2195 | {0, 0, 0}, /* 4 */ |
2248 | {0, 0, 0}, /* 4 */ |
… | |
… | |
2291 | int |
2344 | int |
2292 | can_pick (const object *who, const object *item) |
2345 | can_pick (const object *who, const object *item) |
2293 | { |
2346 | { |
2294 | return /*QUERY_FLAG(who,FLAG_WIZ)|| */ |
2347 | return /*QUERY_FLAG(who,FLAG_WIZ)|| */ |
2295 | (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && |
2348 | (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && |
2296 | !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); |
2349 | !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3)); |
2297 | } |
2350 | } |
2298 | |
2351 | |
2299 | /* |
2352 | /* |
2300 | * create clone from object to another |
2353 | * create clone from object to another |
2301 | */ |
2354 | */ |
… | |
… | |
2333 | return tmp; |
2386 | return tmp; |
2334 | |
2387 | |
2335 | return 0; |
2388 | return 0; |
2336 | } |
2389 | } |
2337 | |
2390 | |
2338 | const shstr & |
2391 | shstr_tmp |
2339 | object::kv_get (const shstr &key) const |
2392 | object::kv_get (shstr_tmp key) const |
2340 | { |
2393 | { |
2341 | for (key_value *kv = key_values; kv; kv = kv->next) |
2394 | for (key_value *kv = key_values; kv; kv = kv->next) |
2342 | if (kv->key == key) |
2395 | if (kv->key == key) |
2343 | return kv->value; |
2396 | return kv->value; |
2344 | |
2397 | |
2345 | return shstr_null; |
2398 | return shstr (); |
2346 | } |
2399 | } |
2347 | |
2400 | |
2348 | void |
2401 | void |
2349 | object::kv_set (const shstr &key, const shstr &value) |
2402 | object::kv_set (shstr_tmp key, shstr_tmp value) |
2350 | { |
2403 | { |
2351 | for (key_value *kv = key_values; kv; kv = kv->next) |
2404 | for (key_value *kv = key_values; kv; kv = kv->next) |
2352 | if (kv->key == key) |
2405 | if (kv->key == key) |
2353 | { |
2406 | { |
2354 | kv->value = value; |
2407 | kv->value = value; |
… | |
… | |
2363 | |
2416 | |
2364 | key_values = kv; |
2417 | key_values = kv; |
2365 | } |
2418 | } |
2366 | |
2419 | |
2367 | void |
2420 | void |
2368 | object::kv_del (const shstr &key) |
2421 | object::kv_del (shstr_tmp key) |
2369 | { |
2422 | { |
2370 | for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next) |
2423 | for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next) |
2371 | if ((*kvp)->key == key) |
2424 | if ((*kvp)->key == key) |
2372 | { |
2425 | { |
2373 | key_value *kv = *kvp; |
2426 | key_value *kv = *kvp; |
… | |
… | |
2466 | { |
2519 | { |
2467 | return map ? map->region (x, y) |
2520 | return map ? map->region (x, y) |
2468 | : region::default_region (); |
2521 | : region::default_region (); |
2469 | } |
2522 | } |
2470 | |
2523 | |
2471 | const materialtype_t * |
|
|
2472 | object::dominant_material () const |
|
|
2473 | { |
|
|
2474 | if (materialtype_t *mt = name_to_material (materialname)) |
|
|
2475 | return mt; |
|
|
2476 | |
|
|
2477 | return name_to_material (shstr_unknown); |
|
|
2478 | } |
|
|
2479 | |
|
|
2480 | void |
2524 | void |
2481 | object::open_container (object *new_container) |
2525 | object::open_container (object *new_container) |
2482 | { |
2526 | { |
2483 | if (container == new_container) |
2527 | if (container == new_container) |
2484 | return; |
2528 | return; |
… | |
… | |
2504 | container = 0; |
2548 | container = 0; |
2505 | |
2549 | |
2506 | // client needs item update to make it work, client bug requires this to be separate |
2550 | // client needs item update to make it work, client bug requires this to be separate |
2507 | esrv_update_item (UPD_FLAGS, this, old_container); |
2551 | esrv_update_item (UPD_FLAGS, this, old_container); |
2508 | |
2552 | |
2509 | new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); |
2553 | new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ()); |
2510 | play_sound (sound_find ("chest_close")); |
2554 | play_sound (sound_find ("chest_close")); |
2511 | } |
2555 | } |
2512 | |
2556 | |
2513 | if (new_container) |
2557 | if (new_container) |
2514 | { |
2558 | { |
… | |
… | |
2518 | // TODO: this does not seem to serve any purpose anymore? |
2562 | // TODO: this does not seem to serve any purpose anymore? |
2519 | #if 0 |
2563 | #if 0 |
2520 | // insert the "Close Container" object. |
2564 | // insert the "Close Container" object. |
2521 | if (archetype *closer = new_container->other_arch) |
2565 | if (archetype *closer = new_container->other_arch) |
2522 | { |
2566 | { |
2523 | object *closer = arch_to_object (new_container->other_arch); |
2567 | object *closer = new_container->other_arch->instance (); |
2524 | closer->flag [FLAG_NO_MAP_SAVE] = 1; |
2568 | closer->flag [FLAG_NO_MAP_SAVE] = 1; |
2525 | new_container->insert (closer); |
2569 | new_container->insert (closer); |
2526 | } |
2570 | } |
2527 | #endif |
2571 | #endif |
2528 | |
2572 | |
2529 | new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); |
2573 | new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ()); |
2530 | |
2574 | |
2531 | // make sure the container is available, client bug requires this to be separate |
2575 | // make sure the container is available, client bug requires this to be separate |
2532 | esrv_send_item (this, new_container); |
2576 | esrv_send_item (this, new_container); |
2533 | |
2577 | |
2534 | new_container->flag [FLAG_APPLIED] = true; |
2578 | new_container->flag [FLAG_APPLIED] = true; |
… | |
… | |
2542 | // else if (!old_container->env && contr && contr->ns) |
2586 | // else if (!old_container->env && contr && contr->ns) |
2543 | // contr->ns->floorbox_reset (); |
2587 | // contr->ns->floorbox_reset (); |
2544 | } |
2588 | } |
2545 | |
2589 | |
2546 | object * |
2590 | object * |
2547 | object::force_find (const shstr name) |
2591 | object::force_find (shstr_tmp name) |
2548 | { |
2592 | { |
2549 | /* cycle through his inventory to look for the MARK we want to |
2593 | /* cycle through his inventory to look for the MARK we want to |
2550 | * place |
2594 | * place |
2551 | */ |
2595 | */ |
2552 | for (object *tmp = inv; tmp; tmp = tmp->below) |
2596 | for (object *tmp = inv; tmp; tmp = tmp->below) |
… | |
… | |
2554 | return splay (tmp); |
2598 | return splay (tmp); |
2555 | |
2599 | |
2556 | return 0; |
2600 | return 0; |
2557 | } |
2601 | } |
2558 | |
2602 | |
|
|
2603 | //-GPL |
|
|
2604 | |
2559 | void |
2605 | void |
|
|
2606 | object::force_set_timer (int duration) |
|
|
2607 | { |
|
|
2608 | this->duration = 1; |
|
|
2609 | this->speed_left = -1.f; |
|
|
2610 | |
|
|
2611 | this->set_speed (duration ? 1.f / duration : 0.f); |
|
|
2612 | } |
|
|
2613 | |
|
|
2614 | object * |
2560 | object::force_add (const shstr name, int duration) |
2615 | object::force_add (shstr_tmp name, int duration) |
2561 | { |
2616 | { |
2562 | if (object *force = force_find (name)) |
2617 | if (object *force = force_find (name)) |
2563 | force->destroy (); |
2618 | force->destroy (); |
2564 | |
2619 | |
2565 | object *force = get_archetype (FORCE_NAME); |
2620 | object *force = get_archetype (FORCE_NAME); |
2566 | |
2621 | |
2567 | force->slaying = name; |
2622 | force->slaying = name; |
2568 | force->stats.food = 1; |
2623 | force->force_set_timer (duration); |
2569 | force->speed_left = -1.f; |
|
|
2570 | |
|
|
2571 | force->set_speed (duration ? 1.f / duration : 0.f); |
|
|
2572 | force->flag [FLAG_IS_USED_UP] = true; |
|
|
2573 | force->flag [FLAG_APPLIED] = true; |
2624 | force->flag [FLAG_APPLIED] = true; |
2574 | |
2625 | |
2575 | insert (force); |
2626 | return insert (force); |
2576 | } |
2627 | } |
2577 | |
2628 | |
2578 | void |
2629 | void |
2579 | object::play_sound (faceidx sound) |
2630 | object::play_sound (faceidx sound) const |
2580 | { |
2631 | { |
2581 | if (!sound) |
2632 | if (!sound) |
2582 | return; |
2633 | return; |
2583 | |
2634 | |
2584 | if (flag [FLAG_REMOVED]) |
2635 | if (is_on_map ()) |
|
|
2636 | map->play_sound (sound, x, y); |
|
|
2637 | else if (object *pl = in_player ()) |
|
|
2638 | pl->contr->play_sound (sound); |
|
|
2639 | } |
|
|
2640 | |
|
|
2641 | void |
|
|
2642 | object::say_msg (const char *msg) const |
|
|
2643 | { |
|
|
2644 | if (is_on_map ()) |
|
|
2645 | map->say_msg (msg, x, y); |
|
|
2646 | else if (object *pl = in_player ()) |
|
|
2647 | pl->contr->play_sound (sound); |
|
|
2648 | } |
|
|
2649 | |
|
|
2650 | void |
|
|
2651 | object::make_noise () |
|
|
2652 | { |
|
|
2653 | // we do not model noise in the map, so instead put |
|
|
2654 | // a temporary light into the noise source |
|
|
2655 | // could use the map instead, but that's less reliable for our |
|
|
2656 | // goal, which is to make invisibility a bit harder to exploit |
|
|
2657 | |
|
|
2658 | // currently only works sensibly for players |
|
|
2659 | if (!is_player ()) |
2585 | return; |
2660 | return; |
2586 | |
2661 | |
2587 | if (env) |
2662 | // find old force, or create new one |
2588 | { |
2663 | object *force = force_find (shstr_noise_force); |
2589 | if (object *pl = in_player ()) |
2664 | |
2590 | pl->contr->play_sound (sound); |
2665 | if (force) |
2591 | } |
2666 | force->speed_left = -1.f; // patch old speed up |
2592 | else |
2667 | else |
2593 | map->play_sound (sound, x, y); |
2668 | { |
2594 | } |
2669 | force = archetype::get (shstr_noise_force); |
2595 | |
2670 | |
|
|
2671 | force->slaying = shstr_noise_force; |
|
|
2672 | force->stats.food = 1; |
|
|
2673 | force->speed_left = -1.f; |
|
|
2674 | |
|
|
2675 | force->set_speed (1.f / 4.f); |
|
|
2676 | force->flag [FLAG_IS_USED_UP] = true; |
|
|
2677 | force->flag [FLAG_APPLIED] = true; |
|
|
2678 | |
|
|
2679 | insert (force); |
|
|
2680 | } |
|
|
2681 | } |
|
|
2682 | |