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 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 | //+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, assume nrof |
260 | /* Do not merge objects if nrof would overflow, assume nrof |
192 | * is always 0 .. 2**31-1 */ |
261 | * is always 0 .. 2**31-1 */ |
193 | if (ob1->nrof > 0x7fffffff - ob2->nrof) |
262 | if (ob1->nrof > 0x7fffffff - ob2->nrof) |
… | |
… | |
214 | || ob1->magic != ob2->magic |
283 | || ob1->magic != ob2->magic |
215 | || ob1->slaying != ob2->slaying |
284 | || ob1->slaying != ob2->slaying |
216 | || ob1->skill != ob2->skill |
285 | || ob1->skill != ob2->skill |
217 | || ob1->value != ob2->value |
286 | || ob1->value != ob2->value |
218 | || ob1->animation_id != ob2->animation_id |
287 | || ob1->animation_id != ob2->animation_id |
219 | || (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 |
220 | || ob1->client_type != ob2->client_type |
289 | || ob1->client_type != ob2->client_type |
221 | || ob1->materialname != ob2->materialname |
290 | || ob1->material != ob2->material |
222 | || ob1->lore != ob2->lore |
291 | || ob1->lore != ob2->lore |
223 | || ob1->subtype != ob2->subtype |
292 | || ob1->subtype != ob2->subtype |
224 | || ob1->move_type != ob2->move_type |
293 | || ob1->move_type != ob2->move_type |
225 | || ob1->move_block != ob2->move_block |
294 | || ob1->move_block != ob2->move_block |
226 | || ob1->move_allow != ob2->move_allow |
295 | || ob1->move_allow != ob2->move_allow |
227 | || ob1->move_on != ob2->move_on |
296 | || ob1->move_on != ob2->move_on |
228 | || ob1->move_off != ob2->move_off |
297 | || ob1->move_off != ob2->move_off |
229 | || ob1->move_slow != ob2->move_slow |
298 | || ob1->move_slow != ob2->move_slow |
230 | || ob1->move_slow_penalty != ob2->move_slow_penalty |
299 | || fabs (ob1->move_slow_penalty - ob2->move_slow_penalty) >= (1.f / 1024.f) |
231 | || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) |
300 | || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) |
232 | || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats))) |
301 | || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats))) |
233 | return 0; |
302 | return 0; |
234 | |
303 | |
235 | if ((ob1->flag ^ ob2->flag) |
304 | if ((ob1->flag ^ ob2->flag) |
… | |
… | |
323 | { |
392 | { |
324 | // see if we are in a container of sorts |
393 | // see if we are in a container of sorts |
325 | if (env) |
394 | if (env) |
326 | { |
395 | { |
327 | // the player inventory itself is always visible |
396 | // the player inventory itself is always visible |
328 | if (env->type == PLAYER) |
397 | if (env->is_player ()) |
329 | return env; |
398 | return env; |
330 | |
399 | |
331 | // else a player could have our env open |
400 | // else a player could have our env open |
332 | object *envest = env->outer_env (); |
401 | object *envest = env->outer_env_or_self (); |
333 | |
402 | |
334 | // 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 |
335 | // even if our inv is in a player. |
404 | // even if our inv is in a player. |
336 | if (envest->is_on_map ()) |
405 | if (envest->is_on_map ()) |
337 | if (object *pl = envest->ms ().player ()) |
406 | if (object *pl = envest->ms ().player ()) |
338 | if (pl->container == env) |
407 | if (pl->container_ () == env) |
339 | return pl; |
408 | return pl; |
340 | } |
409 | } |
341 | else |
410 | else |
342 | { |
411 | { |
343 | // maybe there is a player standing on the same mapspace |
412 | // maybe there is a player standing on the same mapspace |
344 | // this will catch the case where "this" is a player |
413 | // this will catch the case where "this" is a player |
345 | if (object *pl = ms ().player ()) |
414 | if (object *pl = ms ().player ()) |
346 | if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look) |
415 | if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look) |
347 | || this == pl->container) |
416 | || pl->container_ () == this) |
348 | return pl; |
417 | return pl; |
349 | } |
418 | } |
350 | } |
419 | } |
351 | |
420 | |
352 | return 0; |
421 | return 0; |
… | |
… | |
430 | object_freezer freezer; |
499 | object_freezer freezer; |
431 | op->write (freezer); |
500 | op->write (freezer); |
432 | return freezer.as_string (); |
501 | return freezer.as_string (); |
433 | } |
502 | } |
434 | |
503 | |
435 | /* |
504 | char * |
436 | * get_nearest_part(multi-object, object 2) returns the part of the |
505 | object::as_string () |
437 | * multi-object 1 which is closest to the second object. |
|
|
438 | * If it's not a multi-object, it is returned. |
|
|
439 | */ |
|
|
440 | object * |
|
|
441 | get_nearest_part (object *op, const object *pl) |
|
|
442 | { |
506 | { |
443 | object *tmp, *closest; |
507 | return dump_object (this); |
444 | int last_dist, i; |
|
|
445 | |
|
|
446 | if (!op->more) |
|
|
447 | return op; |
|
|
448 | |
|
|
449 | for (last_dist = distance (op, pl), closest = op, tmp = op->more; |
|
|
450 | tmp; |
|
|
451 | tmp = tmp->more) |
|
|
452 | if ((i = distance (tmp, pl)) < last_dist) |
|
|
453 | closest = tmp, last_dist = i; |
|
|
454 | |
|
|
455 | return closest; |
|
|
456 | } |
508 | } |
457 | |
509 | |
458 | /* |
510 | /* |
459 | * 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. |
460 | * VERRRY slow. |
512 | * VERRRY slow. |
… | |
… | |
462 | object * |
514 | object * |
463 | find_object (tag_t i) |
515 | find_object (tag_t i) |
464 | { |
516 | { |
465 | for_all_objects (op) |
517 | for_all_objects (op) |
466 | if (op->count == i) |
518 | if (op->count == i) |
|
|
519 | return op; |
|
|
520 | |
|
|
521 | return 0; |
|
|
522 | } |
|
|
523 | |
|
|
524 | /* |
|
|
525 | * Returns the object which has the uuid equal to the argument. |
|
|
526 | * MOAR VERRRY slow. |
|
|
527 | */ |
|
|
528 | |
|
|
529 | object * |
|
|
530 | find_object_uuid (UUID i) |
|
|
531 | { |
|
|
532 | for_all_objects (op) |
|
|
533 | if (op->uuid == i) |
467 | return op; |
534 | return op; |
468 | |
535 | |
469 | return 0; |
536 | return 0; |
470 | } |
537 | } |
471 | |
538 | |
… | |
… | |
505 | LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ()); |
572 | LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ()); |
506 | return; |
573 | return; |
507 | } |
574 | } |
508 | |
575 | |
509 | this->owner = owner; |
576 | this->owner = owner; |
510 | } |
|
|
511 | |
|
|
512 | int |
|
|
513 | object::slottype () const |
|
|
514 | { |
|
|
515 | if (type == SKILL) |
|
|
516 | { |
|
|
517 | if (IS_COMBAT_SKILL (subtype)) return slot_combat; |
|
|
518 | if (IS_RANGED_SKILL (subtype)) return slot_ranged; |
|
|
519 | } |
|
|
520 | else |
|
|
521 | { |
|
|
522 | if (slot [body_combat].info) return slot_combat; |
|
|
523 | if (slot [body_range ].info) return slot_ranged; |
|
|
524 | } |
|
|
525 | |
|
|
526 | return slot_none; |
|
|
527 | } |
|
|
528 | |
|
|
529 | bool |
|
|
530 | object::change_weapon (object *ob) |
|
|
531 | { |
|
|
532 | if (current_weapon == ob) |
|
|
533 | return true; |
|
|
534 | |
|
|
535 | if (chosen_skill) |
|
|
536 | chosen_skill->flag [FLAG_APPLIED] = false; |
|
|
537 | |
|
|
538 | current_weapon = ob; |
|
|
539 | chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill); |
|
|
540 | |
|
|
541 | if (chosen_skill) |
|
|
542 | chosen_skill->flag [FLAG_APPLIED] = true; |
|
|
543 | |
|
|
544 | update_stats (); |
|
|
545 | |
|
|
546 | if (ob) |
|
|
547 | { |
|
|
548 | // now check wether any body locations became invalid, in which case |
|
|
549 | // we cannot apply the weapon at the moment. |
|
|
550 | for (int i = 0; i < NUM_BODY_LOCATIONS; ++i) |
|
|
551 | if (slot[i].used < 0) |
|
|
552 | { |
|
|
553 | current_weapon = chosen_skill = 0; |
|
|
554 | update_stats (); |
|
|
555 | |
|
|
556 | new_draw_info_format (NDI_UNIQUE, 0, this, |
|
|
557 | "You try to balance all your items at once, " |
|
|
558 | "but the %s is just too much for your body. " |
|
|
559 | "[You need to unapply some items first.]", &ob->name); |
|
|
560 | return false; |
|
|
561 | } |
|
|
562 | |
|
|
563 | //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name); |
|
|
564 | } |
|
|
565 | else |
|
|
566 | ;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons."); |
|
|
567 | |
|
|
568 | if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL) |
|
|
569 | { |
|
|
570 | LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s", |
|
|
571 | &name, ob->debug_desc ()); |
|
|
572 | return false; |
|
|
573 | } |
|
|
574 | |
|
|
575 | return true; |
|
|
576 | } |
577 | } |
577 | |
578 | |
578 | /* Zero the key_values on op, decrementing the shared-string |
579 | /* Zero the key_values on op, decrementing the shared-string |
579 | * refcounts and freeing the links. |
580 | * refcounts and freeing the links. |
580 | */ |
581 | */ |
… | |
… | |
633 | tail = new_link; |
634 | tail = new_link; |
634 | } |
635 | } |
635 | } |
636 | } |
636 | } |
637 | } |
637 | |
638 | |
638 | if (speed < 0) |
|
|
639 | dst->speed_left -= rndm (); |
|
|
640 | |
|
|
641 | dst->activate (); |
639 | dst->activate (); |
642 | } |
640 | } |
643 | |
641 | |
644 | void |
642 | void |
645 | object::instantiate () |
643 | object::instantiate () |
646 | { |
644 | { |
647 | if (!uuid.seq) // HACK |
645 | if (!uuid.seq) // HACK |
648 | uuid = UUID::gen (); |
646 | uuid = UUID::gen (); |
649 | |
647 | |
|
|
648 | // TODO: unclean state changes, should nt be done in copy_to AND instantiate |
|
|
649 | if (flag [FLAG_RANDOM_SPEED] && speed) |
|
|
650 | speed_left = - speed - rndm (); // TODO animation |
|
|
651 | else |
650 | speed_left = -0.1f; |
652 | speed_left = -1.; |
|
|
653 | |
651 | /* copy the body_info to the body_used - this is only really |
654 | /* copy the body_info to the body_used - this is only really |
652 | * need for monsters, but doesn't hurt to do it for everything. |
655 | * need for monsters, but doesn't hurt to do it for everything. |
653 | * by doing so, when a monster is created, it has good starting |
656 | * by doing so, when a monster is created, it has good starting |
654 | * values for the body_used info, so when items are created |
657 | * values for the body_used info, so when items are created |
655 | * for it, they can be properly equipped. |
658 | * for it, they can be properly equipped. |
… | |
… | |
663 | object * |
666 | object * |
664 | object::clone () |
667 | object::clone () |
665 | { |
668 | { |
666 | object *neu = create (); |
669 | object *neu = create (); |
667 | copy_to (neu); |
670 | copy_to (neu); |
|
|
671 | |
|
|
672 | // TODO: unclean state changes, should not be done in clone AND instantiate |
|
|
673 | if (neu->flag [FLAG_RANDOM_SPEED] && neu->speed) |
|
|
674 | neu->speed_left = - neu->speed - rndm (); // TODO animation |
|
|
675 | |
668 | neu->map = map; // not copied by copy_to |
676 | neu->map = map; // not copied by copy_to |
669 | return neu; |
677 | return neu; |
670 | } |
678 | } |
671 | |
679 | |
672 | /* |
680 | /* |
… | |
… | |
690 | * This function needs to be called whenever the speed of an object changes. |
698 | * This function needs to be called whenever the speed of an object changes. |
691 | */ |
699 | */ |
692 | void |
700 | void |
693 | object::set_speed (float speed) |
701 | object::set_speed (float speed) |
694 | { |
702 | { |
695 | if (flag [FLAG_FREED] && speed) |
|
|
696 | { |
|
|
697 | LOG (llevError, "Object %s is freed but has speed.\n", &name); |
|
|
698 | speed = 0; |
|
|
699 | } |
|
|
700 | |
|
|
701 | this->speed = speed; |
703 | this->speed = speed; |
702 | |
704 | |
703 | if (has_active_speed ()) |
705 | if (has_active_speed ()) |
704 | activate (); |
706 | activate (); |
705 | else |
707 | else |
… | |
… | |
755 | |
757 | |
756 | if (!(m.flags_ & P_UPTODATE)) |
758 | if (!(m.flags_ & P_UPTODATE)) |
757 | /* nop */; |
759 | /* nop */; |
758 | else if (action == UP_OBJ_INSERT) |
760 | else if (action == UP_OBJ_INSERT) |
759 | { |
761 | { |
|
|
762 | #if 0 |
760 | // this is likely overkill, TODO: revisit (schmorp) |
763 | // this is likely overkill, TODO: revisit (schmorp) |
761 | if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) |
764 | if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) |
762 | || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) |
765 | || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) |
763 | || (op->type == PLAYER && !(m.flags_ & P_PLAYER)) |
766 | || (op->is_player () && !(m.flags_ & P_PLAYER)) |
764 | || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) |
767 | || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) |
765 | || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) |
768 | || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) |
766 | || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) |
769 | || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) |
767 | || (m.move_on | op->move_on ) != m.move_on |
770 | || (m.move_on | op->move_on ) != m.move_on |
768 | || (m.move_off | op->move_off ) != m.move_off |
771 | || (m.move_off | op->move_off ) != m.move_off |
769 | || (m.move_slow | op->move_slow) != m.move_slow |
772 | || (m.move_slow | op->move_slow) != m.move_slow |
770 | /* This isn't perfect, but I don't expect a lot of objects to |
773 | /* This isn't perfect, but I don't expect a lot of objects to |
771 | * have move_allow right now. |
774 | * have move_allow right now. |
772 | */ |
775 | */ |
773 | || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block |
776 | || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block |
774 | || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) |
|
|
775 | m.invalidate (); |
777 | m.invalidate (); |
|
|
778 | #else |
|
|
779 | // the above is not strong enough a test to skip updating. los maybe? TODO (schmorp) |
|
|
780 | m.invalidate (); |
|
|
781 | #endif |
776 | } |
782 | } |
777 | /* if the object is being removed, we can't make intelligent |
783 | /* if the object is being removed, we can't make intelligent |
778 | * decisions, because remove_ob can't really pass the object |
784 | * decisions, because remove_ob can't really pass the object |
779 | * that is being removed. |
785 | * that is being removed. |
780 | */ |
786 | */ |
… | |
… | |
791 | |
797 | |
792 | object::object () |
798 | object::object () |
793 | { |
799 | { |
794 | SET_FLAG (this, FLAG_REMOVED); |
800 | SET_FLAG (this, FLAG_REMOVED); |
795 | |
801 | |
796 | expmul = 1.0; |
802 | //expmul = 1.0; declared const for the time being |
797 | face = blank_face; |
803 | face = blank_face; |
|
|
804 | material = MATERIAL_NULL; |
798 | } |
805 | } |
799 | |
806 | |
800 | object::~object () |
807 | object::~object () |
801 | { |
808 | { |
802 | unlink (); |
809 | unlink (); |
… | |
… | |
830 | { |
837 | { |
831 | /* If already on active list, don't do anything */ |
838 | /* If already on active list, don't do anything */ |
832 | if (active) |
839 | if (active) |
833 | return; |
840 | return; |
834 | |
841 | |
835 | if (has_active_speed () && flag [FLAG_FREED]) LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D |
|
|
836 | if (has_active_speed () && flag [FLAG_DEBUG]) LOG (llevError | logBacktrace, "BUG: tried to activate DEBUG object %s\n", debug_desc ());//D temp |
|
|
837 | |
|
|
838 | if (has_active_speed ()) |
842 | if (has_active_speed ()) |
|
|
843 | { |
|
|
844 | if (flag [FLAG_FREED]) |
|
|
845 | LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D |
|
|
846 | |
839 | actives.insert (this); |
847 | actives.insert (this); |
|
|
848 | } |
840 | } |
849 | } |
841 | |
850 | |
842 | void |
851 | void |
843 | object::activate_recursive () |
852 | object::activate_recursive () |
844 | { |
853 | { |
… | |
… | |
962 | |
971 | |
963 | void |
972 | void |
964 | object::do_destroy () |
973 | object::do_destroy () |
965 | { |
974 | { |
966 | if (flag [FLAG_IS_LINKED]) |
975 | if (flag [FLAG_IS_LINKED]) |
967 | remove_button_link (this); |
976 | remove_link (); |
968 | |
977 | |
969 | if (flag [FLAG_FRIENDLY]) |
978 | if (flag [FLAG_FRIENDLY]) |
970 | remove_friendly_object (this); |
979 | remove_friendly_object (this); |
971 | |
980 | |
972 | remove (); |
981 | remove (); |
… | |
… | |
1030 | * the previous environment. |
1039 | * the previous environment. |
1031 | */ |
1040 | */ |
1032 | void |
1041 | void |
1033 | object::do_remove () |
1042 | object::do_remove () |
1034 | { |
1043 | { |
1035 | object *tmp, *last = 0; |
|
|
1036 | object *otmp; |
|
|
1037 | |
|
|
1038 | if (flag [FLAG_REMOVED]) |
1044 | if (flag [FLAG_REMOVED]) |
1039 | return; |
1045 | return; |
1040 | |
1046 | |
1041 | INVOKE_OBJECT (REMOVE, this); |
1047 | INVOKE_OBJECT (REMOVE, this); |
1042 | |
1048 | |
… | |
… | |
1074 | |
1080 | |
1075 | above = 0; |
1081 | above = 0; |
1076 | below = 0; |
1082 | below = 0; |
1077 | env = 0; |
1083 | env = 0; |
1078 | |
1084 | |
1079 | /* NO_FIX_PLAYER is set when a great many changes are being |
1085 | if (pl && pl->is_player ()) |
1080 | * made to players inventory. If set, avoiding the call |
|
|
1081 | * to save cpu time. |
|
|
1082 | */ |
1086 | { |
1083 | if (pl) |
1087 | if (expect_false (pl->contr->combat_ob == this)) |
1084 | if (pl->is_player () && (glow_radius || !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER))) |
|
|
1085 | { |
1088 | { |
1086 | pl->update_stats (); |
1089 | pl->apply (pl->contr->combat_ob, AP_UNAPPLY); |
|
|
1090 | pl->contr->combat_ob = 0; |
|
|
1091 | if (pl->contr->ranged_ob) pl->apply (pl->contr->ranged_ob); |
|
|
1092 | } |
1087 | |
1093 | |
1088 | if (glow_radius && pl->is_on_map () && pl->map->darklevel () > 0) |
1094 | if (expect_false (pl->contr->ranged_ob == this)) |
|
|
1095 | { |
|
|
1096 | pl->apply (pl->contr->ranged_ob, AP_UNAPPLY); |
|
|
1097 | pl->contr->ranged_ob = 0; |
|
|
1098 | if (pl->contr->combat_ob) pl->apply (pl->contr->combat_ob); |
|
|
1099 | } |
|
|
1100 | |
|
|
1101 | pl->contr->queue_stats_update (); |
|
|
1102 | |
|
|
1103 | if (expect_false (glow_radius) && pl->is_on_map ()) |
1089 | update_all_los (pl->map, pl->x, pl->y); |
1104 | update_all_los (pl->map, pl->x, pl->y); |
1090 | } |
1105 | } |
1091 | } |
1106 | } |
1092 | else if (map) |
1107 | else if (map) |
1093 | { |
1108 | { |
1094 | map->dirty = true; |
1109 | map->dirty = true; |
1095 | mapspace &ms = this->ms (); |
1110 | mapspace &ms = this->ms (); |
1096 | |
1111 | |
1097 | if (object *pl = ms.player ()) |
1112 | if (object *pl = ms.player ()) |
1098 | { |
1113 | { |
1099 | if (type == PLAYER) // this == pl(!) |
1114 | if (is_player ()) |
1100 | { |
1115 | { |
|
|
1116 | if (!flag [FLAG_WIZPASS]) |
|
|
1117 | ms.smell = ++mapspace::smellcount; // remember the smell of the player |
|
|
1118 | |
1101 | // leaving a spot always closes any open container on the ground |
1119 | // leaving a spot always closes any open container on the ground |
1102 | if (container && !container->env) |
1120 | if (container && !container->env) |
1103 | // this causes spurious floorbox updates, but it ensures |
1121 | // this causes spurious floorbox updates, but it ensures |
1104 | // that the CLOSE event is being sent. |
1122 | // that the CLOSE event is being sent. |
1105 | close_container (); |
1123 | close_container (); |
1106 | |
1124 | |
1107 | --map->players; |
1125 | --map->players; |
1108 | map->touch (); |
1126 | map->touch (); |
1109 | } |
1127 | } |
1110 | else if (pl->container == this) |
1128 | else if (pl->container_ () == this) |
1111 | { |
1129 | { |
1112 | // removing a container should close it |
1130 | // removing a container should close it |
1113 | close_container (); |
1131 | close_container (); |
1114 | } |
1132 | } |
1115 | |
1133 | |
… | |
… | |
1131 | |
1149 | |
1132 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1150 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1133 | |
1151 | |
1134 | if (object *pl = ms.player ()) |
1152 | if (object *pl = ms.player ()) |
1135 | { |
1153 | { |
1136 | if (pl->container == this) |
1154 | if (pl->container_ () == this) |
1137 | /* If a container that the player is currently using somehow gets |
1155 | /* If a container that the player is currently using somehow gets |
1138 | * removed (most likely destroyed), update the player view |
1156 | * removed (most likely destroyed), update the player view |
1139 | * appropriately. |
1157 | * appropriately. |
1140 | */ |
1158 | */ |
1141 | pl->close_container (); |
1159 | pl->close_container (); |
… | |
… | |
1145 | //TODO: update floorbox to preserve ordering |
1163 | //TODO: update floorbox to preserve ordering |
1146 | if (pl->contr->ns) |
1164 | if (pl->contr->ns) |
1147 | pl->contr->ns->floorbox_update (); |
1165 | pl->contr->ns->floorbox_update (); |
1148 | } |
1166 | } |
1149 | |
1167 | |
|
|
1168 | if (check_walk_off) |
1150 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
1169 | for (object *above, *tmp = ms.bot; tmp; tmp = above) |
1151 | { |
1170 | { |
|
|
1171 | above = tmp->above; |
|
|
1172 | |
1152 | /* No point updating the players look faces if he is the object |
1173 | /* No point updating the players look faces if he is the object |
1153 | * being removed. |
1174 | * being removed. |
1154 | */ |
1175 | */ |
1155 | |
1176 | |
1156 | /* See if object moving off should effect something */ |
1177 | /* See if object moving off should effect something */ |
1157 | if (check_walk_off |
|
|
1158 | && ((move_type & tmp->move_off) |
1178 | if ((move_type & tmp->move_off) |
1159 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1179 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0) |
1160 | { |
|
|
1161 | move_apply (tmp, this, 0); |
1180 | move_apply (tmp, this, 0); |
1162 | |
|
|
1163 | if (destroyed ()) |
|
|
1164 | LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); |
|
|
1165 | } |
1181 | } |
1166 | |
1182 | |
1167 | last = tmp; |
1183 | if (affects_los ()) |
1168 | } |
|
|
1169 | |
|
|
1170 | if (affect_los () && map->darklevel () > 0) |
|
|
1171 | update_all_los (map, x, y); |
1184 | update_all_los (map, x, y); |
1172 | } |
1185 | } |
1173 | } |
1186 | } |
1174 | |
1187 | |
1175 | /* |
1188 | /* |
… | |
… | |
1217 | |
1230 | |
1218 | object *prev = this; |
1231 | object *prev = this; |
1219 | |
1232 | |
1220 | for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more) |
1233 | for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more) |
1221 | { |
1234 | { |
1222 | object *op = arch_to_object (at); |
1235 | object *op = at->instance (); |
1223 | |
1236 | |
1224 | op->name = name; |
1237 | op->name = name; |
1225 | op->name_pl = name_pl; |
1238 | op->name_pl = name_pl; |
1226 | op->title = title; |
1239 | op->title = title; |
1227 | |
1240 | |
… | |
… | |
1265 | * Passing 0 for flag gives proper default values, so flag really only needs |
1278 | * Passing 0 for flag gives proper default values, so flag really only needs |
1266 | * to be set if special handling is needed. |
1279 | * to be set if special handling is needed. |
1267 | * |
1280 | * |
1268 | * Return value: |
1281 | * Return value: |
1269 | * new object if 'op' was merged with other object |
1282 | * new object if 'op' was merged with other object |
1270 | * NULL if 'op' was destroyed |
1283 | * NULL if there was an error (destroyed, blocked etc.) |
1271 | * just 'op' otherwise |
1284 | * just 'op' otherwise |
1272 | */ |
1285 | */ |
1273 | object * |
1286 | object * |
1274 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1287 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1275 | { |
1288 | { |
… | |
… | |
1282 | |
1295 | |
1283 | /* Ideally, the caller figures this out. However, it complicates a lot |
1296 | /* Ideally, the caller figures this out. However, it complicates a lot |
1284 | * of areas of callers (eg, anything that uses find_free_spot would now |
1297 | * of areas of callers (eg, anything that uses find_free_spot would now |
1285 | * need extra work |
1298 | * need extra work |
1286 | */ |
1299 | */ |
|
|
1300 | maptile *newmap = m; |
1287 | if (!xy_normalise (m, op->x, op->y)) |
1301 | if (!xy_normalise (newmap, op->x, op->y)) |
1288 | { |
1302 | { |
1289 | op->head_ ()->destroy ();// remove head_ once all tail object destroyers found |
1303 | op->head_ ()->destroy ();// remove head_ once all tail object destroyers found |
1290 | return 0; |
1304 | return 0; |
1291 | } |
1305 | } |
1292 | |
1306 | |
1293 | if (object *more = op->more) |
1307 | if (object *more = op->more) |
1294 | if (!insert_ob_in_map (more, m, originator, flag)) |
1308 | if (!insert_ob_in_map (more, m, originator, flag)) |
1295 | return 0; |
1309 | return 0; |
1296 | |
1310 | |
1297 | CLEAR_FLAG (op, FLAG_REMOVED); |
1311 | op->flag [FLAG_REMOVED] = false; |
1298 | |
1312 | op->env = 0; |
1299 | op->map = m; |
1313 | op->map = newmap; |
|
|
1314 | |
1300 | mapspace &ms = op->ms (); |
1315 | mapspace &ms = op->ms (); |
1301 | |
1316 | |
1302 | /* this has to be done after we translate the coordinates. |
1317 | /* this has to be done after we translate the coordinates. |
1303 | */ |
1318 | */ |
1304 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1319 | if (op->nrof && !(flag & INS_NO_MERGE)) |
… | |
… | |
1325 | LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); |
1340 | LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); |
1326 | abort (); |
1341 | abort (); |
1327 | } |
1342 | } |
1328 | |
1343 | |
1329 | if (!originator->is_on_map ()) |
1344 | if (!originator->is_on_map ()) |
|
|
1345 | { |
1330 | LOG (llevDebug | logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map", |
1346 | LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map", |
1331 | op->debug_desc (), originator->debug_desc ()); |
1347 | op->debug_desc (), originator->debug_desc ()); |
|
|
1348 | abort (); |
|
|
1349 | } |
1332 | |
1350 | |
1333 | op->above = originator; |
1351 | op->above = originator; |
1334 | op->below = originator->below; |
1352 | op->below = originator->below; |
1335 | originator->below = op; |
1353 | originator->below = op; |
1336 | |
1354 | |
… | |
… | |
1422 | op->below = top; |
1440 | op->below = top; |
1423 | *(op->above ? &op->above->below : &ms.top) = op; |
1441 | *(op->above ? &op->above->below : &ms.top) = op; |
1424 | } |
1442 | } |
1425 | } |
1443 | } |
1426 | |
1444 | |
1427 | if (op->type == PLAYER) |
1445 | if (op->is_player ()) |
1428 | { |
1446 | { |
1429 | op->contr->do_los = 1; |
1447 | op->contr->do_los = 1; |
1430 | ++op->map->players; |
1448 | ++op->map->players; |
1431 | op->map->touch (); |
1449 | op->map->touch (); |
1432 | } |
1450 | } |
… | |
… | |
1447 | * be far away from this change and not affected in any way - |
1465 | * be far away from this change and not affected in any way - |
1448 | * this should get redone to only look for players within range, |
1466 | * this should get redone to only look for players within range, |
1449 | * or just updating the P_UPTODATE for spaces within this area |
1467 | * or just updating the P_UPTODATE for spaces within this area |
1450 | * of effect may be sufficient. |
1468 | * of effect may be sufficient. |
1451 | */ |
1469 | */ |
1452 | if (op->affects_los () && op->map->darklevel () > 0) |
1470 | if (op->affects_los ()) |
1453 | { |
1471 | { |
1454 | op->ms ().invalidate (); |
1472 | op->ms ().invalidate (); |
1455 | update_all_los (op->map, op->x, op->y); |
1473 | update_all_los (op->map, op->x, op->y); |
1456 | } |
1474 | } |
1457 | |
1475 | |
… | |
… | |
1468 | * blocked() and wall() work properly), and these flags are updated by |
1486 | * blocked() and wall() work properly), and these flags are updated by |
1469 | * update_object(). |
1487 | * update_object(). |
1470 | */ |
1488 | */ |
1471 | |
1489 | |
1472 | /* if this is not the head or flag has been passed, don't check walk on status */ |
1490 | /* if this is not the head or flag has been passed, don't check walk on status */ |
1473 | if (!(flag & INS_NO_WALK_ON) && op->head_ () == op) |
1491 | if (!(flag & INS_NO_WALK_ON) && op->is_head ()) |
1474 | { |
1492 | { |
1475 | if (check_move_on (op, originator)) |
1493 | if (check_move_on (op, originator)) |
1476 | return 0; |
1494 | return 0; |
1477 | |
1495 | |
1478 | /* If we are a multi part object, lets work our way through the check |
1496 | /* If we are a multi part object, lets work our way through the check |
… | |
… | |
1489 | /* this function inserts an object in the map, but if it |
1507 | /* this function inserts an object in the map, but if it |
1490 | * finds an object of its own type, it'll remove that one first. |
1508 | * finds an object of its own type, it'll remove that one first. |
1491 | * op is the object to insert it under: supplies x and the map. |
1509 | * op is the object to insert it under: supplies x and the map. |
1492 | */ |
1510 | */ |
1493 | void |
1511 | void |
1494 | replace_insert_ob_in_map (const char *arch_string, object *op) |
1512 | replace_insert_ob_in_map (shstr_tmp archname, object *op) |
1495 | { |
1513 | { |
1496 | /* first search for itself and remove any old instances */ |
1514 | /* first search for itself and remove any old instances */ |
1497 | |
1515 | |
1498 | for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) |
1516 | for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) |
1499 | if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ |
1517 | if (tmp->arch->archname == archname) /* same archetype */ |
1500 | tmp->destroy (); |
1518 | tmp->destroy (); |
1501 | |
1519 | |
1502 | object *tmp = arch_to_object (archetype::find (arch_string)); |
1520 | object *tmp = archetype::find (archname)->instance (); |
1503 | |
1521 | |
1504 | tmp->x = op->x; |
1522 | tmp->x = op->x; |
1505 | tmp->y = op->y; |
1523 | tmp->y = op->y; |
1506 | |
1524 | |
1507 | insert_ob_in_map (tmp, op->map, op, 0); |
1525 | insert_ob_in_map (tmp, op->map, op, 0); |
… | |
… | |
1512 | { |
1530 | { |
1513 | if (where->env) |
1531 | if (where->env) |
1514 | return where->env->insert (this); |
1532 | return where->env->insert (this); |
1515 | else |
1533 | else |
1516 | return where->map->insert (this, where->x, where->y, originator, flags); |
1534 | return where->map->insert (this, where->x, where->y, originator, flags); |
|
|
1535 | } |
|
|
1536 | |
|
|
1537 | // check whether we can put this into the map, respect max_volume, max_items |
|
|
1538 | bool |
|
|
1539 | object::can_drop_at (maptile *m, int x, int y, object *originator) |
|
|
1540 | { |
|
|
1541 | mapspace &ms = m->at (x, y); |
|
|
1542 | |
|
|
1543 | int items = ms.items (); |
|
|
1544 | |
|
|
1545 | if (!items // testing !items ensures we can drop at least one item |
|
|
1546 | || (items < m->max_items |
|
|
1547 | && ms.volume () < m->max_volume)) |
|
|
1548 | return true; |
|
|
1549 | |
|
|
1550 | if (originator && originator->is_player ()) |
|
|
1551 | originator->contr->failmsg (format ( |
|
|
1552 | "No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>", |
|
|
1553 | query_name () |
|
|
1554 | )); |
|
|
1555 | |
|
|
1556 | return false; |
1517 | } |
1557 | } |
1518 | |
1558 | |
1519 | /* |
1559 | /* |
1520 | * decrease(object, number) decreases a specified number from |
1560 | * decrease(object, number) decreases a specified number from |
1521 | * the amount of an object. If the amount reaches 0, the object |
1561 | * the amount of an object. If the amount reaches 0, the object |
… | |
… | |
1656 | |
1696 | |
1657 | adjust_weight (this, op->total_weight ()); |
1697 | adjust_weight (this, op->total_weight ()); |
1658 | |
1698 | |
1659 | inserted: |
1699 | inserted: |
1660 | /* reset the light list and los of the players on the map */ |
1700 | /* reset the light list and los of the players on the map */ |
1661 | if (op->glow_radius && is_on_map () && map->darklevel () > 0) |
1701 | if (op->glow_radius && is_on_map ()) |
1662 | { |
1702 | { |
1663 | update_stats (); |
1703 | update_stats (); |
1664 | update_all_los (map, x, y); |
1704 | update_all_los (map, x, y); |
1665 | } |
1705 | } |
1666 | else if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER]) |
1706 | else if (is_player ()) |
1667 | // if this is a player's inventory, update stats |
1707 | // if this is a player's inventory, update stats |
1668 | update_stats (); |
1708 | contr->queue_stats_update (); |
1669 | |
1709 | |
1670 | INVOKE_OBJECT (INSERT, this); |
1710 | INVOKE_OBJECT (INSERT, this); |
1671 | |
1711 | |
1672 | return op; |
1712 | return op; |
1673 | } |
1713 | } |
… | |
… | |
1693 | * on top. |
1733 | * on top. |
1694 | */ |
1734 | */ |
1695 | int |
1735 | int |
1696 | check_move_on (object *op, object *originator) |
1736 | check_move_on (object *op, object *originator) |
1697 | { |
1737 | { |
|
|
1738 | if (QUERY_FLAG (op, FLAG_NO_APPLY)) |
|
|
1739 | return 0; |
|
|
1740 | |
1698 | object *tmp; |
1741 | object *tmp; |
1699 | maptile *m = op->map; |
1742 | maptile *m = op->map; |
1700 | int x = op->x, y = op->y; |
1743 | int x = op->x, y = op->y; |
1701 | |
1744 | |
1702 | MoveType move_on, move_slow, move_block; |
1745 | mapspace &ms = m->at (x, y); |
1703 | |
1746 | |
1704 | if (QUERY_FLAG (op, FLAG_NO_APPLY)) |
1747 | ms.update (); |
1705 | return 0; |
|
|
1706 | |
1748 | |
1707 | move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); |
1749 | MoveType move_on = ms.move_on; |
1708 | move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); |
1750 | MoveType move_slow = ms.move_slow; |
1709 | move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); |
1751 | MoveType move_block = ms.move_block; |
1710 | |
1752 | |
1711 | /* if nothing on this space will slow op down or be applied, |
1753 | /* if nothing on this space will slow op down or be applied, |
1712 | * no need to do checking below. have to make sure move_type |
1754 | * no need to do checking below. have to make sure move_type |
1713 | * is set, as lots of objects don't have it set - we treat that |
1755 | * is set, as lots of objects don't have it set - we treat that |
1714 | * as walking. |
1756 | * as walking. |
… | |
… | |
1725 | return 0; |
1767 | return 0; |
1726 | |
1768 | |
1727 | /* The objects have to be checked from top to bottom. |
1769 | /* The objects have to be checked from top to bottom. |
1728 | * Hence, we first go to the top: |
1770 | * Hence, we first go to the top: |
1729 | */ |
1771 | */ |
1730 | |
1772 | for (object *next, *tmp = ms.top; tmp; tmp = next) |
1731 | for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above) |
|
|
1732 | { |
|
|
1733 | /* Trim the search when we find the first other spell effect |
|
|
1734 | * this helps performance so that if a space has 50 spell objects, |
|
|
1735 | * we don't need to check all of them. |
|
|
1736 | */ |
|
|
1737 | if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK)) |
|
|
1738 | break; |
|
|
1739 | } |
1773 | { |
|
|
1774 | next = tmp->below; |
1740 | |
1775 | |
1741 | for (; tmp; tmp = tmp->below) |
|
|
1742 | { |
|
|
1743 | if (tmp == op) |
1776 | if (tmp == op) |
1744 | continue; /* Can't apply yourself */ |
1777 | continue; /* Can't apply yourself */ |
1745 | |
1778 | |
1746 | /* Check to see if one of the movement types should be slowed down. |
1779 | /* Check to see if one of the movement types should be slowed down. |
1747 | * Second check makes sure that the movement types not being slowed |
1780 | * Second check makes sure that the movement types not being slowed |
… | |
… | |
1752 | if (!QUERY_FLAG (op, FLAG_WIZPASS)) |
1785 | if (!QUERY_FLAG (op, FLAG_WIZPASS)) |
1753 | { |
1786 | { |
1754 | if ((!op->move_type && tmp->move_slow & MOVE_WALK) || |
1787 | if ((!op->move_type && tmp->move_slow & MOVE_WALK) || |
1755 | ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) |
1788 | ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) |
1756 | { |
1789 | { |
1757 | |
|
|
1758 | float |
|
|
1759 | diff = tmp->move_slow_penalty * fabs (op->speed); |
1790 | float diff = tmp->move_slow_penalty * fabs (op->speed); |
1760 | |
1791 | |
1761 | if (op->type == PLAYER) |
1792 | if (op->is_player ()) |
1762 | if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || |
1793 | if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) || |
1763 | (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) |
1794 | (tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN))) |
1764 | diff /= 4.0; |
1795 | diff /= 4.0; |
1765 | |
1796 | |
1766 | op->speed_left -= diff; |
1797 | op->speed_left -= diff; |
1767 | } |
1798 | } |
1768 | } |
1799 | } |
… | |
… | |
2052 | * there is capable of. |
2083 | * there is capable of. |
2053 | */ |
2084 | */ |
2054 | int |
2085 | int |
2055 | find_dir (maptile *m, int x, int y, object *exclude) |
2086 | find_dir (maptile *m, int x, int y, object *exclude) |
2056 | { |
2087 | { |
2057 | int i, max = SIZEOFFREE, mflags; |
2088 | int max = SIZEOFFREE, mflags; |
2058 | |
|
|
2059 | sint16 nx, ny; |
|
|
2060 | object *tmp; |
|
|
2061 | maptile *mp; |
|
|
2062 | |
|
|
2063 | MoveType blocked, move_type; |
2089 | MoveType move_type; |
2064 | |
2090 | |
2065 | if (exclude && exclude->head_ () != exclude) |
2091 | if (exclude && exclude->head_ () != exclude) |
2066 | { |
2092 | { |
2067 | exclude = exclude->head; |
2093 | exclude = exclude->head; |
2068 | move_type = exclude->move_type; |
2094 | move_type = exclude->move_type; |
… | |
… | |
2071 | { |
2097 | { |
2072 | /* If we don't have anything, presume it can use all movement types. */ |
2098 | /* If we don't have anything, presume it can use all movement types. */ |
2073 | move_type = MOVE_ALL; |
2099 | move_type = MOVE_ALL; |
2074 | } |
2100 | } |
2075 | |
2101 | |
2076 | for (i = 1; i < max; i++) |
2102 | for (int i = 1; i < max; i++) |
2077 | { |
2103 | { |
2078 | mp = m; |
2104 | mapxy pos (m, x, y); |
2079 | nx = x + freearr_x[i]; |
2105 | pos.move (i); |
2080 | ny = y + freearr_y[i]; |
|
|
2081 | |
2106 | |
2082 | mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); |
2107 | if (!pos.normalise ()) |
2083 | |
|
|
2084 | if (mflags & P_OUT_OF_MAP) |
|
|
2085 | max = maxfree[i]; |
2108 | max = maxfree[i]; |
2086 | else |
2109 | else |
2087 | { |
2110 | { |
2088 | mapspace &ms = mp->at (nx, ny); |
2111 | mapspace &ms = *pos; |
2089 | |
2112 | |
2090 | blocked = ms.move_block; |
|
|
2091 | |
|
|
2092 | if ((move_type & blocked) == move_type) |
2113 | if ((move_type & ms.move_block) == move_type) |
2093 | max = maxfree[i]; |
2114 | max = maxfree [i]; |
2094 | else if (mflags & P_IS_ALIVE) |
2115 | else if (ms.flags () & P_IS_ALIVE) |
2095 | { |
2116 | { |
2096 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
2117 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
2097 | if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) |
2118 | if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ()) |
2098 | && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude))) |
2119 | && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude))) |
2099 | break; |
|
|
2100 | |
|
|
2101 | if (tmp) |
|
|
2102 | return freedir[i]; |
2120 | return freedir [i]; |
2103 | } |
2121 | } |
2104 | } |
2122 | } |
2105 | } |
2123 | } |
2106 | |
2124 | |
2107 | return 0; |
2125 | return 0; |
… | |
… | |
2182 | * This basically means that if direction is 15, then it could either go |
2200 | * This basically means that if direction is 15, then it could either go |
2183 | * direction 4, 14, or 16 to get back to where we are. |
2201 | * direction 4, 14, or 16 to get back to where we are. |
2184 | * Moved from spell_util.c to object.c with the other related direction |
2202 | * Moved from spell_util.c to object.c with the other related direction |
2185 | * functions. |
2203 | * functions. |
2186 | */ |
2204 | */ |
2187 | int reduction_dir[SIZEOFFREE][3] = { |
2205 | static const int reduction_dir[SIZEOFFREE][3] = { |
2188 | {0, 0, 0}, /* 0 */ |
2206 | {0, 0, 0}, /* 0 */ |
2189 | {0, 0, 0}, /* 1 */ |
2207 | {0, 0, 0}, /* 1 */ |
2190 | {0, 0, 0}, /* 2 */ |
2208 | {0, 0, 0}, /* 2 */ |
2191 | {0, 0, 0}, /* 3 */ |
2209 | {0, 0, 0}, /* 3 */ |
2192 | {0, 0, 0}, /* 4 */ |
2210 | {0, 0, 0}, /* 4 */ |
… | |
… | |
2288 | int |
2306 | int |
2289 | can_pick (const object *who, const object *item) |
2307 | can_pick (const object *who, const object *item) |
2290 | { |
2308 | { |
2291 | return /*QUERY_FLAG(who,FLAG_WIZ)|| */ |
2309 | return /*QUERY_FLAG(who,FLAG_WIZ)|| */ |
2292 | (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && |
2310 | (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && |
2293 | !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); |
2311 | !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3)); |
2294 | } |
2312 | } |
2295 | |
2313 | |
2296 | /* |
2314 | /* |
2297 | * create clone from object to another |
2315 | * create clone from object to another |
2298 | */ |
2316 | */ |
… | |
… | |
2330 | return tmp; |
2348 | return tmp; |
2331 | |
2349 | |
2332 | return 0; |
2350 | return 0; |
2333 | } |
2351 | } |
2334 | |
2352 | |
2335 | const shstr & |
2353 | shstr_tmp |
2336 | object::kv_get (const shstr &key) const |
2354 | object::kv_get (shstr_tmp key) const |
2337 | { |
2355 | { |
2338 | for (key_value *kv = key_values; kv; kv = kv->next) |
2356 | for (key_value *kv = key_values; kv; kv = kv->next) |
2339 | if (kv->key == key) |
2357 | if (kv->key == key) |
2340 | return kv->value; |
2358 | return kv->value; |
2341 | |
2359 | |
2342 | return shstr_null; |
2360 | return shstr (); |
2343 | } |
2361 | } |
2344 | |
2362 | |
2345 | void |
2363 | void |
2346 | object::kv_set (const shstr &key, const shstr &value) |
2364 | object::kv_set (shstr_tmp key, shstr_tmp value) |
2347 | { |
2365 | { |
2348 | for (key_value *kv = key_values; kv; kv = kv->next) |
2366 | for (key_value *kv = key_values; kv; kv = kv->next) |
2349 | if (kv->key == key) |
2367 | if (kv->key == key) |
2350 | { |
2368 | { |
2351 | kv->value = value; |
2369 | kv->value = value; |
… | |
… | |
2360 | |
2378 | |
2361 | key_values = kv; |
2379 | key_values = kv; |
2362 | } |
2380 | } |
2363 | |
2381 | |
2364 | void |
2382 | void |
2365 | object::kv_del (const shstr &key) |
2383 | object::kv_del (shstr_tmp key) |
2366 | { |
2384 | { |
2367 | for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next) |
2385 | for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next) |
2368 | if ((*kvp)->key == key) |
2386 | if ((*kvp)->key == key) |
2369 | { |
2387 | { |
2370 | key_value *kv = *kvp; |
2388 | key_value *kv = *kvp; |
… | |
… | |
2463 | { |
2481 | { |
2464 | return map ? map->region (x, y) |
2482 | return map ? map->region (x, y) |
2465 | : region::default_region (); |
2483 | : region::default_region (); |
2466 | } |
2484 | } |
2467 | |
2485 | |
2468 | const materialtype_t * |
|
|
2469 | object::dominant_material () const |
|
|
2470 | { |
|
|
2471 | if (materialtype_t *mt = name_to_material (materialname)) |
|
|
2472 | return mt; |
|
|
2473 | |
|
|
2474 | return name_to_material (shstr_unknown); |
|
|
2475 | } |
|
|
2476 | |
|
|
2477 | void |
2486 | void |
2478 | object::open_container (object *new_container) |
2487 | object::open_container (object *new_container) |
2479 | { |
2488 | { |
2480 | if (container == new_container) |
2489 | if (container == new_container) |
2481 | return; |
2490 | return; |
… | |
… | |
2501 | container = 0; |
2510 | container = 0; |
2502 | |
2511 | |
2503 | // client needs item update to make it work, client bug requires this to be separate |
2512 | // client needs item update to make it work, client bug requires this to be separate |
2504 | esrv_update_item (UPD_FLAGS, this, old_container); |
2513 | esrv_update_item (UPD_FLAGS, this, old_container); |
2505 | |
2514 | |
2506 | new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); |
2515 | new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ()); |
2507 | play_sound (sound_find ("chest_close")); |
2516 | play_sound (sound_find ("chest_close")); |
2508 | } |
2517 | } |
2509 | |
2518 | |
2510 | if (new_container) |
2519 | if (new_container) |
2511 | { |
2520 | { |
… | |
… | |
2515 | // TODO: this does not seem to serve any purpose anymore? |
2524 | // TODO: this does not seem to serve any purpose anymore? |
2516 | #if 0 |
2525 | #if 0 |
2517 | // insert the "Close Container" object. |
2526 | // insert the "Close Container" object. |
2518 | if (archetype *closer = new_container->other_arch) |
2527 | if (archetype *closer = new_container->other_arch) |
2519 | { |
2528 | { |
2520 | object *closer = arch_to_object (new_container->other_arch); |
2529 | object *closer = new_container->other_arch->instance (); |
2521 | closer->flag [FLAG_NO_MAP_SAVE] = 1; |
2530 | closer->flag [FLAG_NO_MAP_SAVE] = 1; |
2522 | new_container->insert (closer); |
2531 | new_container->insert (closer); |
2523 | } |
2532 | } |
2524 | #endif |
2533 | #endif |
2525 | |
2534 | |
2526 | new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); |
2535 | new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ()); |
2527 | |
2536 | |
2528 | // make sure the container is available, client bug requires this to be separate |
2537 | // make sure the container is available, client bug requires this to be separate |
2529 | esrv_send_item (this, new_container); |
2538 | esrv_send_item (this, new_container); |
2530 | |
2539 | |
2531 | new_container->flag [FLAG_APPLIED] = true; |
2540 | new_container->flag [FLAG_APPLIED] = true; |
… | |
… | |
2539 | // else if (!old_container->env && contr && contr->ns) |
2548 | // else if (!old_container->env && contr && contr->ns) |
2540 | // contr->ns->floorbox_reset (); |
2549 | // contr->ns->floorbox_reset (); |
2541 | } |
2550 | } |
2542 | |
2551 | |
2543 | object * |
2552 | object * |
2544 | object::force_find (const shstr name) |
2553 | object::force_find (shstr_tmp name) |
2545 | { |
2554 | { |
2546 | /* cycle through his inventory to look for the MARK we want to |
2555 | /* cycle through his inventory to look for the MARK we want to |
2547 | * place |
2556 | * place |
2548 | */ |
2557 | */ |
2549 | for (object *tmp = inv; tmp; tmp = tmp->below) |
2558 | for (object *tmp = inv; tmp; tmp = tmp->below) |
… | |
… | |
2551 | return splay (tmp); |
2560 | return splay (tmp); |
2552 | |
2561 | |
2553 | return 0; |
2562 | return 0; |
2554 | } |
2563 | } |
2555 | |
2564 | |
|
|
2565 | //-GPL |
|
|
2566 | |
|
|
2567 | void |
|
|
2568 | object::force_set_timer (int duration) |
|
|
2569 | { |
|
|
2570 | this->duration = 1; |
|
|
2571 | this->speed_left = -1.f; |
|
|
2572 | |
|
|
2573 | this->set_speed (duration ? 1.f / duration : 0.f); |
|
|
2574 | } |
|
|
2575 | |
2556 | object * |
2576 | object * |
2557 | object::force_add (const shstr name, int duration) |
2577 | object::force_add (shstr_tmp name, int duration) |
2558 | { |
2578 | { |
2559 | if (object *force = force_find (name)) |
2579 | if (object *force = force_find (name)) |
2560 | force->destroy (); |
2580 | force->destroy (); |
2561 | |
2581 | |
2562 | object *force = get_archetype (FORCE_NAME); |
2582 | object *force = get_archetype (FORCE_NAME); |
2563 | |
2583 | |
2564 | force->slaying = name; |
2584 | force->slaying = name; |
2565 | force->stats.food = 1; |
2585 | force->force_set_timer (duration); |
2566 | force->speed_left = -1.f; |
|
|
2567 | |
|
|
2568 | force->set_speed (duration ? 1.f / duration : 0.f); |
|
|
2569 | force->flag [FLAG_IS_USED_UP] = true; |
|
|
2570 | force->flag [FLAG_APPLIED] = true; |
2586 | force->flag [FLAG_APPLIED] = true; |
2571 | |
2587 | |
2572 | return insert (force); |
2588 | return insert (force); |
2573 | } |
2589 | } |
2574 | |
2590 | |
2575 | void |
2591 | void |
2576 | object::play_sound (faceidx sound) |
2592 | object::play_sound (faceidx sound) const |
2577 | { |
2593 | { |
2578 | if (!sound) |
2594 | if (!sound) |
2579 | return; |
2595 | return; |
2580 | |
2596 | |
2581 | if (flag [FLAG_REMOVED]) |
2597 | if (is_on_map ()) |
2582 | return; |
|
|
2583 | |
|
|
2584 | if (env) |
|
|
2585 | { |
|
|
2586 | if (object *pl = in_player ()) |
|
|
2587 | pl->contr->play_sound (sound); |
|
|
2588 | } |
|
|
2589 | else |
|
|
2590 | map->play_sound (sound, x, y); |
2598 | map->play_sound (sound, x, y); |
|
|
2599 | else if (object *pl = in_player ()) |
|
|
2600 | pl->contr->play_sound (sound); |
|
|
2601 | } |
|
|
2602 | |
|
|
2603 | void |
|
|
2604 | object::say_msg (const char *msg) const |
|
|
2605 | { |
|
|
2606 | if (is_on_map ()) |
|
|
2607 | map->say_msg (msg, x, y); |
|
|
2608 | else if (object *pl = in_player ()) |
|
|
2609 | pl->contr->play_sound (sound); |
2591 | } |
2610 | } |
2592 | |
2611 | |
2593 | void |
2612 | void |
2594 | object::make_noise () |
2613 | object::make_noise () |
2595 | { |
2614 | { |
… | |
… | |
2604 | |
2623 | |
2605 | // find old force, or create new one |
2624 | // find old force, or create new one |
2606 | object *force = force_find (shstr_noise_force); |
2625 | object *force = force_find (shstr_noise_force); |
2607 | |
2626 | |
2608 | if (force) |
2627 | if (force) |
2609 | force->speed = 1.f / 4; // patch old speed up |
2628 | force->speed_left = -1.f; // patch old speed up |
2610 | else |
2629 | else |
2611 | force_add (shstr_noise_force, 4); |
2630 | { |
2612 | } |
2631 | force = archetype::get (shstr_noise_force); |
2613 | |
2632 | |
|
|
2633 | force->slaying = shstr_noise_force; |
|
|
2634 | force->stats.food = 1; |
|
|
2635 | force->speed_left = -1.f; |
|
|
2636 | |
|
|
2637 | force->set_speed (1.f / 4.f); |
|
|
2638 | force->flag [FLAG_IS_USED_UP] = true; |
|
|
2639 | force->flag [FLAG_APPLIED] = true; |
|
|
2640 | |
|
|
2641 | insert (force); |
|
|
2642 | } |
|
|
2643 | } |
|
|
2644 | |
|
|
2645 | void object::change_move_type (MoveType mt) |
|
|
2646 | { |
|
|
2647 | if (move_type == mt) |
|
|
2648 | return; |
|
|
2649 | |
|
|
2650 | if (is_on_map ()) |
|
|
2651 | { |
|
|
2652 | // we are on the map, so handle move_on/off effects |
|
|
2653 | remove (); |
|
|
2654 | move_type = mt; |
|
|
2655 | map->insert (this, x, y, this); |
|
|
2656 | } |
|
|
2657 | else |
|
|
2658 | move_type = mt; |
|
|
2659 | } |
|
|
2660 | |