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.104 by root, Tue Jan 2 21:13:21 2007 UTC vs.
Revision 1.332 by root, Thu Apr 22 03:49:13 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines