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.46 by root, Thu Sep 14 21:16:11 2006 UTC vs.
Revision 1.337 by root, Thu May 6 21:45:49 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines