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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines