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.153 by root, Thu May 17 21:11:01 2007 UTC vs.
Revision 1.338 by root, Fri Jul 2 16:24:24 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines