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.31 by root, Mon Sep 11 23:33:27 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 *
911 op;
912
913 if (freed.empty ())
914 op = new object; 870 object *op = new object;
915 else
916 {
917 // highly annoying, but the only way to get it stable right now
918 op = freed.back ();
919 freed.pop_back ();
920 op->~object ();
921 new ((void *) op) object;
922 }
923
924 op->link (); 871 op->link ();
925 return op; 872 return op;
926} 873}
927 874
928/* 875void
929 * free_object() frees everything allocated by an object, removes 876object::do_destroy ()
930 * it from the list of used objects, and puts it on the list of
931 * free objects. The IS_FREED() flag is set in the object.
932 * The object must have been removed by remove_ob() first for
933 * this function to succeed.
934 *
935 * If free_inventory is set, free inventory as well. Else drop items in
936 * inventory to the ground.
937 */
938void object::free (bool free_inventory)
939{ 877{
940 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 ())
941 return; 935 return;
942 936
943 if (!QUERY_FLAG (this, FLAG_REMOVED)) 937 if (destroy_inventory)
944 remove_ob (this); 938 destroy_inv (false);
945 939
946 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 940 attachable::destroy ();
947 remove_friendly_object (this);
948
949 SET_FLAG (this, FLAG_FREED);
950
951 if (more)
952 {
953 more->free (free_inventory);
954 more = 0;
955 }
956
957 if (inv)
958 {
959 /* Only if the space blocks everything do we not process -
960 * if some form of movement is allowed, let objects
961 * drop on that space.
962 */
963 if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))
964 {
965 object *op = inv;
966
967 while (op)
968 {
969 object *tmp = op->below;
970 op->free (free_inventory);
971 op = tmp;
972 }
973 }
974 else
975 { /* Put objects in inventory onto this space */
976 object *op = inv;
977
978 while (op)
979 {
980 object *tmp = op->below;
981
982 remove_ob (op);
983
984 if (QUERY_FLAG (op, FLAG_STARTEQUIP)
985 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
986 free_object (op);
987 else
988 {
989 op->x = x;
990 op->y = y;
991 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
992 }
993
994 op = tmp;
995 }
996 }
997 }
998
999 owner = 0;
1000
1001 /* Remove object from the active list */
1002 speed = 0;
1003 update_ob_speed (this);
1004
1005 unlink ();
1006
1007 mortals.push_back (this);
1008} 941}
1009 942
1010/* 943/*
1011 * sub_weight() recursively (outwards) subtracts a number from the 944 * sub_weight() recursively (outwards) subtracts a number from the
1012 * 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)).
1013 */ 946 */
1014
1015void 947void
1016sub_weight (object *op, signed long weight) 948sub_weight (object *op, signed long weight)
1017{ 949{
1018 while (op != NULL) 950 while (op != NULL)
1019 { 951 {
1020 if (op->type == CONTAINER) 952 if (op->type == CONTAINER)
1021 {
1022 weight = (signed long) (weight * (100 - op->stats.Str) / 100); 953 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1023 } 954
1024 op->carrying -= weight; 955 op->carrying -= weight;
1025 op = op->env; 956 op = op->env;
1026 } 957 }
1027} 958}
1028 959
1029/* remove_ob(op): 960/* op->remove ():
1030 * 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
1031 * 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
1032 * object will have no environment. If the object previously had an 963 * object will have no environment. If the object previously had an
1033 * environment, the x and y coordinates will be updated to 964 * environment, the x and y coordinates will be updated to
1034 * the previous environment. 965 * the previous environment.
1035 * Beware: This function is called from the editor as well!
1036 */ 966 */
1037
1038void 967void
1039remove_ob (object *op) 968object::do_remove ()
1040{ 969{
970 object *tmp, *last = 0;
1041 object * 971 object *otmp;
1042 tmp, *
1043 last = NULL;
1044 object *
1045 otmp;
1046 972
1047 tag_t
1048 tag;
1049 int
1050 check_walk_off;
1051 mapstruct *
1052 m;
1053
1054 sint16
1055 x,
1056 y;
1057
1058 if (QUERY_FLAG (op, FLAG_REMOVED)) 973 if (QUERY_FLAG (this, FLAG_REMOVED))
1059 return; 974 return;
1060 975
1061 SET_FLAG (op, FLAG_REMOVED); 976 SET_FLAG (this, FLAG_REMOVED);
977 INVOKE_OBJECT (REMOVE, this);
1062 978
1063 if (op->more != NULL) 979 if (more)
1064 remove_ob (op->more); 980 more->remove ();
1065 981
1066 /* 982 /*
1067 * In this case, the object to be removed is in someones 983 * In this case, the object to be removed is in someones
1068 * inventory. 984 * inventory.
1069 */ 985 */
1070 if (op->env != NULL) 986 if (env)
1071 { 987 {
1072 if (op->nrof) 988 if (nrof)
1073 sub_weight (op->env, op->weight * op->nrof); 989 sub_weight (env, weight * nrof);
1074 else 990 else
1075 sub_weight (op->env, op->weight + op->carrying); 991 sub_weight (env, weight + carrying);
1076 992
1077 /* 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
1078 * made to players inventory. If set, avoiding the call 994 * made to players inventory. If set, avoiding the call
1079 * to save cpu time. 995 * to save cpu time.
1080 */ 996 */
1081 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))
1082 fix_player (otmp); 998 otmp->update_stats ();
1083 999
1084 if (op->above != NULL) 1000 if (above)
1085 op->above->below = op->below; 1001 above->below = below;
1086 else 1002 else
1087 op->env->inv = op->below; 1003 env->inv = below;
1088 1004
1089 if (op->below != NULL) 1005 if (below)
1090 op->below->above = op->above; 1006 below->above = above;
1091 1007
1092 /* we set up values so that it could be inserted into 1008 /* we set up values so that it could be inserted into
1093 * 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
1094 * to the caller to decide what we want to do. 1010 * to the caller to decide what we want to do.
1095 */ 1011 */
1096 op->x = op->env->x, op->y = op->env->y; 1012 x = env->x, y = env->y;
1097 op->map = op->env->map; 1013 map = env->map;
1098 op->above = NULL, op->below = NULL; 1014 above = 0, below = 0;
1099 op->env = NULL; 1015 env = 0;
1100 } 1016 }
1101 else if (op->map) 1017 else if (map)
1102 { 1018 {
1103 x = op->x; 1019 if (type == PLAYER)
1104 y = op->y;
1105 m = get_map_from_coord (op->map, &x, &y);
1106
1107 if (!m)
1108 { 1020 {
1109 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
1110 op->map->path, op->x, op->y); 1022 if (container && !container->env)
1111 /* in old days, we used to set x and y to 0 and continue. 1023 // this causes spurious floorbox updates, but it ensures
1112 * it seems if we get into this case, something is probablye 1024 // that the CLOSE event is being sent.
1113 * screwed up and should be fixed. 1025 close_container ();
1114 */ 1026
1115 abort (); 1027 --map->players;
1028 map->touch ();
1116 } 1029 }
1117 1030
1118 if (op->map != m) 1031 map->dirty = true;
1119 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 ();
1120 op->map->path, m->path, op->x, op->y, x, y);
1121
1122 /* Re did the following section of code - it looks like it had
1123 * lots of logic for things we no longer care about
1124 */
1125 1033
1126 /* link the object above us */ 1034 /* link the object above us */
1127 if (op->above) 1035 if (above)
1128 op->above->below = op->below; 1036 above->below = below;
1129 else 1037 else
1130 SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */ 1038 ms.top = below; /* we were top, set new top */
1131 1039
1132 /* Relink the object below us, if there is one */ 1040 /* Relink the object below us, if there is one */
1133 if (op->below) 1041 if (below)
1134 op->below->above = op->above; 1042 below->above = above;
1135 else 1043 else
1136 { 1044 {
1137 /* 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
1138 * use translated coordinates in case some oddness with map tiling is 1046 * use translated coordinates in case some oddness with map tiling is
1139 * evident 1047 * evident
1140 */ 1048 */
1141 if (GET_MAP_OB (m, x, y) != op) 1049 if (GET_MAP_OB (map, x, y) != this)
1142 {
1143 dump_object (op);
1144 LOG (llevError,
1145 "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 ());
1146 dump_object (GET_MAP_OB (m, x, y));
1147 LOG (llevError, "%s\n", errmsg);
1148 }
1149 1051
1150 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ 1052 ms.bot = above; /* goes on above it. */
1151 } 1053 }
1152 1054
1153 op->above = 0; 1055 above = 0;
1154 op->below = 0; 1056 below = 0;
1155 1057
1156 if (op->map->in_memory == MAP_SAVING) 1058 if (map->in_memory == MAP_SAVING)
1157 return; 1059 return;
1158 1060
1159 tag = op->count; 1061 int check_walk_off = !flag [FLAG_NO_APPLY];
1160 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1161 1062
1162 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1063 for (tmp = ms.bot; tmp; tmp = tmp->above)
1163 { 1064 {
1164 /* 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
1165 * being removed. 1066 * being removed.
1166 */ 1067 */
1167 1068
1168 if (tmp->type == PLAYER && tmp != op) 1069 if (tmp->type == PLAYER && tmp != this)
1169 { 1070 {
1170 /* If a container that the player is currently using somehow gets 1071 /* If a container that the player is currently using somehow gets
1171 * removed (most likely destroyed), update the player view 1072 * removed (most likely destroyed), update the player view
1172 * appropriately. 1073 * appropriately.
1173 */ 1074 */
1174 if (tmp->container == op) 1075 if (tmp->container == this)
1175 { 1076 {
1176 CLEAR_FLAG (op, FLAG_APPLIED); 1077 flag [FLAG_APPLIED] = 0;
1177 tmp->container = NULL; 1078 tmp->container = 0;
1178 } 1079 }
1179 1080
1180 tmp->contr->socket.update_look = 1; 1081 if (tmp->contr->ns)
1082 tmp->contr->ns->floorbox_update ();
1181 } 1083 }
1182 1084
1183 /* See if player moving off should effect something */ 1085 /* See if object moving off should effect something */
1184 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))
1185 { 1089 {
1186 move_apply (tmp, op, NULL); 1090 move_apply (tmp, this, 0);
1187 1091
1188 if (was_destroyed (op, tag)) 1092 if (destroyed ())
1189 {
1190 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 ());
1191 }
1192 } 1094 }
1193 1095
1194 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1096 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1195 1097 //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1196 if (tmp->above == tmp) 1098 if (tmp->above == tmp)
1197 tmp->above = NULL; 1099 tmp->above = 0;
1198 1100
1199 last = tmp; 1101 last = tmp;
1200 } 1102 }
1201 1103
1202 /* 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?
1203 if (last == NULL) 1106 if (!last)
1204 { 1107 map->at (x, y).flags_ = 0;
1205 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1206 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1207 * those out anyways, and if there are any flags set right now, they won't
1208 * be correct anyways.
1209 */
1210 SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1211 update_position (op->map, op->x, op->y);
1212 }
1213 else 1108 else
1214 update_object (last, UP_OBJ_REMOVE); 1109 update_object (last, UP_OBJ_REMOVE);
1215 1110
1216 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) 1111 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1217 update_all_los (op->map, op->x, op->y); 1112 update_all_los (map, x, y);
1218 } 1113 }
1219} 1114}
1220 1115
1221/* 1116/*
1222 * merge_ob(op,top): 1117 * merge_ob(op,top):
… …
1224 * This function goes through all objects below and including top, and 1119 * This function goes through all objects below and including top, and
1225 * merges op to the first matching object. 1120 * merges op to the first matching object.
1226 * If top is NULL, it is calculated. 1121 * If top is NULL, it is calculated.
1227 * 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
1228 */ 1123 */
1229
1230object * 1124object *
1231merge_ob (object *op, object *top) 1125merge_ob (object *op, object *top)
1232{ 1126{
1233 if (!op->nrof) 1127 if (!op->nrof)
1234 return 0; 1128 return 0;
1235 1129
1236 if (top == NULL) 1130 if (top)
1237 for (top = op; top != NULL && top->above != NULL; top = top->above); 1131 for (top = op; top && top->above; top = top->above)
1132 ;
1238 1133
1239 for (; top != NULL; top = top->below) 1134 for (; top; top = top->below)
1240 { 1135 {
1241 if (top == op) 1136 if (top == op)
1242 continue; 1137 continue;
1243 if (CAN_MERGE (op, top)) 1138
1139 if (object::can_merge (op, top))
1244 { 1140 {
1245 top->nrof += op->nrof; 1141 top->nrof += op->nrof;
1246 1142
1247/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1143/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1248 op->weight = 0; /* Don't want any adjustements now */ 1144 op->weight = 0; /* Don't want any adjustements now */
1249 remove_ob (op); 1145 op->destroy ();
1250 free_object (op);
1251 return top; 1146 return top;
1252 } 1147 }
1253 } 1148 }
1254 1149
1255 return NULL; 1150 return 0;
1256} 1151}
1257 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
1258/* 1176/*
1259 * 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
1260 * job preparing multi-part monsters 1178 * job preparing multi-part monsters.
1261 */ 1179 */
1262object * 1180object *
1263insert_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)
1264{ 1182{
1265 object *tmp;
1266
1267 if (op->head)
1268 op = op->head;
1269
1270 for (tmp = op; tmp; tmp = tmp->more) 1183 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1271 { 1184 {
1272 tmp->x = x + tmp->arch->clone.x; 1185 tmp->x = x + tmp->arch->clone.x;
1273 tmp->y = y + tmp->arch->clone.y; 1186 tmp->y = y + tmp->arch->clone.y;
1274 } 1187 }
1275 1188
… …
1294 * Return value: 1207 * Return value:
1295 * new object if 'op' was merged with other object 1208 * new object if 'op' was merged with other object
1296 * NULL if 'op' was destroyed 1209 * NULL if 'op' was destroyed
1297 * just 'op' otherwise 1210 * just 'op' otherwise
1298 */ 1211 */
1299
1300object * 1212object *
1301insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag) 1213insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1302{ 1214{
1215 assert (!op->flag [FLAG_FREED]);
1216
1303 object *tmp, *top, *floor = NULL; 1217 object *tmp, *top, *floor = NULL;
1304 sint16 x, y;
1305 1218
1306 if (QUERY_FLAG (op, FLAG_FREED)) 1219 op->remove ();
1307 {
1308 LOG (llevError, "Trying to insert freed object!\n");
1309 return NULL;
1310 }
1311 1220
1312 if (m == NULL) 1221#if 0
1313 { 1222 if (!m->active != !op->active)
1314 dump_object (op); 1223 if (m->active)
1315 LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg); 1224 op->activate_recursive ();
1316 return op; 1225 else
1317 } 1226 op->deactivate_recursive ();
1227#endif
1318 1228
1319 if (out_of_map (m, op->x, op->y)) 1229 if (out_of_map (m, op->x, op->y))
1320 { 1230 {
1321 dump_object (op);
1322 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 ());
1323#ifdef MANY_CORES 1232#ifdef MANY_CORES
1324 /* 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
1325 * 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
1326 * improperly inserted. 1235 * improperly inserted.
1327 */ 1236 */
1328 abort (); 1237 abort ();
1329#endif 1238#endif
1330 return op; 1239 return op;
1331 } 1240 }
1332 1241
1333 if (!QUERY_FLAG (op, FLAG_REMOVED))
1334 {
1335 dump_object (op);
1336 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);
1337 return op;
1338 }
1339
1340 if (op->more != NULL)
1341 {
1342 /* The part may be on a different map. */
1343
1344 object *more = op->more; 1242 if (object *more = op->more)
1345 1243 {
1346 /* We really need the caller to normalize coordinates - if
1347 * we set the map, that doesn't work if the location is within
1348 * a map and this is straddling an edge. So only if coordinate
1349 * is clear wrong do we normalize it.
1350 */
1351 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1352 more->map = get_map_from_coord (m, &more->x, &more->y);
1353 else if (!more->map)
1354 {
1355 /* For backwards compatibility - when not dealing with tiled maps,
1356 * more->map should always point to the parent.
1357 */
1358 more->map = m;
1359 }
1360
1361 if (insert_ob_in_map (more, more->map, originator, flag) == NULL) 1244 if (!insert_ob_in_map (more, m, originator, flag))
1362 { 1245 {
1363 if (!op->head) 1246 if (!op->head)
1364 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");
1365 1248
1366 return NULL; 1249 return 0;
1367 } 1250 }
1368 } 1251 }
1369 1252
1370 CLEAR_FLAG (op, FLAG_REMOVED); 1253 CLEAR_FLAG (op, FLAG_REMOVED);
1371 1254
1372 /* Ideally, the caller figures this out. However, it complicates a lot 1255 /* Ideally, the caller figures this out. However, it complicates a lot
1373 * 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
1374 * need extra work 1257 * need extra work
1375 */ 1258 */
1376 op->map = get_map_from_coord (m, &op->x, &op->y); 1259 if (!xy_normalise (m, op->x, op->y))
1377 x = op->x; 1260 return 0;
1378 y = op->y; 1261
1262 op->map = m;
1263 mapspace &ms = op->ms ();
1379 1264
1380 /* this has to be done after we translate the coordinates. 1265 /* this has to be done after we translate the coordinates.
1381 */ 1266 */
1382 if (op->nrof && !(flag & INS_NO_MERGE)) 1267 if (op->nrof && !(flag & INS_NO_MERGE))
1383 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) 1268 for (tmp = ms.bot; tmp; tmp = tmp->above)
1384 if (CAN_MERGE (op, tmp)) 1269 if (object::can_merge (op, tmp))
1385 { 1270 {
1386 op->nrof += tmp->nrof; 1271 op->nrof += tmp->nrof;
1387 remove_ob (tmp); 1272 tmp->destroy ();
1388 free_object (tmp);
1389 } 1273 }
1390 1274
1391 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 */
1392 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1276 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1393 1277
… …
1406 op->below = originator->below; 1290 op->below = originator->below;
1407 1291
1408 if (op->below) 1292 if (op->below)
1409 op->below->above = op; 1293 op->below->above = op;
1410 else 1294 else
1411 SET_MAP_OB (op->map, op->x, op->y, op); 1295 ms.bot = op;
1412 1296
1413 /* since *below* originator, no need to update top */ 1297 /* since *below* originator, no need to update top */
1414 originator->below = op; 1298 originator->below = op;
1415 } 1299 }
1416 else 1300 else
1417 { 1301 {
1302 top = ms.bot;
1303
1418 /* If there are other objects, then */ 1304 /* If there are other objects, then */
1419 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1305 if ((!(flag & INS_MAP_LOAD)) && top)
1420 { 1306 {
1421 object *last = NULL; 1307 object *last = 0;
1422 1308
1423 /* 1309 /*
1424 * 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.
1425 * We've already dealt with merging if appropriate. 1311 * We've already dealt with merging if appropriate.
1426 * 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
… …
1430 * 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
1431 * 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
1432 * 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
1433 * that flying non pickable objects are spell objects. 1319 * that flying non pickable objects are spell objects.
1434 */ 1320 */
1435 1321 for (top = ms.bot; top; top = top->above)
1436 while (top != NULL)
1437 { 1322 {
1438 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))
1439 floor = top; 1324 floor = top;
1440 1325
1441 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))
… …
1444 top = top->below; 1329 top = top->below;
1445 break; 1330 break;
1446 } 1331 }
1447 1332
1448 last = top; 1333 last = top;
1449 top = top->above;
1450 } 1334 }
1451 1335
1452 /* 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 */
1453 top = last; 1337 top = last;
1454 1338
… …
1456 * looks like instead of lots of conditions here. 1340 * looks like instead of lots of conditions here.
1457 * makes things faster, and effectively the same result. 1341 * makes things faster, and effectively the same result.
1458 */ 1342 */
1459 1343
1460 /* Have object 'fall below' other objects that block view. 1344 /* Have object 'fall below' other objects that block view.
1461 * Unless those objects are exits, type 66 1345 * Unless those objects are exits.
1462 * If INS_ON_TOP is used, don't do this processing 1346 * If INS_ON_TOP is used, don't do this processing
1463 * Need to find the object that in fact blocks view, otherwise 1347 * Need to find the object that in fact blocks view, otherwise
1464 * stacking is a bit odd. 1348 * stacking is a bit odd.
1465 */ 1349 */
1466 if (!(flag & INS_ON_TOP) && 1350 if (!(flag & INS_ON_TOP)
1467 (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))
1468 { 1353 {
1469 for (last = top; last != floor; last = last->below) 1354 for (last = top; last != floor; last = last->below)
1470 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1355 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1471 break; 1356 break;
1357
1472 /* Check to see if we found the object that blocks view, 1358 /* Check to see if we found the object that blocks view,
1473 * 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
1474 * we can get inserted below this one, which requires we 1360 * we can get inserted below this one, which requires we
1475 * set top to the object below us. 1361 * set top to the object below us.
1476 */ 1362 */
… …
1478 top = last->below; 1364 top = last->below;
1479 } 1365 }
1480 } /* If objects on this space */ 1366 } /* If objects on this space */
1481 1367
1482 if (flag & INS_MAP_LOAD) 1368 if (flag & INS_MAP_LOAD)
1483 top = GET_MAP_TOP (op->map, op->x, op->y); 1369 top = ms.top;
1484 1370
1485 if (flag & INS_ABOVE_FLOOR_ONLY) 1371 if (flag & INS_ABOVE_FLOOR_ONLY)
1486 top = floor; 1372 top = floor;
1487 1373
1488 /* 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.
1489 */ 1375 */
1490 1376
1491 /* First object on this space */ 1377 /* First object on this space */
1492 if (!top) 1378 if (!top)
1493 { 1379 {
1494 op->above = GET_MAP_OB (op->map, op->x, op->y); 1380 op->above = ms.bot;
1495 1381
1496 if (op->above) 1382 if (op->above)
1497 op->above->below = op; 1383 op->above->below = op;
1498 1384
1499 op->below = NULL; 1385 op->below = 0;
1500 SET_MAP_OB (op->map, op->x, op->y, op); 1386 ms.bot = op;
1501 } 1387 }
1502 else 1388 else
1503 { /* get inserted into the stack above top */ 1389 { /* get inserted into the stack above top */
1504 op->above = top->above; 1390 op->above = top->above;
1505 1391
… …
1508 1394
1509 op->below = top; 1395 op->below = top;
1510 top->above = op; 1396 top->above = op;
1511 } 1397 }
1512 1398
1513 if (op->above == NULL) 1399 if (!op->above)
1514 SET_MAP_TOP (op->map, op->x, op->y, op); 1400 ms.top = op;
1515 } /* else not INS_BELOW_ORIGINATOR */ 1401 } /* else not INS_BELOW_ORIGINATOR */
1516 1402
1517 if (op->type == PLAYER) 1403 if (op->type == PLAYER)
1404 {
1518 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;
1519 1411
1520 /* 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
1521 * it, so save a few ticks and start from there. 1413 * it, so save a few ticks and start from there.
1522 */ 1414 */
1523 if (!(flag & INS_MAP_LOAD)) 1415 if (!(flag & INS_MAP_LOAD))
1524 for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1416 if (object *pl = ms.player ())
1525 if (tmp->type == PLAYER) 1417 if (pl->contr->ns)
1526 tmp->contr->socket.update_look = 1; 1418 pl->contr->ns->floorbox_update ();
1527 1419
1528 /* If this object glows, it may affect lighting conditions that are 1420 /* If this object glows, it may affect lighting conditions that are
1529 * 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
1530 * 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
1531 * on the map will get recalculated. The players could very well 1423 * on the map will get recalculated. The players could very well
1532 * 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 -
1533 * this should get redone to only look for players within range, 1425 * this should get redone to only look for players within range,
1534 * or just updating the P_NEED_UPDATE for spaces within this area 1426 * or just updating the P_UPTODATE for spaces within this area
1535 * of effect may be sufficient. 1427 * of effect may be sufficient.
1536 */ 1428 */
1537 if (MAP_DARKNESS (op->map) && (op->glow_radius != 0)) 1429 if (op->map->darkness && (op->glow_radius != 0))
1538 update_all_los (op->map, op->x, op->y); 1430 update_all_los (op->map, op->x, op->y);
1539 1431
1540 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1432 /* updates flags (blocked, alive, no magic, etc) for this map space */
1541 update_object (op, UP_OBJ_INSERT); 1433 update_object (op, UP_OBJ_INSERT);
1542 1434
1435 INVOKE_OBJECT (INSERT, op);
1436
1543 /* 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,
1544 * we want to have update_look set above before calling this. 1438 * we want to have floorbox_update called before calling this.
1545 * 1439 *
1546 * check_move_on() must be after this because code called from 1440 * check_move_on() must be after this because code called from
1547 * check_move_on() depends on correct map flags (so functions like 1441 * check_move_on() depends on correct map flags (so functions like
1548 * blocked() and wall() work properly), and these flags are updated by 1442 * blocked() and wall() work properly), and these flags are updated by
1549 * update_object(). 1443 * update_object().
… …
1551 1445
1552 /* 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 */
1553 if (!(flag & INS_NO_WALK_ON) && !op->head) 1447 if (!(flag & INS_NO_WALK_ON) && !op->head)
1554 { 1448 {
1555 if (check_move_on (op, originator)) 1449 if (check_move_on (op, originator))
1556 return NULL; 1450 return 0;
1557 1451
1558 /* 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
1559 * walk on's. 1453 * walk on's.
1560 */ 1454 */
1561 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1455 for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1562 if (check_move_on (tmp, originator)) 1456 if (check_move_on (tmp, originator))
1563 return NULL; 1457 return 0;
1564 } 1458 }
1565 1459
1566 return op; 1460 return op;
1567} 1461}
1568 1462
1569/* this function inserts an object in the map, but if it 1463/* this function inserts an object in the map, but if it
1570 * 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.
1571 * 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.
1572 */ 1466 */
1573void 1467void
1574replace_insert_ob_in_map (const char *arch_string, object *op) 1468replace_insert_ob_in_map (const char *arch_string, object *op)
1575{ 1469{
1576 object * 1470 object *tmp, *tmp1;
1577 tmp;
1578 object *
1579 tmp1;
1580 1471
1581 /* first search for itself and remove any old instances */ 1472 /* first search for itself and remove any old instances */
1582 1473
1583 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)
1584 {
1585 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1475 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1586 { 1476 tmp->destroy ();
1587 remove_ob (tmp);
1588 free_object (tmp);
1589 }
1590 }
1591 1477
1592 tmp1 = arch_to_object (find_archetype (arch_string)); 1478 tmp1 = arch_to_object (archetype::find (arch_string));
1593 1479
1594 tmp1->x = op->x; 1480 tmp1->x = op->x;
1595 tmp1->y = op->y; 1481 tmp1->y = op->y;
1596 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);
1597} 1489}
1598 1490
1599/* 1491/*
1600 * 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
1601 * is returned contains nr objects, and the remaining parts contains 1493 * is returned contains nr objects, and the remaining parts contains
1602 * 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).
1603 * On failure, NULL is returned, and the reason put into the 1495 * On failure, NULL is returned, and the reason put into the
1604 * global static errmsg array. 1496 * global static errmsg array.
1605 */ 1497 */
1606
1607object * 1498object *
1608get_split_ob (object *orig_ob, uint32 nr) 1499get_split_ob (object *orig_ob, uint32 nr)
1609{ 1500{
1610 object * 1501 object *newob;
1611 newob;
1612 int
1613 is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1502 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1614 1503
1615 if (orig_ob->nrof < nr) 1504 if (orig_ob->nrof < nr)
1616 { 1505 {
1617 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);
1618 return NULL; 1507 return NULL;
1619 } 1508 }
1620 1509
1621 newob = object_create_clone (orig_ob); 1510 newob = object_create_clone (orig_ob);
1622 1511
1623 if ((orig_ob->nrof -= nr) < 1) 1512 if ((orig_ob->nrof -= nr) < 1)
1624 { 1513 orig_ob->destroy (1);
1625 if (!is_removed)
1626 remove_ob (orig_ob);
1627 free_object2 (orig_ob, 1);
1628 }
1629 else if (!is_removed) 1514 else if (!is_removed)
1630 { 1515 {
1631 if (orig_ob->env != NULL) 1516 if (orig_ob->env != NULL)
1632 sub_weight (orig_ob->env, orig_ob->weight * nr); 1517 sub_weight (orig_ob->env, orig_ob->weight * nr);
1633 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)
… …
1648 * 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
1649 * is subsequently removed and freed. 1534 * is subsequently removed and freed.
1650 * 1535 *
1651 * 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
1652 */ 1537 */
1653
1654object * 1538object *
1655decrease_ob_nr (object *op, uint32 i) 1539decrease_ob_nr (object *op, uint32 i)
1656{ 1540{
1657 object *tmp; 1541 object *tmp;
1658 player *pl;
1659 1542
1660 if (i == 0) /* objects with op->nrof require this check */ 1543 if (i == 0) /* objects with op->nrof require this check */
1661 return op; 1544 return op;
1662 1545
1663 if (i > op->nrof) 1546 if (i > op->nrof)
1664 i = op->nrof; 1547 i = op->nrof;
1665 1548
1666 if (QUERY_FLAG (op, FLAG_REMOVED)) 1549 if (QUERY_FLAG (op, FLAG_REMOVED))
1667 op->nrof -= i; 1550 op->nrof -= i;
1668 else if (op->env != NULL) 1551 else if (op->env)
1669 { 1552 {
1670 /* is this object in the players inventory, or sub container 1553 /* is this object in the players inventory, or sub container
1671 * therein? 1554 * therein?
1672 */ 1555 */
1673 tmp = is_player_inv (op->env); 1556 tmp = op->in_player ();
1674 /* nope. Is this a container the player has opened? 1557 /* nope. Is this a container the player has opened?
1675 * If so, set tmp to that player. 1558 * If so, set tmp to that player.
1676 * IMO, searching through all the players will mostly 1559 * IMO, searching through all the players will mostly
1677 * likely be quicker than following op->env to the map, 1560 * likely be quicker than following op->env to the map,
1678 * and then searching the map for a player. 1561 * and then searching the map for a player.
1679 */ 1562 */
1680 if (!tmp) 1563 if (!tmp)
1681 { 1564 for_all_players (pl)
1682 for (pl = first_player; pl; pl = pl->next)
1683 if (pl->ob->container == op->env) 1565 if (pl->ob->container == op->env)
1566 {
1567 tmp = pl->ob;
1684 break; 1568 break;
1685 if (pl)
1686 tmp = pl->ob;
1687 else
1688 tmp = NULL;
1689 } 1569 }
1690 1570
1691 if (i < op->nrof) 1571 if (i < op->nrof)
1692 { 1572 {
1693 sub_weight (op->env, op->weight * i); 1573 sub_weight (op->env, op->weight * i);
1694 op->nrof -= i; 1574 op->nrof -= i;
1695 if (tmp) 1575 if (tmp)
1696 {
1697 esrv_send_item (tmp, op); 1576 esrv_send_item (tmp, op);
1698 }
1699 } 1577 }
1700 else 1578 else
1701 { 1579 {
1702 remove_ob (op); 1580 op->remove ();
1703 op->nrof = 0; 1581 op->nrof = 0;
1704 if (tmp) 1582 if (tmp)
1705 {
1706 esrv_del_item (tmp->contr, op->count); 1583 esrv_del_item (tmp->contr, op->count);
1707 }
1708 } 1584 }
1709 } 1585 }
1710 else 1586 else
1711 { 1587 {
1712 object *above = op->above; 1588 object *above = op->above;
1713 1589
1714 if (i < op->nrof) 1590 if (i < op->nrof)
1715 op->nrof -= i; 1591 op->nrof -= i;
1716 else 1592 else
1717 { 1593 {
1718 remove_ob (op); 1594 op->remove ();
1719 op->nrof = 0; 1595 op->nrof = 0;
1720 } 1596 }
1721 1597
1722 /* Since we just removed op, op->above is null */ 1598 /* Since we just removed op, op->above is null */
1723 for (tmp = above; tmp != NULL; tmp = tmp->above) 1599 for (tmp = above; tmp; tmp = tmp->above)
1724 if (tmp->type == PLAYER) 1600 if (tmp->type == PLAYER)
1725 { 1601 {
1726 if (op->nrof) 1602 if (op->nrof)
1727 esrv_send_item (tmp, op); 1603 esrv_send_item (tmp, op);
1728 else 1604 else
… …
1732 1608
1733 if (op->nrof) 1609 if (op->nrof)
1734 return op; 1610 return op;
1735 else 1611 else
1736 { 1612 {
1737 free_object (op); 1613 op->destroy ();
1738 return NULL; 1614 return 0;
1739 } 1615 }
1740} 1616}
1741 1617
1742/* 1618/*
1743 * add_weight(object, weight) adds the specified weight to an object, 1619 * add_weight(object, weight) adds the specified weight to an object,
1744 * and also updates how much the environment(s) is/are carrying. 1620 * and also updates how much the environment(s) is/are carrying.
1745 */ 1621 */
1746
1747void 1622void
1748add_weight (object *op, signed long weight) 1623add_weight (object *op, signed long weight)
1749{ 1624{
1750 while (op != NULL) 1625 while (op != NULL)
1751 { 1626 {
… …
1755 op->carrying += weight; 1630 op->carrying += weight;
1756 op = op->env; 1631 op = op->env;
1757 } 1632 }
1758} 1633}
1759 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
1760/* 1655/*
1761 * insert_ob_in_ob(op,environment): 1656 * env->insert (op)
1762 * This function inserts the object op in the linked list 1657 * This function inserts the object op in the linked list
1763 * inside the object environment. 1658 * inside the object environment.
1764 * 1659 *
1765 * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1766 * the inventory at the last position or next to other objects of the same
1767 * type.
1768 * Frank: Now sorted by type, archetype and magic!
1769 *
1770 * 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
1771 * be != op, if items are merged. -Tero 1661 * be != op, if items are merged. -Tero
1772 */ 1662 */
1773
1774object * 1663object *
1775insert_ob_in_ob (object *op, object *where) 1664object::insert (object *op)
1776{ 1665{
1777 object * 1666 object *tmp, *otmp;
1778 tmp, *
1779 otmp;
1780 1667
1781 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1668 if (!QUERY_FLAG (op, FLAG_REMOVED))
1782 { 1669 op->remove ();
1783 dump_object (op);
1784 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1785 return op;
1786 }
1787
1788 if (where == NULL)
1789 {
1790 dump_object (op);
1791 LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1792 return op;
1793 }
1794
1795 if (where->head)
1796 {
1797 LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1798 where = where->head;
1799 }
1800 1670
1801 if (op->more) 1671 if (op->more)
1802 { 1672 {
1803 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);
1804 return op; 1674 return op;
… …
1806 1676
1807 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1677 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1808 CLEAR_FLAG (op, FLAG_REMOVED); 1678 CLEAR_FLAG (op, FLAG_REMOVED);
1809 if (op->nrof) 1679 if (op->nrof)
1810 { 1680 {
1811 for (tmp = where->inv; tmp != NULL; tmp = tmp->below) 1681 for (tmp = inv; tmp != NULL; tmp = tmp->below)
1812 if (CAN_MERGE (tmp, op)) 1682 if (object::can_merge (tmp, op))
1813 { 1683 {
1814 /* return the original object and remove inserted object 1684 /* return the original object and remove inserted object
1815 (client needs the original object) */ 1685 (client needs the original object) */
1816 tmp->nrof += op->nrof; 1686 tmp->nrof += op->nrof;
1817 /* Weight handling gets pretty funky. Since we are adding to 1687 /* Weight handling gets pretty funky. Since we are adding to
1818 * tmp->nrof, we need to increase the weight. 1688 * tmp->nrof, we need to increase the weight.
1819 */ 1689 */
1820 add_weight (where, op->weight * op->nrof); 1690 add_weight (this, op->weight * op->nrof);
1821 SET_FLAG (op, FLAG_REMOVED); 1691 SET_FLAG (op, FLAG_REMOVED);
1822 free_object (op); /* free the inserted object */ 1692 op->destroy (); /* free the inserted object */
1823 op = tmp; 1693 op = tmp;
1824 remove_ob (op); /* and fix old object's links */ 1694 op->remove (); /* and fix old object's links */
1825 CLEAR_FLAG (op, FLAG_REMOVED); 1695 CLEAR_FLAG (op, FLAG_REMOVED);
1826 break; 1696 break;
1827 } 1697 }
1828 1698
1829 /* I assume combined objects have no inventory 1699 /* I assume combined objects have no inventory
1830 * We add the weight - this object could have just been removed 1700 * We add the weight - this object could have just been removed
1831 * (if it was possible to merge). calling remove_ob will subtract 1701 * (if it was possible to merge). calling remove_ob will subtract
1832 * 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
1833 * the linking below 1703 * the linking below
1834 */ 1704 */
1835 add_weight (where, op->weight * op->nrof); 1705 add_weight (this, op->weight * op->nrof);
1836 } 1706 }
1837 else 1707 else
1838 add_weight (where, (op->weight + op->carrying)); 1708 add_weight (this, (op->weight + op->carrying));
1839 1709
1840 otmp = is_player_inv (where); 1710 otmp = this->in_player ();
1841 if (otmp && otmp->contr != NULL) 1711 if (otmp && otmp->contr)
1842 {
1843 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1712 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1844 fix_player (otmp); 1713 otmp->update_stats ();
1845 }
1846 1714
1847 op->map = NULL; 1715 op->map = 0;
1848 op->env = where; 1716 op->env = this;
1849 op->above = NULL; 1717 op->above = 0;
1850 op->below = NULL; 1718 op->below = 0;
1851 op->x = 0, op->y = 0; 1719 op->x = 0, op->y = 0;
1852 1720
1853 /* 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 */
1854 if ((op->glow_radius != 0) && where->map) 1722 if ((op->glow_radius != 0) && map)
1855 { 1723 {
1856#ifdef DEBUG_LIGHTS 1724#ifdef DEBUG_LIGHTS
1857 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);
1858#endif /* DEBUG_LIGHTS */ 1726#endif /* DEBUG_LIGHTS */
1859 if (MAP_DARKNESS (where->map)) 1727 if (map->darkness)
1860 update_all_los (where->map, where->x, where->y); 1728 update_all_los (map, x, y);
1861 } 1729 }
1862 1730
1863 /* 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.
1864 * It sure simplifies this function... 1732 * It sure simplifies this function...
1865 */ 1733 */
1866 if (where->inv == NULL) 1734 if (!inv)
1867 where->inv = op; 1735 inv = op;
1868 else 1736 else
1869 { 1737 {
1870 op->below = where->inv; 1738 op->below = inv;
1871 op->below->above = op; 1739 op->below->above = op;
1872 where->inv = op; 1740 inv = op;
1873 } 1741 }
1742
1743 INVOKE_OBJECT (INSERT, this);
1744
1874 return op; 1745 return op;
1875} 1746}
1876 1747
1877/* 1748/*
1878 * Checks if any objects has a move_type that matches objects 1749 * Checks if any objects has a move_type that matches objects
… …
1892 * 1763 *
1893 * 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
1894 * 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
1895 * on top. 1766 * on top.
1896 */ 1767 */
1897
1898int 1768int
1899check_move_on (object *op, object *originator) 1769check_move_on (object *op, object *originator)
1900{ 1770{
1901 object * 1771 object *tmp;
1902 tmp; 1772 maptile *m = op->map;
1903 tag_t
1904 tag;
1905 mapstruct *
1906 m = op->map;
1907 int
1908 x = op->x, y = op->y; 1773 int x = op->x, y = op->y;
1909 1774
1910 MoveType 1775 MoveType move_on, move_slow, move_block;
1911 move_on,
1912 move_slow,
1913 move_block;
1914 1776
1915 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1777 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1916 return 0; 1778 return 0;
1917
1918 tag = op->count;
1919 1779
1920 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);
1921 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);
1922 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);
1923 1783
… …
1939 1799
1940 /* The objects have to be checked from top to bottom. 1800 /* The objects have to be checked from top to bottom.
1941 * Hence, we first go to the top: 1801 * Hence, we first go to the top:
1942 */ 1802 */
1943 1803
1944 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)
1945 { 1805 {
1946 /* Trim the search when we find the first other spell effect 1806 /* Trim the search when we find the first other spell effect
1947 * 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,
1948 * we don't need to check all of them. 1808 * we don't need to check all of them.
1949 */ 1809 */
… …
1967 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1827 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1968 ((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))
1969 { 1829 {
1970 1830
1971 float 1831 float
1972 diff = tmp->move_slow_penalty * FABS (op->speed); 1832 diff = tmp->move_slow_penalty * fabs (op->speed);
1973 1833
1974 if (op->type == PLAYER) 1834 if (op->type == PLAYER)
1975 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)) ||
1976 (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)))
1977 diff /= 4.0; 1837 diff /= 4.0;
… …
1984 if ((!op->move_type && tmp->move_on & MOVE_WALK) || 1844 if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
1985 ((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))
1986 { 1846 {
1987 move_apply (tmp, op, originator); 1847 move_apply (tmp, op, originator);
1988 1848
1989 if (was_destroyed (op, tag)) 1849 if (op->destroyed ())
1990 return 1; 1850 return 1;
1991 1851
1992 /* what the person/creature stepped onto has moved the object 1852 /* what the person/creature stepped onto has moved the object
1993 * someplace new. Don't process any further - if we did, 1853 * someplace new. Don't process any further - if we did,
1994 * have a feeling strange problems would result. 1854 * have a feeling strange problems would result.
… …
2004/* 1864/*
2005 * present_arch(arch, map, x, y) searches for any objects with 1865 * present_arch(arch, map, x, y) searches for any objects with
2006 * a matching archetype at the given map and coordinates. 1866 * a matching archetype at the given map and coordinates.
2007 * The first matching object is returned, or NULL if none. 1867 * The first matching object is returned, or NULL if none.
2008 */ 1868 */
2009
2010object * 1869object *
2011present_arch (const archetype *at, mapstruct *m, int x, int y) 1870present_arch (const archetype *at, maptile *m, int x, int y)
2012{ 1871{
2013 object *
2014 tmp;
2015
2016 if (m == NULL || out_of_map (m, x, y)) 1872 if (!m || out_of_map (m, x, y))
2017 { 1873 {
2018 LOG (llevError, "Present_arch called outside map.\n"); 1874 LOG (llevError, "Present_arch called outside map.\n");
2019 return NULL; 1875 return NULL;
2020 } 1876 }
2021 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)
2022 if (tmp->arch == at) 1879 if (tmp->arch == at)
2023 return tmp; 1880 return tmp;
1881
2024 return NULL; 1882 return NULL;
2025} 1883}
2026 1884
2027/* 1885/*
2028 * present(type, map, x, y) searches for any objects with 1886 * present(type, map, x, y) searches for any objects with
2029 * a matching type variable at the given map and coordinates. 1887 * a matching type variable at the given map and coordinates.
2030 * The first matching object is returned, or NULL if none. 1888 * The first matching object is returned, or NULL if none.
2031 */ 1889 */
2032
2033object * 1890object *
2034present (unsigned char type, mapstruct *m, int x, int y) 1891present (unsigned char type, maptile *m, int x, int y)
2035{ 1892{
2036 object *
2037 tmp;
2038
2039 if (out_of_map (m, x, y)) 1893 if (out_of_map (m, x, y))
2040 { 1894 {
2041 LOG (llevError, "Present called outside map.\n"); 1895 LOG (llevError, "Present called outside map.\n");
2042 return NULL; 1896 return NULL;
2043 } 1897 }
2044 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)
2045 if (tmp->type == type) 1900 if (tmp->type == type)
2046 return tmp; 1901 return tmp;
1902
2047 return NULL; 1903 return NULL;
2048} 1904}
2049 1905
2050/* 1906/*
2051 * present_in_ob(type, object) searches for any objects with 1907 * present_in_ob(type, object) searches for any objects with
2052 * a matching type variable in the inventory of the given object. 1908 * a matching type variable in the inventory of the given object.
2053 * The first matching object is returned, or NULL if none. 1909 * The first matching object is returned, or NULL if none.
2054 */ 1910 */
2055
2056object * 1911object *
2057present_in_ob (unsigned char type, const object *op) 1912present_in_ob (unsigned char type, const object *op)
2058{ 1913{
2059 object *
2060 tmp;
2061
2062 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1914 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2063 if (tmp->type == type) 1915 if (tmp->type == type)
2064 return tmp; 1916 return tmp;
1917
2065 return NULL; 1918 return NULL;
2066} 1919}
2067 1920
2068/* 1921/*
2069 * present_in_ob (type, str, object) searches for any objects with 1922 * present_in_ob (type, str, object) searches for any objects with
… …
2077 * 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
2078 * 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
2079 * 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
2080 * to be unique. 1933 * to be unique.
2081 */ 1934 */
2082
2083object * 1935object *
2084present_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)
2085{ 1937{
2086 object *
2087 tmp;
2088
2089 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1938 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2090 {
2091 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name))) 1939 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
2092 return tmp; 1940 return tmp;
2093 } 1941
2094 return NULL; 1942 return 0;
2095} 1943}
2096 1944
2097/* 1945/*
2098 * present_arch_in_ob(archetype, object) searches for any objects with 1946 * present_arch_in_ob(archetype, object) searches for any objects with
2099 * a matching archetype in the inventory of the given object. 1947 * a matching archetype in the inventory of the given object.
2100 * The first matching object is returned, or NULL if none. 1948 * The first matching object is returned, or NULL if none.
2101 */ 1949 */
2102
2103object * 1950object *
2104present_arch_in_ob (const archetype *at, const object *op) 1951present_arch_in_ob (const archetype *at, const object *op)
2105{ 1952{
2106 object *
2107 tmp;
2108
2109 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1953 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2110 if (tmp->arch == at) 1954 if (tmp->arch == at)
2111 return tmp; 1955 return tmp;
1956
2112 return NULL; 1957 return NULL;
2113} 1958}
2114 1959
2115/* 1960/*
2116 * activate recursively a flag on an object inventory 1961 * activate recursively a flag on an object inventory
2117 */ 1962 */
2118void 1963void
2119flag_inv (object *op, int flag) 1964flag_inv (object *op, int flag)
2120{ 1965{
2121 object *
2122 tmp;
2123
2124 if (op->inv) 1966 if (op->inv)
2125 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1967 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2126 { 1968 {
2127 SET_FLAG (tmp, flag); 1969 SET_FLAG (tmp, flag);
2128 flag_inv (tmp, flag); 1970 flag_inv (tmp, flag);
2129 } 1971 }
2130} /* 1972}
1973
1974/*
2131 * desactivate recursively a flag on an object inventory 1975 * deactivate recursively a flag on an object inventory
2132 */ 1976 */
2133void 1977void
2134unflag_inv (object *op, int flag) 1978unflag_inv (object *op, int flag)
2135{ 1979{
2136 object *
2137 tmp;
2138
2139 if (op->inv) 1980 if (op->inv)
2140 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1981 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2141 { 1982 {
2142 CLEAR_FLAG (tmp, flag); 1983 CLEAR_FLAG (tmp, flag);
2143 unflag_inv (tmp, flag); 1984 unflag_inv (tmp, flag);
2144 } 1985 }
2145} 1986}
… …
2148 * 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
2149 * all it's inventory (recursively). 1990 * all it's inventory (recursively).
2150 * 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
2151 * 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.
2152 */ 1993 */
2153
2154void 1994void
2155set_cheat (object *op) 1995set_cheat (object *op)
2156{ 1996{
2157 SET_FLAG (op, FLAG_WAS_WIZ); 1997 SET_FLAG (op, FLAG_WAS_WIZ);
2158 flag_inv (op, FLAG_WAS_WIZ); 1998 flag_inv (op, FLAG_WAS_WIZ);
… …
2177 * 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
2178 * 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
2179 * 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
2180 * customized, changed states, etc. 2020 * customized, changed states, etc.
2181 */ 2021 */
2182
2183int 2022int
2184find_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)
2185{ 2024{
2186 int
2187 i,
2188 index = 0, flag; 2025 int index = 0, flag;
2189 static int
2190 altern[SIZEOFFREE]; 2026 int altern[SIZEOFFREE];
2191 2027
2192 for (i = start; i < stop; i++) 2028 for (int i = start; i < stop; i++)
2193 { 2029 {
2194 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]);
2195 if (!flag) 2031 if (!flag)
2196 altern[index++] = i; 2032 altern [index++] = i;
2197 2033
2198 /* 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.
2199 * 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.
2200 * 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 -
2201 * 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
2202 * 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
2203 * to only the spaces immediately surrounding the target area, and 2039 * to only the spaces immediately surrounding the target area, and
2204 * won't look 2 spaces south of the target space. 2040 * won't look 2 spaces south of the target space.
2205 */ 2041 */
2206 else if ((flag & AB_NO_PASS) && maxfree[i] < stop) 2042 else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2207 stop = maxfree[i]; 2043 stop = maxfree[i];
2208 } 2044 }
2045
2209 if (!index) 2046 if (!index)
2210 return -1; 2047 return -1;
2048
2211 return altern[RANDOM () % index]; 2049 return altern [rndm (index)];
2212} 2050}
2213 2051
2214/* 2052/*
2215 * find_first_free_spot(archetype, mapstruct, x, y) works like 2053 * find_first_free_spot(archetype, maptile, x, y) works like
2216 * find_free_spot(), but it will search max number of squares. 2054 * find_free_spot(), but it will search max number of squares.
2217 * 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.
2218 * 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.
2219 */ 2057 */
2220
2221int 2058int
2222find_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)
2223{ 2060{
2224 int
2225 i;
2226
2227 for (i = 0; i < SIZEOFFREE; i++) 2061 for (int i = 0; i < SIZEOFFREE; i++)
2228 {
2229 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]))
2230 return i; 2063 return i;
2231 } 2064
2232 return -1; 2065 return -1;
2233} 2066}
2234 2067
2235/* 2068/*
2236 * The function permute(arr, begin, end) randomly reorders the array 2069 * The function permute(arr, begin, end) randomly reorders the array
2237 * arr[begin..end-1]. 2070 * arr[begin..end-1].
2071 * now uses a fisher-yates shuffle, old permute was broken
2238 */ 2072 */
2239static void 2073static void
2240permute (int *arr, int begin, int end) 2074permute (int *arr, int begin, int end)
2241{ 2075{
2242 int 2076 arr += begin;
2243 i,
2244 j,
2245 tmp,
2246 len;
2247
2248 len = end - begin; 2077 end -= begin;
2249 for (i = begin; i < end; i++)
2250 {
2251 j = begin + RANDOM () % len;
2252 2078
2253 tmp = arr[i]; 2079 while (--end)
2254 arr[i] = arr[j]; 2080 swap (arr [end], arr [rndm (end + 1)]);
2255 arr[j] = tmp;
2256 }
2257} 2081}
2258 2082
2259/* new function to make monster searching more efficient, and effective! 2083/* new function to make monster searching more efficient, and effective!
2260 * This basically returns a randomized array (in the passed pointer) of 2084 * This basically returns a randomized array (in the passed pointer) of
2261 * 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
… …
2264 * 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.
2265 */ 2089 */
2266void 2090void
2267get_search_arr (int *search_arr) 2091get_search_arr (int *search_arr)
2268{ 2092{
2269 int 2093 int i;
2270 i;
2271 2094
2272 for (i = 0; i < SIZEOFFREE; i++) 2095 for (i = 0; i < SIZEOFFREE; i++)
2273 {
2274 search_arr[i] = i; 2096 search_arr[i] = i;
2275 }
2276 2097
2277 permute (search_arr, 1, SIZEOFFREE1 + 1); 2098 permute (search_arr, 1, SIZEOFFREE1 + 1);
2278 permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1); 2099 permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2279 permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE); 2100 permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2280} 2101}
… …
2289 * Perhaps incorrectly, but I'm making the assumption that exclude 2110 * Perhaps incorrectly, but I'm making the assumption that exclude
2290 * 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
2291 * 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
2292 * there is capable of. 2113 * there is capable of.
2293 */ 2114 */
2294
2295int 2115int
2296find_dir (mapstruct *m, int x, int y, object *exclude) 2116find_dir (maptile *m, int x, int y, object *exclude)
2297{ 2117{
2298 int
2299 i,
2300 max = SIZEOFFREE, mflags; 2118 int i, max = SIZEOFFREE, mflags;
2301 2119
2302 sint16 nx, ny; 2120 sint16 nx, ny;
2303 object * 2121 object *tmp;
2304 tmp; 2122 maptile *mp;
2305 mapstruct *
2306 mp;
2307 2123
2308 MoveType blocked, move_type; 2124 MoveType blocked, move_type;
2309 2125
2310 if (exclude && exclude->head) 2126 if (exclude && exclude->head)
2311 { 2127 {
… …
2323 mp = m; 2139 mp = m;
2324 nx = x + freearr_x[i]; 2140 nx = x + freearr_x[i];
2325 ny = y + freearr_y[i]; 2141 ny = y + freearr_y[i];
2326 2142
2327 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); 2143 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
2144
2328 if (mflags & P_OUT_OF_MAP) 2145 if (mflags & P_OUT_OF_MAP)
2329 {
2330 max = maxfree[i]; 2146 max = maxfree[i];
2331 }
2332 else 2147 else
2333 { 2148 {
2334 blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny); 2149 mapspace &ms = mp->at (nx, ny);
2150
2151 blocked = ms.move_block;
2335 2152
2336 if ((move_type & blocked) == move_type) 2153 if ((move_type & blocked) == move_type)
2337 {
2338 max = maxfree[i]; 2154 max = maxfree[i];
2339 }
2340 else if (mflags & P_IS_ALIVE) 2155 else if (mflags & P_IS_ALIVE)
2341 { 2156 {
2342 for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above) 2157 for (tmp = ms.bot; tmp; tmp = tmp->above)
2343 { 2158 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2344 if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2159 && (tmp != exclude || (tmp->head && tmp->head != exclude)))
2345 {
2346 break; 2160 break;
2347 } 2161
2348 }
2349 if (tmp) 2162 if (tmp)
2350 {
2351 return freedir[i]; 2163 return freedir[i];
2352 }
2353 } 2164 }
2354 } 2165 }
2355 } 2166 }
2167
2356 return 0; 2168 return 0;
2357} 2169}
2358 2170
2359/* 2171/*
2360 * distance(object 1, object 2) will return the square of the 2172 * distance(object 1, object 2) will return the square of the
2361 * distance between the two given objects. 2173 * distance between the two given objects.
2362 */ 2174 */
2363
2364int 2175int
2365distance (const object *ob1, const object *ob2) 2176distance (const object *ob1, const object *ob2)
2366{ 2177{
2367 int
2368 i;
2369
2370 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);
2371 return i;
2372} 2179}
2373 2180
2374/* 2181/*
2375 * 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
2376 * 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
2377 * object, needs to travel toward it. 2184 * object, needs to travel toward it.
2378 */ 2185 */
2379
2380int 2186int
2381find_dir_2 (int x, int y) 2187find_dir_2 (int x, int y)
2382{ 2188{
2383 int 2189 int q;
2384 q;
2385 2190
2386 if (y) 2191 if (y)
2387 q = x * 100 / y; 2192 q = x * 100 / y;
2388 else if (x) 2193 else if (x)
2389 q = -300 * x; 2194 q = -300 * x;
… …
2414 2219
2415 return 3; 2220 return 3;
2416} 2221}
2417 2222
2418/* 2223/*
2419 * absdir(int): Returns a number between 1 and 8, which represent
2420 * the "absolute" direction of a number (it actually takes care of
2421 * "overflow" in previous calculations of a direction).
2422 */
2423
2424int
2425absdir (int d)
2426{
2427 while (d < 1)
2428 d += 8;
2429 while (d > 8)
2430 d -= 8;
2431 return d;
2432}
2433
2434/*
2435 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2224 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2436 * between two directions (which are expected to be absolute (see absdir()) 2225 * between two directions (which are expected to be absolute (see absdir())
2437 */ 2226 */
2438
2439int 2227int
2440dirdiff (int dir1, int dir2) 2228dirdiff (int dir1, int dir2)
2441{ 2229{
2442 int 2230 int d;
2443 d;
2444 2231
2445 d = abs (dir1 - dir2); 2232 d = abs (dir1 - dir2);
2446 if (d > 4) 2233 if (d > 4)
2447 d = 8 - d; 2234 d = 8 - d;
2235
2448 return d; 2236 return d;
2449} 2237}
2450 2238
2451/* peterm: 2239/* peterm:
2452 * 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.
… …
2455 * 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
2456 * 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.
2457 * 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
2458 * functions. 2246 * functions.
2459 */ 2247 */
2460
2461int
2462 reduction_dir[SIZEOFFREE][3] = { 2248int reduction_dir[SIZEOFFREE][3] = {
2463 {0, 0, 0}, /* 0 */ 2249 {0, 0, 0}, /* 0 */
2464 {0, 0, 0}, /* 1 */ 2250 {0, 0, 0}, /* 1 */
2465 {0, 0, 0}, /* 2 */ 2251 {0, 0, 0}, /* 2 */
2466 {0, 0, 0}, /* 3 */ 2252 {0, 0, 0}, /* 3 */
2467 {0, 0, 0}, /* 4 */ 2253 {0, 0, 0}, /* 4 */
… …
2515 * find a path to that monster that we found. If not, 2301 * find a path to that monster that we found. If not,
2516 * we don't bother going toward it. Returns 1 if we 2302 * we don't bother going toward it. Returns 1 if we
2517 * can see a direct way to get it 2303 * can see a direct way to get it
2518 * Modified to be map tile aware -.MSW 2304 * Modified to be map tile aware -.MSW
2519 */ 2305 */
2520
2521
2522int 2306int
2523can_see_monsterP (mapstruct *m, int x, int y, int dir) 2307can_see_monsterP (maptile *m, int x, int y, int dir)
2524{ 2308{
2525 sint16 dx, dy; 2309 sint16 dx, dy;
2526 int
2527 mflags; 2310 int mflags;
2528 2311
2529 if (dir < 0) 2312 if (dir < 0)
2530 return 0; /* exit condition: invalid direction */ 2313 return 0; /* exit condition: invalid direction */
2531 2314
2532 dx = x + freearr_x[dir]; 2315 dx = x + freearr_x[dir];
… …
2545 return 0; 2328 return 0;
2546 2329
2547 /* yes, can see. */ 2330 /* yes, can see. */
2548 if (dir < 9) 2331 if (dir < 9)
2549 return 1; 2332 return 1;
2333
2550 return can_see_monsterP (m, x, y, reduction_dir[dir][0]) | 2334 return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2551 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]);
2552} 2337}
2553
2554
2555 2338
2556/* 2339/*
2557 * 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
2558 * picked up by the picker. Returnes 1 if it can be 2341 * picked up by the picker. Returnes 1 if it can be
2559 * picked up, otherwise 0. 2342 * picked up, otherwise 0.
… …
2570 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2353 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2571 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2354 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2572 !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));
2573} 2356}
2574 2357
2575
2576/* 2358/*
2577 * create clone from object to another 2359 * create clone from object to another
2578 */ 2360 */
2579object * 2361object *
2580object_create_clone (object *asrc) 2362object_create_clone (object *asrc)
2581{ 2363{
2582 object *
2583 dst = NULL, *tmp, *src, *part, *prev, *item; 2364 object *dst = 0, *tmp, *src, *part, *prev, *item;
2584 2365
2585 if (!asrc) 2366 if (!asrc)
2586 return NULL; 2367 return 0;
2368
2587 src = asrc; 2369 src = asrc;
2588 if (src->head) 2370 if (src->head)
2589 src = src->head; 2371 src = src->head;
2590 2372
2591 prev = NULL; 2373 prev = 0;
2592 for (part = src; part; part = part->more) 2374 for (part = src; part; part = part->more)
2593 { 2375 {
2594 tmp = get_object (); 2376 tmp = part->clone ();
2595 copy_object (part, tmp);
2596 tmp->x -= src->x; 2377 tmp->x -= src->x;
2597 tmp->y -= src->y; 2378 tmp->y -= src->y;
2379
2598 if (!part->head) 2380 if (!part->head)
2599 { 2381 {
2600 dst = tmp; 2382 dst = tmp;
2601 tmp->head = NULL; 2383 tmp->head = 0;
2602 } 2384 }
2603 else 2385 else
2604 {
2605 tmp->head = dst; 2386 tmp->head = dst;
2606 } 2387
2607 tmp->more = NULL; 2388 tmp->more = 0;
2389
2608 if (prev) 2390 if (prev)
2609 prev->more = tmp; 2391 prev->more = tmp;
2392
2610 prev = tmp; 2393 prev = tmp;
2611 } 2394 }
2612 2395
2613 /*** copy inventory ***/
2614 for (item = src->inv; item; item = item->below) 2396 for (item = src->inv; item; item = item->below)
2615 {
2616 (void) insert_ob_in_ob (object_create_clone (item), dst); 2397 insert_ob_in_ob (object_create_clone (item), dst);
2617 }
2618 2398
2619 return dst; 2399 return dst;
2620}
2621
2622/* return true if the object was destroyed, 0 otherwise */
2623int
2624was_destroyed (const object *op, tag_t old_tag)
2625{
2626 /* checking for FLAG_FREED isn't necessary, but makes this function more
2627 * robust */
2628 return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2629}
2630
2631/* GROS - Creates an object using a string representing its content. */
2632
2633/* Basically, we save the content of the string to a temp file, then call */
2634
2635/* load_object on it. I admit it is a highly inefficient way to make things, */
2636
2637/* but it was simple to make and allows reusing the load_object function. */
2638
2639/* Remember not to use load_object_str in a time-critical situation. */
2640
2641/* Also remember that multiparts objects are not supported for now. */
2642
2643object *
2644load_object_str (const char *obstr)
2645{
2646 object *
2647 op;
2648 char
2649 filename[MAX_BUF];
2650
2651 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2652
2653 FILE *
2654 tempfile = fopen (filename, "w");
2655
2656 if (tempfile == NULL)
2657 {
2658 LOG (llevError, "Error - Unable to access load object temp file\n");
2659 return NULL;
2660 };
2661 fprintf (tempfile, obstr);
2662 fclose (tempfile);
2663
2664 op = get_object ();
2665
2666 object_thawer thawer (filename);
2667
2668 if (thawer)
2669 load_object (thawer, op, 0);
2670
2671 LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2672 CLEAR_FLAG (op, FLAG_REMOVED);
2673
2674 return op;
2675} 2400}
2676 2401
2677/* This returns the first object in who's inventory that 2402/* This returns the first object in who's inventory that
2678 * has the same type and subtype match. 2403 * has the same type and subtype match.
2679 * returns NULL if no match. 2404 * returns NULL if no match.
2680 */ 2405 */
2681object * 2406object *
2682find_obj_by_type_subtype (const object *who, int type, int subtype) 2407find_obj_by_type_subtype (const object *who, int type, int subtype)
2683{ 2408{
2684 object *
2685 tmp;
2686
2687 for (tmp = who->inv; tmp; tmp = tmp->below) 2409 for (object *tmp = who->inv; tmp; tmp = tmp->below)
2688 if (tmp->type == type && tmp->subtype == subtype) 2410 if (tmp->type == type && tmp->subtype == subtype)
2689 return tmp; 2411 return tmp;
2690 2412
2691 return NULL; 2413 return 0;
2692} 2414}
2693 2415
2694/* 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,
2695 * otherwise return NULL. 2417 * otherwise return NULL.
2696 * 2418 *
… …
2698 * do the desired thing. 2420 * do the desired thing.
2699 */ 2421 */
2700key_value * 2422key_value *
2701get_ob_key_link (const object *ob, const char *key) 2423get_ob_key_link (const object *ob, const char *key)
2702{ 2424{
2703 key_value *
2704 link;
2705
2706 for (link = ob->key_values; link != NULL; link = link->next) 2425 for (key_value *link = ob->key_values; link; link = link->next)
2707 {
2708 if (link->key == key) 2426 if (link->key == key)
2709 {
2710 return link; 2427 return link;
2711 }
2712 }
2713 2428
2714 return NULL; 2429 return 0;
2715} 2430}
2716 2431
2717/* 2432/*
2718 * 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.
2719 * 2434 *
… …
2722 * The returned string is shared. 2437 * The returned string is shared.
2723 */ 2438 */
2724const char * 2439const char *
2725get_ob_key_value (const object *op, const char *const key) 2440get_ob_key_value (const object *op, const char *const key)
2726{ 2441{
2727 key_value * 2442 key_value *link;
2728 link; 2443 shstr_cmp canonical_key (key);
2729 const char *
2730 canonical_key;
2731 2444
2732 canonical_key = shstr::find (key);
2733
2734 if (canonical_key == NULL) 2445 if (!canonical_key)
2735 { 2446 {
2736 /* 1. There being a field named key on any object 2447 /* 1. There being a field named key on any object
2737 * implies there'd be a shared string to find. 2448 * implies there'd be a shared string to find.
2738 * 2. Since there isn't, no object has this field. 2449 * 2. Since there isn't, no object has this field.
2739 * 3. Therefore, *this* object doesn't have this field. 2450 * 3. Therefore, *this* object doesn't have this field.
2740 */ 2451 */
2741 return NULL; 2452 return 0;
2742 } 2453 }
2743 2454
2744 /* This is copied from get_ob_key_link() above - 2455 /* This is copied from get_ob_key_link() above -
2745 * only 4 lines, and saves the function call overhead. 2456 * only 4 lines, and saves the function call overhead.
2746 */ 2457 */
2747 for (link = op->key_values; link != NULL; link = link->next) 2458 for (link = op->key_values; link; link = link->next)
2748 {
2749 if (link->key == canonical_key) 2459 if (link->key == canonical_key)
2750 {
2751 return link->value; 2460 return link->value;
2752 } 2461
2753 }
2754 return NULL; 2462 return 0;
2755} 2463}
2756
2757 2464
2758/* 2465/*
2759 * Updates the canonical_key in op to value. 2466 * Updates the canonical_key in op to value.
2760 * 2467 *
2761 * 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).
… …
2766 * Returns TRUE on success. 2473 * Returns TRUE on success.
2767 */ 2474 */
2768int 2475int
2769set_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)
2770{ 2477{
2771 key_value *
2772 field = NULL, *last = NULL; 2478 key_value *field = NULL, *last = NULL;
2773 2479
2774 for (field = op->key_values; field != NULL; field = field->next) 2480 for (field = op->key_values; field != NULL; field = field->next)
2775 { 2481 {
2776 if (field->key != canonical_key) 2482 if (field->key != canonical_key)
2777 { 2483 {
… …
2805 /* IF we get here, key doesn't exist */ 2511 /* IF we get here, key doesn't exist */
2806 2512
2807 /* No field, we'll have to add it. */ 2513 /* No field, we'll have to add it. */
2808 2514
2809 if (!add_key) 2515 if (!add_key)
2810 {
2811 return FALSE; 2516 return FALSE;
2812 } 2517
2813 /* There isn't any good reason to store a null 2518 /* There isn't any good reason to store a null
2814 * value in the key/value list. If the archetype has 2519 * value in the key/value list. If the archetype has
2815 * this key, then we should also have it, so shouldn't 2520 * this key, then we should also have it, so shouldn't
2816 * be here. If user wants to store empty strings, 2521 * be here. If user wants to store empty strings,
2817 * should pass in "" 2522 * should pass in ""
… …
2845 shstr key_ (key); 2550 shstr key_ (key);
2846 2551
2847 return set_ob_key_value_s (op, key_, value, add_key); 2552 return set_ob_key_value_s (op, key_, value, add_key);
2848} 2553}
2849 2554
2555object::depth_iterator::depth_iterator (object *container)
2556: iterator_base (container)
2557{
2558 while (item->inv)
2559 item = item->inv;
2560}
2561
2850void 2562void
2851object::deep_iterator::next () 2563object::depth_iterator::next ()
2852{ 2564{
2853 if (item->inv)
2854 item = item->inv;
2855 else if (item->below) 2565 if (item->below)
2566 {
2856 item = item->below; 2567 item = item->below;
2568
2569 while (item->inv)
2570 item = item->inv;
2571 }
2857 else 2572 else
2858 item = item->env->below; 2573 item = item->env;
2859} 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