ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/object.C
(Generate patch)

Comparing deliantra/server/common/object.C (file contents):
Revision 1.32 by root, Mon Sep 11 23:53:30 2006 UTC vs.
Revision 1.147 by root, Sat May 12 16:06:42 2007 UTC

1
2/* 1/*
3 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game
4 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5 Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2001 Mark Wedel & Crossfire Development Team
6 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
7 7 *
8 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 (at your option) any later version. 11 * (at your 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 GNU General Public License
19 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 21 *
22 The authors can be reached via e-mail at crossfire-devel@real-time.com 22 * The authors can be reached via e-mail at <crossfire@schmorp.de>
23*/ 23 */
24 24
25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. 25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26 sub/add_weight will transcend the environment updating the carrying 26 sub/add_weight will transcend the environment updating the carrying
27 variable. */ 27 variable. */
28#include <global.h> 28#include <global.h>
29#include <stdio.h> 29#include <stdio.h>
30#include <sys/types.h> 30#include <sys/types.h>
31#include <sys/uio.h> 31#include <sys/uio.h>
32#include <object.h> 32#include <object.h>
33#include <funcpoint.h> 33#include <funcpoint.h>
34#include <skills.h> 34#include <sproto.h>
35#include <loader.h> 35#include <loader.h>
36 36
37#include <bitset>
38
37int nrofallocobjects = 0; 39int nrofallocobjects = 0;
40static UUID uuid;
41const uint64 UUID_SKIP = 1<<19;
38 42
39object *objects; /* Pointer to the list of used objects */ 43objectvec objects;
40object *active_objects; /* List of active objects that need to be processed */ 44activevec actives;
41 45
42short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, 46short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
43 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1 47 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
44}; 48};
45short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, 49short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
… …
51int freedir[SIZEOFFREE] = { 55int freedir[SIZEOFFREE] = {
52 0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8, 56 0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
53 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8 57 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
54}; 58};
55 59
60static void
61write_uuid (void)
62{
63 char filename1[MAX_BUF], filename2[MAX_BUF];
64
65 sprintf (filename1, "%s/uuid", settings.localdir);
66 sprintf (filename2, "%s/uuid~", settings.localdir);
67
68 FILE *fp;
69
70 if (!(fp = fopen (filename2, "w")))
71 {
72 LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
73 return;
74 }
75
76 fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
77 fclose (fp);
78 rename (filename2, filename1);
79}
80
81static void
82read_uuid (void)
83{
84 char filename[MAX_BUF];
85
86 sprintf (filename, "%s/uuid", settings.localdir);
87
88 FILE *fp;
89
90 if (!(fp = fopen (filename, "r")))
91 {
92 if (errno == ENOENT)
93 {
94 LOG (llevInfo, "RESET uid to 1\n");
95 uuid.seq = 0;
96 write_uuid ();
97 return;
98 }
99
100 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
101 _exit (1);
102 }
103
104 int version;
105 unsigned long long uid;
106 if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1)
107 {
108 LOG (llevError, "FATAL: error reading uid from %s!\n", filename);
109 _exit (1);
110 }
111
112 uuid.seq = uid;
113 write_uuid ();
114 LOG (llevDebug, "read UID: %" PRId64 "\n", uid);
115 fclose (fp);
116}
117
118UUID
119gen_uuid ()
120{
121 UUID uid;
122
123 uid.seq = ++uuid.seq;
124
125 if (!(uuid.seq & (UUID_SKIP - 1)))
126 write_uuid ();
127
128 return uid;
129}
130
131void
132init_uuid ()
133{
134 read_uuid ();
135}
136
56/* Returns TRUE if every key_values in wants has a partner with the same value in has. */ 137/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
57static int 138static int
58compare_ob_value_lists_one (const object *wants, const object *has) 139compare_ob_value_lists_one (const object *wants, const object *has)
59{ 140{
60 key_value *wants_field; 141 key_value *wants_field;
… …
63 * objects with lists are rare, and lists stay short. If not, use a 144 * objects with lists are rare, and lists stay short. If not, use a
64 * different structure or at least keep the lists sorted... 145 * different structure or at least keep the lists sorted...
65 */ 146 */
66 147
67 /* For each field in wants, */ 148 /* For each field in wants, */
68 for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next) 149 for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)
69 { 150 {
70 key_value *has_field; 151 key_value *has_field;
71 152
72 /* Look for a field in has with the same key. */ 153 /* Look for a field in has with the same key. */
73 has_field = get_ob_key_link (has, wants_field->key); 154 has_field = get_ob_key_link (has, wants_field->key);
… …
107 * 188 *
108 * Note that this function appears a lot longer than the macro it 189 * Note that this function appears a lot longer than the macro it
109 * replaces - this is mostly for clarity - a decent compiler should hopefully 190 * replaces - this is mostly for clarity - a decent compiler should hopefully
110 * reduce this to the same efficiency. 191 * reduce this to the same efficiency.
111 * 192 *
112 * Check nrof variable *before* calling CAN_MERGE() 193 * Check nrof variable *before* calling can_merge()
113 * 194 *
114 * Improvements made with merge: Better checking on potion, and also 195 * Improvements made with merge: Better checking on potion, and also
115 * check weight 196 * check weight
116 */ 197 */
117
118bool object::can_merge (object *ob1, object *ob2) 198bool object::can_merge_slow (object *ob1, object *ob2)
119{ 199{
120 /* A couple quicksanity checks */ 200 /* A couple quicksanity checks */
121 if ((ob1 == ob2) || (ob1->type != ob2->type)) 201 if (ob1 == ob2
202 || ob1->type != ob2->type
203 || ob1->speed != ob2->speed
204 || ob1->value != ob2->value
205 || ob1->name != ob2->name)
122 return 0; 206 return 0;
123 207
124 if (ob1->speed != ob2->speed) 208 //TODO: this ain't working well, use nicer and correct overflow check
125 return 0;
126
127 /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that 209 /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that
128 * value could not be stored in a sint32 (which unfortunately sometimes is 210 * value could not be stored in a sint32 (which unfortunately sometimes is
129 * used to store nrof). 211 * used to store nrof).
130 */ 212 */
131 if (ob1->nrof + ob2->nrof >= 1UL << 31) 213 if (ob1->nrof + ob2->nrof >= 1UL << 31)
… …
141 SET_FLAG (ob1, FLAG_BEEN_APPLIED); 223 SET_FLAG (ob1, FLAG_BEEN_APPLIED);
142 224
143 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) 225 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
144 SET_FLAG (ob2, FLAG_BEEN_APPLIED); 226 SET_FLAG (ob2, FLAG_BEEN_APPLIED);
145 227
146 228 if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
147 /* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something 229 || ob1->arch != ob2->arch
148 * being locked in inventory should prevent merging.
149 * 0x4 in flags3 is CLIENT_SENT
150 */
151 if ((ob1->arch != ob2->arch) ||
152 (ob1->flags[0] != ob2->flags[0]) ||
153 (ob1->flags[1] != ob2->flags[1]) ||
154 ((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~0x400000)) ||
155 ((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) ||
156 (ob1->name != ob2->name) || 230 || ob1->name != ob2->name
157 (ob1->title != ob2->title) || 231 || ob1->title != ob2->title
158 (ob1->msg != ob2->msg) || 232 || ob1->msg != ob2->msg
159 (ob1->weight != ob2->weight) || 233 || ob1->weight != ob2->weight
160 (memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) || 234 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
161 (memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) || 235 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
162 (ob1->attacktype != ob2->attacktype) || 236 || ob1->attacktype != ob2->attacktype
163 (ob1->magic != ob2->magic) || 237 || ob1->magic != ob2->magic
164 (ob1->slaying != ob2->slaying) || 238 || ob1->slaying != ob2->slaying
165 (ob1->skill != ob2->skill) || 239 || ob1->skill != ob2->skill
166 (ob1->value != ob2->value) || 240 || ob1->value != ob2->value
167 (ob1->animation_id != ob2->animation_id) || 241 || ob1->animation_id != ob2->animation_id
168 (ob1->client_type != ob2->client_type) || 242 || ob1->client_type != ob2->client_type
169 (ob1->materialname != ob2->materialname) || 243 || ob1->materialname != ob2->materialname
170 (ob1->lore != ob2->lore) || 244 || ob1->lore != ob2->lore
171 (ob1->subtype != ob2->subtype) || 245 || ob1->subtype != ob2->subtype
172 (ob1->move_type != ob2->move_type) || 246 || ob1->move_type != ob2->move_type
173 (ob1->move_block != ob2->move_block) || 247 || ob1->move_block != ob2->move_block
174 (ob1->move_allow != ob2->move_allow) || 248 || ob1->move_allow != ob2->move_allow
175 (ob1->move_on != ob2->move_on) || 249 || ob1->move_on != ob2->move_on
176 (ob1->move_off != ob2->move_off) || (ob1->move_slow != ob2->move_slow) || (ob1->move_slow_penalty != ob2->move_slow_penalty)) 250 || ob1->move_off != ob2->move_off
251 || ob1->move_slow != ob2->move_slow
252 || ob1->move_slow_penalty != ob2->move_slow_penalty)
177 return 0; 253 return 0;
178 254
179 /* This is really a spellbook check - really, we should 255 /* This is really a spellbook check - really, we should
180 * check all objects in the inventory. 256 * check all objects in the inventory.
181 */ 257 */
… …
184 /* if one object has inventory but the other doesn't, not equiv */ 260 /* if one object has inventory but the other doesn't, not equiv */
185 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) 261 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
186 return 0; 262 return 0;
187 263
188 /* Now check to see if the two inventory objects could merge */ 264 /* Now check to see if the two inventory objects could merge */
189 if (!CAN_MERGE (ob1->inv, ob2->inv)) 265 if (!object::can_merge (ob1->inv, ob2->inv))
190 return 0; 266 return 0;
191 267
192 /* inventory ok - still need to check rest of this object to see 268 /* inventory ok - still need to check rest of this object to see
193 * if it is valid. 269 * if it is valid.
194 */ 270 */
… …
203 279
204 /* Note sure why the following is the case - either the object has to 280 /* Note sure why the following is the case - either the object has to
205 * be animated or have a very low speed. Is this an attempted monster 281 * be animated or have a very low speed. Is this an attempted monster
206 * check? 282 * check?
207 */ 283 */
208 if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED) 284 if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())
209 return 0; 285 return 0;
210 286
211 switch (ob1->type) 287 switch (ob1->type)
212 { 288 {
213 case SCROLL: 289 case SCROLL:
… …
249sum_weight (object *op) 325sum_weight (object *op)
250{ 326{
251 long sum; 327 long sum;
252 object *inv; 328 object *inv;
253 329
254 for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below) 330 for (sum = 0, inv = op->inv; inv; inv = inv->below)
255 { 331 {
256 if (inv->inv) 332 if (inv->inv)
257 sum_weight (inv); 333 sum_weight (inv);
334
258 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); 335 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
259 } 336 }
337
260 if (op->type == CONTAINER && op->stats.Str) 338 if (op->type == CONTAINER && op->stats.Str)
261 sum = (sum * (100 - op->stats.Str)) / 100; 339 sum = (sum * (100 - op->stats.Str)) / 100;
340
262 if (op->carrying != sum) 341 if (op->carrying != sum)
263 op->carrying = sum; 342 op->carrying = sum;
343
264 return sum; 344 return sum;
265} 345}
266 346
267/** 347/**
268 * Return the outermost environment object for a given object. 348 * Return the outermost environment object for a given object.
… …
275 op = op->env; 355 op = op->env;
276 return op; 356 return op;
277} 357}
278 358
279/* 359/*
280 * Eneq(@csd.uu.se): Since we can have items buried in a character we need
281 * a better check. We basically keeping traversing up until we can't
282 * or find a player.
283 */
284
285object *
286is_player_inv (object *op)
287{
288 for (; op != NULL && op->type != PLAYER; op = op->env)
289 if (op->env == op)
290 op->env = NULL;
291 return op;
292}
293
294/*
295 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. 360 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
296 * Some error messages. 361 * Some error messages.
297 * The result of the dump is stored in the static global errmsg array. 362 * The result of the dump is stored in the static global errmsg array.
298 */ 363 */
299 364char *
300void
301dump_object2 (object *op)
302{
303 errmsg[0] = 0;
304 return;
305 //TODO//D#d#
306#if 0
307 char *cp;
308
309/* object *tmp;*/
310
311 if (op->arch != NULL)
312 {
313 strcat (errmsg, "arch ");
314 strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
315 strcat (errmsg, "\n");
316 if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
317 strcat (errmsg, cp);
318# if 0
319 /* Don't dump player diffs - they are too long, mostly meaningless, and
320 * will overflow the buffer.
321 * Changed so that we don't dump inventory either. This may
322 * also overflow the buffer.
323 */
324 if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
325 strcat (errmsg, cp);
326 for (tmp = op->inv; tmp; tmp = tmp->below)
327 dump_object2 (tmp);
328# endif
329 strcat (errmsg, "end\n");
330 }
331 else
332 {
333 strcat (errmsg, "Object ");
334 if (op->name == NULL)
335 strcat (errmsg, "(null)");
336 else
337 strcat (errmsg, op->name);
338 strcat (errmsg, "\n");
339# if 0
340 if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
341 strcat (errmsg, cp);
342 for (tmp = op->inv; tmp; tmp = tmp->below)
343 dump_object2 (tmp);
344# endif
345 strcat (errmsg, "end\n");
346 }
347#endif
348}
349
350/*
351 * Dumps an object. Returns output in the static global errmsg array.
352 */
353
354void
355dump_object (object *op) 365dump_object (object *op)
356{ 366{
357 if (op == NULL) 367 if (!op)
358 { 368 return strdup ("[NULLOBJ]");
359 strcpy (errmsg, "[NULL pointer]");
360 return;
361 }
362 errmsg[0] = '\0';
363 dump_object2 (op);
364}
365 369
366void 370 object_freezer freezer;
367dump_all_objects (void) 371 op->write (freezer);
368{ 372 return freezer.as_string ();
369 object *op;
370
371 for (op = objects; op != NULL; op = op->next)
372 {
373 dump_object (op);
374 fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
375 }
376} 373}
377 374
378/* 375/*
379 * get_nearest_part(multi-object, object 2) returns the part of the 376 * get_nearest_part(multi-object, object 2) returns the part of the
380 * multi-object 1 which is closest to the second object. 377 * multi-object 1 which is closest to the second object.
… …
396} 393}
397 394
398/* 395/*
399 * Returns the object which has the count-variable equal to the argument. 396 * Returns the object which has the count-variable equal to the argument.
400 */ 397 */
401
402object * 398object *
403find_object (tag_t i) 399find_object (tag_t i)
404{ 400{
405 object *op; 401 for_all_objects (op)
406
407 for (op = objects; op != NULL; op = op->next)
408 if (op->count == i) 402 if (op->count == i)
409 break;
410 return op; 403 return op;
404
405 return 0;
411} 406}
412 407
413/* 408/*
414 * Returns the first object which has a name equal to the argument. 409 * Returns the first object which has a name equal to the argument.
415 * Used only by the patch command, but not all that useful. 410 * Used only by the patch command, but not all that useful.
416 * Enables features like "patch <name-of-other-player> food 999" 411 * Enables features like "patch <name-of-other-player> food 999"
417 */ 412 */
418
419object * 413object *
420find_object_name (const char *str) 414find_object_name (const char *str)
421{ 415{
422 const char *name = shstr::find (str); 416 shstr_cmp str_ (str);
423 object *op; 417 object *op;
424 418
425 for (op = objects; op != NULL; op = op->next) 419 for_all_objects (op)
426 if (&op->name == name) 420 if (op->name == str_)
427 break; 421 break;
428 422
429 return op; 423 return op;
430} 424}
431 425
432void 426void
433free_all_object_data () 427free_all_object_data ()
434{ 428{
435 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects); 429 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
436}
437
438/*
439 * Returns the object which this object marks as being the owner.
440 * A id-scheme is used to avoid pointing to objects which have been
441 * freed and are now reused. If this is detected, the owner is
442 * set to NULL, and NULL is returned.
443 * Changed 2004-02-12 - if the player is setting at the play again
444 * prompt, he is removed, and we don't want to treat him as an owner of
445 * anything, so check removed flag. I don't expect that this should break
446 * anything - once an object is removed, it is basically dead anyways.
447 */
448object *
449object::get_owner ()
450{
451 if (!owner
452 || QUERY_FLAG (owner, FLAG_FREED)
453 || QUERY_FLAG (owner, FLAG_REMOVED))
454 owner = 0;
455
456 return owner;
457} 430}
458 431
459/* 432/*
460 * Sets the owner and sets the skill and exp pointers to owner's current 433 * Sets the owner and sets the skill and exp pointers to owner's current
461 * skill and experience objects. 434 * skill and experience objects.
… …
477 owner = owner->owner; 450 owner = owner->owner;
478 451
479 this->owner = owner; 452 this->owner = owner;
480} 453}
481 454
455bool
456object::change_weapon (object *ob)
457{
458 if (current_weapon == ob)
459 return true;
460
461 if (chosen_skill)
462 chosen_skill->flag [FLAG_APPLIED] = false;
463
464 current_weapon = ob;
465 chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
466
467 if (chosen_skill)
468 chosen_skill->flag [FLAG_APPLIED] = true;
469
470 update_stats ();
471
472 if (ob)
473 {
474 // now check wether any body locations became invalid, in which case
475 // we cannot apply the weapon at the moment.
476 for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
477 if (slot[i].used < 0)
478 {
479 current_weapon = chosen_skill = 0;
480 update_stats ();
481
482 new_draw_info_format (NDI_UNIQUE, 0, this,
483 "You try to balance your applied items all at once, but the %s is too much. "
484 "You need to unapply some items first.", &ob->name);
485 return false;
486 }
487
488 new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
489 }
490 else
491 new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
492
493 return true;
494}
495
482/* Zero the key_values on op, decrementing the shared-string 496/* Zero the key_values on op, decrementing the shared-string
483 * refcounts and freeing the links. 497 * refcounts and freeing the links.
484 */ 498 */
485static void 499static void
486free_key_values (object *op) 500free_key_values (object *op)
487{ 501{
488 for (key_value *i = op->key_values; i != 0;) 502 for (key_value *i = op->key_values; i; )
489 { 503 {
490 key_value *next = i->next; 504 key_value *next = i->next;
491 delete i; 505 delete i;
492 506
493 i = next; 507 i = next;
494 } 508 }
495 509
496 op->key_values = 0; 510 op->key_values = 0;
497} 511}
498 512
499void object::clear () 513object &
514object::operator =(const object &src)
500{ 515{
501 attachable_base::clear (); 516 bool is_freed = flag [FLAG_FREED];
517 bool is_removed = flag [FLAG_REMOVED];
502 518
503 free_key_values (this); 519 *(object_copy *)this = src;
504 520
505 owner = 0; 521 flag [FLAG_FREED] = is_freed;
506 name = 0; 522 flag [FLAG_REMOVED] = is_removed;
507 name_pl = 0;
508 title = 0;
509 race = 0;
510 slaying = 0;
511 skill = 0;
512 msg = 0;
513 lore = 0;
514 custom_name = 0;
515 materialname = 0;
516 contr = 0;
517 below = 0;
518 above = 0;
519 inv = 0;
520 container = 0;
521 env = 0;
522 more = 0;
523 head = 0;
524 map = 0;
525 active_next = 0;
526 active_prev = 0;
527
528 memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
529
530 SET_FLAG (this, FLAG_REMOVED);
531
532 /* What is not cleared is next, prev, and count */
533
534 expmul = 1.0;
535 face = blank_face;
536 attacked_by_count = -1;
537
538 if (settings.casting_time)
539 casting_time = -1;
540}
541
542void object::clone (object *destination)
543{
544 *(object_copy *)destination = *this;
545 *(object_pod *)destination = *this;
546
547 if (self || cb)
548 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
549}
550
551/*
552 * copy object first frees everything allocated by the second object,
553 * and then copies the contends of the first object into the second
554 * object, allocating what needs to be allocated. Basically, any
555 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
556 * if the first object is freed, the pointers in the new object
557 * will point at garbage.
558 */
559void
560copy_object (object *op2, object *op)
561{
562 bool is_freed = QUERY_FLAG (op, FLAG_FREED);
563 bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);
564
565 op2->clone (op);
566
567 if (is_freed)
568 SET_FLAG (op, FLAG_FREED);
569 if (is_removed)
570 SET_FLAG (op, FLAG_REMOVED);
571
572 if (op2->speed < 0)
573 op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;
574 523
575 /* Copy over key_values, if any. */ 524 /* Copy over key_values, if any. */
576 if (op2->key_values) 525 if (src.key_values)
577 { 526 {
578 key_value *tail = 0; 527 key_value *tail = 0;
579 key_value *i;
580
581 op->key_values = 0; 528 key_values = 0;
582 529
583 for (i = op2->key_values; i; i = i->next) 530 for (key_value *i = src.key_values; i; i = i->next)
584 { 531 {
585 key_value *new_link = new key_value; 532 key_value *new_link = new key_value;
586 533
587 new_link->next = 0; 534 new_link->next = 0;
588 new_link->key = i->key; 535 new_link->key = i->key;
589 new_link->value = i->value; 536 new_link->value = i->value;
590 537
591 /* Try and be clever here, too. */ 538 /* Try and be clever here, too. */
592 if (!op->key_values) 539 if (!key_values)
593 { 540 {
594 op->key_values = new_link; 541 key_values = new_link;
595 tail = new_link; 542 tail = new_link;
596 } 543 }
597 else 544 else
598 { 545 {
599 tail->next = new_link; 546 tail->next = new_link;
600 tail = new_link; 547 tail = new_link;
601 } 548 }
602 } 549 }
603 } 550 }
551}
604 552
605 update_ob_speed (op); 553/*
554 * copy_to first frees everything allocated by the dst object,
555 * and then copies the contents of itself into the second
556 * object, allocating what needs to be allocated. Basically, any
557 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
558 * if the first object is freed, the pointers in the new object
559 * will point at garbage.
560 */
561void
562object::copy_to (object *dst)
563{
564 *dst = *this;
565
566 if (speed < 0)
567 dst->speed_left = speed_left - rndm ();
568
569 dst->set_speed (dst->speed);
570}
571
572void
573object::instantiate ()
574{
575 if (!uuid.seq) // HACK
576 uuid = gen_uuid ();
577
578 speed_left = -0.1f;
579 /* copy the body_info to the body_used - this is only really
580 * need for monsters, but doesn't hurt to do it for everything.
581 * by doing so, when a monster is created, it has good starting
582 * values for the body_used info, so when items are created
583 * for it, they can be properly equipped.
584 */
585 for (int i = NUM_BODY_LOCATIONS; i--; )
586 slot[i].used = slot[i].info;
587
588 attachable::instantiate ();
589}
590
591object *
592object::clone ()
593{
594 object *neu = create ();
595 copy_to (neu);
596 return neu;
606} 597}
607 598
608/* 599/*
609 * If an object with the IS_TURNABLE() flag needs to be turned due 600 * If an object with the IS_TURNABLE() flag needs to be turned due
610 * to the closest player being on the other side, this function can 601 * to the closest player being on the other side, this function can
611 * be called to update the face variable, _and_ how it looks on the map. 602 * be called to update the face variable, _and_ how it looks on the map.
612 */ 603 */
613
614void 604void
615update_turn_face (object *op) 605update_turn_face (object *op)
616{ 606{
617 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL) 607 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
618 return; 608 return;
609
619 SET_ANIMATION (op, op->direction); 610 SET_ANIMATION (op, op->direction);
620 update_object (op, UP_OBJ_FACE); 611 update_object (op, UP_OBJ_FACE);
621} 612}
622 613
623/* 614/*
624 * Updates the speed of an object. If the speed changes from 0 to another 615 * Updates the speed of an object. If the speed changes from 0 to another
625 * value, or vice versa, then add/remove the object from the active list. 616 * value, or vice versa, then add/remove the object from the active list.
626 * This function needs to be called whenever the speed of an object changes. 617 * This function needs to be called whenever the speed of an object changes.
627 */ 618 */
628void 619void
629update_ob_speed (object *op) 620object::set_speed (float speed)
630{ 621{
631 extern int arch_init; 622 if (flag [FLAG_FREED] && speed)
632
633 /* No reason putting the archetypes objects on the speed list,
634 * since they never really need to be updated.
635 */
636
637 if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
638 { 623 {
639 LOG (llevError, "Object %s is freed but has speed.\n", &op->name); 624 LOG (llevError, "Object %s is freed but has speed.\n", &name);
640#ifdef MANY_CORES
641 abort ();
642#else
643 op->speed = 0; 625 speed = 0;
644#endif
645 }
646
647 if (arch_init)
648 return;
649
650 if (FABS (op->speed) > MIN_ACTIVE_SPEED)
651 { 626 }
652 /* If already on active list, don't do anything */
653 if (op->active_next || op->active_prev || op == active_objects)
654 return;
655 627
656 /* process_events() expects us to insert the object at the beginning 628 this->speed = speed;
657 * of the list. */
658 op->active_next = active_objects;
659 629
660 if (op->active_next != NULL) 630 if (has_active_speed ())
661 op->active_next->active_prev = op; 631 activate ();
662
663 active_objects = op;
664 }
665 else 632 else
666 { 633 deactivate ();
667 /* If not on the active list, nothing needs to be done */
668 if (!op->active_next && !op->active_prev && op != active_objects)
669 return;
670
671 if (op->active_prev == NULL)
672 {
673 active_objects = op->active_next;
674
675 if (op->active_next != NULL)
676 op->active_next->active_prev = NULL;
677 }
678 else
679 {
680 op->active_prev->active_next = op->active_next;
681
682 if (op->active_next)
683 op->active_next->active_prev = op->active_prev;
684 }
685
686 op->active_next = NULL;
687 op->active_prev = NULL;
688 }
689} 634}
690 635
691/* This function removes object 'op' from the list of active
692 * objects.
693 * This should only be used for style maps or other such
694 * reference maps where you don't want an object that isn't
695 * in play chewing up cpu time getting processed.
696 * The reverse of this is to call update_ob_speed, which
697 * will do the right thing based on the speed of the object.
698 */
699void
700remove_from_active_list (object *op)
701{
702 /* If not on the active list, nothing needs to be done */
703 if (!op->active_next && !op->active_prev && op != active_objects)
704 return;
705
706 if (op->active_prev == NULL)
707 {
708 active_objects = op->active_next;
709 if (op->active_next != NULL)
710 op->active_next->active_prev = NULL;
711 }
712 else
713 {
714 op->active_prev->active_next = op->active_next;
715 if (op->active_next)
716 op->active_next->active_prev = op->active_prev;
717 }
718 op->active_next = NULL;
719 op->active_prev = NULL;
720}
721
722/* 636/*
723 * update_object() updates the array which represents the map. 637 * update_object() updates the the map.
724 * It takes into account invisible objects (and represent squares covered 638 * It takes into account invisible objects (and represent squares covered
725 * by invisible objects by whatever is below them (unless it's another 639 * by invisible objects by whatever is below them (unless it's another
726 * invisible object, etc...) 640 * invisible object, etc...)
727 * If the object being updated is beneath a player, the look-window 641 * If the object being updated is beneath a player, the look-window
728 * of that player is updated (this might be a suboptimal way of 642 * of that player is updated (this might be a suboptimal way of
729 * updating that window, though, since update_object() is called _often_) 643 * updating that window, though, since update_object() is called _often_)
730 * 644 *
731 * action is a hint of what the caller believes need to be done. 645 * action is a hint of what the caller believes need to be done.
732 * For example, if the only thing that has changed is the face (due to
733 * an animation), we don't need to call update_position until that actually
734 * comes into view of a player. OTOH, many other things, like addition/removal
735 * of walls or living creatures may need us to update the flags now.
736 * current action are: 646 * current action are:
737 * UP_OBJ_INSERT: op was inserted 647 * UP_OBJ_INSERT: op was inserted
738 * UP_OBJ_REMOVE: op was removed 648 * UP_OBJ_REMOVE: op was removed
739 * UP_OBJ_CHANGE: object has somehow changed. In this case, we always update 649 * UP_OBJ_CHANGE: object has somehow changed. In this case, we always update
740 * as that is easier than trying to look at what may have changed. 650 * as that is easier than trying to look at what may have changed.
741 * UP_OBJ_FACE: only the objects face has changed. 651 * UP_OBJ_FACE: only the objects face has changed.
742 */ 652 */
743
744void 653void
745update_object (object *op, int action) 654update_object (object *op, int action)
746{ 655{
747 int update_now = 0, flags;
748 MoveType move_on, move_off, move_block, move_slow;
749
750 if (op == NULL) 656 if (op == NULL)
751 { 657 {
752 /* this should never happen */ 658 /* this should never happen */
753 LOG (llevDebug, "update_object() called for NULL object.\n"); 659 LOG (llevDebug, "update_object() called for NULL object.\n");
754 return; 660 return;
755 } 661 }
756 662
757 if (op->env != NULL) 663 if (op->env)
758 { 664 {
759 /* Animation is currently handled by client, so nothing 665 /* Animation is currently handled by client, so nothing
760 * to do in this case. 666 * to do in this case.
761 */ 667 */
762 return; 668 return;
… …
767 */ 673 */
768 if (!op->map || op->map->in_memory == MAP_SAVING) 674 if (!op->map || op->map->in_memory == MAP_SAVING)
769 return; 675 return;
770 676
771 /* make sure the object is within map boundaries */ 677 /* make sure the object is within map boundaries */
772 if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map)) 678 if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
773 { 679 {
774 LOG (llevError, "update_object() called for object out of map!\n"); 680 LOG (llevError, "update_object() called for object out of map!\n");
775#ifdef MANY_CORES 681#ifdef MANY_CORES
776 abort (); 682 abort ();
777#endif 683#endif
778 return; 684 return;
779 } 685 }
780 686
781 flags = GET_MAP_FLAGS (op->map, op->x, op->y); 687 mapspace &m = op->ms ();
782 SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE);
783 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
784 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
785 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
786 move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y);
787 688
689 if (!(m.flags_ & P_UPTODATE))
690 /* nop */;
788 if (action == UP_OBJ_INSERT) 691 else if (action == UP_OBJ_INSERT)
789 { 692 {
693 // this is likely overkill, TODO: revisit (schmorp)
790 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW)) 694 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
791 update_now = 1;
792
793 if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC)) 695 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
794 update_now = 1; 696 || (op->type == PLAYER && !(m.flags_ & P_PLAYER))
795 697 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
698 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
796 if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC)) 699 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
797 update_now = 1;
798
799 if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
800 update_now = 1;
801
802 if (op->type == SAFE_GROUND && !(flags & P_SAFE))
803 update_now = 1;
804
805 if ((move_on | op->move_on) != move_on) 700 || (m.move_on | op->move_on ) != m.move_on
806 update_now = 1;
807
808 if ((move_off | op->move_off) != move_off) 701 || (m.move_off | op->move_off ) != m.move_off
809 update_now = 1; 702 || (m.move_slow | op->move_slow) != m.move_slow
810
811 /* This isn't perfect, but I don't expect a lot of objects to 703 /* This isn't perfect, but I don't expect a lot of objects to
812 * to have move_allow right now. 704 * to have move_allow right now.
813 */ 705 */
814 if (((move_block | op->move_block) & ~op->move_allow) != move_block) 706 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
815 update_now = 1; 707 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
816 708 m.flags_ = 0;
817 if ((move_slow | op->move_slow) != move_slow)
818 update_now = 1;
819 } 709 }
820 /* if the object is being removed, we can't make intelligent 710 /* if the object is being removed, we can't make intelligent
821 * decisions, because remove_ob can't really pass the object 711 * decisions, because remove_ob can't really pass the object
822 * that is being removed. 712 * that is being removed.
823 */ 713 */
824 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 714 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
825 update_now = 1; 715 m.flags_ = 0;
826 else if (action == UP_OBJ_FACE) 716 else if (action == UP_OBJ_FACE)
827 /* Nothing to do for that case */ ; 717 /* Nothing to do for that case */ ;
828 else 718 else
829 LOG (llevError, "update_object called with invalid action: %d\n", action); 719 LOG (llevError, "update_object called with invalid action: %d\n", action);
830 720
831 if (update_now)
832 {
833 SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
834 update_position (op->map, op->x, op->y);
835 }
836
837 if (op->more != NULL) 721 if (op->more)
838 update_object (op->more, action); 722 update_object (op->more, action);
839}
840
841static unordered_vector<object *> mortals;
842static std::vector<object *> freed;
843
844void object::free_mortals ()
845{
846 for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();)
847 if ((*i)->refcnt)
848 ++i; // further delay freeing
849 else
850 {
851 freed.push_back (*i);//D
852 //delete *i;
853 mortals.erase (i);
854 }
855
856 if (mortals.size())//D
857 LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D
858} 723}
859 724
860object::object () 725object::object ()
861{ 726{
862 SET_FLAG (this, FLAG_REMOVED); 727 SET_FLAG (this, FLAG_REMOVED);
863 728
864 expmul = 1.0; 729 expmul = 1.0;
865 face = blank_face; 730 face = blank_face;
866 attacked_by_count = -1;
867} 731}
868 732
869object::~object () 733object::~object ()
870{ 734{
735 unlink ();
736
871 free_key_values (this); 737 free_key_values (this);
872} 738}
873 739
740static int object_count;
741
874void object::link () 742void object::link ()
875{ 743{
744 assert (!index);//D
745 uuid = gen_uuid ();
876 count = ++ob_count; 746 count = ++object_count;
877 747
878 prev = 0; 748 refcnt_inc ();
879 next = objects; 749 objects.insert (this);
880
881 if (objects)
882 objects->prev = this;
883
884 objects = this;
885} 750}
886 751
887void object::unlink () 752void object::unlink ()
888{ 753{
889 count = 0;
890
891 /* Remove this object from the list of used objects */
892 if (prev)
893 {
894 prev->next = next;
895 prev = 0;
896 }
897
898 if (next) 754 if (!index)
899 { 755 return;
900 next->prev = prev; 756
901 next = 0; 757 objects.erase (this);
758 refcnt_dec ();
759}
760
761void
762object::activate ()
763{
764 /* If already on active list, don't do anything */
765 if (active)
766 return;
767
768 if (has_active_speed ())
769 actives.insert (this);
770}
771
772void
773object::activate_recursive ()
774{
775 activate ();
776
777 for (object *op = inv; op; op = op->below)
778 op->activate_recursive ();
779}
780
781/* This function removes object 'op' from the list of active
782 * objects.
783 * This should only be used for style maps or other such
784 * reference maps where you don't want an object that isn't
785 * in play chewing up cpu time getting processed.
786 * The reverse of this is to call update_ob_speed, which
787 * will do the right thing based on the speed of the object.
788 */
789void
790object::deactivate ()
791{
792 /* If not on the active list, nothing needs to be done */
793 if (!active)
794 return;
795
796 actives.erase (this);
797}
798
799void
800object::deactivate_recursive ()
801{
802 for (object *op = inv; op; op = op->below)
803 op->deactivate_recursive ();
804
805 deactivate ();
806}
807
808void
809object::set_flag_inv (int flag, int value)
810{
811 for (object *op = inv; op; op = op->below)
902 } 812 {
813 op->flag [flag] = value;
814 op->set_flag_inv (flag, value);
815 }
816}
903 817
904 if (this == objects) 818/*
905 objects = next; 819 * Remove and free all objects in the inventory of the given object.
820 * object.c ?
821 */
822void
823object::destroy_inv (bool drop_to_ground)
824{
825 // need to check first, because the checks below might segfault
826 // as we might be on an invalid mapspace and crossfire code
827 // is too buggy to ensure that the inventory is empty.
828 // corollary: if you create arrows etc. with stuff in tis inventory,
829 // cf will crash below with off-map x and y
830 if (!inv)
831 return;
832
833 /* Only if the space blocks everything do we not process -
834 * if some form of movement is allowed, let objects
835 * drop on that space.
836 */
837 if (!drop_to_ground
838 || !map
839 || map->in_memory != MAP_IN_MEMORY
840 || map->nodrop
841 || ms ().move_block == MOVE_ALL)
842 {
843 while (inv)
844 {
845 inv->destroy_inv (drop_to_ground);
846 inv->destroy ();
847 }
848 }
849 else
850 { /* Put objects in inventory onto this space */
851 while (inv)
852 {
853 object *op = inv;
854
855 if (op->flag [FLAG_STARTEQUIP]
856 || op->flag [FLAG_NO_DROP]
857 || op->type == RUNE
858 || op->type == TRAP
859 || op->flag [FLAG_IS_A_TEMPLATE]
860 || op->flag [FLAG_DESTROY_ON_DEATH])
861 op->destroy ();
862 else
863 map->insert (op, x, y);
864 }
865 }
906} 866}
907 867
908object *object::create () 868object *object::create ()
909{ 869{
910 object *op;
911
912 if (freed.empty ())
913 op = new object; 870 object *op = new object;
914 else
915 {
916 // highly annoying, but the only way to get it stable right now
917 op = freed.back ();
918 freed.pop_back ();
919 op->~object ();
920 new ((void *) op) object;
921 }
922
923 op->link (); 871 op->link ();
924 return op; 872 return op;
925} 873}
926 874
927/* 875void
928 * free_object() frees everything allocated by an object, removes 876object::do_destroy ()
929 * it from the list of used objects, and puts it on the list of
930 * free objects. The IS_FREED() flag is set in the object.
931 * The object must have been removed by remove_ob() first for
932 * this function to succeed.
933 *
934 * If free_inventory is set, free inventory as well. Else drop items in
935 * inventory to the ground.
936 */
937void object::free (bool free_inventory)
938{ 877{
939 if (QUERY_FLAG (this, FLAG_FREED)) 878 attachable::do_destroy ();
879
880 if (flag [FLAG_IS_LINKED])
881 remove_button_link (this);
882
883 if (flag [FLAG_FRIENDLY])
884 remove_friendly_object (this);
885
886 if (!flag [FLAG_REMOVED])
887 remove ();
888
889 destroy_inv (true);
890
891 deactivate ();
892 unlink ();
893
894 flag [FLAG_FREED] = 1;
895
896 // hack to ensure that freed objects still have a valid map
897 {
898 static maptile *freed_map; // freed objects are moved here to avoid crashes
899
900 if (!freed_map)
901 {
902 freed_map = new maptile;
903
904 freed_map->name = "/internal/freed_objects_map";
905 freed_map->width = 3;
906 freed_map->height = 3;
907
908 freed_map->alloc ();
909 freed_map->in_memory = MAP_IN_MEMORY;
910 }
911
912 map = freed_map;
913 x = 1;
914 y = 1;
915 }
916
917 head = 0;
918
919 if (more)
920 {
921 more->destroy ();
922 more = 0;
923 }
924
925 // clear those pointers that likely might have circular references to us
926 owner = 0;
927 enemy = 0;
928 attacked_by = 0;
929}
930
931void
932object::destroy (bool destroy_inventory)
933{
934 if (destroyed ())
940 return; 935 return;
941 936
942 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 937 if (destroy_inventory)
943 remove_friendly_object (this); 938 destroy_inv (false);
944 939
945 if (!QUERY_FLAG (this, FLAG_REMOVED)) 940 attachable::destroy ();
946 remove_ob (this);
947
948 SET_FLAG (this, FLAG_FREED);
949
950 if (more)
951 {
952 more->free (free_inventory);
953 more = 0;
954 }
955
956 if (inv)
957 {
958 /* Only if the space blocks everything do we not process -
959 * if some form of movement is allowed, let objects
960 * drop on that space.
961 */
962 if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
963 {
964 object *op = inv;
965
966 while (op)
967 {
968 object *tmp = op->below;
969 op->free (free_inventory);
970 op = tmp;
971 }
972 }
973 else
974 { /* Put objects in inventory onto this space */
975 object *op = inv;
976
977 while (op)
978 {
979 object *tmp = op->below;
980
981 remove_ob (op);
982
983 if (QUERY_FLAG (op, FLAG_STARTEQUIP)
984 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
985 free_object (op);
986 else
987 {
988 op->x = x;
989 op->y = y;
990 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
991 }
992
993 op = tmp;
994 }
995 }
996 }
997
998 owner = 0;
999
1000 /* Remove object from the active list */
1001 speed = 0;
1002 update_ob_speed (this);
1003
1004 unlink ();
1005
1006 mortals.push_back (this);
1007} 941}
1008 942
1009/* 943/*
1010 * sub_weight() recursively (outwards) subtracts a number from the 944 * sub_weight() recursively (outwards) subtracts a number from the
1011 * weight of an object (and what is carried by it's environment(s)). 945 * weight of an object (and what is carried by it's environment(s)).
1012 */ 946 */
1013
1014void 947void
1015sub_weight (object *op, signed long weight) 948sub_weight (object *op, signed long weight)
1016{ 949{
1017 while (op != NULL) 950 while (op != NULL)
1018 { 951 {
1019 if (op->type == CONTAINER) 952 if (op->type == CONTAINER)
1020 {
1021 weight = (signed long) (weight * (100 - op->stats.Str) / 100); 953 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1022 } 954
1023 op->carrying -= weight; 955 op->carrying -= weight;
1024 op = op->env; 956 op = op->env;
1025 } 957 }
1026} 958}
1027 959
1028/* remove_ob(op): 960/* op->remove ():
1029 * This function removes the object op from the linked list of objects 961 * This function removes the object op from the linked list of objects
1030 * which it is currently tied to. When this function is done, the 962 * which it is currently tied to. When this function is done, the
1031 * object will have no environment. If the object previously had an 963 * object will have no environment. If the object previously had an
1032 * environment, the x and y coordinates will be updated to 964 * environment, the x and y coordinates will be updated to
1033 * the previous environment. 965 * the previous environment.
1034 * Beware: This function is called from the editor as well!
1035 */ 966 */
1036
1037void 967void
1038remove_ob (object *op) 968object::do_remove ()
1039{ 969{
970 object *tmp, *last = 0;
1040 object * 971 object *otmp;
1041 tmp, *
1042 last = NULL;
1043 object *
1044 otmp;
1045 972
1046 tag_t
1047 tag;
1048 int
1049 check_walk_off;
1050 mapstruct *
1051 m;
1052
1053 sint16
1054 x,
1055 y;
1056
1057 if (QUERY_FLAG (op, FLAG_REMOVED)) 973 if (QUERY_FLAG (this, FLAG_REMOVED))
1058 return; 974 return;
1059 975
1060 SET_FLAG (op, FLAG_REMOVED); 976 SET_FLAG (this, FLAG_REMOVED);
977 INVOKE_OBJECT (REMOVE, this);
1061 978
1062 if (op->more != NULL) 979 if (more)
1063 remove_ob (op->more); 980 more->remove ();
1064 981
1065 /* 982 /*
1066 * In this case, the object to be removed is in someones 983 * In this case, the object to be removed is in someones
1067 * inventory. 984 * inventory.
1068 */ 985 */
1069 if (op->env != NULL) 986 if (env)
1070 { 987 {
1071 if (op->nrof) 988 if (nrof)
1072 sub_weight (op->env, op->weight * op->nrof); 989 sub_weight (env, weight * nrof);
1073 else 990 else
1074 sub_weight (op->env, op->weight + op->carrying); 991 sub_weight (env, weight + carrying);
1075 992
1076 /* NO_FIX_PLAYER is set when a great many changes are being 993 /* NO_FIX_PLAYER is set when a great many changes are being
1077 * made to players inventory. If set, avoiding the call 994 * made to players inventory. If set, avoiding the call
1078 * to save cpu time. 995 * to save cpu time.
1079 */ 996 */
1080 if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 997 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1081 fix_player (otmp); 998 otmp->update_stats ();
1082 999
1083 if (op->above != NULL) 1000 if (above)
1084 op->above->below = op->below; 1001 above->below = below;
1085 else 1002 else
1086 op->env->inv = op->below; 1003 env->inv = below;
1087 1004
1088 if (op->below != NULL) 1005 if (below)
1089 op->below->above = op->above; 1006 below->above = above;
1090 1007
1091 /* we set up values so that it could be inserted into 1008 /* we set up values so that it could be inserted into
1092 * the map, but we don't actually do that - it is up 1009 * the map, but we don't actually do that - it is up
1093 * to the caller to decide what we want to do. 1010 * to the caller to decide what we want to do.
1094 */ 1011 */
1095 op->x = op->env->x, op->y = op->env->y; 1012 x = env->x, y = env->y;
1096 op->map = op->env->map; 1013 map = env->map;
1097 op->above = NULL, op->below = NULL; 1014 above = 0, below = 0;
1098 op->env = NULL; 1015 env = 0;
1099 } 1016 }
1100 else if (op->map) 1017 else if (map)
1101 { 1018 {
1102 x = op->x; 1019 if (type == PLAYER)
1103 y = op->y;
1104 m = get_map_from_coord (op->map, &x, &y);
1105
1106 if (!m)
1107 { 1020 {
1108 LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n", 1021 // leaving a spot always closes any open container on the ground
1109 op->map->path, op->x, op->y); 1022 if (container && !container->env)
1110 /* in old days, we used to set x and y to 0 and continue. 1023 // this causes spurious floorbox updates, but it ensures
1111 * it seems if we get into this case, something is probablye 1024 // that the CLOSE event is being sent.
1112 * screwed up and should be fixed. 1025 close_container ();
1113 */ 1026
1114 abort (); 1027 --map->players;
1028 map->touch ();
1115 } 1029 }
1116 1030
1117 if (op->map != m) 1031 map->dirty = true;
1118 LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n", 1032 mapspace &ms = this->ms ();
1119 op->map->path, m->path, op->x, op->y, x, y);
1120
1121 /* Re did the following section of code - it looks like it had
1122 * lots of logic for things we no longer care about
1123 */
1124 1033
1125 /* link the object above us */ 1034 /* link the object above us */
1126 if (op->above) 1035 if (above)
1127 op->above->below = op->below; 1036 above->below = below;
1128 else 1037 else
1129 SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */ 1038 ms.top = below; /* we were top, set new top */
1130 1039
1131 /* Relink the object below us, if there is one */ 1040 /* Relink the object below us, if there is one */
1132 if (op->below) 1041 if (below)
1133 op->below->above = op->above; 1042 below->above = above;
1134 else 1043 else
1135 { 1044 {
1136 /* Nothing below, which means we need to relink map object for this space 1045 /* Nothing below, which means we need to relink map object for this space
1137 * use translated coordinates in case some oddness with map tiling is 1046 * use translated coordinates in case some oddness with map tiling is
1138 * evident 1047 * evident
1139 */ 1048 */
1140 if (GET_MAP_OB (m, x, y) != op) 1049 if (GET_MAP_OB (map, x, y) != this)
1141 {
1142 dump_object (op);
1143 LOG (llevError,
1144 "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", errmsg); 1050 LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom? %s\n", debug_desc ());
1145 dump_object (GET_MAP_OB (m, x, y));
1146 LOG (llevError, "%s\n", errmsg);
1147 }
1148 1051
1149 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ 1052 ms.bot = above; /* goes on above it. */
1150 } 1053 }
1151 1054
1152 op->above = 0; 1055 above = 0;
1153 op->below = 0; 1056 below = 0;
1154 1057
1155 if (op->map->in_memory == MAP_SAVING) 1058 if (map->in_memory == MAP_SAVING)
1156 return; 1059 return;
1157 1060
1158 tag = op->count; 1061 int check_walk_off = !flag [FLAG_NO_APPLY];
1159 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1160 1062
1161 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1063 for (tmp = ms.bot; tmp; tmp = tmp->above)
1162 { 1064 {
1163 /* No point updating the players look faces if he is the object 1065 /* No point updating the players look faces if he is the object
1164 * being removed. 1066 * being removed.
1165 */ 1067 */
1166 1068
1167 if (tmp->type == PLAYER && tmp != op) 1069 if (tmp->type == PLAYER && tmp != this)
1168 { 1070 {
1169 /* If a container that the player is currently using somehow gets 1071 /* If a container that the player is currently using somehow gets
1170 * removed (most likely destroyed), update the player view 1072 * removed (most likely destroyed), update the player view
1171 * appropriately. 1073 * appropriately.
1172 */ 1074 */
1173 if (tmp->container == op) 1075 if (tmp->container == this)
1174 { 1076 {
1175 CLEAR_FLAG (op, FLAG_APPLIED); 1077 flag [FLAG_APPLIED] = 0;
1176 tmp->container = NULL; 1078 tmp->container = 0;
1177 } 1079 }
1178 1080
1179 tmp->contr->socket.update_look = 1; 1081 if (tmp->contr->ns)
1082 tmp->contr->ns->floorbox_update ();
1180 } 1083 }
1181 1084
1182 /* See if player moving off should effect something */ 1085 /* See if object moving off should effect something */
1183 if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1086 if (check_walk_off
1087 && ((move_type & tmp->move_off)
1088 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1184 { 1089 {
1185 move_apply (tmp, op, NULL); 1090 move_apply (tmp, this, 0);
1186 1091
1187 if (was_destroyed (op, tag)) 1092 if (destroyed ())
1188 {
1189 LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name); 1093 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1190 }
1191 } 1094 }
1192 1095
1193 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1096 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1194 1097 //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1195 if (tmp->above == tmp) 1098 if (tmp->above == tmp)
1196 tmp->above = NULL; 1099 tmp->above = 0;
1197 1100
1198 last = tmp; 1101 last = tmp;
1199 } 1102 }
1200 1103
1201 /* last == NULL of there are no objects on this space */ 1104 /* last == NULL if there are no objects on this space */
1105 //TODO: this makes little sense, why only update the topmost object?
1202 if (last == NULL) 1106 if (!last)
1203 { 1107 map->at (x, y).flags_ = 0;
1204 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1205 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1206 * those out anyways, and if there are any flags set right now, they won't
1207 * be correct anyways.
1208 */
1209 SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1210 update_position (op->map, op->x, op->y);
1211 }
1212 else 1108 else
1213 update_object (last, UP_OBJ_REMOVE); 1109 update_object (last, UP_OBJ_REMOVE);
1214 1110
1215 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) 1111 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1216 update_all_los (op->map, op->x, op->y); 1112 update_all_los (map, x, y);
1217 } 1113 }
1218} 1114}
1219 1115
1220/* 1116/*
1221 * merge_ob(op,top): 1117 * merge_ob(op,top):
… …
1223 * This function goes through all objects below and including top, and 1119 * This function goes through all objects below and including top, and
1224 * merges op to the first matching object. 1120 * merges op to the first matching object.
1225 * If top is NULL, it is calculated. 1121 * If top is NULL, it is calculated.
1226 * Returns pointer to object if it succeded in the merge, otherwise NULL 1122 * Returns pointer to object if it succeded in the merge, otherwise NULL
1227 */ 1123 */
1228
1229object * 1124object *
1230merge_ob (object *op, object *top) 1125merge_ob (object *op, object *top)
1231{ 1126{
1232 if (!op->nrof) 1127 if (!op->nrof)
1233 return 0; 1128 return 0;
1234 1129
1235 if (top == NULL) 1130 if (top)
1236 for (top = op; top != NULL && top->above != NULL; top = top->above); 1131 for (top = op; top && top->above; top = top->above)
1132 ;
1237 1133
1238 for (; top != NULL; top = top->below) 1134 for (; top; top = top->below)
1239 { 1135 {
1240 if (top == op) 1136 if (top == op)
1241 continue; 1137 continue;
1242 if (CAN_MERGE (op, top)) 1138
1139 if (object::can_merge (op, top))
1243 { 1140 {
1244 top->nrof += op->nrof; 1141 top->nrof += op->nrof;
1245 1142
1246/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1143/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1247 op->weight = 0; /* Don't want any adjustements now */ 1144 op->weight = 0; /* Don't want any adjustements now */
1248 remove_ob (op); 1145 op->destroy ();
1249 free_object (op);
1250 return top; 1146 return top;
1251 } 1147 }
1252 } 1148 }
1253 1149
1254 return NULL; 1150 return 0;
1255} 1151}
1256 1152
1153void
1154object::expand_tail ()
1155{
1156 if (more)
1157 return;
1158
1159 object *prev = this;
1160
1161 for (archetype *at = arch->more; at; at = at->more)
1162 {
1163 object *op = arch_to_object (at);
1164
1165 op->name = name;
1166 op->name_pl = name_pl;
1167 op->title = title;
1168
1169 op->head = this;
1170 prev->more = op;
1171
1172 prev = op;
1173 }
1174}
1175
1257/* 1176/*
1258 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1177 * same as insert_ob_in_map except it handles separate coordinates and does a clean
1259 * job preparing multi-part monsters 1178 * job preparing multi-part monsters.
1260 */ 1179 */
1261object * 1180object *
1262insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y) 1181insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1263{ 1182{
1264 object *tmp;
1265
1266 if (op->head)
1267 op = op->head;
1268
1269 for (tmp = op; tmp; tmp = tmp->more) 1183 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1270 { 1184 {
1271 tmp->x = x + tmp->arch->clone.x; 1185 tmp->x = x + tmp->arch->clone.x;
1272 tmp->y = y + tmp->arch->clone.y; 1186 tmp->y = y + tmp->arch->clone.y;
1273 } 1187 }
1274 1188
… …
1293 * Return value: 1207 * Return value:
1294 * new object if 'op' was merged with other object 1208 * new object if 'op' was merged with other object
1295 * NULL if 'op' was destroyed 1209 * NULL if 'op' was destroyed
1296 * just 'op' otherwise 1210 * just 'op' otherwise
1297 */ 1211 */
1298
1299object * 1212object *
1300insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag) 1213insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1301{ 1214{
1215 assert (!op->flag [FLAG_FREED]);
1216
1302 object *tmp, *top, *floor = NULL; 1217 object *tmp, *top, *floor = NULL;
1303 sint16 x, y;
1304 1218
1305 if (QUERY_FLAG (op, FLAG_FREED)) 1219 op->remove ();
1306 {
1307 LOG (llevError, "Trying to insert freed object!\n");
1308 return NULL;
1309 }
1310 1220
1311 if (m == NULL) 1221#if 0
1312 { 1222 if (!m->active != !op->active)
1313 dump_object (op); 1223 if (m->active)
1314 LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg); 1224 op->activate_recursive ();
1315 return op; 1225 else
1316 } 1226 op->deactivate_recursive ();
1227#endif
1317 1228
1318 if (out_of_map (m, op->x, op->y)) 1229 if (out_of_map (m, op->x, op->y))
1319 { 1230 {
1320 dump_object (op);
1321 LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg); 1231 LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1322#ifdef MANY_CORES 1232#ifdef MANY_CORES
1323 /* Better to catch this here, as otherwise the next use of this object 1233 /* Better to catch this here, as otherwise the next use of this object
1324 * is likely to cause a crash. Better to find out where it is getting 1234 * is likely to cause a crash. Better to find out where it is getting
1325 * improperly inserted. 1235 * improperly inserted.
1326 */ 1236 */
1327 abort (); 1237 abort ();
1328#endif 1238#endif
1329 return op; 1239 return op;
1330 } 1240 }
1331 1241
1332 if (!QUERY_FLAG (op, FLAG_REMOVED))
1333 {
1334 dump_object (op);
1335 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);
1336 return op;
1337 }
1338
1339 if (op->more != NULL)
1340 {
1341 /* The part may be on a different map. */
1342
1343 object *more = op->more; 1242 if (object *more = op->more)
1344 1243 {
1345 /* We really need the caller to normalize coordinates - if
1346 * we set the map, that doesn't work if the location is within
1347 * a map and this is straddling an edge. So only if coordinate
1348 * is clear wrong do we normalize it.
1349 */
1350 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1351 more->map = get_map_from_coord (m, &more->x, &more->y);
1352 else if (!more->map)
1353 {
1354 /* For backwards compatibility - when not dealing with tiled maps,
1355 * more->map should always point to the parent.
1356 */
1357 more->map = m;
1358 }
1359
1360 if (insert_ob_in_map (more, more->map, originator, flag) == NULL) 1244 if (!insert_ob_in_map (more, m, originator, flag))
1361 { 1245 {
1362 if (!op->head) 1246 if (!op->head)
1363 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); 1247 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1364 1248
1365 return NULL; 1249 return 0;
1366 } 1250 }
1367 } 1251 }
1368 1252
1369 CLEAR_FLAG (op, FLAG_REMOVED); 1253 CLEAR_FLAG (op, FLAG_REMOVED);
1370 1254
1371 /* Ideally, the caller figures this out. However, it complicates a lot 1255 /* Ideally, the caller figures this out. However, it complicates a lot
1372 * of areas of callers (eg, anything that uses find_free_spot would now 1256 * of areas of callers (eg, anything that uses find_free_spot would now
1373 * need extra work 1257 * need extra work
1374 */ 1258 */
1375 op->map = get_map_from_coord (m, &op->x, &op->y); 1259 if (!xy_normalise (m, op->x, op->y))
1376 x = op->x; 1260 return 0;
1377 y = op->y; 1261
1262 op->map = m;
1263 mapspace &ms = op->ms ();
1378 1264
1379 /* this has to be done after we translate the coordinates. 1265 /* this has to be done after we translate the coordinates.
1380 */ 1266 */
1381 if (op->nrof && !(flag & INS_NO_MERGE)) 1267 if (op->nrof && !(flag & INS_NO_MERGE))
1382 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) 1268 for (tmp = ms.bot; tmp; tmp = tmp->above)
1383 if (CAN_MERGE (op, tmp)) 1269 if (object::can_merge (op, tmp))
1384 { 1270 {
1385 op->nrof += tmp->nrof; 1271 op->nrof += tmp->nrof;
1386 remove_ob (tmp); 1272 tmp->destroy ();
1387 free_object (tmp);
1388 } 1273 }
1389 1274
1390 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1275 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1391 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1276 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1392 1277
… …
1405 op->below = originator->below; 1290 op->below = originator->below;
1406 1291
1407 if (op->below) 1292 if (op->below)
1408 op->below->above = op; 1293 op->below->above = op;
1409 else 1294 else
1410 SET_MAP_OB (op->map, op->x, op->y, op); 1295 ms.bot = op;
1411 1296
1412 /* since *below* originator, no need to update top */ 1297 /* since *below* originator, no need to update top */
1413 originator->below = op; 1298 originator->below = op;
1414 } 1299 }
1415 else 1300 else
1416 { 1301 {
1302 top = ms.bot;
1303
1417 /* If there are other objects, then */ 1304 /* If there are other objects, then */
1418 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1305 if ((!(flag & INS_MAP_LOAD)) && top)
1419 { 1306 {
1420 object *last = NULL; 1307 object *last = 0;
1421 1308
1422 /* 1309 /*
1423 * If there are multiple objects on this space, we do some trickier handling. 1310 * If there are multiple objects on this space, we do some trickier handling.
1424 * We've already dealt with merging if appropriate. 1311 * We've already dealt with merging if appropriate.
1425 * Generally, we want to put the new object on top. But if 1312 * Generally, we want to put the new object on top. But if
… …
1429 * once we get to them. This reduces the need to traverse over all of 1316 * once we get to them. This reduces the need to traverse over all of
1430 * them when adding another one - this saves quite a bit of cpu time 1317 * them when adding another one - this saves quite a bit of cpu time
1431 * when lots of spells are cast in one area. Currently, it is presumed 1318 * when lots of spells are cast in one area. Currently, it is presumed
1432 * that flying non pickable objects are spell objects. 1319 * that flying non pickable objects are spell objects.
1433 */ 1320 */
1434 1321 for (top = ms.bot; top; top = top->above)
1435 while (top != NULL)
1436 { 1322 {
1437 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1323 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1438 floor = top; 1324 floor = top;
1439 1325
1440 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1326 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
… …
1443 top = top->below; 1329 top = top->below;
1444 break; 1330 break;
1445 } 1331 }
1446 1332
1447 last = top; 1333 last = top;
1448 top = top->above;
1449 } 1334 }
1450 1335
1451 /* Don't want top to be NULL, so set it to the last valid object */ 1336 /* Don't want top to be NULL, so set it to the last valid object */
1452 top = last; 1337 top = last;
1453 1338
… …
1455 * looks like instead of lots of conditions here. 1340 * looks like instead of lots of conditions here.
1456 * makes things faster, and effectively the same result. 1341 * makes things faster, and effectively the same result.
1457 */ 1342 */
1458 1343
1459 /* Have object 'fall below' other objects that block view. 1344 /* Have object 'fall below' other objects that block view.
1460 * Unless those objects are exits, type 66 1345 * Unless those objects are exits.
1461 * If INS_ON_TOP is used, don't do this processing 1346 * If INS_ON_TOP is used, don't do this processing
1462 * Need to find the object that in fact blocks view, otherwise 1347 * Need to find the object that in fact blocks view, otherwise
1463 * stacking is a bit odd. 1348 * stacking is a bit odd.
1464 */ 1349 */
1465 if (!(flag & INS_ON_TOP) && 1350 if (!(flag & INS_ON_TOP)
1466 (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) 1351 && ms.flags () & P_BLOCKSVIEW
1352 && (op->face && !faces [op->face].visibility))
1467 { 1353 {
1468 for (last = top; last != floor; last = last->below) 1354 for (last = top; last != floor; last = last->below)
1469 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1355 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1470 break; 1356 break;
1357
1471 /* Check to see if we found the object that blocks view, 1358 /* Check to see if we found the object that blocks view,
1472 * and make sure we have a below pointer for it so that 1359 * and make sure we have a below pointer for it so that
1473 * we can get inserted below this one, which requires we 1360 * we can get inserted below this one, which requires we
1474 * set top to the object below us. 1361 * set top to the object below us.
1475 */ 1362 */
… …
1477 top = last->below; 1364 top = last->below;
1478 } 1365 }
1479 } /* If objects on this space */ 1366 } /* If objects on this space */
1480 1367
1481 if (flag & INS_MAP_LOAD) 1368 if (flag & INS_MAP_LOAD)
1482 top = GET_MAP_TOP (op->map, op->x, op->y); 1369 top = ms.top;
1483 1370
1484 if (flag & INS_ABOVE_FLOOR_ONLY) 1371 if (flag & INS_ABOVE_FLOOR_ONLY)
1485 top = floor; 1372 top = floor;
1486 1373
1487 /* Top is the object that our object (op) is going to get inserted above. 1374 /* Top is the object that our object (op) is going to get inserted above.
1488 */ 1375 */
1489 1376
1490 /* First object on this space */ 1377 /* First object on this space */
1491 if (!top) 1378 if (!top)
1492 { 1379 {
1493 op->above = GET_MAP_OB (op->map, op->x, op->y); 1380 op->above = ms.bot;
1494 1381
1495 if (op->above) 1382 if (op->above)
1496 op->above->below = op; 1383 op->above->below = op;
1497 1384
1498 op->below = NULL; 1385 op->below = 0;
1499 SET_MAP_OB (op->map, op->x, op->y, op); 1386 ms.bot = op;
1500 } 1387 }
1501 else 1388 else
1502 { /* get inserted into the stack above top */ 1389 { /* get inserted into the stack above top */
1503 op->above = top->above; 1390 op->above = top->above;
1504 1391
… …
1507 1394
1508 op->below = top; 1395 op->below = top;
1509 top->above = op; 1396 top->above = op;
1510 } 1397 }
1511 1398
1512 if (op->above == NULL) 1399 if (!op->above)
1513 SET_MAP_TOP (op->map, op->x, op->y, op); 1400 ms.top = op;
1514 } /* else not INS_BELOW_ORIGINATOR */ 1401 } /* else not INS_BELOW_ORIGINATOR */
1515 1402
1516 if (op->type == PLAYER) 1403 if (op->type == PLAYER)
1404 {
1517 op->contr->do_los = 1; 1405 op->contr->do_los = 1;
1406 ++op->map->players;
1407 op->map->touch ();
1408 }
1409
1410 op->map->dirty = true;
1518 1411
1519 /* If we have a floor, we know the player, if any, will be above 1412 /* If we have a floor, we know the player, if any, will be above
1520 * it, so save a few ticks and start from there. 1413 * it, so save a few ticks and start from there.
1521 */ 1414 */
1522 if (!(flag & INS_MAP_LOAD)) 1415 if (!(flag & INS_MAP_LOAD))
1523 for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1416 if (object *pl = ms.player ())
1524 if (tmp->type == PLAYER) 1417 if (pl->contr->ns)
1525 tmp->contr->socket.update_look = 1; 1418 pl->contr->ns->floorbox_update ();
1526 1419
1527 /* If this object glows, it may affect lighting conditions that are 1420 /* If this object glows, it may affect lighting conditions that are
1528 * visible to others on this map. But update_all_los is really 1421 * visible to others on this map. But update_all_los is really
1529 * an inefficient way to do this, as it means los for all players 1422 * an inefficient way to do this, as it means los for all players
1530 * on the map will get recalculated. The players could very well 1423 * on the map will get recalculated. The players could very well
1531 * be far away from this change and not affected in any way - 1424 * be far away from this change and not affected in any way -
1532 * this should get redone to only look for players within range, 1425 * this should get redone to only look for players within range,
1533 * or just updating the P_NEED_UPDATE for spaces within this area 1426 * or just updating the P_UPTODATE for spaces within this area
1534 * of effect may be sufficient. 1427 * of effect may be sufficient.
1535 */ 1428 */
1536 if (MAP_DARKNESS (op->map) && (op->glow_radius != 0)) 1429 if (op->map->darkness && (op->glow_radius != 0))
1537 update_all_los (op->map, op->x, op->y); 1430 update_all_los (op->map, op->x, op->y);
1538 1431
1539 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1432 /* updates flags (blocked, alive, no magic, etc) for this map space */
1540 update_object (op, UP_OBJ_INSERT); 1433 update_object (op, UP_OBJ_INSERT);
1541 1434
1435 INVOKE_OBJECT (INSERT, op);
1436
1542 /* Don't know if moving this to the end will break anything. However, 1437 /* Don't know if moving this to the end will break anything. However,
1543 * we want to have update_look set above before calling this. 1438 * we want to have floorbox_update called before calling this.
1544 * 1439 *
1545 * check_move_on() must be after this because code called from 1440 * check_move_on() must be after this because code called from
1546 * check_move_on() depends on correct map flags (so functions like 1441 * check_move_on() depends on correct map flags (so functions like
1547 * blocked() and wall() work properly), and these flags are updated by 1442 * blocked() and wall() work properly), and these flags are updated by
1548 * update_object(). 1443 * update_object().
… …
1550 1445
1551 /* if this is not the head or flag has been passed, don't check walk on status */ 1446 /* if this is not the head or flag has been passed, don't check walk on status */
1552 if (!(flag & INS_NO_WALK_ON) && !op->head) 1447 if (!(flag & INS_NO_WALK_ON) && !op->head)
1553 { 1448 {
1554 if (check_move_on (op, originator)) 1449 if (check_move_on (op, originator))
1555 return NULL; 1450 return 0;
1556 1451
1557 /* If we are a multi part object, lets work our way through the check 1452 /* If we are a multi part object, lets work our way through the check
1558 * walk on's. 1453 * walk on's.
1559 */ 1454 */
1560 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1455 for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1561 if (check_move_on (tmp, originator)) 1456 if (check_move_on (tmp, originator))
1562 return NULL; 1457 return 0;
1563 } 1458 }
1564 1459
1565 return op; 1460 return op;
1566} 1461}
1567 1462
1568/* this function inserts an object in the map, but if it 1463/* this function inserts an object in the map, but if it
1569 * finds an object of its own type, it'll remove that one first. 1464 * finds an object of its own type, it'll remove that one first.
1570 * op is the object to insert it under: supplies x and the map. 1465 * op is the object to insert it under: supplies x and the map.
1571 */ 1466 */
1572void 1467void
1573replace_insert_ob_in_map (const char *arch_string, object *op) 1468replace_insert_ob_in_map (const char *arch_string, object *op)
1574{ 1469{
1575 object * 1470 object *tmp, *tmp1;
1576 tmp;
1577 object *
1578 tmp1;
1579 1471
1580 /* first search for itself and remove any old instances */ 1472 /* first search for itself and remove any old instances */
1581 1473
1582 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1474 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1583 {
1584 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1475 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1585 { 1476 tmp->destroy ();
1586 remove_ob (tmp);
1587 free_object (tmp);
1588 }
1589 }
1590 1477
1591 tmp1 = arch_to_object (find_archetype (arch_string)); 1478 tmp1 = arch_to_object (archetype::find (arch_string));
1592 1479
1593 tmp1->x = op->x; 1480 tmp1->x = op->x;
1594 tmp1->y = op->y; 1481 tmp1->y = op->y;
1595 insert_ob_in_map (tmp1, op->map, op, 0); 1482 insert_ob_in_map (tmp1, op->map, op, 0);
1483}
1484
1485object *
1486object::insert_at (object *where, object *originator, int flags)
1487{
1488 return where->map->insert (this, where->x, where->y, originator, flags);
1596} 1489}
1597 1490
1598/* 1491/*
1599 * get_split_ob(ob,nr) splits up ob into two parts. The part which 1492 * get_split_ob(ob,nr) splits up ob into two parts. The part which
1600 * is returned contains nr objects, and the remaining parts contains 1493 * is returned contains nr objects, and the remaining parts contains
1601 * the rest (or is removed and freed if that number is 0). 1494 * the rest (or is removed and freed if that number is 0).
1602 * On failure, NULL is returned, and the reason put into the 1495 * On failure, NULL is returned, and the reason put into the
1603 * global static errmsg array. 1496 * global static errmsg array.
1604 */ 1497 */
1605
1606object * 1498object *
1607get_split_ob (object *orig_ob, uint32 nr) 1499get_split_ob (object *orig_ob, uint32 nr)
1608{ 1500{
1609 object * 1501 object *newob;
1610 newob;
1611 int
1612 is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1502 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1613 1503
1614 if (orig_ob->nrof < nr) 1504 if (orig_ob->nrof < nr)
1615 { 1505 {
1616 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name); 1506 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1617 return NULL; 1507 return NULL;
1618 } 1508 }
1619 1509
1620 newob = object_create_clone (orig_ob); 1510 newob = object_create_clone (orig_ob);
1621 1511
1622 if ((orig_ob->nrof -= nr) < 1) 1512 if ((orig_ob->nrof -= nr) < 1)
1623 { 1513 orig_ob->destroy (1);
1624 if (!is_removed)
1625 remove_ob (orig_ob);
1626 free_object2 (orig_ob, 1);
1627 }
1628 else if (!is_removed) 1514 else if (!is_removed)
1629 { 1515 {
1630 if (orig_ob->env != NULL) 1516 if (orig_ob->env != NULL)
1631 sub_weight (orig_ob->env, orig_ob->weight * nr); 1517 sub_weight (orig_ob->env, orig_ob->weight * nr);
1632 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY) 1518 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
… …
1647 * the amount of an object. If the amount reaches 0, the object 1533 * the amount of an object. If the amount reaches 0, the object
1648 * is subsequently removed and freed. 1534 * is subsequently removed and freed.
1649 * 1535 *
1650 * Return value: 'op' if something is left, NULL if the amount reached 0 1536 * Return value: 'op' if something is left, NULL if the amount reached 0
1651 */ 1537 */
1652
1653object * 1538object *
1654decrease_ob_nr (object *op, uint32 i) 1539decrease_ob_nr (object *op, uint32 i)
1655{ 1540{
1656 object *tmp; 1541 object *tmp;
1657 player *pl;
1658 1542
1659 if (i == 0) /* objects with op->nrof require this check */ 1543 if (i == 0) /* objects with op->nrof require this check */
1660 return op; 1544 return op;
1661 1545
1662 if (i > op->nrof) 1546 if (i > op->nrof)
1663 i = op->nrof; 1547 i = op->nrof;
1664 1548
1665 if (QUERY_FLAG (op, FLAG_REMOVED)) 1549 if (QUERY_FLAG (op, FLAG_REMOVED))
1666 op->nrof -= i; 1550 op->nrof -= i;
1667 else if (op->env != NULL) 1551 else if (op->env)
1668 { 1552 {
1669 /* is this object in the players inventory, or sub container 1553 /* is this object in the players inventory, or sub container
1670 * therein? 1554 * therein?
1671 */ 1555 */
1672 tmp = is_player_inv (op->env); 1556 tmp = op->in_player ();
1673 /* nope. Is this a container the player has opened? 1557 /* nope. Is this a container the player has opened?
1674 * If so, set tmp to that player. 1558 * If so, set tmp to that player.
1675 * IMO, searching through all the players will mostly 1559 * IMO, searching through all the players will mostly
1676 * likely be quicker than following op->env to the map, 1560 * likely be quicker than following op->env to the map,
1677 * and then searching the map for a player. 1561 * and then searching the map for a player.
1678 */ 1562 */
1679 if (!tmp) 1563 if (!tmp)
1680 { 1564 for_all_players (pl)
1681 for (pl = first_player; pl; pl = pl->next)
1682 if (pl->ob->container == op->env) 1565 if (pl->ob->container == op->env)
1566 {
1567 tmp = pl->ob;
1683 break; 1568 break;
1684 if (pl)
1685 tmp = pl->ob;
1686 else
1687 tmp = NULL;
1688 } 1569 }
1689 1570
1690 if (i < op->nrof) 1571 if (i < op->nrof)
1691 { 1572 {
1692 sub_weight (op->env, op->weight * i); 1573 sub_weight (op->env, op->weight * i);
1693 op->nrof -= i; 1574 op->nrof -= i;
1694 if (tmp) 1575 if (tmp)
1695 {
1696 esrv_send_item (tmp, op); 1576 esrv_send_item (tmp, op);
1697 }
1698 } 1577 }
1699 else 1578 else
1700 { 1579 {
1701 remove_ob (op); 1580 op->remove ();
1702 op->nrof = 0; 1581 op->nrof = 0;
1703 if (tmp) 1582 if (tmp)
1704 {
1705 esrv_del_item (tmp->contr, op->count); 1583 esrv_del_item (tmp->contr, op->count);
1706 }
1707 } 1584 }
1708 } 1585 }
1709 else 1586 else
1710 { 1587 {
1711 object *above = op->above; 1588 object *above = op->above;
1712 1589
1713 if (i < op->nrof) 1590 if (i < op->nrof)
1714 op->nrof -= i; 1591 op->nrof -= i;
1715 else 1592 else
1716 { 1593 {
1717 remove_ob (op); 1594 op->remove ();
1718 op->nrof = 0; 1595 op->nrof = 0;
1719 } 1596 }
1720 1597
1721 /* Since we just removed op, op->above is null */ 1598 /* Since we just removed op, op->above is null */
1722 for (tmp = above; tmp != NULL; tmp = tmp->above) 1599 for (tmp = above; tmp; tmp = tmp->above)
1723 if (tmp->type == PLAYER) 1600 if (tmp->type == PLAYER)
1724 { 1601 {
1725 if (op->nrof) 1602 if (op->nrof)
1726 esrv_send_item (tmp, op); 1603 esrv_send_item (tmp, op);
1727 else 1604 else
… …
1731 1608
1732 if (op->nrof) 1609 if (op->nrof)
1733 return op; 1610 return op;
1734 else 1611 else
1735 { 1612 {
1736 free_object (op); 1613 op->destroy ();
1737 return NULL; 1614 return 0;
1738 } 1615 }
1739} 1616}
1740 1617
1741/* 1618/*
1742 * add_weight(object, weight) adds the specified weight to an object, 1619 * add_weight(object, weight) adds the specified weight to an object,
1743 * and also updates how much the environment(s) is/are carrying. 1620 * and also updates how much the environment(s) is/are carrying.
1744 */ 1621 */
1745
1746void 1622void
1747add_weight (object *op, signed long weight) 1623add_weight (object *op, signed long weight)
1748{ 1624{
1749 while (op != NULL) 1625 while (op != NULL)
1750 { 1626 {
… …
1754 op->carrying += weight; 1630 op->carrying += weight;
1755 op = op->env; 1631 op = op->env;
1756 } 1632 }
1757} 1633}
1758 1634
1635object *
1636insert_ob_in_ob (object *op, object *where)
1637{
1638 if (!where)
1639 {
1640 char *dump = dump_object (op);
1641 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1642 free (dump);
1643 return op;
1644 }
1645
1646 if (where->head)
1647 {
1648 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
1649 where = where->head;
1650 }
1651
1652 return where->insert (op);
1653}
1654
1759/* 1655/*
1760 * insert_ob_in_ob(op,environment): 1656 * env->insert (op)
1761 * This function inserts the object op in the linked list 1657 * This function inserts the object op in the linked list
1762 * inside the object environment. 1658 * inside the object environment.
1763 * 1659 *
1764 * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1765 * the inventory at the last position or next to other objects of the same
1766 * type.
1767 * Frank: Now sorted by type, archetype and magic!
1768 *
1769 * The function returns now pointer to inserted item, and return value can 1660 * The function returns now pointer to inserted item, and return value can
1770 * be != op, if items are merged. -Tero 1661 * be != op, if items are merged. -Tero
1771 */ 1662 */
1772
1773object * 1663object *
1774insert_ob_in_ob (object *op, object *where) 1664object::insert (object *op)
1775{ 1665{
1776 object * 1666 object *tmp, *otmp;
1777 tmp, *
1778 otmp;
1779 1667
1780 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1668 if (!QUERY_FLAG (op, FLAG_REMOVED))
1781 { 1669 op->remove ();
1782 dump_object (op);
1783 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1784 return op;
1785 }
1786
1787 if (where == NULL)
1788 {
1789 dump_object (op);
1790 LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1791 return op;
1792 }
1793
1794 if (where->head)
1795 {
1796 LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1797 where = where->head;
1798 }
1799 1670
1800 if (op->more) 1671 if (op->more)
1801 { 1672 {
1802 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); 1673 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1803 return op; 1674 return op;
… …
1805 1676
1806 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1677 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1807 CLEAR_FLAG (op, FLAG_REMOVED); 1678 CLEAR_FLAG (op, FLAG_REMOVED);
1808 if (op->nrof) 1679 if (op->nrof)
1809 { 1680 {
1810 for (tmp = where->inv; tmp != NULL; tmp = tmp->below) 1681 for (tmp = inv; tmp != NULL; tmp = tmp->below)
1811 if (CAN_MERGE (tmp, op)) 1682 if (object::can_merge (tmp, op))
1812 { 1683 {
1813 /* return the original object and remove inserted object 1684 /* return the original object and remove inserted object
1814 (client needs the original object) */ 1685 (client needs the original object) */
1815 tmp->nrof += op->nrof; 1686 tmp->nrof += op->nrof;
1816 /* Weight handling gets pretty funky. Since we are adding to 1687 /* Weight handling gets pretty funky. Since we are adding to
1817 * tmp->nrof, we need to increase the weight. 1688 * tmp->nrof, we need to increase the weight.
1818 */ 1689 */
1819 add_weight (where, op->weight * op->nrof); 1690 add_weight (this, op->weight * op->nrof);
1820 SET_FLAG (op, FLAG_REMOVED); 1691 SET_FLAG (op, FLAG_REMOVED);
1821 free_object (op); /* free the inserted object */ 1692 op->destroy (); /* free the inserted object */
1822 op = tmp; 1693 op = tmp;
1823 remove_ob (op); /* and fix old object's links */ 1694 op->remove (); /* and fix old object's links */
1824 CLEAR_FLAG (op, FLAG_REMOVED); 1695 CLEAR_FLAG (op, FLAG_REMOVED);
1825 break; 1696 break;
1826 } 1697 }
1827 1698
1828 /* I assume combined objects have no inventory 1699 /* I assume combined objects have no inventory
1829 * We add the weight - this object could have just been removed 1700 * We add the weight - this object could have just been removed
1830 * (if it was possible to merge). calling remove_ob will subtract 1701 * (if it was possible to merge). calling remove_ob will subtract
1831 * the weight, so we need to add it in again, since we actually do 1702 * the weight, so we need to add it in again, since we actually do
1832 * the linking below 1703 * the linking below
1833 */ 1704 */
1834 add_weight (where, op->weight * op->nrof); 1705 add_weight (this, op->weight * op->nrof);
1835 } 1706 }
1836 else 1707 else
1837 add_weight (where, (op->weight + op->carrying)); 1708 add_weight (this, (op->weight + op->carrying));
1838 1709
1839 otmp = is_player_inv (where); 1710 otmp = this->in_player ();
1840 if (otmp && otmp->contr != NULL) 1711 if (otmp && otmp->contr)
1841 {
1842 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1712 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1843 fix_player (otmp); 1713 otmp->update_stats ();
1844 }
1845 1714
1846 op->map = NULL; 1715 op->map = 0;
1847 op->env = where; 1716 op->env = this;
1848 op->above = NULL; 1717 op->above = 0;
1849 op->below = NULL; 1718 op->below = 0;
1850 op->x = 0, op->y = 0; 1719 op->x = 0, op->y = 0;
1851 1720
1852 /* reset the light list and los of the players on the map */ 1721 /* reset the light list and los of the players on the map */
1853 if ((op->glow_radius != 0) && where->map) 1722 if ((op->glow_radius != 0) && map)
1854 { 1723 {
1855#ifdef DEBUG_LIGHTS 1724#ifdef DEBUG_LIGHTS
1856 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1725 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1857#endif /* DEBUG_LIGHTS */ 1726#endif /* DEBUG_LIGHTS */
1858 if (MAP_DARKNESS (where->map)) 1727 if (map->darkness)
1859 update_all_los (where->map, where->x, where->y); 1728 update_all_los (map, x, y);
1860 } 1729 }
1861 1730
1862 /* Client has no idea of ordering so lets not bother ordering it here. 1731 /* Client has no idea of ordering so lets not bother ordering it here.
1863 * It sure simplifies this function... 1732 * It sure simplifies this function...
1864 */ 1733 */
1865 if (where->inv == NULL) 1734 if (!inv)
1866 where->inv = op; 1735 inv = op;
1867 else 1736 else
1868 { 1737 {
1869 op->below = where->inv; 1738 op->below = inv;
1870 op->below->above = op; 1739 op->below->above = op;
1871 where->inv = op; 1740 inv = op;
1872 } 1741 }
1742
1743 INVOKE_OBJECT (INSERT, this);
1744
1873 return op; 1745 return op;
1874} 1746}
1875 1747
1876/* 1748/*
1877 * Checks if any objects has a move_type that matches objects 1749 * Checks if any objects has a move_type that matches objects
… …
1891 * 1763 *
1892 * MSW 2001-07-08: Check all objects on space, not just those below 1764 * MSW 2001-07-08: Check all objects on space, not just those below
1893 * object being inserted. insert_ob_in_map may not put new objects 1765 * object being inserted. insert_ob_in_map may not put new objects
1894 * on top. 1766 * on top.
1895 */ 1767 */
1896
1897int 1768int
1898check_move_on (object *op, object *originator) 1769check_move_on (object *op, object *originator)
1899{ 1770{
1900 object * 1771 object *tmp;
1901 tmp; 1772 maptile *m = op->map;
1902 tag_t
1903 tag;
1904 mapstruct *
1905 m = op->map;
1906 int
1907 x = op->x, y = op->y; 1773 int x = op->x, y = op->y;
1908 1774
1909 MoveType 1775 MoveType move_on, move_slow, move_block;
1910 move_on,
1911 move_slow,
1912 move_block;
1913 1776
1914 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1777 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1915 return 0; 1778 return 0;
1916
1917 tag = op->count;
1918 1779
1919 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); 1780 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
1920 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); 1781 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
1921 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); 1782 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1922 1783
… …
1938 1799
1939 /* The objects have to be checked from top to bottom. 1800 /* The objects have to be checked from top to bottom.
1940 * Hence, we first go to the top: 1801 * Hence, we first go to the top:
1941 */ 1802 */
1942 1803
1943 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above) 1804 for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1944 { 1805 {
1945 /* Trim the search when we find the first other spell effect 1806 /* Trim the search when we find the first other spell effect
1946 * this helps performance so that if a space has 50 spell objects, 1807 * this helps performance so that if a space has 50 spell objects,
1947 * we don't need to check all of them. 1808 * we don't need to check all of them.
1948 */ 1809 */
… …
1966 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1827 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1967 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1828 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1968 { 1829 {
1969 1830
1970 float 1831 float
1971 diff = tmp->move_slow_penalty * FABS (op->speed); 1832 diff = tmp->move_slow_penalty * fabs (op->speed);
1972 1833
1973 if (op->type == PLAYER) 1834 if (op->type == PLAYER)
1974 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1835 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1975 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1836 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1976 diff /= 4.0; 1837 diff /= 4.0;
… …
1983 if ((!op->move_type && tmp->move_on & MOVE_WALK) || 1844 if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
1984 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0)) 1845 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
1985 { 1846 {
1986 move_apply (tmp, op, originator); 1847 move_apply (tmp, op, originator);
1987 1848
1988 if (was_destroyed (op, tag)) 1849 if (op->destroyed ())
1989 return 1; 1850 return 1;
1990 1851
1991 /* what the person/creature stepped onto has moved the object 1852 /* what the person/creature stepped onto has moved the object
1992 * someplace new. Don't process any further - if we did, 1853 * someplace new. Don't process any further - if we did,
1993 * have a feeling strange problems would result. 1854 * have a feeling strange problems would result.
… …
2003/* 1864/*
2004 * present_arch(arch, map, x, y) searches for any objects with 1865 * present_arch(arch, map, x, y) searches for any objects with
2005 * a matching archetype at the given map and coordinates. 1866 * a matching archetype at the given map and coordinates.
2006 * The first matching object is returned, or NULL if none. 1867 * The first matching object is returned, or NULL if none.
2007 */ 1868 */
2008
2009object * 1869object *
2010present_arch (const archetype *at, mapstruct *m, int x, int y) 1870present_arch (const archetype *at, maptile *m, int x, int y)
2011{ 1871{
2012 object *
2013 tmp;
2014
2015 if (m == NULL || out_of_map (m, x, y)) 1872 if (!m || out_of_map (m, x, y))
2016 { 1873 {
2017 LOG (llevError, "Present_arch called outside map.\n"); 1874 LOG (llevError, "Present_arch called outside map.\n");
2018 return NULL; 1875 return NULL;
2019 } 1876 }
2020 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1877
1878 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
2021 if (tmp->arch == at) 1879 if (tmp->arch == at)
2022 return tmp; 1880 return tmp;
1881
2023 return NULL; 1882 return NULL;
2024} 1883}
2025 1884
2026/* 1885/*
2027 * present(type, map, x, y) searches for any objects with 1886 * present(type, map, x, y) searches for any objects with
2028 * a matching type variable at the given map and coordinates. 1887 * a matching type variable at the given map and coordinates.
2029 * The first matching object is returned, or NULL if none. 1888 * The first matching object is returned, or NULL if none.
2030 */ 1889 */
2031
2032object * 1890object *
2033present (unsigned char type, mapstruct *m, int x, int y) 1891present (unsigned char type, maptile *m, int x, int y)
2034{ 1892{
2035 object *
2036 tmp;
2037
2038 if (out_of_map (m, x, y)) 1893 if (out_of_map (m, x, y))
2039 { 1894 {
2040 LOG (llevError, "Present called outside map.\n"); 1895 LOG (llevError, "Present called outside map.\n");
2041 return NULL; 1896 return NULL;
2042 } 1897 }
2043 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1898
1899 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
2044 if (tmp->type == type) 1900 if (tmp->type == type)
2045 return tmp; 1901 return tmp;
1902
2046 return NULL; 1903 return NULL;
2047} 1904}
2048 1905
2049/* 1906/*
2050 * present_in_ob(type, object) searches for any objects with 1907 * present_in_ob(type, object) searches for any objects with
2051 * a matching type variable in the inventory of the given object. 1908 * a matching type variable in the inventory of the given object.
2052 * The first matching object is returned, or NULL if none. 1909 * The first matching object is returned, or NULL if none.
2053 */ 1910 */
2054
2055object * 1911object *
2056present_in_ob (unsigned char type, const object *op) 1912present_in_ob (unsigned char type, const object *op)
2057{ 1913{
2058 object *
2059 tmp;
2060
2061 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1914 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2062 if (tmp->type == type) 1915 if (tmp->type == type)
2063 return tmp; 1916 return tmp;
1917
2064 return NULL; 1918 return NULL;
2065} 1919}
2066 1920
2067/* 1921/*
2068 * present_in_ob (type, str, object) searches for any objects with 1922 * present_in_ob (type, str, object) searches for any objects with
… …
2076 * str is the string to match against. Note that we match against 1930 * str is the string to match against. Note that we match against
2077 * the object name, not the archetype name. this is so that the 1931 * the object name, not the archetype name. this is so that the
2078 * spell code can use one object type (force), but change it's name 1932 * spell code can use one object type (force), but change it's name
2079 * to be unique. 1933 * to be unique.
2080 */ 1934 */
2081
2082object * 1935object *
2083present_in_ob_by_name (int type, const char *str, const object *op) 1936present_in_ob_by_name (int type, const char *str, const object *op)
2084{ 1937{
2085 object *
2086 tmp;
2087
2088 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1938 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2089 {
2090 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name))) 1939 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
2091 return tmp; 1940 return tmp;
2092 } 1941
2093 return NULL; 1942 return 0;
2094} 1943}
2095 1944
2096/* 1945/*
2097 * present_arch_in_ob(archetype, object) searches for any objects with 1946 * present_arch_in_ob(archetype, object) searches for any objects with
2098 * a matching archetype in the inventory of the given object. 1947 * a matching archetype in the inventory of the given object.
2099 * The first matching object is returned, or NULL if none. 1948 * The first matching object is returned, or NULL if none.
2100 */ 1949 */
2101
2102object * 1950object *
2103present_arch_in_ob (const archetype *at, const object *op) 1951present_arch_in_ob (const archetype *at, const object *op)
2104{ 1952{
2105 object *
2106 tmp;
2107
2108 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1953 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2109 if (tmp->arch == at) 1954 if (tmp->arch == at)
2110 return tmp; 1955 return tmp;
1956
2111 return NULL; 1957 return NULL;
2112} 1958}
2113 1959
2114/* 1960/*
2115 * activate recursively a flag on an object inventory 1961 * activate recursively a flag on an object inventory
2116 */ 1962 */
2117void 1963void
2118flag_inv (object *op, int flag) 1964flag_inv (object *op, int flag)
2119{ 1965{
2120 object *
2121 tmp;
2122
2123 if (op->inv) 1966 if (op->inv)
2124 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1967 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2125 { 1968 {
2126 SET_FLAG (tmp, flag); 1969 SET_FLAG (tmp, flag);
2127 flag_inv (tmp, flag); 1970 flag_inv (tmp, flag);
2128 } 1971 }
2129} /* 1972}
1973
1974/*
2130 * desactivate recursively a flag on an object inventory 1975 * deactivate recursively a flag on an object inventory
2131 */ 1976 */
2132void 1977void
2133unflag_inv (object *op, int flag) 1978unflag_inv (object *op, int flag)
2134{ 1979{
2135 object *
2136 tmp;
2137
2138 if (op->inv) 1980 if (op->inv)
2139 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1981 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2140 { 1982 {
2141 CLEAR_FLAG (tmp, flag); 1983 CLEAR_FLAG (tmp, flag);
2142 unflag_inv (tmp, flag); 1984 unflag_inv (tmp, flag);
2143 } 1985 }
2144} 1986}
… …
2147 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in 1989 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
2148 * all it's inventory (recursively). 1990 * all it's inventory (recursively).
2149 * If checksums are used, a player will get set_cheat called for 1991 * If checksums are used, a player will get set_cheat called for
2150 * him/her-self and all object carried by a call to this function. 1992 * him/her-self and all object carried by a call to this function.
2151 */ 1993 */
2152
2153void 1994void
2154set_cheat (object *op) 1995set_cheat (object *op)
2155{ 1996{
2156 SET_FLAG (op, FLAG_WAS_WIZ); 1997 SET_FLAG (op, FLAG_WAS_WIZ);
2157 flag_inv (op, FLAG_WAS_WIZ); 1998 flag_inv (op, FLAG_WAS_WIZ);
… …
2176 * because arch_blocked (now ob_blocked) needs to know the movement type 2017 * because arch_blocked (now ob_blocked) needs to know the movement type
2177 * to know if the space in question will block the object. We can't use 2018 * to know if the space in question will block the object. We can't use
2178 * the archetype because that isn't correct if the monster has been 2019 * the archetype because that isn't correct if the monster has been
2179 * customized, changed states, etc. 2020 * customized, changed states, etc.
2180 */ 2021 */
2181
2182int 2022int
2183find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop) 2023find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2184{ 2024{
2185 int
2186 i,
2187 index = 0, flag; 2025 int index = 0, flag;
2188 static int
2189 altern[SIZEOFFREE]; 2026 int altern[SIZEOFFREE];
2190 2027
2191 for (i = start; i < stop; i++) 2028 for (int i = start; i < stop; i++)
2192 { 2029 {
2193 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 2030 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);
2194 if (!flag) 2031 if (!flag)
2195 altern[index++] = i; 2032 altern [index++] = i;
2196 2033
2197 /* Basically, if we find a wall on a space, we cut down the search size. 2034 /* Basically, if we find a wall on a space, we cut down the search size.
2198 * In this way, we won't return spaces that are on another side of a wall. 2035 * In this way, we won't return spaces that are on another side of a wall.
2199 * This mostly work, but it cuts down the search size in all directions - 2036 * This mostly work, but it cuts down the search size in all directions -
2200 * if the space being examined only has a wall to the north and empty 2037 * if the space being examined only has a wall to the north and empty
2201 * spaces in all the other directions, this will reduce the search space 2038 * spaces in all the other directions, this will reduce the search space
2202 * to only the spaces immediately surrounding the target area, and 2039 * to only the spaces immediately surrounding the target area, and
2203 * won't look 2 spaces south of the target space. 2040 * won't look 2 spaces south of the target space.
2204 */ 2041 */
2205 else if ((flag & AB_NO_PASS) && maxfree[i] < stop) 2042 else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2206 stop = maxfree[i]; 2043 stop = maxfree[i];
2207 } 2044 }
2045
2208 if (!index) 2046 if (!index)
2209 return -1; 2047 return -1;
2048
2210 return altern[RANDOM () % index]; 2049 return altern [rndm (index)];
2211} 2050}
2212 2051
2213/* 2052/*
2214 * find_first_free_spot(archetype, mapstruct, x, y) works like 2053 * find_first_free_spot(archetype, maptile, x, y) works like
2215 * find_free_spot(), but it will search max number of squares. 2054 * find_free_spot(), but it will search max number of squares.
2216 * But it will return the first available spot, not a random choice. 2055 * But it will return the first available spot, not a random choice.
2217 * Changed 0.93.2: Have it return -1 if there is no free spot available. 2056 * Changed 0.93.2: Have it return -1 if there is no free spot available.
2218 */ 2057 */
2219
2220int 2058int
2221find_first_free_spot (const object *ob, mapstruct *m, int x, int y) 2059find_first_free_spot (const object *ob, maptile *m, int x, int y)
2222{ 2060{
2223 int
2224 i;
2225
2226 for (i = 0; i < SIZEOFFREE; i++) 2061 for (int i = 0; i < SIZEOFFREE; i++)
2227 {
2228 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2062 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))
2229 return i; 2063 return i;
2230 } 2064
2231 return -1; 2065 return -1;
2232} 2066}
2233 2067
2234/* 2068/*
2235 * The function permute(arr, begin, end) randomly reorders the array 2069 * The function permute(arr, begin, end) randomly reorders the array
2236 * arr[begin..end-1]. 2070 * arr[begin..end-1].
2071 * now uses a fisher-yates shuffle, old permute was broken
2237 */ 2072 */
2238static void 2073static void
2239permute (int *arr, int begin, int end) 2074permute (int *arr, int begin, int end)
2240{ 2075{
2241 int 2076 arr += begin;
2242 i,
2243 j,
2244 tmp,
2245 len;
2246
2247 len = end - begin; 2077 end -= begin;
2248 for (i = begin; i < end; i++)
2249 {
2250 j = begin + RANDOM () % len;
2251 2078
2252 tmp = arr[i]; 2079 while (--end)
2253 arr[i] = arr[j]; 2080 swap (arr [end], arr [rndm (end + 1)]);
2254 arr[j] = tmp;
2255 }
2256} 2081}
2257 2082
2258/* new function to make monster searching more efficient, and effective! 2083/* new function to make monster searching more efficient, and effective!
2259 * This basically returns a randomized array (in the passed pointer) of 2084 * This basically returns a randomized array (in the passed pointer) of
2260 * the spaces to find monsters. In this way, it won't always look for 2085 * the spaces to find monsters. In this way, it won't always look for
… …
2263 * the 3x3 area will be searched, just not in a predictable order. 2088 * the 3x3 area will be searched, just not in a predictable order.
2264 */ 2089 */
2265void 2090void
2266get_search_arr (int *search_arr) 2091get_search_arr (int *search_arr)
2267{ 2092{
2268 int 2093 int i;
2269 i;
2270 2094
2271 for (i = 0; i < SIZEOFFREE; i++) 2095 for (i = 0; i < SIZEOFFREE; i++)
2272 {
2273 search_arr[i] = i; 2096 search_arr[i] = i;
2274 }
2275 2097
2276 permute (search_arr, 1, SIZEOFFREE1 + 1); 2098 permute (search_arr, 1, SIZEOFFREE1 + 1);
2277 permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1); 2099 permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2278 permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE); 2100 permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2279} 2101}
… …
2288 * Perhaps incorrectly, but I'm making the assumption that exclude 2110 * Perhaps incorrectly, but I'm making the assumption that exclude
2289 * is actually want is going to try and move there. We need this info 2111 * is actually want is going to try and move there. We need this info
2290 * because we have to know what movement the thing looking to move 2112 * because we have to know what movement the thing looking to move
2291 * there is capable of. 2113 * there is capable of.
2292 */ 2114 */
2293
2294int 2115int
2295find_dir (mapstruct *m, int x, int y, object *exclude) 2116find_dir (maptile *m, int x, int y, object *exclude)
2296{ 2117{
2297 int
2298 i,
2299 max = SIZEOFFREE, mflags; 2118 int i, max = SIZEOFFREE, mflags;
2300 2119
2301 sint16 nx, ny; 2120 sint16 nx, ny;
2302 object * 2121 object *tmp;
2303 tmp; 2122 maptile *mp;
2304 mapstruct *
2305 mp;
2306 2123
2307 MoveType blocked, move_type; 2124 MoveType blocked, move_type;
2308 2125
2309 if (exclude && exclude->head) 2126 if (exclude && exclude->head)
2310 { 2127 {
… …
2322 mp = m; 2139 mp = m;
2323 nx = x + freearr_x[i]; 2140 nx = x + freearr_x[i];
2324 ny = y + freearr_y[i]; 2141 ny = y + freearr_y[i];
2325 2142
2326 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); 2143 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
2144
2327 if (mflags & P_OUT_OF_MAP) 2145 if (mflags & P_OUT_OF_MAP)
2328 {
2329 max = maxfree[i]; 2146 max = maxfree[i];
2330 }
2331 else 2147 else
2332 { 2148 {
2333 blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny); 2149 mapspace &ms = mp->at (nx, ny);
2150
2151 blocked = ms.move_block;
2334 2152
2335 if ((move_type & blocked) == move_type) 2153 if ((move_type & blocked) == move_type)
2336 {
2337 max = maxfree[i]; 2154 max = maxfree[i];
2338 }
2339 else if (mflags & P_IS_ALIVE) 2155 else if (mflags & P_IS_ALIVE)
2340 { 2156 {
2341 for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above) 2157 for (tmp = ms.bot; tmp; tmp = tmp->above)
2342 { 2158 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2343 if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2159 && (tmp != exclude || (tmp->head && tmp->head != exclude)))
2344 {
2345 break; 2160 break;
2346 } 2161
2347 }
2348 if (tmp) 2162 if (tmp)
2349 {
2350 return freedir[i]; 2163 return freedir[i];
2351 }
2352 } 2164 }
2353 } 2165 }
2354 } 2166 }
2167
2355 return 0; 2168 return 0;
2356} 2169}
2357 2170
2358/* 2171/*
2359 * distance(object 1, object 2) will return the square of the 2172 * distance(object 1, object 2) will return the square of the
2360 * distance between the two given objects. 2173 * distance between the two given objects.
2361 */ 2174 */
2362
2363int 2175int
2364distance (const object *ob1, const object *ob2) 2176distance (const object *ob1, const object *ob2)
2365{ 2177{
2366 int
2367 i;
2368
2369 i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); 2178 return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2370 return i;
2371} 2179}
2372 2180
2373/* 2181/*
2374 * find_dir_2(delta-x,delta-y) will return a direction in which 2182 * find_dir_2(delta-x,delta-y) will return a direction in which
2375 * an object which has subtracted the x and y coordinates of another 2183 * an object which has subtracted the x and y coordinates of another
2376 * object, needs to travel toward it. 2184 * object, needs to travel toward it.
2377 */ 2185 */
2378
2379int 2186int
2380find_dir_2 (int x, int y) 2187find_dir_2 (int x, int y)
2381{ 2188{
2382 int 2189 int q;
2383 q;
2384 2190
2385 if (y) 2191 if (y)
2386 q = x * 100 / y; 2192 q = x * 100 / y;
2387 else if (x) 2193 else if (x)
2388 q = -300 * x; 2194 q = -300 * x;
… …
2413 2219
2414 return 3; 2220 return 3;
2415} 2221}
2416 2222
2417/* 2223/*
2418 * absdir(int): Returns a number between 1 and 8, which represent
2419 * the "absolute" direction of a number (it actually takes care of
2420 * "overflow" in previous calculations of a direction).
2421 */
2422
2423int
2424absdir (int d)
2425{
2426 while (d < 1)
2427 d += 8;
2428 while (d > 8)
2429 d -= 8;
2430 return d;
2431}
2432
2433/*
2434 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2224 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2435 * between two directions (which are expected to be absolute (see absdir()) 2225 * between two directions (which are expected to be absolute (see absdir())
2436 */ 2226 */
2437
2438int 2227int
2439dirdiff (int dir1, int dir2) 2228dirdiff (int dir1, int dir2)
2440{ 2229{
2441 int 2230 int d;
2442 d;
2443 2231
2444 d = abs (dir1 - dir2); 2232 d = abs (dir1 - dir2);
2445 if (d > 4) 2233 if (d > 4)
2446 d = 8 - d; 2234 d = 8 - d;
2235
2447 return d; 2236 return d;
2448} 2237}
2449 2238
2450/* peterm: 2239/* peterm:
2451 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster. 2240 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
… …
2454 * This basically means that if direction is 15, then it could either go 2243 * This basically means that if direction is 15, then it could either go
2455 * direction 4, 14, or 16 to get back to where we are. 2244 * direction 4, 14, or 16 to get back to where we are.
2456 * Moved from spell_util.c to object.c with the other related direction 2245 * Moved from spell_util.c to object.c with the other related direction
2457 * functions. 2246 * functions.
2458 */ 2247 */
2459
2460int
2461 reduction_dir[SIZEOFFREE][3] = { 2248int reduction_dir[SIZEOFFREE][3] = {
2462 {0, 0, 0}, /* 0 */ 2249 {0, 0, 0}, /* 0 */
2463 {0, 0, 0}, /* 1 */ 2250 {0, 0, 0}, /* 1 */
2464 {0, 0, 0}, /* 2 */ 2251 {0, 0, 0}, /* 2 */
2465 {0, 0, 0}, /* 3 */ 2252 {0, 0, 0}, /* 3 */
2466 {0, 0, 0}, /* 4 */ 2253 {0, 0, 0}, /* 4 */
… …
2514 * find a path to that monster that we found. If not, 2301 * find a path to that monster that we found. If not,
2515 * we don't bother going toward it. Returns 1 if we 2302 * we don't bother going toward it. Returns 1 if we
2516 * can see a direct way to get it 2303 * can see a direct way to get it
2517 * Modified to be map tile aware -.MSW 2304 * Modified to be map tile aware -.MSW
2518 */ 2305 */
2519
2520
2521int 2306int
2522can_see_monsterP (mapstruct *m, int x, int y, int dir) 2307can_see_monsterP (maptile *m, int x, int y, int dir)
2523{ 2308{
2524 sint16 dx, dy; 2309 sint16 dx, dy;
2525 int
2526 mflags; 2310 int mflags;
2527 2311
2528 if (dir < 0) 2312 if (dir < 0)
2529 return 0; /* exit condition: invalid direction */ 2313 return 0; /* exit condition: invalid direction */
2530 2314
2531 dx = x + freearr_x[dir]; 2315 dx = x + freearr_x[dir];
… …
2544 return 0; 2328 return 0;
2545 2329
2546 /* yes, can see. */ 2330 /* yes, can see. */
2547 if (dir < 9) 2331 if (dir < 9)
2548 return 1; 2332 return 1;
2333
2549 return can_see_monsterP (m, x, y, reduction_dir[dir][0]) | 2334 return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2550 can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]); 2335 | can_see_monsterP (m, x, y, reduction_dir[dir][1])
2336 | can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2551} 2337}
2552
2553
2554 2338
2555/* 2339/*
2556 * can_pick(picker, item): finds out if an object is possible to be 2340 * can_pick(picker, item): finds out if an object is possible to be
2557 * picked up by the picker. Returnes 1 if it can be 2341 * picked up by the picker. Returnes 1 if it can be
2558 * picked up, otherwise 0. 2342 * picked up, otherwise 0.
… …
2569 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2353 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2570 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2354 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2571 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); 2355 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
2572} 2356}
2573 2357
2574
2575/* 2358/*
2576 * create clone from object to another 2359 * create clone from object to another
2577 */ 2360 */
2578object * 2361object *
2579object_create_clone (object *asrc) 2362object_create_clone (object *asrc)
2580{ 2363{
2581 object *
2582 dst = NULL, *tmp, *src, *part, *prev, *item; 2364 object *dst = 0, *tmp, *src, *part, *prev, *item;
2583 2365
2584 if (!asrc) 2366 if (!asrc)
2585 return NULL; 2367 return 0;
2368
2586 src = asrc; 2369 src = asrc;
2587 if (src->head) 2370 if (src->head)
2588 src = src->head; 2371 src = src->head;
2589 2372
2590 prev = NULL; 2373 prev = 0;
2591 for (part = src; part; part = part->more) 2374 for (part = src; part; part = part->more)
2592 { 2375 {
2593 tmp = get_object (); 2376 tmp = part->clone ();
2594 copy_object (part, tmp);
2595 tmp->x -= src->x; 2377 tmp->x -= src->x;
2596 tmp->y -= src->y; 2378 tmp->y -= src->y;
2379
2597 if (!part->head) 2380 if (!part->head)
2598 { 2381 {
2599 dst = tmp; 2382 dst = tmp;
2600 tmp->head = NULL; 2383 tmp->head = 0;
2601 } 2384 }
2602 else 2385 else
2603 {
2604 tmp->head = dst; 2386 tmp->head = dst;
2605 } 2387
2606 tmp->more = NULL; 2388 tmp->more = 0;
2389
2607 if (prev) 2390 if (prev)
2608 prev->more = tmp; 2391 prev->more = tmp;
2392
2609 prev = tmp; 2393 prev = tmp;
2610 } 2394 }
2611 2395
2612 /*** copy inventory ***/
2613 for (item = src->inv; item; item = item->below) 2396 for (item = src->inv; item; item = item->below)
2614 {
2615 (void) insert_ob_in_ob (object_create_clone (item), dst); 2397 insert_ob_in_ob (object_create_clone (item), dst);
2616 }
2617 2398
2618 return dst; 2399 return dst;
2619}
2620
2621/* return true if the object was destroyed, 0 otherwise */
2622int
2623was_destroyed (const object *op, tag_t old_tag)
2624{
2625 /* checking for FLAG_FREED isn't necessary, but makes this function more
2626 * robust */
2627 return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2628}
2629
2630/* GROS - Creates an object using a string representing its content. */
2631
2632/* Basically, we save the content of the string to a temp file, then call */
2633
2634/* load_object on it. I admit it is a highly inefficient way to make things, */
2635
2636/* but it was simple to make and allows reusing the load_object function. */
2637
2638/* Remember not to use load_object_str in a time-critical situation. */
2639
2640/* Also remember that multiparts objects are not supported for now. */
2641
2642object *
2643load_object_str (const char *obstr)
2644{
2645 object *
2646 op;
2647 char
2648 filename[MAX_BUF];
2649
2650 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2651
2652 FILE *
2653 tempfile = fopen (filename, "w");
2654
2655 if (tempfile == NULL)
2656 {
2657 LOG (llevError, "Error - Unable to access load object temp file\n");
2658 return NULL;
2659 };
2660 fprintf (tempfile, obstr);
2661 fclose (tempfile);
2662
2663 op = get_object ();
2664
2665 object_thawer thawer (filename);
2666
2667 if (thawer)
2668 load_object (thawer, op, 0);
2669
2670 LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2671 CLEAR_FLAG (op, FLAG_REMOVED);
2672
2673 return op;
2674} 2400}
2675 2401
2676/* This returns the first object in who's inventory that 2402/* This returns the first object in who's inventory that
2677 * has the same type and subtype match. 2403 * has the same type and subtype match.
2678 * returns NULL if no match. 2404 * returns NULL if no match.
2679 */ 2405 */
2680object * 2406object *
2681find_obj_by_type_subtype (const object *who, int type, int subtype) 2407find_obj_by_type_subtype (const object *who, int type, int subtype)
2682{ 2408{
2683 object *
2684 tmp;
2685
2686 for (tmp = who->inv; tmp; tmp = tmp->below) 2409 for (object *tmp = who->inv; tmp; tmp = tmp->below)
2687 if (tmp->type == type && tmp->subtype == subtype) 2410 if (tmp->type == type && tmp->subtype == subtype)
2688 return tmp; 2411 return tmp;
2689 2412
2690 return NULL; 2413 return 0;
2691} 2414}
2692 2415
2693/* If ob has a field named key, return the link from the list, 2416/* If ob has a field named key, return the link from the list,
2694 * otherwise return NULL. 2417 * otherwise return NULL.
2695 * 2418 *
… …
2697 * do the desired thing. 2420 * do the desired thing.
2698 */ 2421 */
2699key_value * 2422key_value *
2700get_ob_key_link (const object *ob, const char *key) 2423get_ob_key_link (const object *ob, const char *key)
2701{ 2424{
2702 key_value *
2703 link;
2704
2705 for (link = ob->key_values; link != NULL; link = link->next) 2425 for (key_value *link = ob->key_values; link; link = link->next)
2706 {
2707 if (link->key == key) 2426 if (link->key == key)
2708 {
2709 return link; 2427 return link;
2710 }
2711 }
2712 2428
2713 return NULL; 2429 return 0;
2714} 2430}
2715 2431
2716/* 2432/*
2717 * Returns the value of op has an extra_field for key, or NULL. 2433 * Returns the value of op has an extra_field for key, or NULL.
2718 * 2434 *
… …
2721 * The returned string is shared. 2437 * The returned string is shared.
2722 */ 2438 */
2723const char * 2439const char *
2724get_ob_key_value (const object *op, const char *const key) 2440get_ob_key_value (const object *op, const char *const key)
2725{ 2441{
2726 key_value * 2442 key_value *link;
2727 link; 2443 shstr_cmp canonical_key (key);
2728 const char *
2729 canonical_key;
2730 2444
2731 canonical_key = shstr::find (key);
2732
2733 if (canonical_key == NULL) 2445 if (!canonical_key)
2734 { 2446 {
2735 /* 1. There being a field named key on any object 2447 /* 1. There being a field named key on any object
2736 * implies there'd be a shared string to find. 2448 * implies there'd be a shared string to find.
2737 * 2. Since there isn't, no object has this field. 2449 * 2. Since there isn't, no object has this field.
2738 * 3. Therefore, *this* object doesn't have this field. 2450 * 3. Therefore, *this* object doesn't have this field.
2739 */ 2451 */
2740 return NULL; 2452 return 0;
2741 } 2453 }
2742 2454
2743 /* This is copied from get_ob_key_link() above - 2455 /* This is copied from get_ob_key_link() above -
2744 * only 4 lines, and saves the function call overhead. 2456 * only 4 lines, and saves the function call overhead.
2745 */ 2457 */
2746 for (link = op->key_values; link != NULL; link = link->next) 2458 for (link = op->key_values; link; link = link->next)
2747 {
2748 if (link->key == canonical_key) 2459 if (link->key == canonical_key)
2749 {
2750 return link->value; 2460 return link->value;
2751 } 2461
2752 }
2753 return NULL; 2462 return 0;
2754} 2463}
2755
2756 2464
2757/* 2465/*
2758 * Updates the canonical_key in op to value. 2466 * Updates the canonical_key in op to value.
2759 * 2467 *
2760 * canonical_key is a shared string (value doesn't have to be). 2468 * canonical_key is a shared string (value doesn't have to be).
… …
2765 * Returns TRUE on success. 2473 * Returns TRUE on success.
2766 */ 2474 */
2767int 2475int
2768set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key) 2476set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2769{ 2477{
2770 key_value *
2771 field = NULL, *last = NULL; 2478 key_value *field = NULL, *last = NULL;
2772 2479
2773 for (field = op->key_values; field != NULL; field = field->next) 2480 for (field = op->key_values; field != NULL; field = field->next)
2774 { 2481 {
2775 if (field->key != canonical_key) 2482 if (field->key != canonical_key)
2776 { 2483 {
… …
2804 /* IF we get here, key doesn't exist */ 2511 /* IF we get here, key doesn't exist */
2805 2512
2806 /* No field, we'll have to add it. */ 2513 /* No field, we'll have to add it. */
2807 2514
2808 if (!add_key) 2515 if (!add_key)
2809 {
2810 return FALSE; 2516 return FALSE;
2811 } 2517
2812 /* There isn't any good reason to store a null 2518 /* There isn't any good reason to store a null
2813 * value in the key/value list. If the archetype has 2519 * value in the key/value list. If the archetype has
2814 * this key, then we should also have it, so shouldn't 2520 * this key, then we should also have it, so shouldn't
2815 * be here. If user wants to store empty strings, 2521 * be here. If user wants to store empty strings,
2816 * should pass in "" 2522 * should pass in ""
… …
2844 shstr key_ (key); 2550 shstr key_ (key);
2845 2551
2846 return set_ob_key_value_s (op, key_, value, add_key); 2552 return set_ob_key_value_s (op, key_, value, add_key);
2847} 2553}
2848 2554
2555object::depth_iterator::depth_iterator (object *container)
2556: iterator_base (container)
2557{
2558 while (item->inv)
2559 item = item->inv;
2560}
2561
2849void 2562void
2850object::deep_iterator::next () 2563object::depth_iterator::next ()
2851{ 2564{
2852 if (item->inv)
2853 item = item->inv;
2854 else if (item->below) 2565 if (item->below)
2566 {
2855 item = item->below; 2567 item = item->below;
2568
2569 while (item->inv)
2570 item = item->inv;
2571 }
2856 else 2572 else
2857 item = item->env->below; 2573 item = item->env;
2858} 2574}
2575
2576
2577const char *
2578object::flag_desc (char *desc, int len) const
2579{
2580 char *p = desc;
2581 bool first = true;
2582
2583 *p = 0;
2584
2585 for (int i = 0; i < NUM_FLAGS; i++)
2586 {
2587 if (len <= 10) // magic constant!
2588 {
2589 snprintf (p, len, ",...");
2590 break;
2591 }
2592
2593 if (flag [i])
2594 {
2595 int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
2596 len -= cnt;
2597 p += cnt;
2598 first = false;
2599 }
2600 }
2601
2602 return desc;
2603}
2604
2605// return a suitable string describing an object in enough detail to find it
2606const char *
2607object::debug_desc (char *info) const
2608{
2609 char flagdesc[512];
2610 char info2[256 * 4];
2611 char *p = info;
2612
2613 p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2614 count, uuid.seq,
2615 &name,
2616 title ? "\",title:\"" : "",
2617 title ? (const char *)title : "",
2618 flag_desc (flagdesc, 512), type);
2619
2620 if (env)
2621 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2622
2623 if (map)
2624 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2625
2626 return info;
2627}
2628
2629const char *
2630object::debug_desc () const
2631{
2632 static char info[3][256 * 4];
2633 static int info_idx;
2634
2635 return debug_desc (info [++info_idx % 3]);
2636}
2637
2638struct region *
2639object::region () const
2640{
2641 return map ? map->region (x, y)
2642 : region::default_region ();
2643}
2644
2645const materialtype_t *
2646object::dominant_material () const
2647{
2648 if (materialtype_t *mat = name_to_material (materialname))
2649 return mat;
2650
2651 // omfg this is slow, this has to be temporary :)
2652 shstr unknown ("unknown");
2653
2654 return name_to_material (unknown);
2655}
2656
2657void
2658object::open_container (object *new_container)
2659{
2660 if (container == new_container)
2661 return;
2662
2663 if (object *old_container = container)
2664 {
2665 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2666 return;
2667
2668#if 0
2669 // remove the "Close old_container" object.
2670 if (object *closer = old_container->inv)
2671 if (closer->type == CLOSE_CON)
2672 closer->destroy ();
2673#endif
2674
2675 old_container->flag [FLAG_APPLIED] = 0;
2676 container = 0;
2677
2678 esrv_update_item (UPD_FLAGS, this, old_container);
2679 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2680 }
2681
2682 if (new_container)
2683 {
2684 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2685 return;
2686
2687 // TODO: this does not seem to serve any purpose anymore?
2688#if 0
2689 // insert the "Close Container" object.
2690 if (archetype *closer = new_container->other_arch)
2691 {
2692 object *closer = arch_to_object (new_container->other_arch);
2693 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2694 new_container->insert (closer);
2695 }
2696#endif
2697
2698 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2699
2700 new_container->flag [FLAG_APPLIED] = 1;
2701 container = new_container;
2702
2703 esrv_update_item (UPD_FLAGS, this, new_container);
2704 esrv_send_inventory (this, new_container);
2705 }
2706}
2707
2708

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines