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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines