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.106 by root, Wed Jan 3 20:08:04 2007 UTC vs.
Revision 1.345 by root, Sun May 1 16:58:15 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines