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.118 by root, Thu Jan 18 19:42:09 2007 UTC vs.
Revision 1.339 by root, Fri Jul 2 17:39:23 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines