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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines