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.144 by root, Thu May 3 10:39:46 2007 UTC vs.
Revision 1.349 by root, Sun May 8 11:44:43 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines