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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines