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.30 by root, Mon Sep 11 20:28:37 2006 UTC vs.
Revision 1.366 by root, Sat Nov 17 23:40:00 2018 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines