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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines