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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines