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.39 by root, Wed Sep 13 02:05:19 2006 UTC vs.
Revision 1.343 by root, Sat Apr 23 04:56:46 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines