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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines