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.139 by root, Sat Apr 21 17:34:22 2007 UTC vs.
Revision 1.348 by root, Sat May 7 20:03:27 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines