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.47 by root, Thu Sep 14 22:33:59 2006 UTC vs.
Revision 1.366 by root, Sat Nov 17 23:40:00 2018 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines