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.26 by root, Mon Sep 11 11:46:52 2006 UTC vs.
Revision 1.349 by root, Sun May 8 11:44:43 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines