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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines