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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines