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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines