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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines