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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines