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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines